From d1d41be43fa7ed135b8e3bb2e0174964ced11d83 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Thu, 7 Nov 2024 15:28:01 +0100 Subject: [PATCH] aco: declare phys regs for tba_hi/tma_hi Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/compiler/aco_instruction_selection.cpp | 2 +- src/amd/compiler/aco_ir.h | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/amd/compiler/aco_instruction_selection.cpp b/src/amd/compiler/aco_instruction_selection.cpp index b7d002830d0..b025b313461 100644 --- a/src/amd/compiler/aco_instruction_selection.cpp +++ b/src/amd/compiler/aco_instruction_selection.cpp @@ -12498,7 +12498,7 @@ select_trap_handler_shader(Program* program, struct nir_shader* shader, ac_shade /* disable_wqm */ false, cache_glc); } else { /* Load the buffer descriptor from TMA. */ - bld.smem(aco_opcode::s_load_dwordx4, Definition(tma_rsrc, s4), Operand(PhysReg{tma}, s2), + bld.smem(aco_opcode::s_load_dwordx4, Definition(tma_rsrc, s4), Operand(PhysReg{tma_lo}, s2), Operand::zero()); /* Store TTMP0-TTMP1. */ diff --git a/src/amd/compiler/aco_ir.h b/src/amd/compiler/aco_ir.h index 6848f721eb4..a0fbbf6672d 100644 --- a/src/amd/compiler/aco_ir.h +++ b/src/amd/compiler/aco_ir.h @@ -423,8 +423,10 @@ static constexpr PhysReg flat_scr_lo{102}; /* GFX8-GFX9, encoded differently on static constexpr PhysReg flat_scr_hi{103}; /* GFX8-GFX9, encoded differently on GFX6-7 */ static constexpr PhysReg vcc{106}; static constexpr PhysReg vcc_hi{107}; -static constexpr PhysReg tba{108}; /* GFX6-GFX8 */ -static constexpr PhysReg tma{110}; /* GFX6-GFX8 */ +static constexpr PhysReg tba_lo{108}; /* GFX6-GFX8 */ +static constexpr PhysReg tba_hi{109}; /* GFX6-GFX8 */ +static constexpr PhysReg tma_lo{110}; /* GFX6-GFX8 */ +static constexpr PhysReg tma_hi{111}; /* GFX6-GFX8 */ static constexpr PhysReg ttmp0{112}; static constexpr PhysReg ttmp1{113}; static constexpr PhysReg ttmp2{114};