From 6e3347ed259ed0b2f9c0784d972357e0e76380c9 Mon Sep 17 00:00:00 2001 From: Laurent Morichetti Date: Tue, 12 Nov 2019 11:54:17 -0800 Subject: [PATCH] Fix a typo in INSN_S_ENDPGM_OPCODE encoding. The correct s_endpgm instruction encoding is 0xBF810000. Change-Id: I03f304762dcaced5bf3fa4f069da7a0b287d1cd2 [ROCm/ROCR-Runtime commit: 5774d9162bd6aea5562617a778962b6447b0a7a8] --- .../runtime/hsa-runtime/core/inc/amd_gpu_shaders.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_gpu_shaders.h b/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_gpu_shaders.h index 6652d26db8..c8c4243bae 100644 --- a/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_gpu_shaders.h +++ b/projects/rocr-runtime/runtime/hsa-runtime/core/inc/amd_gpu_shaders.h @@ -127,7 +127,7 @@ static const unsigned int kCodeTrapHandler9[] = { .set SENDMSG_M0_DOORBELL_ID_MASK , ((1 << SENDMSG_M0_DOORBELL_ID_BITS) - 1) .set TTMP11_DEBUG_TRAP_BIT , 7 .set DEBUG_INTERRUPT_CONTEXT_ID_BIT , 23 - .set INSN_S_ENDPGM_OPCODE , 0xBF81000 + .set INSN_S_ENDPGM_OPCODE , 0xBF810000 .if .amdgcn.gfx_generation_number == 9 .set TTMP11_SAVE_RCNT_FIRST_REPLAY_SHIFT , 26 @@ -327,7 +327,7 @@ static const unsigned int kCodeTrapHandler9[] = { 0xbf90000a, 0xbf800007, 0xbf0c9f7e, 0xbf84fffd, 0xbeff006f, 0x867eff7e, 0x00000fff, 0xbeef007e, 0xbefe006e, 0xbeef1a97, 0xbeee007c, 0xbefc006f, 0xbf800000, 0xbf900001, 0xbefc006e, 0x866dff6d, 0x0000ffff, 0xc0021bb6, - 0x00000000, 0xbf8cc07f, 0xbf06ff6e, 0x0bf81000, 0xbf850002, 0x8778ff78, + 0x00000000, 0xbf8cc07f, 0xbf06ff6e, 0xbf810000, 0xbf850002, 0x8778ff78, 0x00002000, 0x8f6e8b77, 0x866eff6e, 0x001f8000, 0xb96ef807, 0x86fe7e7e, 0x86ea6a6a, 0xb978f802, 0xbe801f6c, 0x866fff6e, 0x10000100, 0xbf06ff6f, 0x00000100, 0xbeef00ff, 0x20000000, 0xbf85000e, 0x866fff6e, 0x00000800, @@ -461,7 +461,7 @@ static const unsigned int kCodeTrapHandler10[] = { 0xbf90000a, 0xbf800007, 0xbf0c9f7e, 0xbf84fffd, 0xbeff036f, 0x877eff7e, 0x00000fff, 0xbeef037e, 0xbefe036e, 0xbeef1d97, 0xbeee037c, 0xbefc036f, 0xbf800000, 0xbf900001, 0xbefc036e, 0x876dff6d, 0x0000ffff, 0xf4001bb6, - 0xfa000000, 0xbf8cc07f, 0xbf06ff6e, 0x0bf81000, 0xbf850002, 0x8878ff78, + 0xfa000000, 0xbf8cc07f, 0xbf06ff6e, 0xbf810000, 0xbf850002, 0x8878ff78, 0x00002000, 0x906e8977, 0x876fff6e, 0x003f8000, 0x906e8677, 0x876eff6e, 0x02000000, 0x886e6f6e, 0xb9eef807, 0x87fe7e7e, 0x87ea6a6a, 0xb9f8f802, 0xbe80226c, 0x876fff6e, 0x10000100, 0xbf06ff6f, 0x00000100, 0xbeef03ff,