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 e87e2307f3..bec67b9662 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
@@ -162,9 +162,9 @@ static const unsigned int kCodeTrapHandler9[] = {
   //   ttmp14 = TMA[31:0]
   //   ttmp15 = TMA[63:32]
   // gfx9:
-  //   ttmp11 = SQ_WAVE_IB_STS[20:15], 0[7:0], TrapId[7:0], SavedStatusHalt[0], HaltedAtEndpgm[0], WaveStopped[0], NoScratch[0], WaveIdInWG[5:0]
+  //   ttmp11 = SQ_WAVE_IB_STS[20:15], 0[18:0], NoScratch[0], WaveIdInWG[5:0]
   // gfx10:
-  //   ttmp11 = SQ_WAVE_IB_STS[25], SQ_WAVE_IB_STS[21:15], 0[5:0], TrapId[7:0], SavedStatusHalt[0], HaltedAtEndpgm[0], WaveStopped[0], NoScratch[0], WaveIdInWG[5:0]
+  //   ttmp11 = SQ_WAVE_IB_STS[25], SQ_WAVE_IB_STS[21:15], 0[16:0], NoScratch[0], WaveIdInWG[5:0]
 
   .macro mGetDoorbellId
     s_mov_b32            exec_lo, 0x80000000
@@ -263,8 +263,6 @@ static const unsigned int kCodeTrapHandler9[] = {
   .endif
 
   .excp_raised:
-    s_bitset1_b32       ttmp11, TTMP11_EXCP_RAISED_BIT
-
     // If memory violation without XNACK error then signal queue error.
     // XNACK error will be handled by VM interrupt, since it has more information.
     s_and_b32            ttmp3, ttmp2, (SQ_WAVE_TRAPSTS_MEM_VIOL_MASK | SQ_WAVE_TRAPSTS_XNACK_ERROR_MASK)
@@ -372,26 +370,26 @@ static const unsigned int kCodeTrapHandler9[] = {
     mExitTrap
 */
     0x8677ff77, 0xfffc01ff, 0x866eff78, 0x00002000, 0x8f6e846e, 0x87776e77,
-    0x92eeff6d, 0x00080010, 0xbf850033, 0xb8eef803, 0x866fff6e, 0x00000900,
+    0x92eeff6d, 0x00080010, 0xbf850031, 0xb8eef803, 0x866fff6e, 0x00000900,
     0xbf850021, 0xbeee007e, 0xbeef007f, 0xbefe00ff, 0x80000000, 0xbf90000a,
     0xbf800007, 0xbf0c9f7e, 0xbf84fffd, 0xbeff006f, 0x867eff7e, 0x00000fff,
     0xbeef007e, 0xbefe006e, 0xbeef1a97, 0xbeee007c, 0xbefc006f, 0xbf800000,
     0xbf900001, 0xbefc006e, 0x866dff6d, 0x0000ffff, 0xc0021bb6, 0x00000000,
-    0xbf8cc07f, 0x866eff6e, 0xffff0000, 0xbf06ff6e, 0xbf810000, 0xbf840047,
-    0x80ec886c, 0x82ed806d, 0xbef71a88, 0xbf820043, 0xbef71aff, 0x00000000,
-    0x866fff6e, 0x10000100, 0xbf06ff6f, 0x00000100, 0xbeef00ff, 0x20000000,
-    0xbf850010, 0x866fff6e, 0x00000800, 0xbeef00f4, 0xbf85000c, 0xbf820035,
-    0x8e6f8a6e, 0x87776f77, 0xbf09836e, 0xbf85ffcd, 0xbf06826e, 0xbeef00ff,
-    0x80000000, 0xbf850003, 0x806c846c, 0x826d806d, 0xbf82002d, 0xbef0006f,
-    0xbeee007e, 0xbeef007f, 0xbefe00ff, 0x80000000, 0xbf90000a, 0xbf800007,
-    0xbf0c9f7e, 0xbf84fffd, 0xbeff006f, 0x867eff7e, 0x000003ff, 0x8e6f837e,
-    0xbefe006e, 0xc0051bbd, 0x0000006f, 0xbf8cc07f, 0xc0071bb7, 0x000000c0,
-    0xbf8cc07f, 0xbef10080, 0xc2831c37, 0x00000008, 0xbf8cc07f, 0x87707170,
-    0xbf85000e, 0xc0071c37, 0x00000010, 0xbf8cc07f, 0x86f07070, 0xbf840009,
-    0xc0031bb7, 0x00000018, 0xbf8cc07f, 0xc0431bb8, 0x00000000, 0xbf8cc07f,
-    0xbefc0080, 0xbf800000, 0xbf900001, 0xbef00080, 0xbef10080, 0xbef71a87,
-    0x8778ff78, 0x00002000, 0x8f6e8b77, 0x866eff6e, 0x001f8000, 0xb96ef807,
-    0x86fe7e7e, 0x86ea6a6a, 0xb978f802, 0xbe801f6c,
+    0xbf8cc07f, 0x866eff6e, 0xffff0000, 0xbf06ff6e, 0xbf810000, 0xbf840045,
+    0x80ec886c, 0x82ed806d, 0xbef71a88, 0xbf820041, 0x866fff6e, 0x10000100,
+    0xbf06ff6f, 0x00000100, 0xbeef00ff, 0x20000000, 0xbf850010, 0x866fff6e,
+    0x00000800, 0xbeef00f4, 0xbf85000c, 0xbf820035, 0x8e6f8a6e, 0x87776f77,
+    0xbf09836e, 0xbf85ffcf, 0xbf06826e, 0xbeef00ff, 0x80000000, 0xbf850003,
+    0x806c846c, 0x826d806d, 0xbf82002d, 0xbef0006f, 0xbeee007e, 0xbeef007f,
+    0xbefe00ff, 0x80000000, 0xbf90000a, 0xbf800007, 0xbf0c9f7e, 0xbf84fffd,
+    0xbeff006f, 0x867eff7e, 0x000003ff, 0x8e6f837e, 0xbefe006e, 0xc0051bbd,
+    0x0000006f, 0xbf8cc07f, 0xc0071bb7, 0x000000c0, 0xbf8cc07f, 0xbef10080,
+    0xc2831c37, 0x00000008, 0xbf8cc07f, 0x87707170, 0xbf85000e, 0xc0071c37,
+    0x00000010, 0xbf8cc07f, 0x86f07070, 0xbf840009, 0xc0031bb7, 0x00000018,
+    0xbf8cc07f, 0xc0431bb8, 0x00000000, 0xbf8cc07f, 0xbefc0080, 0xbf800000,
+    0xbf900001, 0xbef00080, 0xbef10080, 0xbef71a87, 0x8778ff78, 0x00002000,
+    0x8f6e8b77, 0x866eff6e, 0x001f8000, 0xb96ef807, 0x86fe7e7e, 0x86ea6a6a,
+    0xb978f802, 0xbe801f6c,
 };
 
 static const unsigned int kCodeCopyAligned8[] = {
@@ -508,43 +506,42 @@ static const unsigned int kCodeFill10[] = {
 
 static const unsigned int kCodeTrapHandler1010[] = {
     0x8777ff77, 0xfffc01ff, 0x876eff78, 0x00002000, 0x906e846e, 0x88776e77,
-    0x93eeff6d, 0x00080010, 0xbf850033, 0xb96ef803, 0x876fff6e, 0x00000900,
+    0x93eeff6d, 0x00080010, 0xbf850031, 0xb96ef803, 0x876fff6e, 0x00000900,
     0xbf850021, 0xbeee037e, 0xbeef037f, 0xbefe03ff, 0x80000000, 0xbf90000a,
     0xbf800007, 0xbf0c9f7e, 0xbf84fffd, 0xbeff036f, 0x877eff7e, 0x00000fff,
     0xbeef037e, 0xbefe036e, 0xbeef1d96, 0xbeee037c, 0xbefc036f, 0xbf800000,
     0xbf900001, 0xbefc036e, 0x876dff6d, 0x0000ffff, 0xf4001bb6, 0xfa000000,
-    0xbf8cc07f, 0x876eff6e, 0xffff0000, 0xbf06ff6e, 0xbf810000, 0xbf840047,
-    0x80ec886c, 0x82ed806d, 0xbef71d88, 0xbf820043, 0xbef71dff, 0x00000000,
-    0x876fff6e, 0x10000100, 0xbf06ff6f, 0x00000100, 0xbeef03ff, 0x20000000,
-    0xbf850010, 0x876fff6e, 0x00000800, 0xbeef03f4, 0xbf85000c, 0xbf820035,
-    0x8f6f8a6e, 0x88776f77, 0xbf09836e, 0xbf85ffcd, 0xbf06826e, 0xbeef03ff,
-    0x80000000, 0xbf850003, 0x806c846c, 0x826d806d, 0xbf82002d, 0xbef0036f,
-    0xbeee037e, 0xbeef037f, 0xbefe03ff, 0x80000000, 0xbf90000a, 0xbf800007,
-    0xbf0c9f7e, 0xbf84fffd, 0xbeff036f, 0x877eff7e, 0x000003ff, 0x8f6f837e,
-    0xbefe036e, 0xf4051bbd, 0xde000000, 0xbf8cc07f, 0xf4051bb7, 0xfa0000c0,
-    0xbf8cc07f, 0xbef10380, 0xf6811c37, 0xfa000008, 0xbf8cc07f, 0x88707170,
-    0xbf85000e, 0xf4051c37, 0xfa000010, 0xbf8cc07f, 0x87f07070, 0xbf840009,
-    0xf4011bb7, 0xfa000018, 0xbf8cc07f, 0xf4411bb8, 0xfa000000, 0xbf8cc07f,
-    0xbefc0380, 0xbf800000, 0xbf900001, 0xbef00380, 0xbef10380, 0xbef71d87,
-    0x8878ff78, 0x00002000, 0x906e8977, 0x876fff6e, 0x003f8000, 0x906e8677,
-    0x876eff6e, 0x02000000, 0x886e6f6e, 0xb9eef807, 0x87fe7e7e, 0x87ea6a6a,
-    0xb9f8f802, 0xbe80226c,
+    0xbf8cc07f, 0x876eff6e, 0xffff0000, 0xbf06ff6e, 0xbf810000, 0xbf840045,
+    0x80ec886c, 0x82ed806d, 0xbef71d88, 0xbf820041, 0x876fff6e, 0x10000100,
+    0xbf06ff6f, 0x00000100, 0xbeef03ff, 0x20000000, 0xbf850010, 0x876fff6e,
+    0x00000800, 0xbeef03f4, 0xbf85000c, 0xbf820035, 0x8f6f8a6e, 0x88776f77,
+    0xbf09836e, 0xbf85ffcf, 0xbf06826e, 0xbeef03ff, 0x80000000, 0xbf850003,
+    0x806c846c, 0x826d806d, 0xbf82002d, 0xbef0036f, 0xbeee037e, 0xbeef037f,
+    0xbefe03ff, 0x80000000, 0xbf90000a, 0xbf800007, 0xbf0c9f7e, 0xbf84fffd,
+    0xbeff036f, 0x877eff7e, 0x000003ff, 0x8f6f837e, 0xbefe036e, 0xf4051bbd,
+    0xde000000, 0xbf8cc07f, 0xf4051bb7, 0xfa0000c0, 0xbf8cc07f, 0xbef10380,
+    0xf6811c37, 0xfa000008, 0xbf8cc07f, 0x88707170, 0xbf85000e, 0xf4051c37,
+    0xfa000010, 0xbf8cc07f, 0x87f07070, 0xbf840009, 0xf4011bb7, 0xfa000018,
+    0xbf8cc07f, 0xf4411bb8, 0xfa000000, 0xbf8cc07f, 0xbefc0380, 0xbf800000,
+    0xbf900001, 0xbef00380, 0xbef10380, 0xbef71d87, 0x8878ff78, 0x00002000,
+    0x906e8977, 0x876fff6e, 0x003f8000, 0x906e8677, 0x876eff6e, 0x02000000,
+    0x886e6f6e, 0xb9eef807, 0x87fe7e7e, 0x87ea6a6a, 0xb9f8f802, 0xbe80226c,
 };
 
 static const unsigned int kCodeTrapHandler10[] = {
     0x8777ff77, 0xfffc01ff, 0x876eff78, 0x00002000, 0x906e846e, 0x88776e77,
-    0x93eeff6d, 0x00080010, 0xbf850026, 0xb96ef803, 0x876fff6e, 0x00000900,
+    0x93eeff6d, 0x00080010, 0xbf850024, 0xb96ef803, 0x876fff6e, 0x00000900,
     0xbf850014, 0xbeee037e, 0xbeef037f, 0xbefe03ff, 0x80000000, 0xbf90000a,
     0xbf800007, 0xbf0c9f7e, 0xbf84fffd, 0xbeff036f, 0x877eff7e, 0x00000fff,
     0xbeef037e, 0xbefe036e, 0xbeef1d96, 0xbeee037c, 0xbefc036f, 0xbf800000,
-    0xbf900001, 0xbefc036e, 0xbf82001b, 0xbef71dff, 0x00000000, 0x876fff6e,
-    0x10000100, 0xbf06ff6f, 0x00000100, 0xbeef03ff, 0x20000000, 0xbf850010,
-    0x876fff6e, 0x00000800, 0xbeef03f4, 0xbf85000c, 0xbf82000d, 0x8f6f8a6e,
-    0x88776f77, 0xbf09836e, 0xbf85ffda, 0xbf06826e, 0xbeef03ff, 0x80000000,
-    0xbf850003, 0x806c846c, 0x826d806d, 0xbf820005, 0xbef00380, 0xbef10380,
-    0xbef71d87, 0x8878ff78, 0x00002000, 0x906e8977, 0x876fff6e, 0x003f8000,
-    0x906e8677, 0x876eff6e, 0x02000000, 0x886e6f6e, 0xb9eef807, 0x87fe7e7e,
-    0x87ea6a6a, 0xb9f8f802, 0xbe80226c,
+    0xbf900001, 0xbefc036e, 0xbf820019, 0x876fff6e, 0x10000100, 0xbf06ff6f,
+    0x00000100, 0xbeef03ff, 0x20000000, 0xbf850010, 0x876fff6e, 0x00000800,
+    0xbeef03f4, 0xbf85000c, 0xbf82000d, 0x8f6f8a6e, 0x88776f77, 0xbf09836e,
+    0xbf85ffdc, 0xbf06826e, 0xbeef03ff, 0x80000000, 0xbf850003, 0x806c846c,
+    0x826d806d, 0xbf820005, 0xbef00380, 0xbef10380, 0xbef71d87, 0x8878ff78,
+    0x00002000, 0x906e8977, 0x876fff6e, 0x003f8000, 0x906e8677, 0x876eff6e,
+    0x02000000, 0x886e6f6e, 0xb9eef807, 0x87fe7e7e, 0x87ea6a6a, 0xb9f8f802,
+    0xbe80226c,
 };
 
 }  // namespace amd