From 32a537b25b8f030bf8ee3dccfa25daa34ed32c75 Mon Sep 17 00:00:00 2001
From: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Date: Tue, 5 Nov 2024 11:43:30 +0100
Subject: [PATCH] aco: use inlined constant offsets for storing SGPRs in the
 trap handler

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31976>
---
 src/amd/compiler/aco_instruction_selection.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp
index 37eb87231ec..36ce31d0bd9 100644
--- a/src/amd/compiler/aco_instruction_selection.cpp
+++ b/src/amd/compiler/aco_instruction_selection.cpp
@@ -12514,11 +12514,10 @@ select_trap_handler_shader(Program* program, struct nir_shader* shader, ac_shade
    /* Dump all SGPRs. */
    for (uint32_t i = 0; i < program->dev.sgpr_limit; i++) {
       bld.copy(Definition(PhysReg{256}, v1) /* v0 */, Operand(PhysReg{i}, s1));
-      bld.copy(Definition(PhysReg{ttmp8}, s1), Operand::c32(offset));
 
       bld.mubuf(aco_opcode::buffer_store_dword, Operand(PhysReg{ttmp4}, s4), Operand(v1),
-                Operand(PhysReg{ttmp8}, s1), Operand(PhysReg{256}, v1) /* v0 */, 0 /* offset */,
-                false /* offen */, false /* idxen */, /* addr64 */ false,
+                Operand::c32(0u), Operand(PhysReg{256}, v1) /* v0 */, offset, false /* offen */,
+                false /* idxen */, /* addr64 */ false,
                 /* disable_wqm */ false, cache_glc);
 
       offset += 4;