diff --git a/src/compiler/nir/nir_opt_algebraic.py b/src/compiler/nir/nir_opt_algebraic.py
index 75987e3cc58..5082271a70d 100644
--- a/src/compiler/nir/nir_opt_algebraic.py
+++ b/src/compiler/nir/nir_opt_algebraic.py
@@ -350,16 +350,16 @@ optimizations.extend([
     ('iadd', ('ishl', ('iadd', a, c), d), ('ishl', b, d))),
 
    # Comparison simplifications
-   (('~inot', ('flt', a, b)), ('fge', a, b)),
-   (('~inot', ('fge', a, b)), ('flt', a, b)),
-   (('inot', ('feq', a, b)), ('fneu', a, b)),
-   (('inot', ('fneu', a, b)), ('feq', a, b)),
-   (('inot', ('ilt', a, b)), ('ige', a, b)),
-   (('inot', ('ult', a, b)), ('uge', a, b)),
-   (('inot', ('ige', a, b)), ('ilt', a, b)),
-   (('inot', ('uge', a, b)), ('ult', a, b)),
-   (('inot', ('ieq', a, b)), ('ine', a, b)),
-   (('inot', ('ine', a, b)), ('ieq', a, b)),
+   (('~inot', ('flt(is_used_once)', a, b)), ('fge', a, b)),
+   (('~inot', ('fge(is_used_once)', a, b)), ('flt', a, b)),
+   (('inot', ('feq(is_used_once)', a, b)), ('fneu', a, b)),
+   (('inot', ('fneu(is_used_once)', a, b)), ('feq', a, b)),
+   (('inot', ('ilt(is_used_once)', a, b)), ('ige', a, b)),
+   (('inot', ('ult(is_used_once)', a, b)), ('uge', a, b)),
+   (('inot', ('ige(is_used_once)', a, b)), ('ilt', a, b)),
+   (('inot', ('uge(is_used_once)', a, b)), ('ult', a, b)),
+   (('inot', ('ieq(is_used_once)', a, b)), ('ine', a, b)),
+   (('inot', ('ine(is_used_once)', a, b)), ('ieq', a, b)),
 
    (('iand', ('feq', a, b), ('fneu', a, b)), False),
    (('iand', ('flt', a, b), ('flt', b, a)), False),
diff --git a/src/freedreno/ci/traces-freedreno.yml b/src/freedreno/ci/traces-freedreno.yml
index db0520b480a..6578aecae9d 100644
--- a/src/freedreno/ci/traces-freedreno.yml
+++ b/src/freedreno/ci/traces-freedreno.yml
@@ -437,7 +437,7 @@ traces:
       - device: freedreno-a306
         checksum: 9227cc8d4e6445f2323438340f2a5d9b
       - device: freedreno-a530
-        checksum: 76fbd196f69594c927dc994b4492dd50
+        checksum: d0d655d81fabeb4087bf7c4837301f2a
       - device: freedreno-a630
         checksum: d70eb1f72d5d50e6cb617520234f20fb
   - path: neverball/neverball.trace
diff --git a/src/gallium/drivers/freedreno/ci/piglit-freedreno-a530-fails.txt b/src/gallium/drivers/freedreno/ci/piglit-freedreno-a530-fails.txt
index 99ad9030616..5eef69986cc 100644
--- a/src/gallium/drivers/freedreno/ci/piglit-freedreno-a530-fails.txt
+++ b/src/gallium/drivers/freedreno/ci/piglit-freedreno-a530-fails.txt
@@ -334,4 +334,3 @@ spec@glsl-1.30@execution@clipping@fs-clip-distance-interpolated,Crash
 spec@glsl-1.30@execution@fs-large-local-array-vec2,Crash
 spec@glsl-1.30@execution@fs-large-local-array-vec3,Crash
 spec@glsl-1.30@execution@fs-large-local-array-vec4,Crash
-spec@glsl-1.30@execution@range_analysis_fsat_of_nan,Fail
diff --git a/src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-fails.txt b/src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-fails.txt
index 082c1b766ad..ebe15bb8206 100644
--- a/src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-fails.txt
+++ b/src/gallium/drivers/freedreno/ci/piglit-freedreno-a630-fails.txt
@@ -309,7 +309,6 @@ spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 2d,Crash
 spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 2d_projvec4,Crash
 spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 2dshadow,Crash
 spec@glsl-1.20@execution@tex-miplevel-selection gl2:textureproj 3d,Crash
-spec@glsl-1.30@execution@range_analysis_fsat_of_nan,Fail
 spec@glsl-1.30@execution@tex-miplevel-selection texture() 1d,Crash
 spec@glsl-1.30@execution@tex-miplevel-selection texture() 1darray,Crash
 spec@glsl-1.30@execution@tex-miplevel-selection texture() 1darrayshadow,Crash
diff --git a/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_shader.txt b/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_shader.txt
index 2f2f46458d2..34d2a2bddad 100644
--- a/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_shader.txt
+++ b/src/gallium/drivers/llvmpipe/ci/llvmpipe-quick_shader.txt
@@ -158,7 +158,6 @@ spec/ext_shader_framebuffer_fetch_non_coherent/execution/gles3/simple-ms8: skip
 spec/ext_shader_image_load_formatted/execution/image_checkerboard: skip
 spec/glsl-1.10/preprocessor/extension-defined-test: skip
 spec/glsl-1.10/preprocessor/extension-if-1: skip
-spec/glsl-1.30/execution/range_analysis_fsat_of_nan: fail
 spec/glsl-1.50/execution/compatibility/clipping/gs-clip-vertex-const-accept: skip
 spec/glsl-1.50/execution/compatibility/clipping/gs-clip-vertex-const-reject: skip
 spec/glsl-1.50/execution/compatibility/clipping/gs-clip-vertex-different-from-position: skip
diff --git a/src/gallium/drivers/softpipe/ci/softpipe-quick.txt b/src/gallium/drivers/softpipe/ci/softpipe-quick.txt
index f0e27c7219a..db7f141c672 100644
--- a/src/gallium/drivers/softpipe/ci/softpipe-quick.txt
+++ b/src/gallium/drivers/softpipe/ci/softpipe-quick.txt
@@ -2702,7 +2702,6 @@ spec/glsl-1.10/execution/fs-dfdx-accuracy: warn
 spec/glsl-1.10/execution/fs-dfdy-accuracy: warn
 spec/glsl-1.10/preprocessor/extension-defined-test: skip
 spec/glsl-1.10/preprocessor/extension-if-1: skip
-spec/glsl-1.30/execution/range_analysis_fsat_of_nan: fail
 spec/glsl-1.30/execution/tex-miplevel-selection texturegrad 1d: fail
 spec/glsl-1.30/execution/tex-miplevel-selection texturegrad 1darray: fail
 spec/glsl-1.30/execution/tex-miplevel-selection texturegrad 1darrayshadow: fail