AI/rocm-systems
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kfdtest: fixup test traphandler for gfx12

Browse Source 
Fix traphandler for KFD debugger testing.

Signed-off-by: Jonathan Kim <jonathan.kim@amd.com>

Change-Id: Ib8f5aac3d1b99e4463ac56b5f6d5dee2c367c447
Signed-off-by: Chris Freehill <cfreehil@amd.com>


[ROCm/ROCR-Runtime commit: a2e9226784]
This commit is contained in:
Jonathan Kim
2023-09-08 11:13:39 -04:00
committed by Chris Freehill
parent 88335be213
commit 5a33ad7ec4
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/rocr-runtime/libhsakmt/tests/kfdtest/src/ShaderStore.cpp
+12 -3
View File
@@ -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