From 5a33ad7ec48f121da6426afa3721b30dff398dc7 Mon Sep 17 00:00:00 2001 From: Jonathan Kim Date: Fri, 8 Sep 2023 11:13:39 -0400 Subject: [PATCH] kfdtest: fixup test traphandler for gfx12 Fix traphandler for KFD debugger testing. Signed-off-by: Jonathan Kim Change-Id: Ib8f5aac3d1b99e4463ac56b5f6d5dee2c367c447 Signed-off-by: Chris Freehill [ROCm/ROCR-Runtime commit: a2e92267840d278884ce767de7b2ac9eb5e9769e] --- .../libhsakmt/tests/kfdtest/src/ShaderStore.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/projects/rocr-runtime/libhsakmt/tests/kfdtest/src/ShaderStore.cpp b/projects/rocr-runtime/libhsakmt/tests/kfdtest/src/ShaderStore.cpp index 298abc118b..b626749f09 100644 --- a/projects/rocr-runtime/libhsakmt/tests/kfdtest/src/ShaderStore.cpp +++ b/projects/rocr-runtime/libhsakmt/tests/kfdtest/src/ShaderStore.cpp @@ -923,11 +923,20 @@ const char *TrapHandlerIsa = R"( CHECK_VMFAULT: /*if trap jumped to by vmfault, restore skip m0 signalling*/ - s_getreg_b32 ttmp14, hwreg(HW_REG_TRAPSTS) - s_and_b32 ttmp2, ttmp14, 0x800 + .if (.amdgcn.gfx_generation_number < 12) + s_getreg_b32 ttmp14, hwreg(HW_REG_TRAPSTS) + s_and_b32 ttmp2, ttmp14, 0x800 + .else + s_getreg_b32 ttmp14, hwreg(HW_REG_EXCP_FLAG_PRIV) + s_and_b32 ttmp2, ttmp14, 0x10 + .endif s_cbranch_scc1 RESTORE_AND_EXIT /*check for address watch event and record pc check point delta*/ - s_and_b32 ttmp2, ttmp14, 0x7080 + .if (.amdgcn.gfx_generation_number < 12) + s_and_b32 ttmp2, ttmp14, 0x7080 + .else + s_and_b32 ttmp2, ttmp14, 0xf + .endif s_cbranch_scc0 GET_DOORBELL v_mov_b32 v5, v4 // capture watch checkpoint v_mov_b32 v6, ttmp14 // capture watch trapsts