From a595c0bd254f6d1eeb5eb140367f89db480ce083 Mon Sep 17 00:00:00 2001 From: Jonathan Kim Date: Tue, 8 Apr 2025 11:07:11 -0400 Subject: [PATCH] kfdtest: fix trap on start for gfx 9 and 11 Similar to GFX 12, GFX 9 and 11 need to exit without forwarding the PC. [ROCm/ROCR-Runtime commit: 4c3a0698f8239525fb20a3350220d1c8aa4be061] --- .../libhsakmt/tests/kfdtest/src/ShaderStore.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/projects/rocr-runtime/libhsakmt/tests/kfdtest/src/ShaderStore.cpp b/projects/rocr-runtime/libhsakmt/tests/kfdtest/src/ShaderStore.cpp index 946adbc967..ce2a3c8a83 100644 --- a/projects/rocr-runtime/libhsakmt/tests/kfdtest/src/ShaderStore.cpp +++ b/projects/rocr-runtime/libhsakmt/tests/kfdtest/src/ShaderStore.cpp @@ -1134,6 +1134,14 @@ const char *TrapHandlerIsa = s_getreg_b32 ttmp14, hwreg(HW_REG_EXCP_FLAG_PRIV) s_and_b32 ttmp2, ttmp14, 0x300 s_cbranch_scc1 RESTORE_AND_EXIT + .elseif (.amdgcn.gfx_generation_number == 11) + s_getreg_b32 ttmp14, hwreg(HW_REG_TRAPSTS) + s_and_b32 ttmp2, ttmp14, 0x30000 + s_cbranch_scc1 RESTORE_AND_EXIT + .else + s_getreg_b32 ttmp14, hwreg(HW_REG_TRAPSTS) + s_and_b32 ttmp2, ttmp14, 0x1800000 + s_cbranch_scc1 RESTORE_AND_EXIT .endif /* restore and increment program counter to skip shader trap jump*/ s_add_u32 ttmp0, ttmp0, 4