From 4118fef567043603fcadf0d7d9254c1e5cbc5896 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= Date: Mon, 17 Feb 2025 09:10:52 +0100 Subject: [PATCH] aco/insert_exec_mask: don't restore exec in continue_or_break blocks Cc: mesa-stable Part-of: (cherry picked from commit 115ff5f95b00e76a28b3f4f1622ccc5e2a64230c) --- .pick_status.json | 2 +- src/amd/compiler/aco_insert_exec_mask.cpp | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index f09c079bd1f..409af3737cd 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2244,7 +2244,7 @@ "description": "aco/insert_exec_mask: don't restore exec in continue_or_break blocks", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/amd/compiler/aco_insert_exec_mask.cpp b/src/amd/compiler/aco_insert_exec_mask.cpp index 7b3d2b26e08..b42bd22b547 100644 --- a/src/amd/compiler/aco_insert_exec_mask.cpp +++ b/src/amd/compiler/aco_insert_exec_mask.cpp @@ -642,15 +642,12 @@ add_branch_code(exec_ctx& ctx, Block* block) assert(block->instructions.back()->opcode == aco_opcode::p_branch); block->instructions.pop_back(); - bool need_parallelcopy = false; - while (!(ctx.info[idx].exec.back().type & mask_type_loop)) { + while (!(ctx.info[idx].exec.back().type & mask_type_loop)) ctx.info[idx].exec.pop_back(); - need_parallelcopy = true; - } - if (need_parallelcopy) - bld.copy(Definition(exec, bld.lm), ctx.info[idx].exec.back().op); - bld.branch(aco_opcode::p_cbranch_nz, Operand(exec, bld.lm), block->linear_succs[1], + Temp cond = bld.sopc(Builder::s_cmp_lg, bld.def(s1, scc), ctx.info[idx].exec.back().op, + Operand::zero(bld.lm.bytes())); + 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) { Pseudo_branch_instruction& branch = block->instructions.back()->branch();