Mesa (staging/21.3): aco/optimizer: fix fneg modifier propagation on VOP3P

[GitLab Mirror]

Module: Mesa
Branch: staging/21.3
Commit: f13bbd3b29a44021cec97560b83c9f5586aece69
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f13bbd3b29a44021cec97560b83c9f5586aece69

Author: Daniel Schürmann <daniel at schuermann.dev>
Date:   Thu Nov  4 18:37:03 2021 +0100

aco/optimizer: fix fneg modifier propagation on VOP3P

Reviewed-by: Rhys Perry <pendingchaos02 at gmail.com>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13688>
(cherry picked from commit 193bd740ab8ca4ee978562eb18361448ad79146b)

---

 .pick_status.json                  |  2 +-
 src/amd/compiler/aco_optimizer.cpp | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 4da91a926b6..6f727902bb0 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -427,7 +427,7 @@
         "description": "aco/optimizer: fix fneg modifier propagation on VOP3P",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/amd/compiler/aco_optimizer.cpp b/src/amd/compiler/aco_optimizer.cpp
index ad70ca15503..f532f03ae96 100644
--- a/src/amd/compiler/aco_optimizer.cpp
+++ b/src/amd/compiler/aco_optimizer.cpp
@@ -3135,10 +3135,12 @@ combine_vop3p(opt_ctx& ctx, aco_ptr<Instruction>& instr)
              * if 0 - pick selection from fneg->lo
              * if 1 - pick selection from fneg->hi
              */
-            bool opsel_lo = vop3p->opsel_lo & (1 << i);
-            bool opsel_hi = vop3p->opsel_hi & (1 << i);
-            vop3p->neg_lo[i] ^= true ^ (opsel_lo ? fneg->neg_hi[0] : fneg->neg_lo[0]);
-            vop3p->neg_hi[i] ^= true ^ (opsel_hi ? fneg->neg_hi[0] : fneg->neg_lo[0]);
+            bool opsel_lo = (vop3p->opsel_lo >> i) & 1;
+            bool opsel_hi = (vop3p->opsel_hi >> i) & 1;
+            bool neg_lo = true ^ fneg->neg_lo[0] ^ fneg->neg_lo[1];
+            bool neg_hi = true ^ fneg->neg_hi[0] ^ fneg->neg_hi[1];
+            vop3p->neg_lo[i] ^= opsel_lo ? neg_hi : neg_lo;
+            vop3p->neg_hi[i] ^= opsel_hi ? neg_hi : neg_lo;
             vop3p->opsel_lo ^= ((opsel_lo ? ~fneg->opsel_hi : fneg->opsel_lo) & 1) << i;
             vop3p->opsel_hi ^= ((opsel_hi ? ~fneg->opsel_hi : fneg->opsel_lo) & 1) << i;