From 1c44a60ff48ef12165eeb2d3d63bb2c941fb31e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Thu, 4 Nov 2021 18:37:03 +0100 Subject: [PATCH] aco/optimizer: fix fneg modifier propagation on VOP3P Reviewed-by: Rhys Perry Cc: mesa-stable Part-of: (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 f16f4eeaaf0..9fd3b16c23e 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -976,7 +976,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& 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;