drm/amdkfd: Remove legacy code from trap handler
Subsystems (3)
PATCH 1/4 drm/amdkfd: Remove legacy code from trap handler
ATC and MTYPE fields do not exist in gfx9 or later.
--- .../gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 93 ++++++------------- .../amd/amdkfd/cwsr_trap_handler_gfx10.asm | 28 +----- .../drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm | 30 +----- 3 files changed, 30 insertions(+), 121 deletions(-)
drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h +28 -65
@@ -274,7 +274,7 @@ static const uint32_t cwsr_trap_gfx8_hex[] = {static const uint32_t cwsr_trap_gfx9_hex[] = { -0xbf820001 ,0xbf820248 , +0xbf820001 ,0xbf820240 ,0xb8f8f802 ,0x89788678 ,0xb8eef801 ,0x866eff6e ,0x00000800 ,0xbf840003 ,
@@ -336,10 +336,6 @@ static const uint32_t cwsr_trap_gfx9_hex[] = {0x0000ffff ,0x8775ff75 ,0x00040000 ,0xbef60080 ,0xbef700ff ,0x00807fac , -0x867aff7f ,0x08000000 , -0x8f7a837a ,0x87777a77 , -0x867aff7f ,0x70000000 , -0x8f7a817a ,0x87777a77 ,0xbef1007c ,0xbef00080 ,0xb8f02a05 ,0x80708170 , 0x8e708a70, 0xb8fa1605,
@@ -566,15 +562,11 @@ static const uint32_t cwsr_trap_gfx9_hex[] = {0x701d0300 ,0x807c847c ,0x8070ff70 ,0x00000400 ,0xbf0a7b7c ,0xbf85ffef , -0xbf9c0000 ,0xbf8200da , +0xbf9c0000 ,0xbf8200cf ,0xbef4007e ,0x8675ff7f ,0x0000ffff ,0x8775ff75 ,0x00040000 ,0xbef60080 ,0xbef700ff ,0x00807fac , -0x866eff7f ,0x08000000 , -0x8f6e836e ,0x87776e77 , -0x866eff7f ,0x70000000 , -0x8f6e816e ,0x87776e77 ,0x866eff7f ,0x04000000 ,0xbf84001e ,0xbefe00c1 , 0xbeff00c1, 0xb8ef4306,
@@ -669,18 +661,16 @@ static const uint32_t cwsr_trap_gfx9_hex[] = {0x876e6f6e ,0x866fff6d ,0x04000000 ,0x8f6f9a6f ,0x8e6f8f6f ,0x876e6f6e , -0x866fff7a ,0x00800000 , -0x8f6f976f ,0xb96ef807 , -0x866dff6d ,0x0000ffff , -0x86fe7e7e ,0x86ea6a6a , -0x8f6e837a ,0xb96ee0c2 , -0xbf800002 ,0xb97a0002 , -0xbf8a0000 ,0x95806f6c , - 0xbf810000, 0x00000000, +0xb96ef807 ,0x866dff6d , +0x0000ffff ,0x86fe7e7e , +0x86ea6a6a ,0x8f6e837a , +0xb96ee0c2 ,0xbf800002 , +0xb97a0002 ,0xbf8a0000 , + 0xbe801f6c, 0xbf810000, };static const uint32_t cwsr_trap_nv1x_hex[] = { -0xbf820001 ,0xbf8201cd , +0xbf820001 ,0xbf8201c5 ,0xb0804004 ,0xb978f802 ,0x8a788678 ,0xb96ef801 , 0x876eff6e, 0x00000800,
@@ -740,10 +730,6 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {0x0000ffff ,0x8875ff75 ,0x00040000 ,0xbef60380 ,0xbef703ff ,0x10807fac , -0x877aff7f ,0x08000000 , -0x907a837a ,0x88777a77 , -0x877aff7f ,0x70000000 , -0x907a817a ,0x88777a77 ,0xbef1037c ,0xbef00380 ,0xb97302dc ,0x8f739973 , 0x8873737f, 0xb97bf816,
@@ -911,15 +897,11 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {0x705d0000 ,0x807c817c ,0x8070ff70 ,0x00000080 ,0xbf0a7b7c ,0xbf85fff8 , -0xbf820151 ,0xbef4037e , +0xbf820146 ,0xbef4037e ,0x8775ff7f ,0x0000ffff ,0x8875ff75 ,0x00040000 ,0xbef60380 ,0xbef703ff , -0x10807fac ,0x876eff7f , -0x08000000 ,0x906e836e , -0x88776e77 ,0x876eff7f , -0x70000000 ,0x906e816e , -0x88776e77 ,0xb97202dc , +0x10807fac ,0xb97202dc ,0x8f729972 ,0x8872727f ,0x876eff7f ,0x04000000 , 0xbf840034, 0xbefe03c1,
@@ -1075,18 +1057,17 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {0x886e6f6e ,0x876fff6d ,0x01000000 ,0x906f986f ,0x8f6f996f ,0x886e6f6e , -0x876fff7a ,0x00800000 , -0x906f976f ,0xb9eef807 , -0x876dff6d ,0x0000ffff , -0x87fe7e7e ,0x87ea6a6a , -0xb9faf802 ,0xbe80226c , -0xbf810000 ,0xbf9f0000 , +0xb9eef807 ,0x876dff6d , +0x0000ffff ,0x87fe7e7e , +0x87ea6a6a ,0xb9faf802 , +0xbe80226c ,0xbf810000 ,0xbf9f0000 ,0xbf9f0000 ,0xbf9f0000 ,0xbf9f0000 , + 0xbf9f0000, 0x00000000, };static const uint32_t cwsr_trap_arcturus_hex[] = { -0xbf820001 ,0xbf8202c4 , +0xbf820001 ,0xbf8202bc ,0xb8f8f802 ,0x89788678 ,0xb8eef801 ,0x866eff6e , 0x00000800, 0xbf840003,
@@ -1148,11 +1129,7 @@ static const uint32_t cwsr_trap_arcturus_hex[] = {0x8675ff7f ,0x0000ffff ,0x8775ff75 ,0x00040000 ,0xbef60080 ,0xbef700ff , -0x00807fac ,0x867aff7f , -0x08000000 ,0x8f7a837a , -0x87777a77 ,0x867aff7f , -0x70000000 ,0x8f7a817a , -0x87777a77 ,0xbef1007c , +0x00807fac ,0xbef1007c ,0xbef00080 ,0xb8f02a05 ,0x80708170 ,0x8e708a70 , 0x8e708170, 0xb8fa1605,
@@ -1440,15 +1417,11 @@ static const uint32_t cwsr_trap_arcturus_hex[] = {0x701d0300 ,0x807c847c ,0x8070ff70 ,0x00000400 ,0xbf0a7b7c ,0xbf85ffeb , -0xbf9c0000 ,0xbf820106 , +0xbf9c0000 ,0xbf8200fb ,0xbef4007e ,0x8675ff7f ,0x0000ffff ,0x8775ff75 ,0x00040000 ,0xbef60080 ,0xbef700ff ,0x00807fac , -0x866eff7f ,0x08000000 , -0x8f6e836e ,0x87776e77 , -0x866eff7f ,0x70000000 , -0x8f6e816e ,0x87776e77 ,0x866eff7f ,0x04000000 ,0xbf84001f ,0xbefe00c1 , 0xbeff00c1, 0xb8ef4306,
@@ -1565,18 +1538,16 @@ static const uint32_t cwsr_trap_arcturus_hex[] = {0x876e6f6e ,0x866fff6d ,0x04000000 ,0x8f6f9a6f ,0x8e6f8f6f ,0x876e6f6e , -0x866fff7a ,0x00800000 , -0x8f6f976f ,0xb96ef807 , -0x866dff6d ,0x0000ffff , -0x86fe7e7e ,0x86ea6a6a , -0x8f6e837a ,0xb96ee0c2 , -0xbf800002 ,0xb97a0002 , -0xbf8a0000 ,0x95806f6c , - 0xbf810000, 0x00000000, +0xb96ef807 ,0x866dff6d , +0x0000ffff ,0x86fe7e7e , +0x86ea6a6a ,0x8f6e837a , +0xb96ee0c2 ,0xbf800002 , +0xb97a0002 ,0xbf8a0000 , + 0xbe801f6c, 0xbf810000, };static const uint32_t cwsr_trap_gfx10_hex[] = { -0xbf820001 ,0xbf8201cf , +0xbf820001 ,0xbf8201c7 ,0xb0804004 ,0xb978f802 ,0x8a788678 ,0xb96ef801 , 0x876eff6e, 0x00000800,
@@ -1615,10 +1586,6 @@ static const uint32_t cwsr_trap_gfx10_hex[] = {0x0000ffff ,0x8875ff75 ,0x00040000 ,0xbef60380 ,0xbef703ff ,0x10807fac , -0x877aff7f ,0x08000000 , -0x907a837a ,0x88777a77 , -0x877aff7f ,0x70000000 , -0x907a817a ,0x88777a77 ,0xbef1037c ,0xbef00380 ,0xb97302dc ,0x8f739973 , 0x8873737f, 0xbefe03c1,
@@ -1808,15 +1775,11 @@ static const uint32_t cwsr_trap_gfx10_hex[] = {0x705d0000 ,0x807c817c ,0x8070ff70 ,0x00000080 ,0xbf0a7b7c ,0xbf85fff8 , -0xbf82013c ,0xbef4037e , +0xbf820134 ,0xbef4037e ,0x8775ff7f ,0x0000ffff ,0x8875ff75 ,0x00040000 ,0xbef60380 ,0xbef703ff , -0x10807fac ,0x876eff7f , -0x08000000 ,0x906e836e , -0x88776e77 ,0x876eff7f , -0x70000000 ,0x906e816e , -0x88776e77 ,0xb97202dc , +0x10807fac ,0xb97202dc ,0x8f729972 ,0x8872727f ,0x876eff7f ,0x04000000 , 0xbf840034, 0xbefe03c1,
drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm +1 -27
@@ -35,8 +35,6 @@ var SINGLE_STEP_MISSED_WORKAROUND = 1 //workaround for lost MODE.DEBUG_EN exception when SAVECTX raised -var SQ_WAVE_STATUS_INST_ATC_SHIFT = 23 -var SQ_WAVE_STATUS_INST_ATC_MASK = 0x00800000 var SQ_WAVE_STATUS_SPI_PRIO_MASK = 0x00000006 var SQ_WAVE_STATUS_HALT_MASK = 0x2000
@@ -76,9 +74,6 @@ var SQ_WAVE_IB_STS_RCNT_FIRST_REPLAY_MASK_NEG = 0x00007FFF var SQ_WAVE_MODE_DEBUG_EN_MASK = 0x800 -var SQ_BUF_RSRC_WORD1_ATC_SHIFT = 24 -var SQ_BUF_RSRC_WORD3_MTYPE_SHIFT = 27 - // bits [31:24] unused by SPI debug data var TTMP11_SAVE_REPLAY_W64H_SHIFT = 31 var TTMP11_SAVE_REPLAY_W64H_MASK = 0x80000000
@@ -90,10 +85,6 @@ var TTMP11_SAVE_RCNT_FIRST_REPLAY_MASK = 0x7F000000 var S_SAVE_BUF_RSRC_WORD1_STRIDE = 0x00040000 var S_SAVE_BUF_RSRC_WORD3_MISC = 0x10807FAC -var S_SAVE_SPI_INIT_ATC_MASK = 0x08000000 -var S_SAVE_SPI_INIT_ATC_SHIFT = 27 -var S_SAVE_SPI_INIT_MTYPE_MASK = 0x70000000 -var S_SAVE_SPI_INIT_MTYPE_SHIFT = 28 var S_SAVE_SPI_INIT_FIRST_WAVE_MASK = 0x04000000 var S_SAVE_SPI_INIT_FIRST_WAVE_SHIFT = 26
@@ -130,10 +121,6 @@ var s_save_ttmps_hi = s_save_trapsts var S_RESTORE_BUF_RSRC_WORD1_STRIDE = S_SAVE_BUF_RSRC_WORD1_STRIDE var S_RESTORE_BUF_RSRC_WORD3_MISC = S_SAVE_BUF_RSRC_WORD3_MISC -var S_RESTORE_SPI_INIT_ATC_MASK = 0x08000000 -var S_RESTORE_SPI_INIT_ATC_SHIFT = 27 -var S_RESTORE_SPI_INIT_MTYPE_MASK = 0x70000000 -var S_RESTORE_SPI_INIT_MTYPE_SHIFT = 28 var S_RESTORE_SPI_INIT_FIRST_WAVE_MASK = 0x04000000 var S_RESTORE_SPI_INIT_FIRST_WAVE_SHIFT = 26 var S_WAVE_SIZE = 25
@@ -326,12 +313,6 @@ L_SLEEP: s_or_b32 s_save_buf_rsrc1, s_save_buf_rsrc1, S_SAVE_BUF_RSRC_WORD1_STRIDE s_mov_b32 s_save_buf_rsrc2, 0 //NUM_RECORDS initial value = 0 (in bytes) although not neccessarily inited s_mov_b32 s_save_buf_rsrc3, S_SAVE_BUF_RSRC_WORD3_MISC - s_and_b32 s_save_tmp, s_save_spi_init_hi, S_SAVE_SPI_INIT_ATC_MASK - s_lshr_b32 s_save_tmp, s_save_tmp, (S_SAVE_SPI_INIT_ATC_SHIFT-SQ_BUF_RSRC_WORD1_ATC_SHIFT) - s_or_b32 s_save_buf_rsrc3, s_save_buf_rsrc3, s_save_tmp //or ATC - s_and_b32 s_save_tmp, s_save_spi_init_hi, S_SAVE_SPI_INIT_MTYPE_MASK - s_lshr_b32 s_save_tmp, s_save_tmp, (S_SAVE_SPI_INIT_MTYPE_SHIFT-SQ_BUF_RSRC_WORD3_MTYPE_SHIFT) - s_or_b32 s_save_buf_rsrc3, s_save_buf_rsrc3, s_save_tmp //or MTYPE s_mov_b32 s_save_m0, m0
@@ -674,12 +655,7 @@ L_RESTORE: s_or_b32 s_restore_buf_rsrc1, s_restore_buf_rsrc1, S_RESTORE_BUF_RSRC_WORD1_STRIDE s_mov_b32 s_restore_buf_rsrc2, 0 //NUM_RECORDS initial value = 0 (in bytes) s_mov_b32 s_restore_buf_rsrc3, S_RESTORE_BUF_RSRC_WORD3_MISC - s_and_b32 s_restore_tmp, s_restore_spi_init_hi, S_RESTORE_SPI_INIT_ATC_MASK - s_lshr_b32 s_restore_tmp, s_restore_tmp, (S_RESTORE_SPI_INIT_ATC_SHIFT-SQ_BUF_RSRC_WORD1_ATC_SHIFT) - s_or_b32 s_restore_buf_rsrc3, s_restore_buf_rsrc3, s_restore_tmp //or ATC - s_and_b32 s_restore_tmp, s_restore_spi_init_hi, S_RESTORE_SPI_INIT_MTYPE_MASK - s_lshr_b32 s_restore_tmp, s_restore_tmp, (S_RESTORE_SPI_INIT_MTYPE_SHIFT-SQ_BUF_RSRC_WORD3_MTYPE_SHIFT) - s_or_b32 s_restore_buf_rsrc3, s_restore_buf_rsrc3, s_restore_tmp //or MTYPE + //determine it is wave32 or wave64 get_wave_size(s_restore_size)
@@ -971,8 +947,6 @@ L_RESTORE_HWREG: s_lshl_b32 s_restore_m0, s_restore_m0, SQ_WAVE_IB_STS_REPLAY_W64H_SHIFT s_or_b32 s_restore_tmp, s_restore_tmp, s_restore_m0 - s_and_b32 s_restore_m0, s_restore_status, SQ_WAVE_STATUS_INST_ATC_MASK - s_lshr_b32 s_restore_m0, s_restore_m0, SQ_WAVE_STATUS_INST_ATC_SHIFT s_setreg_b32 hwreg(HW_REG_IB_STS), s_restore_tmp #endif
drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm +1 -29
@@ -31,8 +31,6 @@ var SINGLE_STEP_MISSED_WORKAROUND = 1 //workaround for lost MODE.DEBUG_EN /**************************************************************************/ /* variables */ /**************************************************************************/ -var SQ_WAVE_STATUS_INST_ATC_SHIFT = 23 -var SQ_WAVE_STATUS_INST_ATC_MASK = 0x00800000 var SQ_WAVE_STATUS_SPI_PRIO_SHIFT = 1 var SQ_WAVE_STATUS_SPI_PRIO_MASK = 0x00000006 var SQ_WAVE_STATUS_HALT_MASK = 0x2000
@@ -70,9 +68,6 @@ var SQ_WAVE_IB_STS_RCNT_FIRST_REPLAY_MASK_NEG = 0x00007FFF //FIXME var SQ_WAVE_MODE_DEBUG_EN_MASK = 0x800 -var SQ_BUF_RSRC_WORD1_ATC_SHIFT = 24 -var SQ_BUF_RSRC_WORD3_MTYPE_SHIFT = 27 - var TTMP11_SAVE_RCNT_FIRST_REPLAY_SHIFT = 26 // bits [31:26] unused by SPI debug data var TTMP11_SAVE_RCNT_FIRST_REPLAY_MASK = 0xFC000000
@@ -80,10 +75,6 @@ var TTMP11_SAVE_RCNT_FIRST_REPLAY_MASK = 0xFC000000 var S_SAVE_BUF_RSRC_WORD1_STRIDE = 0x00040000 //stride is 4 bytes var S_SAVE_BUF_RSRC_WORD3_MISC = 0x00807FAC //SQ_SEL_X/Y/Z/W, BUF_NUM_FORMAT_FLOAT, (0 for MUBUF stride[17:14] when ADD_TID_ENABLE and BUF_DATA_FORMAT_32 for MTBUF), ADD_TID_ENABLE -var S_SAVE_SPI_INIT_ATC_MASK = 0x08000000 //bit[27]: ATC bit -var S_SAVE_SPI_INIT_ATC_SHIFT = 27 -var S_SAVE_SPI_INIT_MTYPE_MASK = 0x70000000 //bit[30:28]: Mtype -var S_SAVE_SPI_INIT_MTYPE_SHIFT = 28 var S_SAVE_SPI_INIT_FIRST_WAVE_MASK = 0x04000000 //bit[26]: FirstWaveInTG var S_SAVE_SPI_INIT_FIRST_WAVE_SHIFT = 26
@@ -118,10 +109,6 @@ var s_save_ttmps_hi = s_save_trapsts //no conflict var S_RESTORE_BUF_RSRC_WORD1_STRIDE = S_SAVE_BUF_RSRC_WORD1_STRIDE var S_RESTORE_BUF_RSRC_WORD3_MISC = S_SAVE_BUF_RSRC_WORD3_MISC -var S_RESTORE_SPI_INIT_ATC_MASK = 0x08000000 //bit[27]: ATC bit -var S_RESTORE_SPI_INIT_ATC_SHIFT = 27 -var S_RESTORE_SPI_INIT_MTYPE_MASK = 0x70000000 //bit[30:28]: Mtype -var S_RESTORE_SPI_INIT_MTYPE_SHIFT = 28 var S_RESTORE_SPI_INIT_FIRST_WAVE_MASK = 0x04000000 //bit[26]: FirstWaveInTG var S_RESTORE_SPI_INIT_FIRST_WAVE_SHIFT = 26
@@ -338,12 +325,6 @@ L_SAVE: s_or_b32 s_save_buf_rsrc1, s_save_buf_rsrc1, S_SAVE_BUF_RSRC_WORD1_STRIDE s_mov_b32 s_save_buf_rsrc2, 0 //NUM_RECORDS initial value = 0 (in bytes) although not neccessarily inited s_mov_b32 s_save_buf_rsrc3, S_SAVE_BUF_RSRC_WORD3_MISC - s_and_b32 s_save_tmp, s_save_spi_init_hi, S_SAVE_SPI_INIT_ATC_MASK - s_lshr_b32 s_save_tmp, s_save_tmp, (S_SAVE_SPI_INIT_ATC_SHIFT-SQ_BUF_RSRC_WORD1_ATC_SHIFT) //get ATC bit into position - s_or_b32 s_save_buf_rsrc3, s_save_buf_rsrc3, s_save_tmp //or ATC - s_and_b32 s_save_tmp, s_save_spi_init_hi, S_SAVE_SPI_INIT_MTYPE_MASK - s_lshr_b32 s_save_tmp, s_save_tmp, (S_SAVE_SPI_INIT_MTYPE_SHIFT-SQ_BUF_RSRC_WORD3_MTYPE_SHIFT) //get MTYPE bits into position - s_or_b32 s_save_buf_rsrc3, s_save_buf_rsrc3, s_save_tmp //or MTYPE //FIXME right now s_save_m0/s_save_mem_offset use tma_lo/tma_hi (might need to save them before using them?) s_mov_b32 s_save_m0, m0 //save M0
@@ -673,12 +654,6 @@ L_RESTORE: s_or_b32 s_restore_buf_rsrc1, s_restore_buf_rsrc1, S_RESTORE_BUF_RSRC_WORD1_STRIDE s_mov_b32 s_restore_buf_rsrc2, 0 //NUM_RECORDS initial value = 0 (in bytes) s_mov_b32 s_restore_buf_rsrc3, S_RESTORE_BUF_RSRC_WORD3_MISC - s_and_b32 s_restore_tmp, s_restore_spi_init_hi, S_RESTORE_SPI_INIT_ATC_MASK - s_lshr_b32 s_restore_tmp, s_restore_tmp, (S_RESTORE_SPI_INIT_ATC_SHIFT-SQ_BUF_RSRC_WORD1_ATC_SHIFT) //get ATC bit into position - s_or_b32 s_restore_buf_rsrc3, s_restore_buf_rsrc3, s_restore_tmp //or ATC - s_and_b32 s_restore_tmp, s_restore_spi_init_hi, S_RESTORE_SPI_INIT_MTYPE_MASK - s_lshr_b32 s_restore_tmp, s_restore_tmp, (S_RESTORE_SPI_INIT_MTYPE_SHIFT-SQ_BUF_RSRC_WORD3_MTYPE_SHIFT) //get MTYPE bits into position - s_or_b32 s_restore_buf_rsrc3, s_restore_buf_rsrc3, s_restore_tmp //or MTYPE /* global mem offset */ // s_mov_b32 s_restore_mem_offset, 0x0 //mem offset initial value = 0
@@ -898,8 +873,6 @@ end s_lshr_b32 s_restore_m0, s_restore_m0, S_SAVE_PC_HI_FIRST_REPLAY_SHIFT s_lshl_b32 s_restore_m0, s_restore_m0, SQ_WAVE_IB_STS_FIRST_REPLAY_SHIFT s_or_b32 s_restore_tmp, s_restore_tmp, s_restore_m0 - s_and_b32 s_restore_m0, s_restore_status, SQ_WAVE_STATUS_INST_ATC_MASK - s_lshr_b32 s_restore_m0, s_restore_m0, SQ_WAVE_STATUS_INST_ATC_SHIFT s_setreg_b32 hwreg(HW_REG_IB_STS), s_restore_tmp s_and_b32 s_restore_pc_hi, s_restore_pc_hi, 0x0000ffff //pc[47:32] //Do it here in order not to affect STATUS
@@ -909,8 +882,7 @@ end s_barrier //barrier to ensure the readiness of LDS before access attempts from any other wave in the same TG //FIXME not performance-optimal at this time -// s_rfe_b64 s_restore_pc_lo //Return to the main shader program and resume execution - s_rfe_restore_b64 s_restore_pc_lo, s_restore_m0 // s_restore_m0[0] is used to set STATUS.inst_atc + s_rfe_b64 s_restore_pc_lo //Return to the main shader program and resume execution /**************************************************************************/
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/4 drm/amdkfd: Remove duplicated code from trap handler
IB_STS bits are saved/restored in both PC and ttmp11 along different code paths. Use ttmp11 on both paths to remove redundant code.
--- .../gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 764 +++++++++--------- .../amd/amdkfd/cwsr_trap_handler_gfx10.asm | 94 +-- .../drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm | 66 +- 3 files changed, 424 insertions(+), 500 deletions(-)
drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h +375 -389
@@ -274,14 +274,14 @@ static const uint32_t cwsr_trap_gfx8_hex[] = {static const uint32_t cwsr_trap_gfx9_hex[] = { -0xbf820001 ,0xbf820240 , +0xbf820001 ,0xbf82023e ,0xb8f8f802 ,0x89788678 ,0xb8eef801 ,0x866eff6e ,0x00000800 ,0xbf840003 ,0x866eff78 ,0x00002000 ,0xbf840016 ,0xb8fbf803 ,0x866eff7b ,0x00000400 , -0xbf85003b ,0x866eff7b , +0xbf85003a ,0x866eff7b ,0x00000800 ,0xbf850003 ,0x866eff7b ,0x00000100 ,0xbf84000c ,0x866eff78 ,
@@ -290,34 +290,33 @@ static const uint32_t cwsr_trap_gfx9_hex[] = {0x866eff6e ,0x00000400 ,0xbf84fffb ,0x8778ff78 ,0x00002000 ,0x80ec886c , -0x82ed806d ,0xb8eef807 , -0x866fff6e ,0x001f8000 , -0x8e6f8b6f ,0x8977ff77 , -0xfc000000 ,0x87776f77 , -0x896eff6e ,0x001f8000 , -0xb96ef807 ,0xb8faf812 , -0xb8fbf813 ,0x8efa887a , -0xc0071bbd ,0x00000000 , -0xbf8cc07f ,0xc0071ebd , -0x00000008 ,0xbf8cc07f , -0x86ee6e6e ,0xbf840001 , -0xbe801d6e ,0xb8fbf803 , -0x867bff7b ,0x000001ff , -0xbf850002 ,0x806c846c , -0x826d806d ,0x866dff6d , -0x0000ffff ,0x8f6e8b77 , -0x866eff6e ,0x001f8000 , -0xb96ef807 ,0x86fe7e7e , -0x86ea6a6a ,0x8f6e8378 , -0xb96ee0c2 ,0xbf800002 , -0xb9780002 ,0xbe801f6c , +0x82ed806d ,0xb8faf807 , +0x867aff7a ,0x001f8000 , +0x8e7a8b7a ,0x8977ff77 , +0xfc000000 ,0x87777a77 , +0xba7ff807 ,0x00000000 , +0xb8faf812 ,0xb8fbf813 , +0x8efa887a ,0xc0071bbd , +0x00000000 ,0xbf8cc07f , +0xc0071ebd ,0x00000008 , +0xbf8cc07f ,0x86ee6e6e , +0xbf840001 ,0xbe801d6e , +0xb8fbf803 ,0x867bff7b , +0x000001ff ,0xbf850002 , +0x806c846c ,0x826d806d ,0x866dff6d ,0x0000ffff , -0xbefa0080 ,0xb97a0283 , -0xb8fa2407 ,0x8e7a9b7a , -0x876d7a6d ,0xb8fa03c7 , -0x8e7a9a7a ,0x876d7a6d , -0xb8faf807 ,0x867aff7a , -0x00007fff ,0xb97af807 , +0x8f7a8b77 ,0x867aff7a , +0x001f8000 ,0xb97af807 , +0x86fe7e7e ,0x86ea6a6a , +0x8f6e8378 ,0xb96ee0c2 , +0xbf800002 ,0xb9780002 , +0xbe801f6c ,0x866dff6d , +0x0000ffff ,0xbefa0080 , +0xb97a0283 ,0xb8faf807 , +0x867aff7a ,0x001f8000 , +0x8e7a8b7a ,0x8977ff77 , +0xfc000000 ,0x87777a77 , +0xba7ff807 ,0x00000000 ,0xbeee007e ,0xbeef007f ,0xbefe0180 ,0xbf900004 , 0x877a8478, 0xb97af802,
@@ -562,7 +561,7 @@ static const uint32_t cwsr_trap_gfx9_hex[] = {0x701d0300 ,0x807c847c ,0x8070ff70 ,0x00000400 ,0xbf0a7b7c ,0xbf85ffef , -0xbf9c0000 ,0xbf8200cf , +0xbf9c0000 ,0xbf8200c7 ,0xbef4007e ,0x8675ff7f ,0x0000ffff ,0x8775ff75 , 0x00040000, 0xbef60080,
@@ -655,12 +654,8 @@ static const uint32_t cwsr_trap_gfx9_hex[] = {0xc00b1c37 ,0x00000050 ,0xc00b1d37 ,0x00000060 ,0xc0031e77 ,0x00000074 , -0xbf8cc07f ,0x866fff6d , -0xf8000000 ,0x8f6f9b6f , -0x8e6f906f ,0xbeee0080 , -0x876e6f6e ,0x866fff6d , -0x04000000 ,0x8f6f9a6f , -0x8e6f8f6f ,0x876e6f6e , +0xbf8cc07f ,0x8f6e8b77 , +0x866eff6e ,0x001f8000 ,0xb96ef807 ,0x866dff6d ,0x0000ffff ,0x86fe7e7e , 0x86ea6a6a, 0x8f6e837a,
@@ -670,7 +665,7 @@ static const uint32_t cwsr_trap_gfx9_hex[] = { };static const uint32_t cwsr_trap_nv1x_hex[] = { -0xbf820001 ,0xbf8201c5 , +0xbf820001 ,0xbf8201c6 ,0xb0804004 ,0xb978f802 ,0x8a788678 ,0xb96ef801 ,0x876eff6e ,0x00000800 ,
@@ -681,13 +676,13 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {0x876eff7b ,0x00000100 ,0xbf840002 ,0x8878ff78 ,0x00002000 ,0x8a77ff77 , -0xff000000 ,0xb96ef807 , -0x876fff6e ,0x02000000 , -0x8f6f866f ,0x88776f77 , -0x876fff6e ,0x003f8000 , -0x8f6f896f ,0x88776f77 , -0x8a6eff6e ,0x023f8000 , -0xb9eef807 ,0xb97af812 , +0xff000000 ,0xb97af807 , +0x877bff7a ,0x02000000 , +0x8f7b867b ,0x88777b77 , +0x877bff7a ,0x003f8000 , +0x8f7b897b ,0x88777b77 , +0x8a7aff7a ,0x023f8000 , +0xb9faf807 ,0xb97af812 ,0xb97bf813 ,0x8ffa887a ,0xf4051bbd ,0xfa000000 , 0xbf8cc07f, 0xf4051ebd,
@@ -697,366 +692,362 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {0x877bff7b ,0x000001ff ,0xbf850002 ,0x806c846c ,0x826d806d ,0x876dff6d , -0x0000ffff ,0x906e8977 , -0x876fff6e ,0x003f8000 , -0x906e8677 ,0x876eff6e , -0x02000000 ,0x886e6f6e , -0xb9eef807 ,0x87fe7e7e , +0x0000ffff ,0x907a8977 , +0x877bff7a ,0x003f8000 , +0x907a8677 ,0x877aff7a , +0x02000000 ,0x887a7b7a , +0xb9faf807 ,0x87fe7e7e ,0x87ea6a6a ,0xb9f8f802 ,0xbe80226c ,0x876dff6d ,0x0000ffff ,0xbefa0380 , -0xb9fa0283 ,0xb97a2c07 , -0x8f7a9a7a ,0x886d7a6d , -0xb97a03c7 ,0x8f7a997a , -0x886d7a6d ,0xb97a0647 , -0x8f7a987a ,0x886d7a6d , -0xb97af807 ,0x877aff7a , -0x00007fff ,0xb9faf807 , -0xbeee037e ,0xbeef037f , -0xbefe0480 ,0xbf900004 , -0xbf8e0002 ,0xbf88fffe , -0xb97b02dc ,0x8f7b997b , -0x887b7b7f ,0xb97a2a05 , -0x807a817a ,0xbf0d997b , -0xbf850002 ,0x8f7a897a , -0xbf820001 ,0x8f7a8a7a , -0x877bff7f ,0x0000ffff , -0x807aff7a ,0x00000200 , -0x807a7e7a ,0x827b807b , -0xf4491c3d ,0xfa000050 , -0xf4491d3d ,0xfa000060 , -0xf4411e7d ,0xfa000074 , -0xbef4037e ,0x8775ff7f , -0x0000ffff ,0x8875ff75 , -0x00040000 ,0xbef60380 , -0xbef703ff ,0x10807fac , -0xbef1037c ,0xbef00380 , -0xb97302dc ,0x8f739973 , -0x8873737f ,0xb97bf816 , -0xba80f816 ,0x00000000 , -0xbefe03c1 ,0x907c9973 , -0x877c817c ,0xbf06817c , -0xbf850002 ,0xbeff0380 , -0xbf820002 ,0xbeff03c1 , -0xbf82000b ,0xbef603ff , -0x01000000 ,0xe0704000 , -0x705d0000 ,0xe0704080 , -0x705d0100 ,0xe0704100 , -0x705d0200 ,0xe0704180 , -0x705d0300 ,0xbf82000a , +0xb9fa0283 ,0x8a77ff77 , +0xff000000 ,0xb97af807 , +0x877bff7a ,0x02000000 , +0x8f7b867b ,0x88777b77 , +0x877bff7a ,0x003f8000 , +0x8f7b897b ,0x88777b77 , +0x8a7aff7a ,0x023f8000 , +0xb9faf807 ,0xbeee037e , +0xbeef037f ,0xbefe0480 , +0xbf900004 ,0xbf8e0002 , +0xbf88fffe ,0xb97b02dc , +0x8f7b997b ,0x887b7b7f , +0xb97a2a05 ,0x807a817a , +0xbf0d997b ,0xbf850002 , +0x8f7a897a ,0xbf820001 , +0x8f7a8a7a ,0x877bff7f , +0x0000ffff ,0x807aff7a , +0x00000200 ,0x807a7e7a , +0x827b807b ,0xf4491c3d , +0xfa000050 ,0xf4491d3d , +0xfa000060 ,0xf4411e7d , +0xfa000074 ,0xbef4037e , +0x8775ff7f ,0x0000ffff , +0x8875ff75 ,0x00040000 , +0xbef60380 ,0xbef703ff , +0x10807fac ,0xbef1037c , +0xbef00380 ,0xb97302dc , +0x8f739973 ,0x8873737f , +0xb97bf816 ,0xba80f816 , +0x00000000 ,0xbefe03c1 , +0x907c9973 ,0x877c817c , +0xbf06817c ,0xbf850002 , +0xbeff0380 ,0xbf820002 , +0xbeff03c1 ,0xbf82000b ,0xbef603ff ,0x01000000 ,0xe0704000 ,0x705d0000 , -0xe0704100 ,0x705d0100 , -0xe0704200 ,0x705d0200 , -0xe0704300 ,0x705d0300 , -0xb9702a05 ,0x80708170 , -0xbf0d9973 ,0xbf850002 , -0x8f708970 ,0xbf820001 , -0x8f708a70 ,0xb97a1e06 , -0x8f7a8a7a ,0x80707a70 , -0x8070ff70 ,0x00000200 , -0xbef603ff ,0x01000000 , -0xbefe037c ,0xbefc0370 , -0xf4611c7a ,0xf8000000 , -0x80708470 ,0xbefc037e , -0xbefe037c ,0xbefc0370 , -0xf4611b3a ,0xf8000000 , -0x80708470 ,0xbefc037e , -0xbefe037c ,0xbefc0370 , -0xf4611b7a ,0xf8000000 , -0x80708470 ,0xbefc037e , -0xbefe037c ,0xbefc0370 , -0xf4611bba ,0xf8000000 , -0x80708470 ,0xbefc037e , -0xbefe037c ,0xbefc0370 , -0xf4611bfa ,0xf8000000 , -0x80708470 ,0xbefc037e , -0xbefe037c ,0xbefc0370 , -0xf4611e3a ,0xf8000000 , -0x80708470 ,0xbefc037e , -0xb97af803 ,0xbefe037c , -0xbefc0370 ,0xf4611eba , +0xe0704080 ,0x705d0100 , +0xe0704100 ,0x705d0200 , +0xe0704180 ,0x705d0300 , +0xbf82000a ,0xbef603ff , +0x01000000 ,0xe0704000 , +0x705d0000 ,0xe0704100 , +0x705d0100 ,0xe0704200 , +0x705d0200 ,0xe0704300 , +0x705d0300 ,0xb9702a05 , +0x80708170 ,0xbf0d9973 , +0xbf850002 ,0x8f708970 , +0xbf820001 ,0x8f708a70 , +0xb97a1e06 ,0x8f7a8a7a , +0x80707a70 ,0x8070ff70 , +0x00000200 ,0xbef603ff , +0x01000000 ,0xbefe037c , +0xbefc0370 ,0xf4611c7a , +0xf8000000 ,0x80708470 , +0xbefc037e ,0xbefe037c , +0xbefc0370 ,0xf4611b3a , +0xf8000000 ,0x80708470 , +0xbefc037e ,0xbefe037c , +0xbefc0370 ,0xf4611b7a ,0xf8000000 ,0x80708470 ,0xbefc037e ,0xbefe037c , -0xbefc0370 ,0xf4611efa , +0xbefc0370 ,0xf4611bba ,0xf8000000 ,0x80708470 , -0xbefc037e ,0xb971f801 , +0xbefc037e ,0xbefe037c , +0xbefc0370 ,0xf4611bfa , +0xf8000000 ,0x80708470 , +0xbefc037e ,0xbefe037c , +0xbefc0370 ,0xf4611e3a , +0xf8000000 ,0x80708470 , +0xbefc037e ,0xb97af803 ,0xbefe037c ,0xbefc0370 , -0xf4611c7a ,0xf8000000 , +0xf4611eba ,0xf8000000 , +0x80708470 ,0xbefc037e , +0xbefe037c ,0xbefc0370 , +0xf4611efa ,0xf8000000 ,0x80708470 ,0xbefc037e , -0xb971f814 ,0xbefe037c , +0xb971f801 ,0xbefe037c ,0xbefc0370 ,0xf4611c7a ,0xf8000000 ,0x80708470 , -0xbefc037e ,0xb971f815 , +0xbefc037e ,0xb971f814 ,0xbefe037c ,0xbefc0370 ,0xf4611c7a ,0xf8000000 ,0x80708470 ,0xbefc037e , -0xb9702a05 ,0x80708170 , -0xbf0d9973 ,0xbf850002 , -0x8f708970 ,0xbf820001 , -0x8f708a70 ,0xb97a1e06 , -0x8f7a8a7a ,0x80707a70 , -0xbef603ff ,0x01000000 , -0xbefb0374 ,0x80747074 , -0x82758075 ,0xbefc0380 , -0xbf800000 ,0xbe802f00 , -0xbe822f02 ,0xbe842f04 , -0xbe862f06 ,0xbe882f08 , -0xbe8a2f0a ,0xbe8c2f0c , -0xbe8e2f0e ,0xf469003a , -0xfa000000 ,0xf469013a , -0xfa000010 ,0xf469023a , -0xfa000020 ,0xf469033a , -0xfa000030 ,0x8074c074 , -0x82758075 ,0x807c907c , -0xbf0aff7c ,0x00000060 , -0xbf85ffea ,0xbe802f00 , -0xbe822f02 ,0xbe842f04 , -0xbe862f06 ,0xbe882f08 , -0xbe8a2f0a ,0xf469003a , -0xfa000000 ,0xf469013a , -0xfa000010 ,0xf469023a , -0xfa000020 ,0x8074b074 , -0x82758075 ,0xbef4037b , +0xb971f815 ,0xbefe037c , +0xbefc0370 ,0xf4611c7a , +0xf8000000 ,0x80708470 , +0xbefc037e ,0xb9702a05 , +0x80708170 ,0xbf0d9973 , +0xbf850002 ,0x8f708970 , +0xbf820001 ,0x8f708a70 , +0xb97a1e06 ,0x8f7a8a7a , +0x80707a70 ,0xbef603ff , +0x01000000 ,0xbefb0374 , +0x80747074 ,0x82758075 , +0xbefc0380 ,0xbf800000 , +0xbe802f00 ,0xbe822f02 , +0xbe842f04 ,0xbe862f06 , +0xbe882f08 ,0xbe8a2f0a , +0xbe8c2f0c ,0xbe8e2f0e , +0xf469003a ,0xfa000000 , +0xf469013a ,0xfa000010 , +0xf469023a ,0xfa000020 , +0xf469033a ,0xfa000030 , +0x8074c074 ,0x82758075 , +0x807c907c ,0xbf0aff7c , +0x00000060 ,0xbf85ffea , +0xbe802f00 ,0xbe822f02 , +0xbe842f04 ,0xbe862f06 , +0xbe882f08 ,0xbe8a2f0a , +0xf469003a ,0xfa000000 , +0xf469013a ,0xfa000010 , +0xf469023a ,0xfa000020 , +0x8074b074 ,0x82758075 , +0xbef4037b ,0xbefe03c1 , +0x907c9973 ,0x877c817c , +0xbf06817c ,0xbf850002 , +0xbeff0380 ,0xbf820001 , +0xbeff03c1 ,0xb97b4306 , +0x877bc17b ,0xbf840044 , +0xbf8a0000 ,0x877aff73 , +0x04000000 ,0xbf840040 , +0x8f7b867b ,0x8f7b827b , +0xbef6037b ,0xb9702a05 , +0x80708170 ,0xbf0d9973 , +0xbf850002 ,0x8f708970 , +0xbf820001 ,0x8f708a70 , +0xb97a1e06 ,0x8f7a8a7a , +0x80707a70 ,0x8070ff70 , +0x00000200 ,0x8070ff70 , +0x00000080 ,0xbef603ff , +0x01000000 ,0xd7650000 , +0x000100c1 ,0xd7660000 , +0x000200c1 ,0x16000084 , +0x907c9973 ,0x877c817c , +0xbf06817c ,0xbefc0380 , +0xbf850012 ,0xbe8303ff , +0x00000080 ,0xbf800000 , +0xbf800000 ,0xbf800000 , +0xd8d80000 ,0x01000000 , +0xbf8c0000 ,0xe0704000 , +0x705d0100 ,0x807c037c , +0x80700370 ,0xd5250000 , +0x0001ff00 ,0x00000080 , +0xbf0a7b7c ,0xbf85fff4 , +0xbf820011 ,0xbe8303ff , +0x00000100 ,0xbf800000 , +0xbf800000 ,0xbf800000 , +0xd8d80000 ,0x01000000 , +0xbf8c0000 ,0xe0704000 , +0x705d0100 ,0x807c037c , +0x80700370 ,0xd5250000 , +0x0001ff00 ,0x00000100 , +0xbf0a7b7c ,0xbf85fff4 ,0xbefe03c1 ,0x907c9973 ,0x877c817c ,0xbf06817c , -0xbf850002 ,0xbeff0380 , -0xbf820001 ,0xbeff03c1 , -0xb97b4306 ,0x877bc17b , -0xbf840044 ,0xbf8a0000 , -0x877aff73 ,0x04000000 , -0xbf840040 ,0x8f7b867b , -0x8f7b827b ,0xbef6037b , -0xb9702a05 ,0x80708170 , -0xbf0d9973 ,0xbf850002 , -0x8f708970 ,0xbf820001 , -0x8f708a70 ,0xb97a1e06 , -0x8f7a8a7a ,0x80707a70 , -0x8070ff70 ,0x00000200 , -0x8070ff70 ,0x00000080 , -0xbef603ff ,0x01000000 , -0xd7650000 ,0x000100c1 , -0xd7660000 ,0x000200c1 , -0x16000084 ,0x907c9973 , +0xbf850004 ,0xbef003ff , +0x00000200 ,0xbeff0380 , +0xbf820003 ,0xbef003ff , +0x00000400 ,0xbeff03c1 , +0xb97b2a05 ,0x807b817b , +0x8f7b827b ,0x907c9973 ,0x877c817c ,0xbf06817c , -0xbefc0380 ,0xbf850012 , -0xbe8303ff ,0x00000080 , -0xbf800000 ,0xbf800000 , -0xbf800000 ,0xd8d80000 , -0x01000000 ,0xbf8c0000 , -0xe0704000 ,0x705d0100 , -0x807c037c ,0x80700370 , -0xd5250000 ,0x0001ff00 , -0x00000080 ,0xbf0a7b7c , -0xbf85fff4 ,0xbf820011 , -0xbe8303ff ,0x00000100 , -0xbf800000 ,0xbf800000 , -0xbf800000 ,0xd8d80000 , -0x01000000 ,0xbf8c0000 , -0xe0704000 ,0x705d0100 , -0x807c037c ,0x80700370 , -0xd5250000 ,0x0001ff00 , -0x00000100 ,0xbf0a7b7c , -0xbf85fff4 ,0xbefe03c1 , -0x907c9973 ,0x877c817c , -0xbf06817c ,0xbf850004 , -0xbef003ff ,0x00000200 , -0xbeff0380 ,0xbf820003 , -0xbef003ff ,0x00000400 , -0xbeff03c1 ,0xb97b2a05 , -0x807b817b ,0x8f7b827b , -0x907c9973 ,0x877c817c , -0xbf06817c ,0xbf850017 , +0xbf850017 ,0xbef603ff , +0x01000000 ,0xbefc0384 , +0xbf0a7b7c ,0xbf840037 , +0x7e008700 ,0x7e028701 , +0x7e048702 ,0x7e068703 , +0xe0704000 ,0x705d0000 , +0xe0704080 ,0x705d0100 , +0xe0704100 ,0x705d0200 , +0xe0704180 ,0x705d0300 , +0x807c847c ,0x8070ff70 , +0x00000200 ,0xbf0a7b7c , +0xbf85ffef ,0xbf820025 ,0xbef603ff ,0x01000000 ,0xbefc0384 ,0xbf0a7b7c , -0xbf840037 ,0x7e008700 , +0xbf840020 ,0x7e008700 ,0x7e028701 ,0x7e048702 ,0x7e068703 ,0xe0704000 , -0x705d0000 ,0xe0704080 , -0x705d0100 ,0xe0704100 , -0x705d0200 ,0xe0704180 , +0x705d0000 ,0xe0704100 , +0x705d0100 ,0xe0704200 , +0x705d0200 ,0xe0704300 ,0x705d0300 ,0x807c847c , -0x8070ff70 ,0x00000200 , +0x8070ff70 ,0x00000400 ,0xbf0a7b7c ,0xbf85ffef , -0xbf820025 ,0xbef603ff , -0x01000000 ,0xbefc0384 , -0xbf0a7b7c ,0xbf840020 , -0x7e008700 ,0x7e028701 , -0x7e048702 ,0x7e068703 , +0xb97b1e06 ,0x877bc17b , +0xbf84000c ,0x8f7b837b , +0x807b7c7b ,0xbefe03c1 , +0xbeff0380 ,0x7e008700 ,0xe0704000 ,0x705d0000 , -0xe0704100 ,0x705d0100 , -0xe0704200 ,0x705d0200 , -0xe0704300 ,0x705d0300 , -0x807c847c ,0x8070ff70 , -0x00000400 ,0xbf0a7b7c , -0xbf85ffef ,0xb97b1e06 , -0x877bc17b ,0xbf84000c , -0x8f7b837b ,0x807b7c7b , -0xbefe03c1 ,0xbeff0380 , -0x7e008700 ,0xe0704000 , -0x705d0000 ,0x807c817c , -0x8070ff70 ,0x00000080 , -0xbf0a7b7c ,0xbf85fff8 , -0xbf820146 ,0xbef4037e , -0x8775ff7f ,0x0000ffff , -0x8875ff75 ,0x00040000 , -0xbef60380 ,0xbef703ff , -0x10807fac ,0xb97202dc , -0x8f729972 ,0x8872727f , -0x876eff7f ,0x04000000 , -0xbf840034 ,0xbefe03c1 , -0x907c9972 ,0x877c817c , -0xbf06817c ,0xbf850002 , -0xbeff0380 ,0xbf820001 , -0xbeff03c1 ,0xb96f4306 , -0x876fc16f ,0xbf840029 , -0x8f6f866f ,0x8f6f826f , -0xbef6036f ,0xb9782a05 , -0x80788178 ,0xbf0d9972 , -0xbf850002 ,0x8f788978 , -0xbf820001 ,0x8f788a78 , -0xb96e1e06 ,0x8f6e8a6e , -0x80786e78 ,0x8078ff78 , -0x00000200 ,0x8078ff78 , -0x00000080 ,0xbef603ff , -0x01000000 ,0x907c9972 , -0x877c817c ,0xbf06817c , -0xbefc0380 ,0xbf850009 , -0xe0310000 ,0x781d0000 , -0x807cff7c ,0x00000080 , -0x8078ff78 ,0x00000080 , -0xbf0a6f7c ,0xbf85fff8 , -0xbf820008 ,0xe0310000 , -0x781d0000 ,0x807cff7c , -0x00000100 ,0x8078ff78 , -0x00000100 ,0xbf0a6f7c , -0xbf85fff8 ,0xbef80380 , +0x807c817c ,0x8070ff70 , +0x00000080 ,0xbf0a7b7c , +0xbf85fff8 ,0xbf82013d , +0xbef4037e ,0x8775ff7f , +0x0000ffff ,0x8875ff75 , +0x00040000 ,0xbef60380 , +0xbef703ff ,0x10807fac , +0xb97202dc ,0x8f729972 , +0x8872727f ,0x876eff7f , +0x04000000 ,0xbf840034 ,0xbefe03c1 ,0x907c9972 ,0x877c817c ,0xbf06817c ,0xbf850002 ,0xbeff0380 ,0xbf820001 ,0xbeff03c1 , -0xb96f2a05 ,0x806f816f , -0x8f6f826f ,0x907c9972 , -0x877c817c ,0xbf06817c , -0xbf850021 ,0xbef603ff , -0x01000000 ,0xbeee0378 , +0xb96f4306 ,0x876fc16f , +0xbf840029 ,0x8f6f866f , +0x8f6f826f ,0xbef6036f , +0xb9782a05 ,0x80788178 , +0xbf0d9972 ,0xbf850002 , +0x8f788978 ,0xbf820001 , +0x8f788a78 ,0xb96e1e06 , +0x8f6e8a6e ,0x80786e78 ,0x8078ff78 ,0x00000200 , -0xbefc0384 ,0xe0304000 , -0x785d0000 ,0xe0304080 , -0x785d0100 ,0xe0304100 , -0x785d0200 ,0xe0304180 , -0x785d0300 ,0xbf8c3f70 , -0x7e008500 ,0x7e028501 , -0x7e048502 ,0x7e068503 , -0x807c847c ,0x8078ff78 , -0x00000200 ,0xbf0a6f7c , -0xbf85ffee ,0xe0304000 , -0x6e5d0000 ,0xe0304080 , -0x6e5d0100 ,0xe0304100 , -0x6e5d0200 ,0xe0304180 , -0x6e5d0300 ,0xbf820032 , +0x8078ff78 ,0x00000080 , +0xbef603ff ,0x01000000 , +0x907c9972 ,0x877c817c , +0xbf06817c ,0xbefc0380 , +0xbf850009 ,0xe0310000 , +0x781d0000 ,0x807cff7c , +0x00000080 ,0x8078ff78 , +0x00000080 ,0xbf0a6f7c , +0xbf85fff8 ,0xbf820008 , +0xe0310000 ,0x781d0000 , +0x807cff7c ,0x00000100 , +0x8078ff78 ,0x00000100 , +0xbf0a6f7c ,0xbf85fff8 , +0xbef80380 ,0xbefe03c1 , +0x907c9972 ,0x877c817c , +0xbf06817c ,0xbf850002 , +0xbeff0380 ,0xbf820001 , +0xbeff03c1 ,0xb96f2a05 , +0x806f816f ,0x8f6f826f , +0x907c9972 ,0x877c817c , +0xbf06817c ,0xbf850021 ,0xbef603ff ,0x01000000 ,0xbeee0378 ,0x8078ff78 , -0x00000400 ,0xbefc0384 , +0x00000200 ,0xbefc0384 ,0xe0304000 ,0x785d0000 , -0xe0304100 ,0x785d0100 , -0xe0304200 ,0x785d0200 , -0xe0304300 ,0x785d0300 , +0xe0304080 ,0x785d0100 , +0xe0304100 ,0x785d0200 , +0xe0304180 ,0x785d0300 ,0xbf8c3f70 ,0x7e008500 ,0x7e028501 ,0x7e048502 ,0x7e068503 ,0x807c847c , -0x8078ff78 ,0x00000400 , +0x8078ff78 ,0x00000200 ,0xbf0a6f7c ,0xbf85ffee , -0xb96f1e06 ,0x876fc16f , -0xbf84000e ,0x8f6f836f , -0x806f7c6f ,0xbefe03c1 , -0xbeff0380 ,0xe0304000 , -0x785d0000 ,0xbf8c3f70 , -0x7e008500 ,0x807c817c , -0x8078ff78 ,0x00000080 , -0xbf0a6f7c ,0xbf85fff7 , -0xbeff03c1 ,0xe0304000 , -0x6e5d0000 ,0xe0304100 , -0x6e5d0100 ,0xe0304200 , -0x6e5d0200 ,0xe0304300 , -0x6e5d0300 ,0xbf8c3f70 , +0xe0304000 ,0x6e5d0000 , +0xe0304080 ,0x6e5d0100 , +0xe0304100 ,0x6e5d0200 , +0xe0304180 ,0x6e5d0300 , +0xbf820032 ,0xbef603ff , +0x01000000 ,0xbeee0378 , +0x8078ff78 ,0x00000400 , +0xbefc0384 ,0xe0304000 , +0x785d0000 ,0xe0304100 , +0x785d0100 ,0xe0304200 , +0x785d0200 ,0xe0304300 , +0x785d0300 ,0xbf8c3f70 , +0x7e008500 ,0x7e028501 , +0x7e048502 ,0x7e068503 , +0x807c847c ,0x8078ff78 , +0x00000400 ,0xbf0a6f7c , +0xbf85ffee ,0xb96f1e06 , +0x876fc16f ,0xbf84000e , +0x8f6f836f ,0x806f7c6f , +0xbefe03c1 ,0xbeff0380 , +0xe0304000 ,0x785d0000 , +0xbf8c3f70 ,0x7e008500 , +0x807c817c ,0x8078ff78 , +0x00000080 ,0xbf0a6f7c , +0xbf85fff7 ,0xbeff03c1 , +0xe0304000 ,0x6e5d0000 , +0xe0304100 ,0x6e5d0100 , +0xe0304200 ,0x6e5d0200 , +0xe0304300 ,0x6e5d0300 , +0xbf8c3f70 ,0xb9782a05 , +0x80788178 ,0xbf0d9972 , +0xbf850002 ,0x8f788978 , +0xbf820001 ,0x8f788a78 , +0xb96e1e06 ,0x8f6e8a6e , +0x80786e78 ,0x8078ff78 , +0x00000200 ,0x80f8ff78 , +0x00000050 ,0xbef603ff , +0x01000000 ,0xbefc03ff , +0x0000006c ,0x80f89078 , +0xf429003a ,0xf0000000 , +0xbf8cc07f ,0x80fc847c , +0xbf800000 ,0xbe803100 , +0xbe823102 ,0x80f8a078 , +0xf42d003a ,0xf0000000 , +0xbf8cc07f ,0x80fc887c , +0xbf800000 ,0xbe803100 , +0xbe823102 ,0xbe843104 , +0xbe863106 ,0x80f8c078 , +0xf431003a ,0xf0000000 , +0xbf8cc07f ,0x80fc907c , +0xbf800000 ,0xbe803100 , +0xbe823102 ,0xbe843104 , +0xbe863106 ,0xbe883108 , +0xbe8a310a ,0xbe8c310c , +0xbe8e310e ,0xbf06807c , +0xbf84fff0 ,0xba80f801 , +0x00000000 ,0xbf8a0000 ,0xb9782a05 ,0x80788178 ,0xbf0d9972 ,0xbf850002 ,0x8f788978 ,0xbf820001 ,0x8f788a78 ,0xb96e1e06 ,0x8f6e8a6e ,0x80786e78 ,0x8078ff78 ,0x00000200 , -0x80f8ff78 ,0x00000050 ,0xbef603ff ,0x01000000 , -0xbefc03ff ,0x0000006c , -0x80f89078 ,0xf429003a , -0xf0000000 ,0xbf8cc07f , -0x80fc847c ,0xbf800000 , -0xbe803100 ,0xbe823102 , -0x80f8a078 ,0xf42d003a , -0xf0000000 ,0xbf8cc07f , -0x80fc887c ,0xbf800000 , -0xbe803100 ,0xbe823102 , -0xbe843104 ,0xbe863106 , -0x80f8c078 ,0xf431003a , -0xf0000000 ,0xbf8cc07f , -0x80fc907c ,0xbf800000 , -0xbe803100 ,0xbe823102 , -0xbe843104 ,0xbe863106 , -0xbe883108 ,0xbe8a310a , -0xbe8c310c ,0xbe8e310e , -0xbf06807c ,0xbf84fff0 , -0xba80f801 ,0x00000000 , -0xbf8a0000 ,0xb9782a05 , -0x80788178 ,0xbf0d9972 , -0xbf850002 ,0x8f788978 , -0xbf820001 ,0x8f788a78 , -0xb96e1e06 ,0x8f6e8a6e , -0x80786e78 ,0x8078ff78 , -0x00000200 ,0xbef603ff , -0x01000000 ,0xf4211bfa , +0xf4211bfa ,0xf0000000 , +0x80788478 ,0xf4211b3a ,0xf0000000 ,0x80788478 , -0xf4211b3a ,0xf0000000 , -0x80788478 ,0xf4211b7a , +0xf4211b7a ,0xf0000000 , +0x80788478 ,0xf4211c3a ,0xf0000000 ,0x80788478 , -0xf4211c3a ,0xf0000000 , -0x80788478 ,0xf4211c7a , +0xf4211c7a ,0xf0000000 , +0x80788478 ,0xf4211eba ,0xf0000000 ,0x80788478 , -0xf4211eba ,0xf0000000 , -0x80788478 ,0xf4211efa , +0xf4211efa ,0xf0000000 , +0x80788478 ,0xf4211e7a ,0xf0000000 ,0x80788478 , -0xf4211e7a ,0xf0000000 , -0x80788478 ,0xf4211cfa , +0xf4211cfa ,0xf0000000 , +0x80788478 ,0xf4211bba ,0xf0000000 ,0x80788478 , +0xbf8cc07f ,0xb9eef814 ,0xf4211bba ,0xf0000000 ,0x80788478 ,0xbf8cc07f , -0xb9eef814 ,0xf4211bba , -0xf0000000 ,0x80788478 , -0xbf8cc07f ,0xb9eef815 , -0xbefc036f ,0xbefe0370 , -0xbeff0371 ,0x876f7bff , -0x000003ff ,0xb9ef4803 , -0xb9f9f816 ,0x876f7bff , -0xfffff800 ,0x906f8b6f , -0xb9efa2c3 ,0xb9f3f801 , -0xb96e2a05 ,0x806e816e , -0xbf0d9972 ,0xbf850002 , -0x8f6e896e ,0xbf820001 , -0x8f6e8a6e ,0x806eff6e , -0x00000200 ,0x806e746e , -0x826f8075 ,0x876fff6f , -0x0000ffff ,0xf4091c37 , -0xfa000050 ,0xf4091d37 , -0xfa000060 ,0xf4011e77 , -0xfa000074 ,0xbf8cc07f , -0x876fff6d ,0xfc000000 , -0x906f9a6f ,0x8f6f906f , -0xbeee0380 ,0x886e6f6e , -0x876fff6d ,0x02000000 , -0x906f996f ,0x8f6f8f6f , -0x886e6f6e ,0x876fff6d , -0x01000000 ,0x906f986f , -0x8f6f996f ,0x886e6f6e , +0xb9eef815 ,0xbefc036f , +0xbefe0370 ,0xbeff0371 , +0x876f7bff ,0x000003ff , +0xb9ef4803 ,0xb9f9f816 , +0x876f7bff ,0xfffff800 , +0x906f8b6f ,0xb9efa2c3 , +0xb9f3f801 ,0xb96e2a05 , +0x806e816e ,0xbf0d9972 , +0xbf850002 ,0x8f6e896e , +0xbf820001 ,0x8f6e8a6e , +0x806eff6e ,0x00000200 , +0x806e746e ,0x826f8075 , +0x876fff6f ,0x0000ffff , +0xf4091c37 ,0xfa000050 , +0xf4091d37 ,0xfa000060 , +0xf4011e77 ,0xfa000074 , +0xbf8cc07f ,0x906e8977 , +0x876fff6e ,0x003f8000 , +0x906e8677 ,0x876eff6e , +0x02000000 ,0x886e6f6e ,0xb9eef807 ,0x876dff6d ,0x0000ffff ,0x87fe7e7e , 0x87ea6a6a, 0xb9faf802,
@@ -1067,14 +1058,14 @@ static const uint32_t cwsr_trap_nv1x_hex[] = { };static const uint32_t cwsr_trap_arcturus_hex[] = { -0xbf820001 ,0xbf8202bc , +0xbf820001 ,0xbf8202ba ,0xb8f8f802 ,0x89788678 ,0xb8eef801 ,0x866eff6e ,0x00000800 ,0xbf840003 ,0x866eff78 ,0x00002000 ,0xbf840016 ,0xb8fbf803 ,0x866eff7b ,0x00000400 , -0xbf85003b ,0x866eff7b , +0xbf85003a ,0x866eff7b ,0x00000800 ,0xbf850003 ,0x866eff7b ,0x00000100 ,0xbf84000c ,0x866eff78 ,
@@ -1083,34 +1074,33 @@ static const uint32_t cwsr_trap_arcturus_hex[] = {0x866eff6e ,0x00000400 ,0xbf84fffb ,0x8778ff78 ,0x00002000 ,0x80ec886c , -0x82ed806d ,0xb8eef807 , -0x866fff6e ,0x001f8000 , -0x8e6f8b6f ,0x8977ff77 , -0xfc000000 ,0x87776f77 , -0x896eff6e ,0x001f8000 , -0xb96ef807 ,0xb8faf812 , -0xb8fbf813 ,0x8efa887a , -0xc0071bbd ,0x00000000 , -0xbf8cc07f ,0xc0071ebd , -0x00000008 ,0xbf8cc07f , -0x86ee6e6e ,0xbf840001 , -0xbe801d6e ,0xb8fbf803 , -0x867bff7b ,0x000001ff , -0xbf850002 ,0x806c846c , -0x826d806d ,0x866dff6d , -0x0000ffff ,0x8f6e8b77 , -0x866eff6e ,0x001f8000 , -0xb96ef807 ,0x86fe7e7e , -0x86ea6a6a ,0x8f6e8378 , -0xb96ee0c2 ,0xbf800002 , -0xb9780002 ,0xbe801f6c , +0x82ed806d ,0xb8faf807 , +0x867aff7a ,0x001f8000 , +0x8e7a8b7a ,0x8977ff77 , +0xfc000000 ,0x87777a77 , +0xba7ff807 ,0x00000000 , +0xb8faf812 ,0xb8fbf813 , +0x8efa887a ,0xc0071bbd , +0x00000000 ,0xbf8cc07f , +0xc0071ebd ,0x00000008 , +0xbf8cc07f ,0x86ee6e6e , +0xbf840001 ,0xbe801d6e , +0xb8fbf803 ,0x867bff7b , +0x000001ff ,0xbf850002 , +0x806c846c ,0x826d806d ,0x866dff6d ,0x0000ffff , -0xbefa0080 ,0xb97a0283 , -0xb8fa2407 ,0x8e7a9b7a , -0x876d7a6d ,0xb8fa03c7 , -0x8e7a9a7a ,0x876d7a6d , -0xb8faf807 ,0x867aff7a , -0x00007fff ,0xb97af807 , +0x8f7a8b77 ,0x867aff7a , +0x001f8000 ,0xb97af807 , +0x86fe7e7e ,0x86ea6a6a , +0x8f6e8378 ,0xb96ee0c2 , +0xbf800002 ,0xb9780002 , +0xbe801f6c ,0x866dff6d , +0x0000ffff ,0xbefa0080 , +0xb97a0283 ,0xb8faf807 , +0x867aff7a ,0x001f8000 , +0x8e7a8b7a ,0x8977ff77 , +0xfc000000 ,0x87777a77 , +0xba7ff807 ,0x00000000 ,0xbeee007e ,0xbeef007f ,0xbefe0180 ,0xbf900004 , 0x877a8478, 0xb97af802,
@@ -1417,7 +1407,7 @@ static const uint32_t cwsr_trap_arcturus_hex[] = {0x701d0300 ,0x807c847c ,0x8070ff70 ,0x00000400 ,0xbf0a7b7c ,0xbf85ffeb , -0xbf9c0000 ,0xbf8200fb , +0xbf9c0000 ,0xbf8200f3 ,0xbef4007e ,0x8675ff7f ,0x0000ffff ,0x8775ff75 , 0x00040000, 0xbef60080,
@@ -1532,12 +1522,8 @@ static const uint32_t cwsr_trap_arcturus_hex[] = {0xc00b1c37 ,0x00000050 ,0xc00b1d37 ,0x00000060 ,0xc0031e77 ,0x00000074 , -0xbf8cc07f ,0x866fff6d , -0xf8000000 ,0x8f6f9b6f , -0x8e6f906f ,0xbeee0080 , -0x876e6f6e ,0x866fff6d , -0x04000000 ,0x8f6f9a6f , -0x8e6f8f6f ,0x876e6f6e , +0xbf8cc07f ,0x8f6e8b77 , +0x866eff6e ,0x001f8000 ,0xb96ef807 ,0x866dff6d ,0x0000ffff ,0x86fe7e7e , 0x86ea6a6a, 0x8f6e837a,
drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm +29 -65
143 lines not on this page · raw message
drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm +20 -46
113 lines not on this page · raw message
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/4 drm/amdkfd: Move first_wave bit in gfx10 trap handler
In reply to Jay CornwallSave first_wave bit from exec_hi to ttmp1. This allows the high bits of exec_lo/exec_hi (which hold a 48-bit address) to be cleared in a follow-up patch.
--- .../gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 596 +++++++++--------- .../amd/amdkfd/cwsr_trap_handler_gfx10.asm | 14 +- 2 files changed, 310 insertions(+), 300 deletions(-)
drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h +299 -297
@@ -665,7 +665,7 @@ static const uint32_t cwsr_trap_gfx9_hex[] = { };static const uint32_t cwsr_trap_nv1x_hex[] = { -0xbf820001 ,0xbf8201c6 , +0xbf820001 ,0xbf8201ca ,0xb0804004 ,0xb978f802 ,0x8a788678 ,0xb96ef801 ,0x876eff6e ,0x00000800 ,
@@ -710,24 +710,25 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {0xb9faf807 ,0xbeee037e ,0xbeef037f ,0xbefe0480 ,0xbf900004 ,0xbf8e0002 , -0xbf88fffe ,0xb97b02dc , -0x8f7b997b ,0x887b7b7f , -0xb97a2a05 ,0x807a817a , -0xbf0d997b ,0xbf850002 , -0x8f7a897a ,0xbf820001 , -0x8f7a8a7a ,0x877bff7f , -0x0000ffff ,0x807aff7a , -0x00000200 ,0x807a7e7a , -0x827b807b ,0xf4491c3d , -0xfa000050 ,0xf4491d3d , -0xfa000060 ,0xf4411e7d , -0xfa000074 ,0xbef4037e , -0x8775ff7f ,0x0000ffff , -0x8875ff75 ,0x00040000 , -0xbef60380 ,0xbef703ff , -0x10807fac ,0xbef1037c , -0xbef00380 ,0xb97302dc , -0x8f739973 ,0x8873737f , +0xbf88fffe ,0x877aff7f , +0x04000000 ,0x8f7a857a , +0x886d7a6d ,0xb97b02dc , +0x8f7b997b ,0xb97a2a05 , +0x807a817a ,0xbf0d997b , +0xbf850002 ,0x8f7a897a , +0xbf820001 ,0x8f7a8a7a , +0x877bff7f ,0x0000ffff , +0x807aff7a ,0x00000200 , +0x807a7e7a ,0x827b807b , +0xf4491c3d ,0xfa000050 , +0xf4491d3d ,0xfa000060 , +0xf4411e7d ,0xfa000074 , +0xbef4037e ,0x8775ff7f , +0x0000ffff ,0x8875ff75 , +0x00040000 ,0xbef60380 , +0xbef703ff ,0x10807fac , +0xbef1037c ,0xbef00380 , +0xb97302dc ,0x8f739973 ,0xb97bf816 ,0xba80f816 ,0x00000000 ,0xbefe03c1 , 0x907c9973, 0x877c817c,
@@ -757,8 +758,9 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {0xbefc037e ,0xbefe037c ,0xbefc0370 ,0xf4611b3a ,0xf8000000 ,0x80708470 , -0xbefc037e ,0xbefe037c , -0xbefc0370 ,0xf4611b7a , +0xbefc037e ,0x8a7aff6d , +0x80000000 ,0xbefe037c , +0xbefc0370 ,0xf4611eba ,0xf8000000 ,0x80708470 ,0xbefc037e ,0xbefe037c , 0xbefc0370, 0xf4611bba,
@@ -819,8 +821,8 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {0xbeff0380 ,0xbf820001 ,0xbeff03c1 ,0xb97b4306 ,0x877bc17b ,0xbf840044 , -0xbf8a0000 ,0x877aff73 , -0x04000000 ,0xbf840040 , +0xbf8a0000 ,0x877aff6d , +0x80000000 ,0xbf840040 ,0x8f7b867b ,0x8f7b827b ,0xbef6037b ,0xb9702a05 , 0x80708170, 0xbf0d9973,
@@ -892,169 +894,168 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {0xe0704000 ,0x705d0000 ,0x807c817c ,0x8070ff70 ,0x00000080 ,0xbf0a7b7c , -0xbf85fff8 ,0xbf82013d , +0xbf85fff8 ,0xbf82013c ,0xbef4037e ,0x8775ff7f ,0x0000ffff ,0x8875ff75 ,0x00040000 ,0xbef60380 ,0xbef703ff ,0x10807fac ,0xb97202dc ,0x8f729972 , -0x8872727f ,0x876eff7f , -0x04000000 ,0xbf840034 , +0x876eff7f ,0x04000000 , +0xbf840034 ,0xbefe03c1 , +0x907c9972 ,0x877c817c , +0xbf06817c ,0xbf850002 , +0xbeff0380 ,0xbf820001 , +0xbeff03c1 ,0xb96f4306 , +0x876fc16f ,0xbf840029 , +0x8f6f866f ,0x8f6f826f , +0xbef6036f ,0xb9782a05 , +0x80788178 ,0xbf0d9972 , +0xbf850002 ,0x8f788978 , +0xbf820001 ,0x8f788a78 , +0xb96e1e06 ,0x8f6e8a6e , +0x80786e78 ,0x8078ff78 , +0x00000200 ,0x8078ff78 , +0x00000080 ,0xbef603ff , +0x01000000 ,0x907c9972 , +0x877c817c ,0xbf06817c , +0xbefc0380 ,0xbf850009 , +0xe0310000 ,0x781d0000 , +0x807cff7c ,0x00000080 , +0x8078ff78 ,0x00000080 , +0xbf0a6f7c ,0xbf85fff8 , +0xbf820008 ,0xe0310000 , +0x781d0000 ,0x807cff7c , +0x00000100 ,0x8078ff78 , +0x00000100 ,0xbf0a6f7c , +0xbf85fff8 ,0xbef80380 ,0xbefe03c1 ,0x907c9972 ,0x877c817c ,0xbf06817c ,0xbf850002 ,0xbeff0380 ,0xbf820001 ,0xbeff03c1 , -0xb96f4306 ,0x876fc16f , -0xbf840029 ,0x8f6f866f , -0x8f6f826f ,0xbef6036f , -0xb9782a05 ,0x80788178 , -0xbf0d9972 ,0xbf850002 , -0x8f788978 ,0xbf820001 , -0x8f788a78 ,0xb96e1e06 , -0x8f6e8a6e ,0x80786e78 , -0x8078ff78 ,0x00000200 , -0x8078ff78 ,0x00000080 , -0xbef603ff ,0x01000000 , -0x907c9972 ,0x877c817c , -0xbf06817c ,0xbefc0380 , -0xbf850009 ,0xe0310000 , -0x781d0000 ,0x807cff7c , -0x00000080 ,0x8078ff78 , -0x00000080 ,0xbf0a6f7c , -0xbf85fff8 ,0xbf820008 , -0xe0310000 ,0x781d0000 , -0x807cff7c ,0x00000100 , -0x8078ff78 ,0x00000100 , -0xbf0a6f7c ,0xbf85fff8 , -0xbef80380 ,0xbefe03c1 , -0x907c9972 ,0x877c817c , -0xbf06817c ,0xbf850002 , -0xbeff0380 ,0xbf820001 , -0xbeff03c1 ,0xb96f2a05 , -0x806f816f ,0x8f6f826f , -0x907c9972 ,0x877c817c , -0xbf06817c ,0xbf850021 , -0xbef603ff ,0x01000000 , -0xbeee0378 ,0x8078ff78 , -0x00000200 ,0xbefc0384 , -0xe0304000 ,0x785d0000 , -0xe0304080 ,0x785d0100 , -0xe0304100 ,0x785d0200 , -0xe0304180 ,0x785d0300 , -0xbf8c3f70 ,0x7e008500 , -0x7e028501 ,0x7e048502 , -0x7e068503 ,0x807c847c , -0x8078ff78 ,0x00000200 , -0xbf0a6f7c ,0xbf85ffee , -0xe0304000 ,0x6e5d0000 , -0xe0304080 ,0x6e5d0100 , -0xe0304100 ,0x6e5d0200 , -0xe0304180 ,0x6e5d0300 , -0xbf820032 ,0xbef603ff , +0xb96f2a05 ,0x806f816f , +0x8f6f826f ,0x907c9972 , +0x877c817c ,0xbf06817c , +0xbf850021 ,0xbef603ff ,0x01000000 ,0xbeee0378 , -0x8078ff78 ,0x00000400 , +0x8078ff78 ,0x00000200 ,0xbefc0384 ,0xe0304000 , -0x785d0000 ,0xe0304100 , -0x785d0100 ,0xe0304200 , -0x785d0200 ,0xe0304300 , +0x785d0000 ,0xe0304080 , +0x785d0100 ,0xe0304100 , +0x785d0200 ,0xe0304180 ,0x785d0300 ,0xbf8c3f70 ,0x7e008500 ,0x7e028501 ,0x7e048502 ,0x7e068503 ,0x807c847c ,0x8078ff78 , -0x00000400 ,0xbf0a6f7c , -0xbf85ffee ,0xb96f1e06 , -0x876fc16f ,0xbf84000e , -0x8f6f836f ,0x806f7c6f , -0xbefe03c1 ,0xbeff0380 , +0x00000200 ,0xbf0a6f7c , +0xbf85ffee ,0xe0304000 , +0x6e5d0000 ,0xe0304080 , +0x6e5d0100 ,0xe0304100 , +0x6e5d0200 ,0xe0304180 , +0x6e5d0300 ,0xbf820032 , +0xbef603ff ,0x01000000 , +0xbeee0378 ,0x8078ff78 , +0x00000400 ,0xbefc0384 ,0xe0304000 ,0x785d0000 , +0xe0304100 ,0x785d0100 , +0xe0304200 ,0x785d0200 , +0xe0304300 ,0x785d0300 ,0xbf8c3f70 ,0x7e008500 , -0x807c817c ,0x8078ff78 , -0x00000080 ,0xbf0a6f7c , -0xbf85fff7 ,0xbeff03c1 , -0xe0304000 ,0x6e5d0000 , -0xe0304100 ,0x6e5d0100 , -0xe0304200 ,0x6e5d0200 , -0xe0304300 ,0x6e5d0300 , -0xbf8c3f70 ,0xb9782a05 , -0x80788178 ,0xbf0d9972 , -0xbf850002 ,0x8f788978 , -0xbf820001 ,0x8f788a78 , -0xb96e1e06 ,0x8f6e8a6e , -0x80786e78 ,0x8078ff78 , -0x00000200 ,0x80f8ff78 , -0x00000050 ,0xbef603ff , -0x01000000 ,0xbefc03ff , -0x0000006c ,0x80f89078 , -0xf429003a ,0xf0000000 , -0xbf8cc07f ,0x80fc847c , -0xbf800000 ,0xbe803100 , -0xbe823102 ,0x80f8a078 , -0xf42d003a ,0xf0000000 , -0xbf8cc07f ,0x80fc887c , -0xbf800000 ,0xbe803100 , -0xbe823102 ,0xbe843104 , -0xbe863106 ,0x80f8c078 , -0xf431003a ,0xf0000000 , -0xbf8cc07f ,0x80fc907c , -0xbf800000 ,0xbe803100 , -0xbe823102 ,0xbe843104 , -0xbe863106 ,0xbe883108 , -0xbe8a310a ,0xbe8c310c , -0xbe8e310e ,0xbf06807c , -0xbf84fff0 ,0xba80f801 , -0x00000000 ,0xbf8a0000 , +0x7e028501 ,0x7e048502 , +0x7e068503 ,0x807c847c , +0x8078ff78 ,0x00000400 , +0xbf0a6f7c ,0xbf85ffee , +0xb96f1e06 ,0x876fc16f , +0xbf84000e ,0x8f6f836f , +0x806f7c6f ,0xbefe03c1 , +0xbeff0380 ,0xe0304000 , +0x785d0000 ,0xbf8c3f70 , +0x7e008500 ,0x807c817c , +0x8078ff78 ,0x00000080 , +0xbf0a6f7c ,0xbf85fff7 , +0xbeff03c1 ,0xe0304000 , +0x6e5d0000 ,0xe0304100 , +0x6e5d0100 ,0xe0304200 , +0x6e5d0200 ,0xe0304300 , +0x6e5d0300 ,0xbf8c3f70 ,0xb9782a05 ,0x80788178 ,0xbf0d9972 ,0xbf850002 ,0x8f788978 ,0xbf820001 ,0x8f788a78 ,0xb96e1e06 ,0x8f6e8a6e ,0x80786e78 ,0x8078ff78 ,0x00000200 , +0x80f8ff78 ,0x00000050 ,0xbef603ff ,0x01000000 , -0xf4211bfa ,0xf0000000 , -0x80788478 ,0xf4211b3a , +0xbefc03ff ,0x0000006c , +0x80f89078 ,0xf429003a , +0xf0000000 ,0xbf8cc07f , +0x80fc847c ,0xbf800000 , +0xbe803100 ,0xbe823102 , +0x80f8a078 ,0xf42d003a , +0xf0000000 ,0xbf8cc07f , +0x80fc887c ,0xbf800000 , +0xbe803100 ,0xbe823102 , +0xbe843104 ,0xbe863106 , +0x80f8c078 ,0xf431003a , +0xf0000000 ,0xbf8cc07f , +0x80fc907c ,0xbf800000 , +0xbe803100 ,0xbe823102 , +0xbe843104 ,0xbe863106 , +0xbe883108 ,0xbe8a310a , +0xbe8c310c ,0xbe8e310e , +0xbf06807c ,0xbf84fff0 , +0xba80f801 ,0x00000000 , +0xbf8a0000 ,0xb9782a05 , +0x80788178 ,0xbf0d9972 , +0xbf850002 ,0x8f788978 , +0xbf820001 ,0x8f788a78 , +0xb96e1e06 ,0x8f6e8a6e , +0x80786e78 ,0x8078ff78 , +0x00000200 ,0xbef603ff , +0x01000000 ,0xf4211bfa ,0xf0000000 ,0x80788478 , -0xf4211b7a ,0xf0000000 , -0x80788478 ,0xf4211c3a , +0xf4211b3a ,0xf0000000 , +0x80788478 ,0xf4211b7a ,0xf0000000 ,0x80788478 , -0xf4211c7a ,0xf0000000 , -0x80788478 ,0xf4211eba , +0xf4211c3a ,0xf0000000 , +0x80788478 ,0xf4211c7a ,0xf0000000 ,0x80788478 , -0xf4211efa ,0xf0000000 , -0x80788478 ,0xf4211e7a , +0xf4211eba ,0xf0000000 , +0x80788478 ,0xf4211efa ,0xf0000000 ,0x80788478 , -0xf4211cfa ,0xf0000000 , -0x80788478 ,0xf4211bba , +0xf4211e7a ,0xf0000000 , +0x80788478 ,0xf4211cfa ,0xf0000000 ,0x80788478 , -0xbf8cc07f ,0xb9eef814 ,0xf4211bba ,0xf0000000 ,0x80788478 ,0xbf8cc07f , -0xb9eef815 ,0xbefc036f , -0xbefe0370 ,0xbeff0371 , -0x876f7bff ,0x000003ff , -0xb9ef4803 ,0xb9f9f816 , -0x876f7bff ,0xfffff800 , -0x906f8b6f ,0xb9efa2c3 , -0xb9f3f801 ,0xb96e2a05 , -0x806e816e ,0xbf0d9972 , -0xbf850002 ,0x8f6e896e , -0xbf820001 ,0x8f6e8a6e , -0x806eff6e ,0x00000200 , -0x806e746e ,0x826f8075 , -0x876fff6f ,0x0000ffff , -0xf4091c37 ,0xfa000050 , -0xf4091d37 ,0xfa000060 , -0xf4011e77 ,0xfa000074 , -0xbf8cc07f ,0x906e8977 , -0x876fff6e ,0x003f8000 , -0x906e8677 ,0x876eff6e , -0x02000000 ,0x886e6f6e , -0xb9eef807 ,0x876dff6d , -0x0000ffff ,0x87fe7e7e , -0x87ea6a6a ,0xb9faf802 , -0xbe80226c ,0xbf810000 , +0xb9eef814 ,0xf4211bba , +0xf0000000 ,0x80788478 , +0xbf8cc07f ,0xb9eef815 , +0xbefc036f ,0xbefe0370 , +0xbeff0371 ,0x876f7bff , +0x000003ff ,0xb9ef4803 , +0xb9f9f816 ,0x876f7bff , +0xfffff800 ,0x906f8b6f , +0xb9efa2c3 ,0xb9f3f801 , +0xb96e2a05 ,0x806e816e , +0xbf0d9972 ,0xbf850002 , +0x8f6e896e ,0xbf820001 , +0x8f6e8a6e ,0x806eff6e , +0x00000200 ,0x806e746e , +0x826f8075 ,0x876fff6f , +0x0000ffff ,0xf4091c37 , +0xfa000050 ,0xf4091d37 , +0xfa000060 ,0xf4011e77 , +0xfa000074 ,0xbf8cc07f , +0x906e8977 ,0x876fff6e , +0x003f8000 ,0x906e8677 , +0x876eff6e ,0x02000000 , +0x886e6f6e ,0xb9eef807 , +0x876dff6d ,0x0000ffff , +0x87fe7e7e ,0x87ea6a6a , +0xb9faf802 ,0xbe80226c , +0xbf810000 ,0xbf9f0000 ,0xbf9f0000 ,0xbf9f0000 , 0xbf9f0000, 0xbf9f0000, - 0xbf9f0000, 0x00000000, }; static const uint32_t cwsr_trap_arcturus_hex[] = {
@@ -1533,7 +1534,7 @@ static const uint32_t cwsr_trap_arcturus_hex[] = { };static const uint32_t cwsr_trap_gfx10_hex[] = { -0xbf820001 ,0xbf8201c7 , +0xbf820001 ,0xbf8201cb ,0xb0804004 ,0xb978f802 ,0x8a788678 ,0xb96ef801 ,0x876eff6e ,0x00000800 ,
@@ -1560,21 +1561,22 @@ static const uint32_t cwsr_trap_gfx10_hex[] = {0xb9fa0283 ,0xbeee037e ,0xbeef037f ,0xbefe0480 ,0xbf900004 ,0xbf8cc07f , +0x877aff7f ,0x04000000 , +0x8f7a857a ,0x886d7a6d ,0xb97b02dc ,0x8f7b997b , -0x887b7b7f ,0xb97a2a05 , -0x807a817a ,0xbf0d997b , -0xbf850002 ,0x8f7a897a , -0xbf820001 ,0x8f7a8a7a , -0x877bff7f ,0x0000ffff , -0x807aff7a ,0x00000200 , -0x807a7e7a ,0x827b807b , -0xbef4037e ,0x8775ff7f , -0x0000ffff ,0x8875ff75 , -0x00040000 ,0xbef60380 , -0xbef703ff ,0x10807fac , -0xbef1037c ,0xbef00380 , -0xb97302dc ,0x8f739973 , -0x8873737f ,0xbefe03c1 , +0xb97a2a05 ,0x807a817a , +0xbf0d997b ,0xbf850002 , +0x8f7a897a ,0xbf820001 , +0x8f7a8a7a ,0x877bff7f , +0x0000ffff ,0x807aff7a , +0x00000200 ,0x807a7e7a , +0x827b807b ,0xbef4037e , +0x8775ff7f ,0x0000ffff , +0x8875ff75 ,0x00040000 , +0xbef60380 ,0xbef703ff , +0x10807fac ,0xbef1037c , +0xbef00380 ,0xb97302dc , +0x8f739973 ,0xbefe03c1 ,0x907c9973 ,0x877c817c ,0xbf06817c ,0xbf850002 , 0xbeff0380, 0xbf820002,
@@ -1601,8 +1603,9 @@ static const uint32_t cwsr_trap_gfx10_hex[] = {0xbefc0380 ,0xd7610002 ,0x0000f871 ,0x807c817c ,0xd7610002 ,0x0000f86c , -0x807c817c ,0xd7610002 , -0x0000f86d ,0x807c817c , +0x807c817c ,0x8a7aff6d , +0x80000000 ,0xd7610002 , +0x0000f87a ,0x807c817c ,0xd7610002 ,0x0000f86e ,0x807c817c ,0xd7610002 , 0x0000f86f, 0x807c817c,
@@ -1688,7 +1691,7 @@ static const uint32_t cwsr_trap_gfx10_hex[] = {0xbf820001 ,0xbeff03c1 ,0xb97b4306 ,0x877bc17b ,0xbf840044 ,0xbf8a0000 , -0x877aff73 ,0x04000000 , +0x877aff6d ,0x80000000 ,0xbf840040 ,0x8f7b867b ,0x8f7b827b ,0xbef6037b , 0xb9702a05, 0x80708170,
@@ -1761,162 +1764,161 @@ static const uint32_t cwsr_trap_gfx10_hex[] = {0x705d0000 ,0x807c817c ,0x8070ff70 ,0x00000080 ,0xbf0a7b7c ,0xbf85fff8 , -0xbf820134 ,0xbef4037e , +0xbf820133 ,0xbef4037e ,0x8775ff7f ,0x0000ffff ,0x8875ff75 ,0x00040000 ,0xbef60380 ,0xbef703ff ,0x10807fac ,0xb97202dc , -0x8f729972 ,0x8872727f , -0x876eff7f ,0x04000000 , -0xbf840034 ,0xbefe03c1 , -0x907c9972 ,0x877c817c , -0xbf06817c ,0xbf850002 , -0xbeff0380 ,0xbf820001 , -0xbeff03c1 ,0xb96f4306 , -0x876fc16f ,0xbf840029 , -0x8f6f866f ,0x8f6f826f , -0xbef6036f ,0xb9782a05 , -0x80788178 ,0xbf0d9972 , -0xbf850002 ,0x8f788978 , -0xbf820001 ,0x8f788a78 , -0xb96e1e06 ,0x8f6e8a6e , -0x80786e78 ,0x8078ff78 , -0x00000200 ,0x8078ff78 , -0x00000080 ,0xbef603ff , -0x01000000 ,0x907c9972 , -0x877c817c ,0xbf06817c , -0xbefc0380 ,0xbf850009 , -0xe0310000 ,0x781d0000 , -0x807cff7c ,0x00000080 , -0x8078ff78 ,0x00000080 , -0xbf0a6f7c ,0xbf85fff8 , -0xbf820008 ,0xe0310000 , -0x781d0000 ,0x807cff7c , -0x00000100 ,0x8078ff78 , -0x00000100 ,0xbf0a6f7c , -0xbf85fff8 ,0xbef80380 , +0x8f729972 ,0x876eff7f , +0x04000000 ,0xbf840034 ,0xbefe03c1 ,0x907c9972 ,0x877c817c ,0xbf06817c ,0xbf850002 ,0xbeff0380 ,0xbf820001 ,0xbeff03c1 , -0xb96f2a05 ,0x806f816f , -0x8f6f826f ,0x907c9972 , -0x877c817c ,0xbf06817c , -0xbf850021 ,0xbef603ff , -0x01000000 ,0xbeee0378 , +0xb96f4306 ,0x876fc16f , +0xbf840029 ,0x8f6f866f , +0x8f6f826f ,0xbef6036f , +0xb9782a05 ,0x80788178 , +0xbf0d9972 ,0xbf850002 , +0x8f788978 ,0xbf820001 , +0x8f788a78 ,0xb96e1e06 , +0x8f6e8a6e ,0x80786e78 ,0x8078ff78 ,0x00000200 , -0xbefc0384 ,0xe0304000 , -0x785d0000 ,0xe0304080 , -0x785d0100 ,0xe0304100 , -0x785d0200 ,0xe0304180 , -0x785d0300 ,0xbf8c3f70 , -0x7e008500 ,0x7e028501 , -0x7e048502 ,0x7e068503 , -0x807c847c ,0x8078ff78 , -0x00000200 ,0xbf0a6f7c , -0xbf85ffee ,0xe0304000 , -0x6e5d0000 ,0xe0304080 , -0x6e5d0100 ,0xe0304100 , -0x6e5d0200 ,0xe0304180 , -0x6e5d0300 ,0xbf820032 , +0x8078ff78 ,0x00000080 , +0xbef603ff ,0x01000000 , +0x907c9972 ,0x877c817c , +0xbf06817c ,0xbefc0380 , +0xbf850009 ,0xe0310000 , +0x781d0000 ,0x807cff7c , +0x00000080 ,0x8078ff78 , +0x00000080 ,0xbf0a6f7c , +0xbf85fff8 ,0xbf820008 , +0xe0310000 ,0x781d0000 , +0x807cff7c ,0x00000100 , +0x8078ff78 ,0x00000100 , +0xbf0a6f7c ,0xbf85fff8 , +0xbef80380 ,0xbefe03c1 , +0x907c9972 ,0x877c817c , +0xbf06817c ,0xbf850002 , +0xbeff0380 ,0xbf820001 , +0xbeff03c1 ,0xb96f2a05 , +0x806f816f ,0x8f6f826f , +0x907c9972 ,0x877c817c , +0xbf06817c ,0xbf850021 ,0xbef603ff ,0x01000000 ,0xbeee0378 ,0x8078ff78 , -0x00000400 ,0xbefc0384 , +0x00000200 ,0xbefc0384 ,0xe0304000 ,0x785d0000 , -0xe0304100 ,0x785d0100 , -0xe0304200 ,0x785d0200 , -0xe0304300 ,0x785d0300 , +0xe0304080 ,0x785d0100 , +0xe0304100 ,0x785d0200 , +0xe0304180 ,0x785d0300 ,0xbf8c3f70 ,0x7e008500 ,0x7e028501 ,0x7e048502 ,0x7e068503 ,0x807c847c , -0x8078ff78 ,0x00000400 , +0x8078ff78 ,0x00000200 ,0xbf0a6f7c ,0xbf85ffee , -0xb96f1e06 ,0x876fc16f , -0xbf84000e ,0x8f6f836f , -0x806f7c6f ,0xbefe03c1 , -0xbeff0380 ,0xe0304000 , -0x785d0000 ,0xbf8c3f70 , -0x7e008500 ,0x807c817c , -0x8078ff78 ,0x00000080 , -0xbf0a6f7c ,0xbf85fff7 , -0xbeff03c1 ,0xe0304000 , -0x6e5d0000 ,0xe0304100 , -0x6e5d0100 ,0xe0304200 , -0x6e5d0200 ,0xe0304300 , -0x6e5d0300 ,0xbf8c3f70 , +0xe0304000 ,0x6e5d0000 , +0xe0304080 ,0x6e5d0100 , +0xe0304100 ,0x6e5d0200 , +0xe0304180 ,0x6e5d0300 , +0xbf820032 ,0xbef603ff , +0x01000000 ,0xbeee0378 , +0x8078ff78 ,0x00000400 , +0xbefc0384 ,0xe0304000 , +0x785d0000 ,0xe0304100 , +0x785d0100 ,0xe0304200 , +0x785d0200 ,0xe0304300 , +0x785d0300 ,0xbf8c3f70 , +0x7e008500 ,0x7e028501 , +0x7e048502 ,0x7e068503 , +0x807c847c ,0x8078ff78 , +0x00000400 ,0xbf0a6f7c , +0xbf85ffee ,0xb96f1e06 , +0x876fc16f ,0xbf84000e , +0x8f6f836f ,0x806f7c6f , +0xbefe03c1 ,0xbeff0380 , +0xe0304000 ,0x785d0000 , +0xbf8c3f70 ,0x7e008500 , +0x807c817c ,0x8078ff78 , +0x00000080 ,0xbf0a6f7c , +0xbf85fff7 ,0xbeff03c1 , +0xe0304000 ,0x6e5d0000 , +0xe0304100 ,0x6e5d0100 , +0xe0304200 ,0x6e5d0200 , +0xe0304300 ,0x6e5d0300 , +0xbf8c3f70 ,0xb9782a05 , +0x80788178 ,0xbf0d9972 , +0xbf850002 ,0x8f788978 , +0xbf820001 ,0x8f788a78 , +0xb96e1e06 ,0x8f6e8a6e , +0x80786e78 ,0x8078ff78 , +0x00000200 ,0x80f8ff78 , +0x00000050 ,0xbef603ff , +0x01000000 ,0xbefc03ff , +0x0000006c ,0x80f89078 , +0xf429003a ,0xf0000000 , +0xbf8cc07f ,0x80fc847c , +0xbf800000 ,0xbe803100 , +0xbe823102 ,0x80f8a078 , +0xf42d003a ,0xf0000000 , +0xbf8cc07f ,0x80fc887c , +0xbf800000 ,0xbe803100 , +0xbe823102 ,0xbe843104 , +0xbe863106 ,0x80f8c078 , +0xf431003a ,0xf0000000 , +0xbf8cc07f ,0x80fc907c , +0xbf800000 ,0xbe803100 , +0xbe823102 ,0xbe843104 , +0xbe863106 ,0xbe883108 , +0xbe8a310a ,0xbe8c310c , +0xbe8e310e ,0xbf06807c , +0xbf84fff0 ,0xba80f801 , +0x00000000 ,0xbf8a0000 ,0xb9782a05 ,0x80788178 ,0xbf0d9972 ,0xbf850002 ,0x8f788978 ,0xbf820001 ,0x8f788a78 ,0xb96e1e06 ,0x8f6e8a6e ,0x80786e78 ,0x8078ff78 ,0x00000200 , -0x80f8ff78 ,0x00000050 ,0xbef603ff ,0x01000000 , -0xbefc03ff ,0x0000006c , -0x80f89078 ,0xf429003a , -0xf0000000 ,0xbf8cc07f , -0x80fc847c ,0xbf800000 , -0xbe803100 ,0xbe823102 , -0x80f8a078 ,0xf42d003a , -0xf0000000 ,0xbf8cc07f , -0x80fc887c ,0xbf800000 , -0xbe803100 ,0xbe823102 , -0xbe843104 ,0xbe863106 , -0x80f8c078 ,0xf431003a , -0xf0000000 ,0xbf8cc07f , -0x80fc907c ,0xbf800000 , -0xbe803100 ,0xbe823102 , -0xbe843104 ,0xbe863106 , -0xbe883108 ,0xbe8a310a , -0xbe8c310c ,0xbe8e310e , -0xbf06807c ,0xbf84fff0 , -0xba80f801 ,0x00000000 , -0xbf8a0000 ,0xb9782a05 , -0x80788178 ,0xbf0d9972 , -0xbf850002 ,0x8f788978 , -0xbf820001 ,0x8f788a78 , -0xb96e1e06 ,0x8f6e8a6e , -0x80786e78 ,0x8078ff78 , -0x00000200 ,0xbef603ff , -0x01000000 ,0xf4211bfa , +0xf4211bfa ,0xf0000000 , +0x80788478 ,0xf4211b3a ,0xf0000000 ,0x80788478 , -0xf4211b3a ,0xf0000000 , -0x80788478 ,0xf4211b7a , +0xf4211b7a ,0xf0000000 , +0x80788478 ,0xf4211c3a ,0xf0000000 ,0x80788478 , -0xf4211c3a ,0xf0000000 , -0x80788478 ,0xf4211c7a , +0xf4211c7a ,0xf0000000 , +0x80788478 ,0xf4211eba ,0xf0000000 ,0x80788478 , -0xf4211eba ,0xf0000000 , -0x80788478 ,0xf4211efa , +0xf4211efa ,0xf0000000 , +0x80788478 ,0xf4211e7a ,0xf0000000 ,0x80788478 , -0xf4211e7a ,0xf0000000 , -0x80788478 ,0xf4211cfa , +0xf4211cfa ,0xf0000000 , +0x80788478 ,0xf4211bba ,0xf0000000 ,0x80788478 , +0xbf8cc07f ,0xb9eef814 ,0xf4211bba ,0xf0000000 ,0x80788478 ,0xbf8cc07f , -0xb9eef814 ,0xf4211bba , -0xf0000000 ,0x80788478 , -0xbf8cc07f ,0xb9eef815 , -0xbefc036f ,0xbefe0370 , -0xbeff0371 ,0x876f7bff , -0x000003ff ,0xb9ef4803 , -0x876f7bff ,0xfffff800 , -0x906f8b6f ,0xb9efa2c3 , -0xb9f3f801 ,0xb96e2a05 , -0x806e816e ,0xbf0d9972 , -0xbf850002 ,0x8f6e896e , -0xbf820001 ,0x8f6e8a6e , -0x806eff6e ,0x00000200 , -0x806e746e ,0x826f8075 , -0x876fff6f ,0x0000ffff , -0xf4091c37 ,0xfa000050 , -0xf4091d37 ,0xfa000060 , -0xf4011e77 ,0xfa000074 , -0xbf8cc07f ,0x876dff6d , -0x0000ffff ,0x87fe7e7e , -0x87ea6a6a ,0xb9faf802 , -0xbe80226c ,0xbf810000 , +0xb9eef815 ,0xbefc036f , +0xbefe0370 ,0xbeff0371 , +0x876f7bff ,0x000003ff , +0xb9ef4803 ,0x876f7bff , +0xfffff800 ,0x906f8b6f , +0xb9efa2c3 ,0xb9f3f801 , +0xb96e2a05 ,0x806e816e , +0xbf0d9972 ,0xbf850002 , +0x8f6e896e ,0xbf820001 , +0x8f6e8a6e ,0x806eff6e , +0x00000200 ,0x806e746e , +0x826f8075 ,0x876fff6f , +0x0000ffff ,0xf4091c37 , +0xfa000050 ,0xf4091d37 , +0xfa000060 ,0xf4011e77 , +0xfa000074 ,0xbf8cc07f , +0x876dff6d ,0x0000ffff , +0x87fe7e7e ,0x87ea6a6a , +0xb9faf802 ,0xbe80226c , +0xbf810000 ,0xbf9f0000 ,0xbf9f0000 ,0xbf9f0000 , 0xbf9f0000, 0xbf9f0000, - 0xbf9f0000, 0x00000000, };
drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm +11 -3
@@ -83,6 +83,9 @@ var S_SAVE_BUF_RSRC_WORD3_MISC = 0x10807FAC var S_SAVE_SPI_INIT_FIRST_WAVE_MASK = 0x04000000 var S_SAVE_SPI_INIT_FIRST_WAVE_SHIFT = 26 +var S_SAVE_PC_HI_FIRST_WAVE_MASK = 0x80000000 +var S_SAVE_PC_HI_FIRST_WAVE_SHIFT = 31 + var s_sgpr_save_num = 108 var s_save_spi_init_lo = exec_lo
@@ -245,6 +248,11 @@ L_SLEEP: s_waitcnt lgkmcnt(0) #endif + // Save first_wave flag so we can clear high bits of save address. + s_and_b32 s_save_tmp, s_save_spi_init_hi, S_SAVE_SPI_INIT_FIRST_WAVE_MASK + s_lshl_b32 s_save_tmp, s_save_tmp, (S_SAVE_PC_HI_FIRST_WAVE_SHIFT - S_SAVE_SPI_INIT_FIRST_WAVE_SHIFT) + s_or_b32 s_save_pc_hi, s_save_pc_hi, s_save_tmp + // Save trap temporaries 4-11, 13 initialized by SPI debug dispatch logic // ttmp SR memory offset : size(VGPR)+size(SGPR)+0x40 get_wave_size(s_save_ttmps_hi)
@@ -331,7 +339,8 @@ L_SAVE_HWREG: write_hwreg_to_mem(s_save_m0, s_save_buf_rsrc0, s_save_mem_offset) write_hwreg_to_mem(s_save_pc_lo, s_save_buf_rsrc0, s_save_mem_offset) - write_hwreg_to_mem(s_save_pc_hi, s_save_buf_rsrc0, s_save_mem_offset) + s_andn2_b32 s_save_tmp, s_save_pc_hi, S_SAVE_PC_HI_FIRST_WAVE_MASK + write_hwreg_to_mem(s_save_tmp, s_save_buf_rsrc0, s_save_mem_offset) write_hwreg_to_mem(s_save_exec_lo, s_save_buf_rsrc0, s_save_mem_offset) write_hwreg_to_mem(s_save_exec_hi, s_save_buf_rsrc0, s_save_mem_offset) write_hwreg_to_mem(s_save_status, s_save_buf_rsrc0, s_save_mem_offset)
@@ -440,7 +449,7 @@ L_SAVE_LDS_NORMAL: s_cbranch_scc0 L_SAVE_LDS_DONE //no lds used? jump to L_SAVE_DONE s_barrier //LDS is used? wait for other waves in the same TG - s_and_b32 s_save_tmp, s_wave_size, S_SAVE_SPI_INIT_FIRST_WAVE_MASK + s_and_b32 s_save_tmp, s_save_pc_hi, S_SAVE_PC_HI_FIRST_WAVE_MASK s_cbranch_scc0 L_SAVE_LDS_DONE // first wave do LDS save;
@@ -1002,7 +1011,6 @@ end function get_wave_size(s_reg) s_getreg_b32 s_reg, hwreg(HW_REG_IB_STS2,SQ_WAVE_IB_STS2_WAVE64_SHIFT,SQ_WAVE_IB_STS2_WAVE64_SIZE) s_lshl_b32 s_reg, s_reg, S_WAVE_SIZE - s_or_b32 s_reg, s_save_spi_init_hi, s_reg //share with exec_hi, it's at bit25 end function save_and_clear_ib_sts(tmp1, tmp2)
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/4 drm/amdkfd: Save TTMPs on all ASICs in gfx10 trap handler
In reply to Jay CornwallTrap temporary GPRs are not currently saved/restored on ASICs without scalar store instructions. They contain data useful to a user-mode debugger.
Use vector store instructons to save TTMPs on these ASICs.
--- .../gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 119 ++++++++++-------- .../amd/amdkfd/cwsr_trap_handler_gfx10.asm | 46 ++++++- 2 files changed, 114 insertions(+), 51 deletions(-)
drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h +70 -49
@@ -1534,7 +1534,7 @@ static const uint32_t cwsr_trap_arcturus_hex[] = { };static const uint32_t cwsr_trap_gfx10_hex[] = { -0xbf820001 ,0xbf8201cb , +0xbf820001 ,0xbf8201f5 ,0xb0804004 ,0xb978f802 ,0x8a788678 ,0xb96ef801 ,0x876eff6e ,0x00000800 ,
@@ -1563,6 +1563,11 @@ static const uint32_t cwsr_trap_gfx10_hex[] = {0xbf900004 ,0xbf8cc07f ,0x877aff7f ,0x04000000 ,0x8f7a857a ,0x886d7a6d , +0xbefa037e ,0x877bff7f , +0x0000ffff ,0xbefe03c1 , +0xbeff03c1 ,0xdc5f8000 , +0x007a0000 ,0x7e000280 , +0xbefe037a ,0xbeff037b ,0xb97b02dc ,0x8f7b997b ,0xb97a2a05 ,0x807a817a , 0xbf0d997b, 0xbf850002,
@@ -1570,58 +1575,74 @@ static const uint32_t cwsr_trap_gfx10_hex[] = {0x8f7a8a7a ,0x877bff7f ,0x0000ffff ,0x807aff7a ,0x00000200 ,0x807a7e7a , -0x827b807b ,0xbef4037e , -0x8775ff7f ,0x0000ffff , -0x8875ff75 ,0x00040000 , -0xbef60380 ,0xbef703ff , -0x10807fac ,0xbef1037c , -0xbef00380 ,0xb97302dc , -0x8f739973 ,0xbefe03c1 , -0x907c9973 ,0x877c817c , -0xbf06817c ,0xbf850002 , -0xbeff0380 ,0xbf820002 , -0xbeff03c1 ,0xbf82000b , +0x827b807b ,0xd7610000 , +0x00010870 ,0xd7610000 , +0x00010a71 ,0xd7610000 , +0x00010c72 ,0xd7610000 , +0x00010e73 ,0xd7610000 , +0x00011074 ,0xd7610000 , +0x00011275 ,0xd7610000 , +0x00011476 ,0xd7610000 , +0x00011677 ,0xd7610000 , +0x00011a79 ,0xd7610000 , +0x00011c7e ,0xd7610000 , +0x00011e7f ,0xbefe03ff , +0x00003fff ,0xbeff0380 , +0xdc5f8040 ,0x007a0000 , +0xd760007a ,0x00011d00 , +0xd760007b ,0x00011f00 , +0xbefe037a ,0xbeff037b , +0xbef4037e ,0x8775ff7f , +0x0000ffff ,0x8875ff75 , +0x00040000 ,0xbef60380 , +0xbef703ff ,0x10807fac , +0xbef1037c ,0xbef00380 , +0xb97302dc ,0x8f739973 , +0xbefe03c1 ,0x907c9973 , +0x877c817c ,0xbf06817c , +0xbf850002 ,0xbeff0380 , +0xbf820002 ,0xbeff03c1 , +0xbf820009 ,0xbef603ff , +0x01000000 ,0xe0704080 , +0x705d0100 ,0xe0704100 , +0x705d0200 ,0xe0704180 , +0x705d0300 ,0xbf820008 ,0xbef603ff ,0x01000000 , -0xe0704000 ,0x705d0000 , -0xe0704080 ,0x705d0100 , -0xe0704100 ,0x705d0200 , -0xe0704180 ,0x705d0300 , -0xbf82000a ,0xbef603ff , -0x01000000 ,0xe0704000 , -0x705d0000 ,0xe0704100 , -0x705d0100 ,0xe0704200 , -0x705d0200 ,0xe0704300 , -0x705d0300 ,0xb9702a05 , -0x80708170 ,0xbf0d9973 , -0xbf850002 ,0x8f708970 , -0xbf820001 ,0x8f708a70 , -0xb97a1e06 ,0x8f7a8a7a , -0x80707a70 ,0x8070ff70 , -0x00000200 ,0xbef603ff , -0x01000000 ,0x7e000280 , -0x7e020280 ,0x7e040280 , -0xbefc0380 ,0xd7610002 , -0x0000f871 ,0x807c817c , -0xd7610002 ,0x0000f86c , -0x807c817c ,0x8a7aff6d , -0x80000000 ,0xd7610002 , -0x0000f87a ,0x807c817c , -0xd7610002 ,0x0000f86e , +0xe0704100 ,0x705d0100 , +0xe0704200 ,0x705d0200 , +0xe0704300 ,0x705d0300 , +0xb9702a05 ,0x80708170 , +0xbf0d9973 ,0xbf850002 , +0x8f708970 ,0xbf820001 , +0x8f708a70 ,0xb97a1e06 , +0x8f7a8a7a ,0x80707a70 , +0x8070ff70 ,0x00000200 , +0xbef603ff ,0x01000000 , +0x7e000280 ,0x7e020280 , +0x7e040280 ,0xbefc0380 , +0xd7610002 ,0x0000f871 ,0x807c817c ,0xd7610002 , -0x0000f86f ,0x807c817c , -0xd7610002 ,0x0000f878 , -0x807c817c ,0xb97af803 , +0x0000f86c ,0x807c817c , +0x8a7aff6d ,0x80000000 ,0xd7610002 ,0x0000f87a ,0x807c817c ,0xd7610002 , -0x0000f87b ,0x807c817c , -0xb971f801 ,0xd7610002 , -0x0000f871 ,0x807c817c , -0xb971f814 ,0xd7610002 , -0x0000f871 ,0x807c817c , -0xb971f815 ,0xd7610002 , -0x0000f871 ,0x807c817c , -0xbeff0380 ,0xe0704000 , -0x705d0200 ,0xb9702a05 , +0x0000f86e ,0x807c817c , +0xd7610002 ,0x0000f86f , +0x807c817c ,0xd7610002 , +0x0000f878 ,0x807c817c , +0xb97af803 ,0xd7610002 , +0x0000f87a ,0x807c817c , +0xd7610002 ,0x0000f87b , +0x807c817c ,0xb971f801 , +0xd7610002 ,0x0000f871 , +0x807c817c ,0xb971f814 , +0xd7610002 ,0x0000f871 , +0x807c817c ,0xb971f815 , +0xd7610002 ,0x0000f871 , +0x807c817c ,0xbefe03ff , +0x0000ffff ,0xbeff0380 , +0xe0704000 ,0x705d0200 , +0xbefe03c1 ,0xb9702a05 ,0x80708170 ,0xbf0d9973 ,0xbf850002 ,0x8f708970 , 0xbf820001, 0x8f708a70,
drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm +44 -2
80 lines not on this page · raw message
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
The series is
I'm hoping Laurent can give it a more through and informed R-b.
Thanks,
Felix
Am 2020-10-01 um 2:24 p.m. schrieb Jay Cornwall:
Quoted 378 lines
ATC and MTYPE fields do not exist in gfx9 or later.
Signed-off-by Jay Cornwall <[email protected]>Cc Laurent Morichetti <[email protected]>--- .../gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 93 ++++++------------- .../amd/amdkfd/cwsr_trap_handler_gfx10.asm | 28 +----- .../drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm | 30 +----- 3 files changed, 30 insertions(+), 121 deletions(-)drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h +28
-65@@ -274,7 +274,7 @@ static const uint32_t cwsr_trap_gfx8_hex[] = {static const uint32_t cwsr_trap_gfx9_hex[] = { -0xbf820001 ,0xbf820248 , +0xbf820001 ,0xbf820240 ,0xb8f8f802 ,0x89788678 ,0xb8eef801 ,0x866eff6e ,0x00000800 ,0xbf840003 ,@@ -336,10 +336,6 @@ static const uint32_t cwsr_trap_gfx9_hex[] = {0x0000ffff ,0x8775ff75 ,0x00040000 ,0xbef60080 ,0xbef700ff ,0x00807fac , -0x867aff7f ,0x08000000 , -0x8f7a837a ,0x87777a77 , -0x867aff7f ,0x70000000 , -0x8f7a817a ,0x87777a77 ,0xbef1007c ,0xbef00080 ,0xb8f02a05 ,0x80708170 , 0x8e708a70, 0xb8fa1605,@@ -566,15 +562,11 @@ static const uint32_t cwsr_trap_gfx9_hex[] = {0x701d0300 ,0x807c847c ,0x8070ff70 ,0x00000400 ,0xbf0a7b7c ,0xbf85ffef , -0xbf9c0000 ,0xbf8200da , +0xbf9c0000 ,0xbf8200cf ,0xbef4007e ,0x8675ff7f ,0x0000ffff ,0x8775ff75 ,0x00040000 ,0xbef60080 ,0xbef700ff ,0x00807fac , -0x866eff7f ,0x08000000 , -0x8f6e836e ,0x87776e77 , -0x866eff7f ,0x70000000 , -0x8f6e816e ,0x87776e77 ,0x866eff7f ,0x04000000 ,0xbf84001e ,0xbefe00c1 , 0xbeff00c1, 0xb8ef4306,@@ -669,18 +661,16 @@ static const uint32_t cwsr_trap_gfx9_hex[] = {0x876e6f6e ,0x866fff6d ,0x04000000 ,0x8f6f9a6f ,0x8e6f8f6f ,0x876e6f6e , -0x866fff7a ,0x00800000 , -0x8f6f976f ,0xb96ef807 , -0x866dff6d ,0x0000ffff , -0x86fe7e7e ,0x86ea6a6a , -0x8f6e837a ,0xb96ee0c2 , -0xbf800002 ,0xb97a0002 , -0xbf8a0000 ,0x95806f6c , - 0xbf810000, 0x00000000, +0xb96ef807 ,0x866dff6d , +0x0000ffff ,0x86fe7e7e , +0x86ea6a6a ,0x8f6e837a , +0xb96ee0c2 ,0xbf800002 , +0xb97a0002 ,0xbf8a0000 , + 0xbe801f6c, 0xbf810000, };static const uint32_t cwsr_trap_nv1x_hex[] = { -0xbf820001 ,0xbf8201cd , +0xbf820001 ,0xbf8201c5 ,0xb0804004 ,0xb978f802 ,0x8a788678 ,0xb96ef801 , 0x876eff6e, 0x00000800,@@ -740,10 +730,6 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {0x0000ffff ,0x8875ff75 ,0x00040000 ,0xbef60380 ,0xbef703ff ,0x10807fac , -0x877aff7f ,0x08000000 , -0x907a837a ,0x88777a77 , -0x877aff7f ,0x70000000 , -0x907a817a ,0x88777a77 ,0xbef1037c ,0xbef00380 ,0xb97302dc ,0x8f739973 , 0x8873737f, 0xb97bf816,@@ -911,15 +897,11 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {0x705d0000 ,0x807c817c ,0x8070ff70 ,0x00000080 ,0xbf0a7b7c ,0xbf85fff8 , -0xbf820151 ,0xbef4037e , +0xbf820146 ,0xbef4037e ,0x8775ff7f ,0x0000ffff ,0x8875ff75 ,0x00040000 ,0xbef60380 ,0xbef703ff , -0x10807fac ,0x876eff7f , -0x08000000 ,0x906e836e , -0x88776e77 ,0x876eff7f , -0x70000000 ,0x906e816e , -0x88776e77 ,0xb97202dc , +0x10807fac ,0xb97202dc ,0x8f729972 ,0x8872727f ,0x876eff7f ,0x04000000 , 0xbf840034, 0xbefe03c1,@@ -1075,18 +1057,17 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {0x886e6f6e ,0x876fff6d ,0x01000000 ,0x906f986f ,0x8f6f996f ,0x886e6f6e , -0x876fff7a ,0x00800000 , -0x906f976f ,0xb9eef807 , -0x876dff6d ,0x0000ffff , -0x87fe7e7e ,0x87ea6a6a , -0xb9faf802 ,0xbe80226c , -0xbf810000 ,0xbf9f0000 , +0xb9eef807 ,0x876dff6d , +0x0000ffff ,0x87fe7e7e , +0x87ea6a6a ,0xb9faf802 , +0xbe80226c ,0xbf810000 ,0xbf9f0000 ,0xbf9f0000 ,0xbf9f0000 ,0xbf9f0000 , + 0xbf9f0000, 0x00000000, };static const uint32_t cwsr_trap_arcturus_hex[] = { -0xbf820001 ,0xbf8202c4 , +0xbf820001 ,0xbf8202bc ,0xb8f8f802 ,0x89788678 ,0xb8eef801 ,0x866eff6e , 0x00000800, 0xbf840003,@@ -1148,11 +1129,7 @@ static const uint32_t cwsr_trap_arcturus_hex[] = {0x8675ff7f ,0x0000ffff ,0x8775ff75 ,0x00040000 ,0xbef60080 ,0xbef700ff , -0x00807fac ,0x867aff7f , -0x08000000 ,0x8f7a837a , -0x87777a77 ,0x867aff7f , -0x70000000 ,0x8f7a817a , -0x87777a77 ,0xbef1007c , +0x00807fac ,0xbef1007c ,0xbef00080 ,0xb8f02a05 ,0x80708170 ,0x8e708a70 , 0x8e708170, 0xb8fa1605,@@ -1440,15 +1417,11 @@ static const uint32_t cwsr_trap_arcturus_hex[] = {0x701d0300 ,0x807c847c ,0x8070ff70 ,0x00000400 ,0xbf0a7b7c ,0xbf85ffeb , -0xbf9c0000 ,0xbf820106 , +0xbf9c0000 ,0xbf8200fb ,0xbef4007e ,0x8675ff7f ,0x0000ffff ,0x8775ff75 ,0x00040000 ,0xbef60080 ,0xbef700ff ,0x00807fac , -0x866eff7f ,0x08000000 , -0x8f6e836e ,0x87776e77 , -0x866eff7f ,0x70000000 , -0x8f6e816e ,0x87776e77 ,0x866eff7f ,0x04000000 ,0xbf84001f ,0xbefe00c1 , 0xbeff00c1, 0xb8ef4306,@@ -1565,18 +1538,16 @@ static const uint32_t cwsr_trap_arcturus_hex[] = {0x876e6f6e ,0x866fff6d ,0x04000000 ,0x8f6f9a6f ,0x8e6f8f6f ,0x876e6f6e , -0x866fff7a ,0x00800000 , -0x8f6f976f ,0xb96ef807 , -0x866dff6d ,0x0000ffff , -0x86fe7e7e ,0x86ea6a6a , -0x8f6e837a ,0xb96ee0c2 , -0xbf800002 ,0xb97a0002 , -0xbf8a0000 ,0x95806f6c , - 0xbf810000, 0x00000000, +0xb96ef807 ,0x866dff6d , +0x0000ffff ,0x86fe7e7e , +0x86ea6a6a ,0x8f6e837a , +0xb96ee0c2 ,0xbf800002 , +0xb97a0002 ,0xbf8a0000 , + 0xbe801f6c, 0xbf810000, };static const uint32_t cwsr_trap_gfx10_hex[] = { -0xbf820001 ,0xbf8201cf , +0xbf820001 ,0xbf8201c7 ,0xb0804004 ,0xb978f802 ,0x8a788678 ,0xb96ef801 , 0x876eff6e, 0x00000800,@@ -1615,10 +1586,6 @@ static const uint32_t cwsr_trap_gfx10_hex[] = {0x0000ffff ,0x8875ff75 ,0x00040000 ,0xbef60380 ,0xbef703ff ,0x10807fac , -0x877aff7f ,0x08000000 , -0x907a837a ,0x88777a77 , -0x877aff7f ,0x70000000 , -0x907a817a ,0x88777a77 ,0xbef1037c ,0xbef00380 ,0xb97302dc ,0x8f739973 , 0x8873737f, 0xbefe03c1,@@ -1808,15 +1775,11 @@ static const uint32_t cwsr_trap_gfx10_hex[] = {0x705d0000 ,0x807c817c ,0x8070ff70 ,0x00000080 ,0xbf0a7b7c ,0xbf85fff8 , -0xbf82013c ,0xbef4037e , +0xbf820134 ,0xbef4037e ,0x8775ff7f ,0x0000ffff ,0x8875ff75 ,0x00040000 ,0xbef60380 ,0xbef703ff , -0x10807fac ,0x876eff7f , -0x08000000 ,0x906e836e , -0x88776e77 ,0x876eff7f , -0x70000000 ,0x906e816e , -0x88776e77 ,0xb97202dc , +0x10807fac ,0xb97202dc ,0x8f729972 ,0x8872727f ,0x876eff7f ,0x04000000 , 0xbf840034, 0xbefe03c1,drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm +1
-27@@ -35,8 +35,6 @@ var SINGLE_STEP_MISSED_WORKAROUND = 1 //workaround for lost MODE.DEBUG_EN exception when SAVECTX raised -var SQ_WAVE_STATUS_INST_ATC_SHIFT = 23 -var SQ_WAVE_STATUS_INST_ATC_MASK = 0x00800000 var SQ_WAVE_STATUS_SPI_PRIO_MASK = 0x00000006 var SQ_WAVE_STATUS_HALT_MASK = 0x2000@@ -76,9 +74,6 @@ var SQ_WAVE_IB_STS_RCNT_FIRST_REPLAY_MASK_NEG = 0x00007FFF var SQ_WAVE_MODE_DEBUG_EN_MASK = 0x800 -var SQ_BUF_RSRC_WORD1_ATC_SHIFT = 24 -var SQ_BUF_RSRC_WORD3_MTYPE_SHIFT = 27 - // bits [31:24] unused by SPI debug data var TTMP11_SAVE_REPLAY_W64H_SHIFT = 31 var TTMP11_SAVE_REPLAY_W64H_MASK = 0x80000000@@ -90,10 +85,6 @@ var TTMP11_SAVE_RCNT_FIRST_REPLAY_MASK = 0x7F000000 var S_SAVE_BUF_RSRC_WORD1_STRIDE = 0x00040000 var S_SAVE_BUF_RSRC_WORD3_MISC = 0x10807FAC -var S_SAVE_SPI_INIT_ATC_MASK = 0x08000000 -var S_SAVE_SPI_INIT_ATC_SHIFT = 27 -var S_SAVE_SPI_INIT_MTYPE_MASK = 0x70000000 -var S_SAVE_SPI_INIT_MTYPE_SHIFT = 28 var S_SAVE_SPI_INIT_FIRST_WAVE_MASK = 0x04000000 var S_SAVE_SPI_INIT_FIRST_WAVE_SHIFT = 26@@ -130,10 +121,6 @@ var s_save_ttmps_hi = s_save_trapsts var S_RESTORE_BUF_RSRC_WORD1_STRIDE = S_SAVE_BUF_RSRC_WORD1_STRIDE var S_RESTORE_BUF_RSRC_WORD3_MISC = S_SAVE_BUF_RSRC_WORD3_MISC -var S_RESTORE_SPI_INIT_ATC_MASK = 0x08000000 -var S_RESTORE_SPI_INIT_ATC_SHIFT = 27 -var S_RESTORE_SPI_INIT_MTYPE_MASK = 0x70000000 -var S_RESTORE_SPI_INIT_MTYPE_SHIFT = 28 var S_RESTORE_SPI_INIT_FIRST_WAVE_MASK = 0x04000000 var S_RESTORE_SPI_INIT_FIRST_WAVE_SHIFT = 26 var S_WAVE_SIZE = 25@@ -326,12 +313,6 @@ L_SLEEP: s_or_b32 s_save_buf_rsrc1, s_save_buf_rsrc1, S_SAVE_BUF_RSRC_WORD1_STRIDE s_mov_b32 s_save_buf_rsrc2, 0 //NUM_RECORDS initial value = 0 (in bytes) although not neccessarily inited s_mov_b32 s_save_buf_rsrc3, S_SAVE_BUF_RSRC_WORD3_MISC - s_and_b32 s_save_tmp, s_save_spi_init_hi, S_SAVE_SPI_INIT_ATC_MASK - s_lshr_b32 s_save_tmp, s_save_tmp, (S_SAVE_SPI_INIT_ATC_SHIFT-SQ_BUF_RSRC_WORD1_ATC_SHIFT) - s_or_b32 s_save_buf_rsrc3, s_save_buf_rsrc3, s_save_tmp //or ATC - s_and_b32 s_save_tmp, s_save_spi_init_hi, S_SAVE_SPI_INIT_MTYPE_MASK - s_lshr_b32 s_save_tmp, s_save_tmp, (S_SAVE_SPI_INIT_MTYPE_SHIFT-SQ_BUF_RSRC_WORD3_MTYPE_SHIFT) - s_or_b32 s_save_buf_rsrc3, s_save_buf_rsrc3, s_save_tmp //or MTYPE s_mov_b32 s_save_m0, m0@@ -674,12 +655,7 @@ L_RESTORE: s_or_b32 s_restore_buf_rsrc1, s_restore_buf_rsrc1, S_RESTORE_BUF_RSRC_WORD1_STRIDE s_mov_b32 s_restore_buf_rsrc2, 0 //NUM_RECORDS initial value = 0 (in bytes) s_mov_b32 s_restore_buf_rsrc3, S_RESTORE_BUF_RSRC_WORD3_MISC - s_and_b32 s_restore_tmp, s_restore_spi_init_hi, S_RESTORE_SPI_INIT_ATC_MASK - s_lshr_b32 s_restore_tmp, s_restore_tmp, (S_RESTORE_SPI_INIT_ATC_SHIFT-SQ_BUF_RSRC_WORD1_ATC_SHIFT) - s_or_b32 s_restore_buf_rsrc3, s_restore_buf_rsrc3, s_restore_tmp //or ATC - s_and_b32 s_restore_tmp, s_restore_spi_init_hi, S_RESTORE_SPI_INIT_MTYPE_MASK - s_lshr_b32 s_restore_tmp, s_restore_tmp, (S_RESTORE_SPI_INIT_MTYPE_SHIFT-SQ_BUF_RSRC_WORD3_MTYPE_SHIFT) - s_or_b32 s_restore_buf_rsrc3, s_restore_buf_rsrc3, s_restore_tmp //or MTYPE + //determine it is wave32 or wave64 get_wave_size(s_restore_size)@@ -971,8 +947,6 @@ L_RESTORE_HWREG: s_lshl_b32 s_restore_m0, s_restore_m0, SQ_WAVE_IB_STS_REPLAY_W64H_SHIFT s_or_b32 s_restore_tmp, s_restore_tmp, s_restore_m0 - s_and_b32 s_restore_m0, s_restore_status, SQ_WAVE_STATUS_INST_ATC_MASK - s_lshr_b32 s_restore_m0, s_restore_m0, SQ_WAVE_STATUS_INST_ATC_SHIFT s_setreg_b32 hwreg(HW_REG_IB_STS), s_restore_tmp #endifdrivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm +0
-27@@ -31,8 +31,6 @@ var SINGLE_STEP_MISSED_WORKAROUND = 1 //workaround for lost MODE.DEBUG_EN /**************************************************************************/ /* variables */ /**************************************************************************/ -var SQ_WAVE_STATUS_INST_ATC_SHIFT = 23 -var SQ_WAVE_STATUS_INST_ATC_MASK = 0x00800000 var SQ_WAVE_STATUS_SPI_PRIO_SHIFT = 1 var SQ_WAVE_STATUS_SPI_PRIO_MASK = 0x00000006 var SQ_WAVE_STATUS_HALT_MASK = 0x2000@@ -70,9 +68,6 @@ var SQ_WAVE_IB_STS_RCNT_FIRST_REPLAY_MASK_NEG = 0x00007FFF //FIXME var SQ_WAVE_MODE_DEBUG_EN_MASK = 0x800 -var SQ_BUF_RSRC_WORD1_ATC_SHIFT = 24 -var SQ_BUF_RSRC_WORD3_MTYPE_SHIFT = 27 - var TTMP11_SAVE_RCNT_FIRST_REPLAY_SHIFT = 26 // bits [31:26] unused by SPI debug data var TTMP11_SAVE_RCNT_FIRST_REPLAY_MASK = 0xFC000000@@ -80,10 +75,6 @@ var TTMP11_SAVE_RCNT_FIRST_REPLAY_MASK = 0xFC000000 var S_SAVE_BUF_RSRC_WORD1_STRIDE = 0x00040000 //stride is 4 bytes var S_SAVE_BUF_RSRC_WORD3_MISC = 0x00807FAC //SQ_SEL_X/Y/Z/W, BUF_NUM_FORMAT_FLOAT, (0 for MUBUF stride[17:14] when ADD_TID_ENABLE and BUF_DATA_FORMAT_32 for MTBUF), ADD_TID_ENABLE -var S_SAVE_SPI_INIT_ATC_MASK = 0x08000000 //bit[27]: ATC bit -var S_SAVE_SPI_INIT_ATC_SHIFT = 27 -var S_SAVE_SPI_INIT_MTYPE_MASK = 0x70000000 //bit[30:28]: Mtype -var S_SAVE_SPI_INIT_MTYPE_SHIFT = 28 var S_SAVE_SPI_INIT_FIRST_WAVE_MASK = 0x04000000 //bit[26]: FirstWaveInTG var S_SAVE_SPI_INIT_FIRST_WAVE_SHIFT = 26@@ -118,10 +109,6 @@ var s_save_ttmps_hi = s_save_trapsts //no conflict var S_RESTORE_BUF_RSRC_WORD1_STRIDE = S_SAVE_BUF_RSRC_WORD1_STRIDE var S_RESTORE_BUF_RSRC_WORD3_MISC = S_SAVE_BUF_RSRC_WORD3_MISC -var S_RESTORE_SPI_INIT_ATC_MASK = 0x08000000 //bit[27]: ATC bit -var S_RESTORE_SPI_INIT_ATC_SHIFT = 27 -var S_RESTORE_SPI_INIT_MTYPE_MASK = 0x70000000 //bit[30:28]: Mtype -var S_RESTORE_SPI_INIT_MTYPE_SHIFT = 28 var S_RESTORE_SPI_INIT_FIRST_WAVE_MASK = 0x04000000 //bit[26]: FirstWaveInTG var S_RESTORE_SPI_INIT_FIRST_WAVE_SHIFT = 26@@ -338,12 +325,6 @@ L_SAVE: s_or_b32 s_save_buf_rsrc1, s_save_buf_rsrc1, S_SAVE_BUF_RSRC_WORD1_STRIDE s_mov_b32 s_save_buf_rsrc2, 0 //NUM_RECORDS initial value = 0 (in bytes) although not neccessarily inited s_mov_b32 s_save_buf_rsrc3, S_SAVE_BUF_RSRC_WORD3_MISC - s_and_b32 s_save_tmp, s_save_spi_init_hi, S_SAVE_SPI_INIT_ATC_MASK - s_lshr_b32 s_save_tmp, s_save_tmp, (S_SAVE_SPI_INIT_ATC_SHIFT-SQ_BUF_RSRC_WORD1_ATC_SHIFT) //get ATC bit into position - s_or_b32 s_save_buf_rsrc3, s_save_buf_rsrc3, s_save_tmp //or ATC - s_and_b32 s_save_tmp, s_save_spi_init_hi, S_SAVE_SPI_INIT_MTYPE_MASK - s_lshr_b32 s_save_tmp, s_save_tmp, (S_SAVE_SPI_INIT_MTYPE_SHIFT-SQ_BUF_RSRC_WORD3_MTYPE_SHIFT) //get MTYPE bits into position - s_or_b32 s_save_buf_rsrc3, s_save_buf_rsrc3, s_save_tmp //or MTYPE //FIXME right now s_save_m0/s_save_mem_offset use tma_lo/tma_hi (might need to save them before using them?) s_mov_b32 s_save_m0, m0 //save M0@@ -673,12 +654,6 @@ L_RESTORE: s_or_b32 s_restore_buf_rsrc1, s_restore_buf_rsrc1, S_RESTORE_BUF_RSRC_WORD1_STRIDE s_mov_b32 s_restore_buf_rsrc2, 0 //NUM_RECORDS initial value = 0 (in bytes) s_mov_b32 s_restore_buf_rsrc3, S_RESTORE_BUF_RSRC_WORD3_MISC - s_and_b32 s_restore_tmp, s_restore_spi_init_hi, S_RESTORE_SPI_INIT_ATC_MASK - s_lshr_b32 s_restore_tmp, s_restore_tmp, (S_RESTORE_SPI_INIT_ATC_SHIFT-SQ_BUF_RSRC_WORD1_ATC_SHIFT) //get ATC bit into position - s_or_b32 s_restore_buf_rsrc3, s_restore_buf_rsrc3, s_restore_tmp //or ATC - s_and_b32 s_restore_tmp, s_restore_spi_init_hi, S_RESTORE_SPI_INIT_MTYPE_MASK - s_lshr_b32 s_restore_tmp, s_restore_tmp, (S_RESTORE_SPI_INIT_MTYPE_SHIFT-SQ_BUF_RSRC_WORD3_MTYPE_SHIFT) //get MTYPE bits into position - s_or_b32 s_restore_buf_rsrc3, s_restore_buf_rsrc3, s_restore_tmp //or MTYPE /* global mem offset */ // s_mov_b32 s_restore_mem_offset, 0x0 //mem offset initial value = 0@@ -898,8 +873,6 @@ end s_lshr_b32 s_restore_m0, s_restore_m0, S_SAVE_PC_HI_FIRST_REPLAY_SHIFT s_lshl_b32 s_restore_m0, s_restore_m0, SQ_WAVE_IB_STS_FIRST_REPLAY_SHIFT s_or_b32 s_restore_tmp, s_restore_tmp, s_restore_m0 - s_and_b32 s_restore_m0, s_restore_status, SQ_WAVE_STATUS_INST_ATC_MASK - s_lshr_b32 s_restore_m0, s_restore_m0, SQ_WAVE_STATUS_INST_ATC_SHIFT s_setreg_b32 hwreg(HW_REG_IB_STS), s_restore_tmp s_and_b32 s_restore_pc_hi, s_restore_pc_hi, 0x0000ffff //pc[47:32] //Do it here in order not to affect STATUS
drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm end · line 888
Quoted 9 lines
drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm +1
-2@@ -909,8 +882,7 @@ end s_barrier //barrier to ensure the readiness of LDS before access attempts from any other wave in the same TG //FIXME not performance-optimal at this time -// s_rfe_b64 s_restore_pc_lo //Return to the main shader program and resume execution - s_rfe_restore_b64 s_restore_pc_lo, s_restore_m0 // s_restore_m0[0] is used to set STATUS.inst_atc + s_rfe_b64 s_restore_pc_lo //Return to the main shader program and resume execution /**************************************************************************/
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Morichetti, Laurent
Tested-by[AMD Official Use Only - Internal Distribution Only]
I reviewed and tested the patch series.
On 10/1/20, 11:34 AM, "Kuehling, Felix" <[email protected]> wrote:
The series is
Acked-by: Felix Kuehling <[email protected]>
I'm hoping Laurent can give it a more through and informed R-b.
Thanks,
Felix
Am 2020-10-01 um 2:24 p.m. schrieb Jay Cornwall:
> ATC and MTYPE fields do not exist in gfx9 or later.
>
> Signed-off-by: Jay Cornwall <[email protected]>
> Cc: Laurent Morichetti <[email protected]>
> ---
> .../gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 93 ++++++-------------
> .../amd/amdkfd/cwsr_trap_handler_gfx10.asm | 28 +-----
> .../drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm | 30 +-----
> 3 files changed, 30 insertions(+), 121 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h b/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h
> index affbca7c0050..aa2de525b2e0 100644
> --- a/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h
> +++ b/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h
> @@ -274,7 +274,7 @@ static const uint32_t cwsr_trap_gfx8_hex[] = {
>
>
> static const uint32_t cwsr_trap_gfx9_hex[] = {
> -0xbf820001, 0xbf820248,
> +0xbf820001, 0xbf820240,
> 0xb8f8f802, 0x89788678,
> 0xb8eef801, 0x866eff6e,
> 0x00000800, 0xbf840003,
> @@ -336,10 +336,6 @@ static const uint32_t cwsr_trap_gfx9_hex[] = {
> 0x0000ffff, 0x8775ff75,
> 0x00040000, 0xbef60080,
> 0xbef700ff, 0x00807fac,
> -0x867aff7f, 0x08000000,
> -0x8f7a837a, 0x87777a77,
> -0x867aff7f, 0x70000000,
> -0x8f7a817a, 0x87777a77,
> 0xbef1007c, 0xbef00080,
> 0xb8f02a05, 0x80708170,
> 0x8e708a70, 0xb8fa1605,
> @@ -566,15 +562,11 @@ static const uint32_t cwsr_trap_gfx9_hex[] = {
> 0x701d0300, 0x807c847c,
> 0x8070ff70, 0x00000400,
> 0xbf0a7b7c, 0xbf85ffef,
> -0xbf9c0000, 0xbf8200da,
> +0xbf9c0000, 0xbf8200cf,
> 0xbef4007e, 0x8675ff7f,
> 0x0000ffff, 0x8775ff75,
> 0x00040000, 0xbef60080,
> 0xbef700ff, 0x00807fac,
> -0x866eff7f, 0x08000000,
> -0x8f6e836e, 0x87776e77,
> -0x866eff7f, 0x70000000,
> -0x8f6e816e, 0x87776e77,
> 0x866eff7f, 0x04000000,
> 0xbf84001e, 0xbefe00c1,
> 0xbeff00c1, 0xb8ef4306,
> @@ -669,18 +661,16 @@ static const uint32_t cwsr_trap_gfx9_hex[] = {
> 0x876e6f6e, 0x866fff6d,
> 0x04000000, 0x8f6f9a6f,
> 0x8e6f8f6f, 0x876e6f6e,
> -0x866fff7a, 0x00800000,
> -0x8f6f976f, 0xb96ef807,
> -0x866dff6d, 0x0000ffff,
> -0x86fe7e7e, 0x86ea6a6a,
> -0x8f6e837a, 0xb96ee0c2,
> -0xbf800002, 0xb97a0002,
> -0xbf8a0000, 0x95806f6c,
> -0xbf810000, 0x00000000,
> +0xb96ef807, 0x866dff6d,
> +0x0000ffff, 0x86fe7e7e,
> +0x86ea6a6a, 0x8f6e837a,
> +0xb96ee0c2, 0xbf800002,
> +0xb97a0002, 0xbf8a0000,
> +0xbe801f6c, 0xbf810000,
> };
>
> static const uint32_t cwsr_trap_nv1x_hex[] = {
> -0xbf820001, 0xbf8201cd,
> +0xbf820001, 0xbf8201c5,
> 0xb0804004, 0xb978f802,
> 0x8a788678, 0xb96ef801,
> 0x876eff6e, 0x00000800,
> @@ -740,10 +730,6 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {
> 0x0000ffff, 0x8875ff75,
> 0x00040000, 0xbef60380,
> 0xbef703ff, 0x10807fac,
> -0x877aff7f, 0x08000000,
> -0x907a837a, 0x88777a77,
> -0x877aff7f, 0x70000000,
> -0x907a817a, 0x88777a77,
> 0xbef1037c, 0xbef00380,
> 0xb97302dc, 0x8f739973,
> 0x8873737f, 0xb97bf816,
> @@ -911,15 +897,11 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {
> 0x705d0000, 0x807c817c,
> 0x8070ff70, 0x00000080,
> 0xbf0a7b7c, 0xbf85fff8,
> -0xbf820151, 0xbef4037e,
> +0xbf820146, 0xbef4037e,
> 0x8775ff7f, 0x0000ffff,
> 0x8875ff75, 0x00040000,
> 0xbef60380, 0xbef703ff,
> -0x10807fac, 0x876eff7f,
> -0x08000000, 0x906e836e,
> -0x88776e77, 0x876eff7f,
> -0x70000000, 0x906e816e,
> -0x88776e77, 0xb97202dc,
> +0x10807fac, 0xb97202dc,
> 0x8f729972, 0x8872727f,
> 0x876eff7f, 0x04000000,
> 0xbf840034, 0xbefe03c1,
> @@ -1075,18 +1057,17 @@ static const uint32_t cwsr_trap_nv1x_hex[] = {
> 0x886e6f6e, 0x876fff6d,
> 0x01000000, 0x906f986f,
> 0x8f6f996f, 0x886e6f6e,
> -0x876fff7a, 0x00800000,
> -0x906f976f, 0xb9eef807,
> -0x876dff6d, 0x0000ffff,
> -0x87fe7e7e, 0x87ea6a6a,
> -0xb9faf802, 0xbe80226c,
> -0xbf810000, 0xbf9f0000,
> +0xb9eef807, 0x876dff6d,
> +0x0000ffff, 0x87fe7e7e,
> +0x87ea6a6a, 0xb9faf802,
> +0xbe80226c, 0xbf810000,
> 0xbf9f0000, 0xbf9f0000,
> 0xbf9f0000, 0xbf9f0000,
> +0xbf9f0000, 0x00000000,
> };
>
> static const uint32_t cwsr_trap_arcturus_hex[] = {
> -0xbf820001, 0xbf8202c4,
> +0xbf820001, 0xbf8202bc,
> 0xb8f8f802, 0x89788678,
> 0xb8eef801, 0x866eff6e,
> 0x00000800, 0xbf840003,
> @@ -1148,11 +1129,7 @@ static const uint32_t cwsr_trap_arcturus_hex[] = {
> 0x8675ff7f, 0x0000ffff,
> 0x8775ff75, 0x00040000,
> 0xbef60080, 0xbef700ff,
> -0x00807fac, 0x867aff7f,
> -0x08000000, 0x8f7a837a,
> -0x87777a77, 0x867aff7f,
> -0x70000000, 0x8f7a817a,
> -0x87777a77, 0xbef1007c,
> +0x00807fac, 0xbef1007c,
> 0xbef00080, 0xb8f02a05,
> 0x80708170, 0x8e708a70,
> 0x8e708170, 0xb8fa1605,
> @@ -1440,15 +1417,11 @@ static const uint32_t cwsr_trap_arcturus_hex[] = {
> 0x701d0300, 0x807c847c,
> 0x8070ff70, 0x00000400,
> 0xbf0a7b7c, 0xbf85ffeb,
> -0xbf9c0000, 0xbf820106,
> +0xbf9c0000, 0xbf8200fb,
> 0xbef4007e, 0x8675ff7f,
> 0x0000ffff, 0x8775ff75,
> 0x00040000, 0xbef60080,
> 0xbef700ff, 0x00807fac,
> -0x866eff7f, 0x08000000,
> -0x8f6e836e, 0x87776e77,
> -0x866eff7f, 0x70000000,
> -0x8f6e816e, 0x87776e77,
> 0x866eff7f, 0x04000000,
> 0xbf84001f, 0xbefe00c1,
> 0xbeff00c1, 0xb8ef4306,
> @@ -1565,18 +1538,16 @@ static const uint32_t cwsr_trap_arcturus_hex[] = {
> 0x876e6f6e, 0x866fff6d,
> 0x04000000, 0x8f6f9a6f,
> 0x8e6f8f6f, 0x876e6f6e,
> -0x866fff7a, 0x00800000,
> -0x8f6f976f, 0xb96ef807,
> -0x866dff6d, 0x0000ffff,
> -0x86fe7e7e, 0x86ea6a6a,
> -0x8f6e837a, 0xb96ee0c2,
> -0xbf800002, 0xb97a0002,
> -0xbf8a0000, 0x95806f6c,
> -0xbf810000, 0x00000000,
> +0xb96ef807, 0x866dff6d,
> +0x0000ffff, 0x86fe7e7e,
> +0x86ea6a6a, 0x8f6e837a,
> +0xb96ee0c2, 0xbf800002,
> +0xb97a0002, 0xbf8a0000,
> +0xbe801f6c, 0xbf810000,
> };
>
> static const uint32_t cwsr_trap_gfx10_hex[] = {
> -0xbf820001, 0xbf8201cf,
> +0xbf820001, 0xbf8201c7,
> 0xb0804004, 0xb978f802,
> 0x8a788678, 0xb96ef801,
> 0x876eff6e, 0x00000800,
> @@ -1615,10 +1586,6 @@ static const uint32_t cwsr_trap_gfx10_hex[] = {
> 0x0000ffff, 0x8875ff75,
> 0x00040000, 0xbef60380,
> 0xbef703ff, 0x10807fac,
> -0x877aff7f, 0x08000000,
> -0x907a837a, 0x88777a77,
> -0x877aff7f, 0x70000000,
> -0x907a817a, 0x88777a77,
> 0xbef1037c, 0xbef00380,
> 0xb97302dc, 0x8f739973,
> 0x8873737f, 0xbefe03c1,
> @@ -1808,15 +1775,11 @@ static const uint32_t cwsr_trap_gfx10_hex[] = {
> 0x705d0000, 0x807c817c,
> 0x8070ff70, 0x00000080,
> 0xbf0a7b7c, 0xbf85fff8,
> -0xbf82013c, 0xbef4037e,
> +0xbf820134, 0xbef4037e,
> 0x8775ff7f, 0x0000ffff,
> 0x8875ff75, 0x00040000,
> 0xbef60380, 0xbef703ff,
> -0x10807fac, 0x876eff7f,
> -0x08000000, 0x906e836e,
> -0x88776e77, 0x876eff7f,
> -0x70000000, 0x906e816e,
> -0x88776e77, 0xb97202dc,
> +0x10807fac, 0xb97202dc,
> 0x8f729972, 0x8872727f,
> 0x876eff7f, 0x04000000,
> 0xbf840034, 0xbefe03c1,
> diff --git a/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm b/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm
> index 5081f91190b8..c3344acdb094 100644
> --- a/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm
> +++ b/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm
> @@ -35,8 +35,6 @@
>
> var SINGLE_STEP_MISSED_WORKAROUND= 1//workaround for lost MODE.DEBUG_EN exception when SAVECTX raised
>
> -var SQ_WAVE_STATUS_INST_ATC_SHIFT= 23
> -var SQ_WAVE_STATUS_INST_ATC_MASK= 0x00800000
> var SQ_WAVE_STATUS_SPI_PRIO_MASK= 0x00000006
> var SQ_WAVE_STATUS_HALT_MASK= 0x2000
>
> @@ -76,9 +74,6 @@ var SQ_WAVE_IB_STS_RCNT_FIRST_REPLAY_MASK_NEG= 0x00007FFF
>
> var SQ_WAVE_MODE_DEBUG_EN_MASK= 0x800
>
> -var SQ_BUF_RSRC_WORD1_ATC_SHIFT= 24
> -var SQ_BUF_RSRC_WORD3_MTYPE_SHIFT= 27
> -
> // bits [31:24] unused by SPI debug data
> var TTMP11_SAVE_REPLAY_W64H_SHIFT= 31
> var TTMP11_SAVE_REPLAY_W64H_MASK= 0x80000000
> @@ -90,10 +85,6 @@ var TTMP11_SAVE_RCNT_FIRST_REPLAY_MASK= 0x7F000000
> var S_SAVE_BUF_RSRC_WORD1_STRIDE= 0x00040000
> var S_SAVE_BUF_RSRC_WORD3_MISC= 0x10807FAC
>
> -var S_SAVE_SPI_INIT_ATC_MASK= 0x08000000
> -var S_SAVE_SPI_INIT_ATC_SHIFT= 27
> -var S_SAVE_SPI_INIT_MTYPE_MASK= 0x70000000
> -var S_SAVE_SPI_INIT_MTYPE_SHIFT= 28
> var S_SAVE_SPI_INIT_FIRST_WAVE_MASK= 0x04000000
> var S_SAVE_SPI_INIT_FIRST_WAVE_SHIFT= 26
>
> @@ -130,10 +121,6 @@ var s_save_ttmps_hi= s_save_trapsts
> var S_RESTORE_BUF_RSRC_WORD1_STRIDE= S_SAVE_BUF_RSRC_WORD1_STRIDE
> var S_RESTORE_BUF_RSRC_WORD3_MISC= S_SAVE_BUF_RSRC_WORD3_MISC
>
> -var S_RESTORE_SPI_INIT_ATC_MASK= 0x08000000
> -var S_RESTORE_SPI_INIT_ATC_SHIFT= 27
> -var S_RESTORE_SPI_INIT_MTYPE_MASK= 0x70000000
> -var S_RESTORE_SPI_INIT_MTYPE_SHIFT= 28
> var S_RESTORE_SPI_INIT_FIRST_WAVE_MASK= 0x04000000
> var S_RESTORE_SPI_INIT_FIRST_WAVE_SHIFT= 26
> var S_WAVE_SIZE= 25
> @@ -326,12 +313,6 @@ L_SLEEP:
> s_or_b32s_save_buf_rsrc1, s_save_buf_rsrc1, S_SAVE_BUF_RSRC_WORD1_STRIDE
> s_mov_b32s_save_buf_rsrc2, 0//NUM_RECORDS initial value = 0 (in bytes) although not neccessarily inited
> s_mov_b32s_save_buf_rsrc3, S_SAVE_BUF_RSRC_WORD3_MISC
> -s_and_b32s_save_tmp, s_save_spi_init_hi, S_SAVE_SPI_INIT_ATC_MASK
> -s_lshr_b32s_save_tmp, s_save_tmp, (S_SAVE_SPI_INIT_ATC_SHIFT-SQ_BUF_RSRC_WORD1_ATC_SHIFT)
> -s_or_b32s_save_buf_rsrc3, s_save_buf_rsrc3, s_save_tmp//or ATC
> -s_and_b32s_save_tmp, s_save_spi_init_hi, S_SAVE_SPI_INIT_MTYPE_MASK
> -s_lshr_b32s_save_tmp, s_save_tmp, (S_SAVE_SPI_INIT_MTYPE_SHIFT-SQ_BUF_RSRC_WORD3_MTYPE_SHIFT)
> -s_or_b32s_save_buf_rsrc3, s_save_buf_rsrc3, s_save_tmp//or MTYPE
>
> s_mov_b32s_save_m0, m0
>
> @@ -674,12 +655,7 @@ L_RESTORE:
> s_or_b32s_restore_buf_rsrc1, s_restore_buf_rsrc1, S_RESTORE_BUF_RSRC_WORD1_STRIDE
> s_mov_b32s_restore_buf_rsrc2, 0//NUM_RECORDS initial value = 0 (in bytes)
> s_mov_b32s_restore_buf_rsrc3, S_RESTORE_BUF_RSRC_WORD3_MISC
> -s_and_b32s_restore_tmp, s_restore_spi_init_hi, S_RESTORE_SPI_INIT_ATC_MASK
> -s_lshr_b32s_restore_tmp, s_restore_tmp, (S_RESTORE_SPI_INIT_ATC_SHIFT-SQ_BUF_RSRC_WORD1_ATC_SHIFT)
> -s_or_b32s_restore_buf_rsrc3, s_restore_buf_rsrc3, s_restore_tmp//or ATC
> -s_and_b32s_restore_tmp, s_restore_spi_init_hi, S_RESTORE_SPI_INIT_MTYPE_MASK
> -s_lshr_b32s_restore_tmp, s_restore_tmp, (S_RESTORE_SPI_INIT_MTYPE_SHIFT-SQ_BUF_RSRC_WORD3_MTYPE_SHIFT)
> -s_or_b32s_restore_buf_rsrc3, s_restore_buf_rsrc3, s_restore_tmp//or MTYPE
> +
> //determine it is wave32 or wave64
> get_wave_size(s_restore_size)
>
> @@ -971,8 +947,6 @@ L_RESTORE_HWREG:
> s_lshl_b32s_restore_m0, s_restore_m0, SQ_WAVE_IB_STS_REPLAY_W64H_SHIFT
> s_or_b32s_restore_tmp, s_restore_tmp, s_restore_m0
>
> -s_and_b32s_restore_m0, s_restore_status, SQ_WAVE_STATUS_INST_ATC_MASK
> -s_lshr_b32s_restore_m0, s_restore_m0, SQ_WAVE_STATUS_INST_ATC_SHIFT
> s_setreg_b32 hwreg(HW_REG_IB_STS), s_restore_tmp
> #endif
>
> diff --git a/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm b/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm
> index 75f29d13c90f..0008eb7d1ef4 100644
> --- a/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm
> +++ b/drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm
> @@ -31,8 +31,6 @@ var SINGLE_STEP_MISSED_WORKAROUND =1 //workaround for lost MODE.DEBUG_EN
> /**************************************************************************/
> /*variables */
> /**************************************************************************/
> -var SQ_WAVE_STATUS_INST_ATC_SHIFT = 23
> -var SQ_WAVE_STATUS_INST_ATC_MASK = 0x00800000
> var SQ_WAVE_STATUS_SPI_PRIO_SHIFT = 1
> var SQ_WAVE_STATUS_SPI_PRIO_MASK = 0x00000006
> var SQ_WAVE_STATUS_HALT_MASK = 0x2000
> @@ -70,9 +68,6 @@ var SQ_WAVE_IB_STS_RCNT_FIRST_REPLAY_MASK_NEG= 0x00007FFF//FIXME
>
> var SQ_WAVE_MODE_DEBUG_EN_MASK= 0x800
>
> -var SQ_BUF_RSRC_WORD1_ATC_SHIFT =24
> -var SQ_BUF_RSRC_WORD3_MTYPE_SHIFT =27
> -
> var TTMP11_SAVE_RCNT_FIRST_REPLAY_SHIFT= 26// bits [31:26] unused by SPI debug data
> var TTMP11_SAVE_RCNT_FIRST_REPLAY_MASK= 0xFC000000
>
> @@ -80,10 +75,6 @@ var TTMP11_SAVE_RCNT_FIRST_REPLAY_MASK= 0xFC000000
> var S_SAVE_BUF_RSRC_WORD1_STRIDE= 0x00040000//stride is 4 bytes
> var S_SAVE_BUF_RSRC_WORD3_MISC= 0x00807FAC//SQ_SEL_X/Y/Z/W, BUF_NUM_FORMAT_FLOAT, (0 for MUBUF stride[17:14] when ADD_TID_ENABLE and BUF_DATA_FORMAT_32 for MTBUF), ADD_TID_ENABLE
>
> -var S_SAVE_SPI_INIT_ATC_MASK= 0x08000000//bit[27]: ATC bit
> -var S_SAVE_SPI_INIT_ATC_SHIFT= 27
> -var S_SAVE_SPI_INIT_MTYPE_MASK= 0x70000000//bit[30:28]: Mtype
> -var S_SAVE_SPI_INIT_MTYPE_SHIFT= 28
> var S_SAVE_SPI_INIT_FIRST_WAVE_MASK= 0x04000000//bit[26]: FirstWaveInTG
> var S_SAVE_SPI_INIT_FIRST_WAVE_SHIFT= 26
>
> @@ -118,10 +109,6 @@ var s_save_ttmps_hi =s_save_trapsts//no conflict
> var S_RESTORE_BUF_RSRC_WORD1_STRIDE =S_SAVE_BUF_RSRC_WORD1_STRIDE
> var S_RESTORE_BUF_RSRC_WORD3_MISC =S_SAVE_BUF_RSRC_WORD3_MISC
>
> -var S_RESTORE_SPI_INIT_ATC_MASK =0x08000000 //bit[27]: ATC bit
> -var S_RESTORE_SPI_INIT_ATC_SHIFT =27
> -var S_RESTORE_SPI_INIT_MTYPE_MASK =0x70000000 //bit[30:28]: Mtype
> -var S_RESTORE_SPI_INIT_MTYPE_SHIFT =28
> var S_RESTORE_SPI_INIT_FIRST_WAVE_MASK =0x04000000 //bit[26]: FirstWaveInTG
> var S_RESTORE_SPI_INIT_FIRST_WAVE_SHIFT =26
>
> @@ -338,12 +325,6 @@ L_SAVE:
> s_or_b32 s_save_buf_rsrc1,s_save_buf_rsrc1, S_SAVE_BUF_RSRC_WORD1_STRIDE
> s_mov_b32 s_save_buf_rsrc2,0//NUM_RECORDS initial value = 0 (in bytes) although not neccessarily inited
> s_mov_b32 s_save_buf_rsrc3,S_SAVE_BUF_RSRC_WORD3_MISC
> - s_and_b32 s_save_tmp,s_save_spi_init_hi, S_SAVE_SPI_INIT_ATC_MASK
> - s_lshr_b32 s_save_tmp,s_save_tmp, (S_SAVE_SPI_INIT_ATC_SHIFT-SQ_BUF_RSRC_WORD1_ATC_SHIFT) //get ATC bit into position
> - s_or_b32 s_save_buf_rsrc3,s_save_buf_rsrc3, s_save_tmp//or ATC
> - s_and_b32 s_save_tmp,s_save_spi_init_hi, S_SAVE_SPI_INIT_MTYPE_MASK
> - s_lshr_b32 s_save_tmp,s_save_tmp, (S_SAVE_SPI_INIT_MTYPE_SHIFT-SQ_BUF_RSRC_WORD3_MTYPE_SHIFT) //get MTYPE bits into position
> - s_or_b32 s_save_buf_rsrc3,s_save_buf_rsrc3, s_save_tmp//or MTYPE
>
> //FIXME right now s_save_m0/s_save_mem_offset use tma_lo/tma_hi (might need to save them before using them?)
> s_mov_b32 s_save_m0,m0 //save M0
> @@ -673,12 +654,6 @@ L_RESTORE:
> s_or_b32 s_restore_buf_rsrc1, s_restore_buf_rsrc1, S_RESTORE_BUF_RSRC_WORD1_STRIDE
> s_mov_b32 s_restore_buf_rsrc2, 0 //NUM_RECORDS initial value = 0 (in bytes)
> s_mov_b32 s_restore_buf_rsrc3, S_RESTORE_BUF_RSRC_WORD3_MISC
> - s_and_b32 s_restore_tmp, s_restore_spi_init_hi, S_RESTORE_SPI_INIT_ATC_MASK
> - s_lshr_b32 s_restore_tmp, s_restore_tmp, (S_RESTORE_SPI_INIT_ATC_SHIFT-SQ_BUF_RSRC_WORD1_ATC_SHIFT) //get ATC bit into position
> - s_or_b32 s_restore_buf_rsrc3, s_restore_buf_rsrc3, s_restore_tmp //or ATC
> - s_and_b32 s_restore_tmp, s_restore_spi_init_hi, S_RESTORE_SPI_INIT_MTYPE_MASK
> - s_lshr_b32 s_restore_tmp, s_restore_tmp, (S_RESTORE_SPI_INIT_MTYPE_SHIFT-SQ_BUF_RSRC_WORD3_MTYPE_SHIFT) //get MTYPE bits into position
> - s_or_b32 s_restore_buf_rsrc3, s_restore_buf_rsrc3, s_restore_tmp //or MTYPE
>
> /* global mem offset*/
> // s_mov_b32 s_restore_mem_offset, 0x0 //mem offset initial value = 0
> @@ -898,8 +873,6 @@ end
> s_lshr_b32 s_restore_m0, s_restore_m0, S_SAVE_PC_HI_FIRST_REPLAY_SHIFT
> s_lshl_b32 s_restore_m0, s_restore_m0, SQ_WAVE_IB_STS_FIRST_REPLAY_SHIFT
> s_or_b32 s_restore_tmp, s_restore_tmp, s_restore_m0
> - s_and_b32 s_restore_m0, s_restore_status, SQ_WAVE_STATUS_INST_ATC_MASK
> - s_lshr_b32 s_restore_m0, s_restore_m0, SQ_WAVE_STATUS_INST_ATC_SHIFT
> s_setreg_b32 hwreg(HW_REG_IB_STS), s_restore_tmp
>
> s_and_b32 s_restore_pc_hi, s_restore_pc_hi, 0x0000ffff//pc[47:32] //Do it here in order not to affect STATUS
> @@ -909,8 +882,7 @@ end
>
> s_barrier//barrier to ensure the readiness of LDS before access attempts from any other wave in the same TG //FIXME not performance-optimal at this time
>
> -// s_rfe_b64 s_restore_pc_lo//Return to the main shader program and resume execution
> - s_rfe_restore_b64 s_restore_pc_lo, s_restore_m0// s_restore_m0[0] is used to set STATUS.inst_atc
> + s_rfe_b64 s_restore_pc_lo//Return to the main shader program and resume execution
>
>
> /**************************************************************************/_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx