fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 13:28:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

aco/insert_exec: fix continue_or_break on gfx6-7

Browse source 
s_cmp_lg_u64 is gfx8+

Fixes: 115ff5f95b ("aco/insert_exec_mask: don't restore exec in continue_or_break blocks")

Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33715>
(cherry picked from commit c249556bf4)
This commit is contained in:
Georg Lehmann 2025-02-24 16:54:55 +01:00 • committed by Eric Engestrom
parent 36e1923284
commit cb09b3f624
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1934,7 +1934,7 @@
"description": "aco/insert_exec: fix continue_or_break on gfx6-7",
"nominated": true,
"nomination_type": 2,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "115ff5f95b00e76a28b3f4f1622ccc5e2a64230c",
"notes": null

6
src/amd/compiler/aco_insert_exec_mask.cpp
View file

@ -645,8 +645,10 @@ add_branch_code(exec_ctx& ctx, Block* block)
while (!(ctx.info[idx].exec.back().type & mask_type_loop))
ctx.info[idx].exec.pop_back();
Temp cond = bld.sopc(Builder::s_cmp_lg, bld.def(s1, scc), ctx.info[idx].exec.back().op,
Operand::zero(bld.lm.bytes()));
Temp cond = bld.sop2(Builder::s_or, bld.def(bld.lm), bld.def(s1, scc),
ctx.info[idx].exec.back().op, Operand::zero(bld.lm.bytes()))
.def(1)
.getTemp();
bld.branch(aco_opcode::p_cbranch_nz, Operand(cond, scc), block->linear_succs[1],
block->linear_succs[0]);
} else if (block->kind & block_kind_uniform) {