.pick_status.json: Update to 74e4cda64b9d114321216eefe536f80644b0f0fd

diff --git a/.pick_status.json b/.pick_status.json
index c3f8523..c272c68 100644 (file)
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -6484,7 +6484,7 @@
         "description": "Revert \"nir: Add a couple trivial abs optimizations\"",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "master_sha": null,
         "because_sha": "e4d346c86db0ae332fcdf55eac0e075cfb99a7eb"
     },

diff --git a/src/compiler/nir/nir_opt_algebraic.py b/src/compiler/nir/nir_opt_algebraic.py
index e237146..6443b33 100644 (file)
--- a/src/compiler/nir/nir_opt_algebraic.py
+++ b/src/compiler/nir/nir_opt_algebraic.py
@@ -476,8 +476,6 @@ optimizations.extend([
    (('fmin', ('fmin', a, b), b), ('fmin', a, b)),
    (('umin', ('umin', a, b), b), ('umin', a, b)),
    (('imin', ('imin', a, b), b), ('imin', a, b)),
-   (('fmax', a, ('fneg', a)), ('fabs', a)),
-   (('imax', a, ('ineg', a)), ('iabs', a)),
    (('fmin', a, ('fneg', a)), ('fneg', ('fabs', a))),
    (('imin', a, ('ineg', a)), ('ineg', ('iabs', a))),
    (('fmin', a, ('fneg', ('fabs', a))), ('fneg', ('fabs', a))),