diff --git a/src/compiler/nir/nir_opt_algebraic.py b/src/compiler/nir/nir_opt_algebraic.py
index 5082271a70d..01379706b5d 100644
--- a/src/compiler/nir/nir_opt_algebraic.py
+++ b/src/compiler/nir/nir_opt_algebraic.py
@@ -350,8 +350,8 @@ optimizations.extend([
     ('iadd', ('ishl', ('iadd', a, c), d), ('ishl', b, d))),
 
    # Comparison simplifications
-   (('~inot', ('flt(is_used_once)', a, b)), ('fge', a, b)),
-   (('~inot', ('fge(is_used_once)', a, b)), ('flt', a, b)),
+   (('inot', ('flt(is_used_once)', 'a(is_a_number)', 'b(is_a_number)')), ('fge', a, b)),
+   (('inot', ('fge(is_used_once)', 'a(is_a_number)', 'b(is_a_number)')), ('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)),
diff --git a/src/freedreno/ci/traces-freedreno.yml b/src/freedreno/ci/traces-freedreno.yml
index 6578aecae9d..05e3e3d642d 100644
--- a/src/freedreno/ci/traces-freedreno.yml
+++ b/src/freedreno/ci/traces-freedreno.yml
@@ -439,7 +439,7 @@ traces:
       - device: freedreno-a530
         checksum: d0d655d81fabeb4087bf7c4837301f2a
       - device: freedreno-a630
-        checksum: d70eb1f72d5d50e6cb617520234f20fb
+        checksum: c7349124612a8760ddd825b903561ec4
   - path: neverball/neverball.trace
     expectations:
       # Skipped since it's long on a530.