Module: Mesa Branch: staging/23.3 Commit: 178c046b9e47c333c86070ffe8e705d820b672e6 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=178c046b9e47c333c86070ffe8e705d820b672e6
Author: Georg Lehmann <[email protected]> Date: Sun Nov 12 19:40:32 2023 +0100 aco: add missing scc def for SALU quad broadcast Cc: mesa-stable Reviewed-by: Rhys Perry <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26163> (cherry picked from commit 509ce19643f51555922947e9b8b5f12d6567fb5b) --- .pick_status.json | 2 +- src/amd/compiler/aco_instruction_selection.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 90205531e6b..fd110a81f39 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -94,7 +94,7 @@ "description": "aco: add missing scc def for SALU quad broadcast", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp index 0f7fd5b3c27..561f3cc02e0 100644 --- a/src/amd/compiler/aco_instruction_selection.cpp +++ b/src/amd/compiler/aco_instruction_selection.cpp @@ -8640,7 +8640,7 @@ visit_intrinsic(isel_context* ctx, nir_intrinsic_instr* instr) src = bld.sop2(Builder::s_and, bld.def(bld.lm), bld.def(s1, scc), src, Operand(exec, bld.lm)); src = bld.sop2(Builder::s_and, bld.def(bld.lm), bld.def(s1, scc), mask_tmp, src); - bld.sop1(Builder::s_wqm, Definition(dst), src); + bld.sop1(Builder::s_wqm, Definition(dst), bld.def(s1, scc), src); } else if (instr->def.bit_size <= 32 || bool_use_valu) { unsigned excess_bytes = bool_use_valu ? 0 : 4 - instr->def.bit_size / 8; Definition def = (excess_bytes || bool_use_valu) ? bld.def(v1) : Definition(dst);
