diff options
| author | Erik Faye-Lund <erik.faye-lund@collabora.com> | 2020-02-12 12:48:37 +0100 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2020-03-06 22:56:48 +0100 |
| commit | 0a13dcfe9b69bb869fbe820835fa3053f308fce4 (patch) | |
| tree | c4a6e730bc4c416b302a848c7a82c10811b663b1 | |
| parent | 64e898a2c1af72bebd8305ba7462f9bfab39b854 (diff) | |
| download | mesa-0a13dcfe9b69bb869fbe820835fa3053f308fce4.tar.gz | |
.pick_status.json: Update to 74e4cda64b9d114321216eefe536f80644b0f0fd
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | src/compiler/nir/nir_opt_algebraic.py | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/.pick_status.json b/.pick_status.json index c3f8523c4bb..c272c68ed4a 100644 --- 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 e2371462d1e..6443b337ad4 100644 --- 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))), |