Skip to content

Commit c35e964

Browse files
authored
SWDEV-517078: Fix gfx11 trap handler (#212)
Fix incorrect edits done when porting the 2nd level trap handler from the hsa-runtime. Change-Id: I7bc5160be47b8f669efe05c4d194bc3c47fc0661
1 parent faac50c commit c35e964

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

rocclr/device/pal/palblitcl.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,9 +124,8 @@ const char* TrapHandlerCode = RUNTIME_KERNEL(
124124
\n
125125
\n // Check if the it was an host trap.
126126
\n s_bitcmp1_b32 ttmp1, SQ_WAVE_PC_HI_HT_SHIFT
127-
\n s_cbranch_scc0 .not_host_trap
127+
\n s_cbranch_scc1 .not_s_trap
128128
\n
129-
\n.not_host_trap:
130129
\n // It's an s_trap; advance the PC
131130
\n s_add_u32 ttmp0, ttmp0, 0x4
132131
\n s_addc_u32 ttmp1, ttmp1, 0x0
@@ -140,6 +139,7 @@ const char* TrapHandlerCode = RUNTIME_KERNEL(
140139
\n // Ignore llvm.debugtrap.
141140
\n s_branch .exit_trap
142141
\n
142+
\n.not_s_trap:
143143
\n.no_skip_debugtrap:
144144
\n // Save trap id and halt status in ttmp6.
145145
\n s_andn2_b32 ttmp6, ttmp6, (TTMP6_SAVED_TRAP_ID_MASK | TTMP6_SAVED_STATUS_HALT_MASK)

0 commit comments

Comments
 (0)