Revert "nir: Replace an odd comparison involving fmin of -b2f"
I originally noticed that 3b308147916 ("nir/algebraic: Optimize 1-bit
Booleans") caused this pattern no longer be matched by incorrectly
replacing b@32 with b@1. Making that correct had no effect on
shader-db. When this pattern originally was added, it only affected 4
shaders, so it's not worth the effort to debug further.
This reverts commit f50400cc8040cf2d07de97e76d9b1ed144c5c8b4.
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6358>
(cherry picked from commit 314a40c902c6e92b9d6ba0e9b43708d7e1fa9f00)
diff --git a/.pick_status.json b/.pick_status.json
index 4fb8630..f1cb264 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1345,7 +1345,7 @@
"description": "Revert \"nir: Replace an odd comparison involving fmin of -b2f\"",
"nominated": true,
"nomination_type": 2,
- "resolution": 0,
+ "resolution": 1,
"master_sha": null,
"because_sha": "f50400cc8040cf2d07de97e76d9b1ed144c5c8b4"
},
diff --git a/src/compiler/nir/nir_opt_algebraic.py b/src/compiler/nir/nir_opt_algebraic.py
index 2fb4d5a..8d14b8c 100644
--- a/src/compiler/nir/nir_opt_algebraic.py
+++ b/src/compiler/nir/nir_opt_algebraic.py
@@ -423,19 +423,6 @@
(('ieq', ('iadd', a, b), a), ('ieq', b, 0)),
(('ine', ('iadd', a, b), a), ('ine', b, 0)),
- # fmin(-b2f(a), b) >= 0.0
- # -b2f(a) >= 0.0 && b >= 0.0
- # -b2f(a) == 0.0 && b >= 0.0 -b2f can only be 0 or -1, never >0
- # b2f(a) == 0.0 && b >= 0.0
- # a == False && b >= 0.0
- # !a && b >= 0.0
- #
- # The fge in the second replacement is not a typo. I leave the proof that
- # "fmin(-b2f(a), b) >= 0 <=> fmin(-b2f(a), b) == 0" as an exercise for the
- # reader.
- (('fge', ('fmin', ('fneg', ('b2f', 'a@1')), 'b@1'), 0.0), ('iand', ('inot', a), ('fge', b, 0.0))),
- (('feq', ('fmin', ('fneg', ('b2f', 'a@1')), 'b@1'), 0.0), ('iand', ('inot', a), ('fge', b, 0.0))),
-
(('feq', ('b2f', 'a@1'), 0.0), ('inot', a)),
(('~fneu', ('b2f', 'a@1'), 0.0), a),
(('ieq', ('b2i', 'a@1'), 0), ('inot', a)),
