From: Rhys Perry <pendingchaos02@gmail.com>
Date: Thu, 11 Jun 2020 13:06:32 +0000 (+0100)
Subject: aco: fix encoding of certain s_setreg_imm32_b32 instructions
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a02e7f679975bba76ee2a5c64b5b43432619b5a5;p=mesa.git

aco: fix encoding of certain s_setreg_imm32_b32 instructions

If the mode is too small, the operand will be an inline constant and the
literal dword won't be written.

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5245>
---

diff --git a/src/amd/compiler/aco_lower_to_hw_instr.cpp b/src/amd/compiler/aco_lower_to_hw_instr.cpp
index 5e93dc603e6..441e1b6b8e5 100644
--- a/src/amd/compiler/aco_lower_to_hw_instr.cpp
+++ b/src/amd/compiler/aco_lower_to_hw_instr.cpp
@@ -1658,7 +1658,9 @@ void lower_to_hw_instr(Program* program)
          assert(block->kind & block_kind_top_level);
          uint32_t mode = block->fp_mode.val;
          /* "((size - 1) << 11) | register" (MODE is encoded as register 1) */
-         bld.sopk(aco_opcode::s_setreg_imm32_b32, Operand(mode), (7 << 11) | 1);
+         Instruction *instr = bld.sopk(aco_opcode::s_setreg_imm32_b32, Operand(mode), (7 << 11) | 1).instr;
+         /* has to be a literal */
+         instr->operands[0].setFixed(PhysReg{255});
       }
 
       for (size_t j = 0; j < block->instructions.size(); j++) {