diff options
| author | Timur Kristóf <timur.kristof@gmail.com> | 2021-10-28 15:48:19 +0200 |
|---|---|---|
| committer | Timur Kristóf <timur.kristof@gmail.com> | 2021-11-13 16:32:02 +0100 |
| commit | d80c7f3406b80ae684a709de57a9ef3d54a497b6 (patch) | |
| tree | 5a809f77693fd5a5663c68585de4cb9cdb02eaaf | |
| parent | 01d36149cdd5f4b43368337c28c894a351c48cfb (diff) | |
aco: Fix how p_is_helper interacts with optimizations.
p_is_helper doesn't have any operands, so ACO's value numbering and/or
the pre-RA optimizer could incorrectly recognize two such instructions
as the same.
This patch adds exec as an operand to p_is_helper in order to achieve
correct behavior.
Cc: mesa-stable
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/5570
Signed-off-by: Timur Kristóf <timur.kristof@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13577>
| -rw-r--r-- | src/amd/compiler/aco_instruction_selection.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp index 5a23c783cfb..5b3d22cd160 100644 --- a/src/amd/compiler/aco_instruction_selection.cpp +++ b/src/amd/compiler/aco_instruction_selection.cpp @@ -8707,7 +8707,7 @@ visit_intrinsic(isel_context* ctx, nir_intrinsic_instr* instr) /* load_helper() after demote() get lowered to is_helper(). * Otherwise, these two behave the same. */ Temp dst = get_ssa_temp(ctx, &instr->dest.ssa); - bld.pseudo(aco_opcode::p_is_helper, Definition(dst)); + bld.pseudo(aco_opcode::p_is_helper, Definition(dst), Operand(exec, bld.lm)); ctx->block->kind |= block_kind_needs_lowering; ctx->program->needs_exact = true; break; |