Module: Mesa Branch: staging/22.3 Commit: 5837d6bb8b198566b5be571bf978be1b43e8b19f URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5837d6bb8b198566b5be571bf978be1b43e8b19f
Author: Georg Lehmann <[email protected]> Date: Mon Nov 28 17:20:10 2022 +0100 aco: Use wave size specific opcode for s_or in cube map coord code. Cc: mesa-stable Reviewed-by: Daniel Schürmann <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20041> (cherry picked from commit a3beb82cf6bcf84425431ec17c046a80b2b7fc79) --- .pick_status.json | 2 +- src/amd/compiler/aco_instruction_selection.cpp | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 6282676e62f..e0fb7aac5cd 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -670,7 +670,7 @@ "description": "aco: Use wave size specific opcode for s_or in cube map coord code.", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp index c1acde8599d..2d11efef20f 100644 --- a/src/amd/compiler/aco_instruction_selection.cpp +++ b/src/amd/compiler/aco_instruction_selection.cpp @@ -9345,8 +9345,7 @@ build_cube_select(isel_context* ctx, Temp ma, Temp id, Temp deriv, Temp* out_ma, Temp is_ma_z = bld.vopc(aco_opcode::v_cmp_le_f32, bld.def(bld.lm), four, id); Temp is_ma_y = bld.vopc(aco_opcode::v_cmp_le_f32, bld.def(bld.lm), two, id); is_ma_y = bld.sop2(Builder::s_andn2, bld.def(bld.lm), bld.def(s1, scc), is_ma_y, is_ma_z); - Temp is_not_ma_x = - bld.sop2(aco_opcode::s_or_b64, bld.def(bld.lm), bld.def(s1, scc), is_ma_z, is_ma_y); + Temp is_not_ma_x = bld.sop2(Builder::s_or, bld.def(bld.lm), bld.def(s1, scc), is_ma_z, is_ma_y); /* select sc */ Temp tmp = bld.vop2(aco_opcode::v_cndmask_b32, bld.def(v1), deriv_z, deriv_x, is_not_ma_x);
