From eecdb45d6185607b501822e2529efdeff81264fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Sch=C3=BCrmann?= <daniel@schuermann.dev>
Date: Wed, 18 Dec 2024 10:57:34 +0100
Subject: [PATCH] aco: consider s_cbranch_exec* instructions in
 needs_exec_mask()

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32477>
---
 src/amd/compiler/aco_ir.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/amd/compiler/aco_ir.cpp b/src/amd/compiler/aco_ir.cpp
index c3d091858c0..d1250cae93c 100644
--- a/src/amd/compiler/aco_ir.cpp
+++ b/src/amd/compiler/aco_ir.cpp
@@ -854,7 +854,8 @@ needs_exec_mask(const Instruction* instr)
       return true;
 
    if (instr->isSALU() || instr->isBranch() || instr->isSMEM() || instr->isBarrier())
-      return instr->reads_exec();
+      return instr->opcode == aco_opcode::s_cbranch_execz ||
+             instr->opcode == aco_opcode::s_cbranch_execnz || instr->reads_exec();
 
    if (instr->isPseudo()) {
       switch (instr->opcode) {