fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-21 23:50:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

aco/optimizer: fix fneg modifier propagation on VOP3P

Browse source 
Reviewed-by: Rhys Perry <pendingchaos02@gmail.com>
Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13688>
(cherry picked from commit 193bd740ab)
This commit is contained in:
Daniel Schürmann 2021-11-04 18:37:03 +01:00 • committed by Eric Engestrom
parent 03f6edd5b7
commit 1c44a60ff4
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -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
},

10
src/amd/compiler/aco_optimizer.cpp
View file

@ -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;