drm/amdkfd: Replace gfx10 trap handler with correct branch
Subsystems (3)
PATCH 1/2 drm/amdkfd: Replace gfx10 trap handler with correct branch
Previously submitted code was taken from an incorrect branch and was non-functional.
--- drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 578 +++--- .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 1978 +++++++++----------- 2 files changed, 1235 insertions(+), 1321 deletions(-)
drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h +332 -246
@@ -680,24 +680,47 @@ static const uint32_t cwsr_trap_gfx9_hex[] = { };static const uint32_t cwsr_trap_gfx10_hex[] = { -0xbf820001 ,0xbf82012e , -0xb0804004 ,0xb970f802 , -0x8a708670 ,0xb971f803 , -0x8771ff71 ,0x00000400 , -0xbf850008 ,0xb971f803 , -0x8771ff71 ,0x000001ff , -0xbf850001 ,0x806c846c , +0xbf820001 ,0xbf8201b7 , +0xb0804004 ,0xb978f802 , +0x8a788678 ,0xb971f803 , +0x876eff71 ,0x00000400 , +0xbf850033 ,0x876eff71 , +0x00000100 ,0xbf840002 , +0x8878ff78 ,0x00002000 , +0x8a77ff77 ,0xff000000 , +0xb96ef807 ,0x876fff6e , +0x02000000 ,0x8f6f866f , +0x88776f77 ,0x876fff6e , +0x003f8000 ,0x8f6f896f , +0x88776f77 ,0x8a6eff6e , +0x023f8000 ,0xb9eef807 , +0xb970f812 ,0xb971f813 , +0x8ff08870 ,0xf4051bb8 , +0xfa000000 ,0xbf8cc07f , +0xf4051c38 ,0xfa000008 , +0xbf8cc07f ,0x87ee6e6e , +0xbf840001 ,0xbe80206e , +0xb971f803 ,0x8771ff71 , +0x000001ff ,0xbf850002 , +0x806c846c ,0x826d806d , +0x876dff6d ,0x0000ffff , +0x906e8977 ,0x876fff6e , +0x003f8000 ,0x906e8677 , +0x876eff6e ,0x02000000 , +0x886e6f6e ,0xb9eef807 , +0x87fe7e7e ,0x87ea6a6a , +0xb9f8f802 ,0xbe80226c , +0xb971f803 ,0x8771ff71 , +0x00000100 ,0xbf840006 , +0xbef60380 ,0xb9f60203 ,0x876dff6d ,0x0000ffff , -0xbe80226c ,0xb971f803 , -0x8771ff71 ,0x00000100 , -0xbf840006 ,0xbef60380 , -0xb9f60203 ,0x876dff6d , -0x0000ffff ,0x80ec886c , -0x82ed806d ,0xbef60380 , -0xb9f60283 ,0xb973f816 , -0xb9762c07 ,0x8f769c76 , -0x886d766d ,0xb97603c7 , -0x8f769b76 ,0x886d766d , +0x80ec886c ,0x82ed806d , +0xbef60380 ,0xb9f60283 , +0xb972f816 ,0xb9762c07 , +0x8f769a76 ,0x886d766d , +0xb97603c7 ,0x8f769976 , +0x886d766d ,0xb9760647 , +0x8f769876 ,0x886d766d ,0xb976f807 ,0x8776ff76 ,0x00007fff ,0xb9f6f807 ,0xbeee037e ,0xbeef037f ,
@@ -706,276 +729,339 @@ static const uint32_t cwsr_trap_gfx10_hex[] = {0xbef4037e ,0x8775ff7f ,0x0000ffff ,0x8875ff75 ,0x00040000 ,0xbef60380 , -0xbef703ff ,0x00807fac , +0xbef703ff ,0x10807fac ,0x8776ff7f ,0x08000000 ,0x90768376 ,0x88777677 ,0x8776ff7f ,0x70000000 ,0x90768176 ,0x88777677 ,0xbefb037c ,0xbefa0380 , -0xb97202dc ,0x8872727f , -0xbefe03c1 ,0x877c8172 , +0xb97302dc ,0x8f739973 , +0x8873737f ,0xb97a2a05 , +0x807a817a ,0x907c9973 , +0x877c817c ,0xbf06817c , +0xbf850002 ,0x8f7a897a , +0xbf820001 ,0x8f7a8a7a , +0xb9761e06 ,0x8f768a76 , +0x807a767a ,0x807aff7a , +0x00000200 ,0xbef60384 , +0xbef603ff ,0x01000000 , +0xbefe037c ,0xbefc037a , +0xf4611efa ,0xf8000000 , +0x807a847a ,0xbefc037e , +0xbefe037c ,0xbefc037a , +0xf4611b3a ,0xf8000000 , +0x807a847a ,0xbefc037e , +0xbefe037c ,0xbefc037a , +0xf4611b7a ,0xf8000000 , +0x807a847a ,0xbefc037e , +0xbefe037c ,0xbefc037a , +0xf4611bba ,0xf8000000 , +0x807a847a ,0xbefc037e , +0xbefe037c ,0xbefc037a , +0xf4611bfa ,0xf8000000 , +0x807a847a ,0xbefc037e , +0xbefe037c ,0xbefc037a , +0xf4611e3a ,0xf8000000 , +0x807a847a ,0xbefc037e , +0xb971f803 ,0xbefe037c , +0xbefc037a ,0xf4611c7a , +0xf8000000 ,0x807a847a , +0xbefc037e ,0xbefe037c , +0xbefc037a ,0xf4611cba , +0xf8000000 ,0x807a847a , +0xbefc037e ,0xb97bf801 , +0xbefe037c ,0xbefc037a , +0xf4611efa ,0xf8000000 , +0x807a847a ,0xbefc037e , +0x8776ff7f ,0x04000000 , +0xbeef0380 ,0x886f6f76 , +0xb97a2a05 ,0x807a817a , +0x907c9973 ,0x877c817c ,0xbf06817c ,0xbf850002 , -0xbeff0380 ,0xbf820001 , -0xbeff03c1 ,0xb9712a05 , -0x80718171 ,0x8f718271 , -0x877c8172 ,0xbf06817c , -0xbf85000d ,0x8f768771 , +0x8f7a897a ,0xbf820001 , +0x8f7a8a7a ,0xb9761e06 , +0x8f768a76 ,0x807a767a , +0x8f7682ff ,0x0000006a , +0xbef603ff ,0x01000000 , +0xbef20374 ,0x80747a74 , +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 , +0xf469003a ,0xfa000000 , +0xf469013a ,0xfa000010 , +0xf465023a ,0xfa000020 , +0x8074c074 ,0x82758075 , +0xbef40372 ,0xbefa0380 , +0xbefe03c1 ,0x907c9973 , +0x877c817c ,0xbf06817c , +0xbf850002 ,0xbeff0380 , +0xbf820002 ,0xbeff03c1 , +0xbf82000b ,0xbef603ff , +0x01000000 ,0xe0704000 , +0x7a5d0000 ,0xe0704080 , +0x7a5d0100 ,0xe0704100 , +0x7a5d0200 ,0xe0704180 , +0x7a5d0300 ,0xbf82000a ,0xbef603ff ,0x01000000 , -0xbefc0380 ,0x7e008700 , -0xe0704000 ,0x7a5d0000 , -0x807c817c ,0x807aff7a , -0x00000080 ,0xbf0a717c , -0xbf85fff8 ,0xbf82001b , -0x8f768871 ,0xbef603ff , -0x01000000 ,0xbefc0380 , -0x7e008700 ,0xe0704000 , -0x7a5d0000 ,0x807c817c , -0x807aff7a ,0x00000100 , -0xbf0a717c ,0xbf85fff8 , -0xb9711e06 ,0x8771c171 , -0xbf84000c ,0x8f718371 , -0x80717c71 ,0xbefe03c1 , -0xbeff0380 ,0x7e008700 ,0xe0704000 ,0x7a5d0000 , -0x807c817c ,0x807aff7a , -0x00000080 ,0xbf0a717c , -0xbf85fff8 ,0xbf8a0000 , -0x8776ff72 ,0x04000000 , -0xbf84002b ,0xbefe03c1 , -0x877c8172 ,0xbf06817c , +0xe0704100 ,0x7a5d0100 , +0xe0704200 ,0x7a5d0200 , +0xe0704300 ,0x7a5d0300 , +0xbefe03c1 ,0x907c9973 , +0x877c817c ,0xbf06817c ,0xbf850002 ,0xbeff0380 ,0xbf820001 ,0xbeff03c1 ,0xb9714306 ,0x8771c171 , -0xbf840021 ,0x8f718671 , +0xbf840046 ,0xbf8a0000 , +0x8776ff6f ,0x04000000 , +0xbf840042 ,0x8f718671 ,0x8f718271 ,0xbef60371 , +0xb97a2a05 ,0x807a817a , +0x907c9973 ,0x877c817c , +0xbf06817c ,0xbf850002 , +0x8f7a897a ,0xbf820001 , +0x8f7a8a7a ,0xb9761e06 , +0x8f768a76 ,0x807a767a , +0x807aff7a ,0x00000200 , +0x807aff7a ,0x00000080 ,0xbef603ff ,0x01000000 ,0xd7650000 ,0x000100c1 ,0xd7660000 ,0x000200c1 , -0x16000084 ,0x877c8172 , -0xbf06817c ,0xbefc0380 , -0xbf85000a ,0x807cff7c , -0x00000080 ,0x807aff7a , -0x00000080 ,0xd5250000 , -0x0001ff00 ,0x00000080 , -0xbf0a717c ,0xbf85fff7 , -0xbf820009 ,0x807cff7c , -0x00000100 ,0x807aff7a , -0x00000100 ,0xd5250000 , -0x0001ff00 ,0x00000100 , -0xbf0a717c ,0xbf85fff7 , -0x877c8172 ,0xbf06817c , -0xbf850003 ,0x8f7687ff , -0x0000006a ,0xbf820002 , -0x8f7688ff ,0x0000006a , -0xbef603ff ,0x01000000 , -0x877c8172 ,0xbf06817c , -0xbefc0380 ,0xbf800000 , -0xbf85000b ,0xbe802e00 , -0x7e000200 ,0xe0704000 , -0x7a5d0000 ,0x807aff7a , -0x00000080 ,0x807c817c , -0xbf0aff7c ,0x0000006a , -0xbf85fff6 ,0xbf82000a , -0xbe802e00 ,0x7e000200 , -0xe0704000 ,0x7a5d0000 , -0x807aff7a ,0x00000100 , -0x807c817c ,0xbf0aff7c , -0x0000006a ,0xbf85fff6 , -0xbef60384 ,0xbef603ff , -0x01000000 ,0x877c8172 , -0xbf06817c ,0xbf850030 , -0x7e00027b ,0xe0704000 , -0x7a5d0000 ,0x807aff7a , -0x00000080 ,0x7e00026c , -0xe0704000 ,0x7a5d0000 , -0x807aff7a ,0x00000080 , -0x7e00026d ,0xe0704000 , -0x7a5d0000 ,0x807aff7a , -0x00000080 ,0x7e00026e , -0xe0704000 ,0x7a5d0000 , -0x807aff7a ,0x00000080 , -0x7e00026f ,0xe0704000 , -0x7a5d0000 ,0x807aff7a , -0x00000080 ,0x7e000270 , +0x16000084 ,0x907c9973 , +0x877c817c ,0xbf06817c , +0xbefc0380 ,0xbf850012 , +0xbe8303ff ,0x00000080 , +0xbf800000 ,0xbf800000 , +0xbf800000 ,0xd8d80000 , +0x01000000 ,0xbf8c0000 , +0xe0704000 ,0x7a5d0100 , +0x807c037c ,0x807a037a , +0xd5250000 ,0x0001ff00 , +0x00000080 ,0xbf0a717c , +0xbf85fff4 ,0xbf820011 , +0xbe8303ff ,0x00000100 , +0xbf800000 ,0xbf800000 , +0xbf800000 ,0xd8d80000 , +0x01000000 ,0xbf8c0000 , +0xe0704000 ,0x7a5d0100 , +0x807c037c ,0x807a037a , +0xd5250000 ,0x0001ff00 , +0x00000100 ,0xbf0a717c , +0xbf85fff4 ,0xbefe03c1 , +0x907c9973 ,0x877c817c , +0xbf06817c ,0xbf850004 , +0xbefa03ff ,0x00000200 , +0xbeff0380 ,0xbf820003 , +0xbefa03ff ,0x00000400 , +0xbeff03c1 ,0xb9712a05 , +0x80718171 ,0x8f718271 , +0x907c9973 ,0x877c817c , +0xbf06817c ,0xbf850018 , +0x8f768771 ,0xbef603ff , +0x01000000 ,0xbefc0384 , +0xbf0a717c ,0xbf840038 , +0x7e008700 ,0x7e028701 , +0x7e048702 ,0x7e068703 ,0xe0704000 ,0x7a5d0000 , -0x807aff7a ,0x00000080 , -0xb971f803 ,0x7e000271 , +0xe0704080 ,0x7a5d0100 , +0xe0704100 ,0x7a5d0200 , +0xe0704180 ,0x7a5d0300 , +0x807c847c ,0x807aff7a , +0x00000200 ,0xbf0a717c , +0xbf85ffef ,0xbf820026 , +0x8f768871 ,0xbef603ff , +0x01000000 ,0xbefc0384 , +0xbf0a717c ,0xbf840020 , +0x7e008700 ,0x7e028701 , +0x7e048702 ,0x7e068703 ,0xe0704000 ,0x7a5d0000 , +0xe0704100 ,0x7a5d0100 , +0xe0704200 ,0x7a5d0200 , +0xe0704300 ,0x7a5d0300 , +0x807c847c ,0x807aff7a , +0x00000400 ,0xbf0a717c , +0xbf85ffef ,0xb9711e06 , +0x8771c171 ,0xbf84000c , +0x8f718371 ,0x80717c71 , +0xbefe03c1 ,0xbeff0380 , +0x7e008700 ,0xe0704000 , +0x7a5d0000 ,0x807c817c ,0x807aff7a ,0x00000080 , -0x7e000273 ,0xe0704000 , -0x7a5d0000 ,0x807aff7a , -0x00000080 ,0xb97bf801 , -0x7e00027b ,0xe0704000 , -0x7a5d0000 ,0x807aff7a , -0x00000080 ,0xbf82002f , -0x7e00027b ,0xe0704000 , -0x7a5d0000 ,0x807aff7a , -0x00000100 ,0x7e00026c , -0xe0704000 ,0x7a5d0000 , -0x807aff7a ,0x00000100 , -0x7e00026d ,0xe0704000 , -0x7a5d0000 ,0x807aff7a , -0x00000100 ,0x7e00026e , -0xe0704000 ,0x7a5d0000 , -0x807aff7a ,0x00000100 , -0x7e00026f ,0xe0704000 , -0x7a5d0000 ,0x807aff7a , -0x00000100 ,0x7e000270 , -0xe0704000 ,0x7a5d0000 , -0x807aff7a ,0x00000100 , -0xb971f803 ,0x7e000271 , -0xe0704000 ,0x7a5d0000 , -0x807aff7a ,0x00000100 , -0x7e000273 ,0xe0704000 , -0x7a5d0000 ,0x807aff7a , -0x00000100 ,0xb97bf801 , -0x7e00027b ,0xe0704000 , -0x7a5d0000 ,0x807aff7a , -0x00000100 ,0xbf820119 , -0xbef4037e ,0x8775ff7f , -0x0000ffff ,0x8875ff75 , -0x00040000 ,0xbef60380 , -0xbef703ff ,0x00807fac , -0x8772ff7f ,0x08000000 , -0x90728372 ,0x88777277 , -0x8772ff7f ,0x70000000 , -0x90728172 ,0x88777277 , -0xb97902dc ,0x8879797f , -0xbef80380 ,0xbefe03c1 , -0x877c8179 ,0xbf06817c , +0xbf0a717c ,0xbf85fff8 , +0xbf82013d ,0xbef4037e , +0x8775ff7f ,0x0000ffff , +0x8875ff75 ,0x00040000 , +0xbef60380 ,0xbef703ff , +0x10807fac ,0x8772ff7f , +0x08000000 ,0x90728372 , +0x88777277 ,0x8772ff7f , +0x70000000 ,0x90728172 , +0x88777277 ,0xb97302dc , +0x8f739973 ,0x8873737f , +0x8772ff7f ,0x04000000 , +0xbf840036 ,0xbefe03c1 , +0x907c9973 ,0x877c817c , +0xbf06817c ,0xbf850002 , +0xbeff0380 ,0xbf820001 , +0xbeff03c1 ,0xb96f4306 , +0x876fc16f ,0xbf84002b , +0x8f6f866f ,0x8f6f826f , +0xbef6036f ,0xb9782a05 , +0x80788178 ,0x907c9973 , +0x877c817c ,0xbf06817c , +0xbf850002 ,0x8f788978 , +0xbf820001 ,0x8f788a78 , +0xb9721e06 ,0x8f728a72 , +0x80787278 ,0x8078ff78 , +0x00000200 ,0x8078ff78 , +0x00000080 ,0xbef603ff , +0x01000000 ,0x907c9973 , +0x877c817c ,0xbf06817c , +0xbefc0380 ,0xbf850009 , +0xe0310000 ,0x781d0000 , +0x807cff7c ,0x00000080 , +0x8078ff78 ,0x00000080 , +0xbf0a6f7c ,0xbf85fff8 , +0xbf820008 ,0xe0310000 , +0x781d0000 ,0x807cff7c , +0x00000100 ,0x8078ff78 , +0x00000100 ,0xbf0a6f7c , +0xbf85fff8 ,0xbef80380 , +0xbefe03c1 ,0x907c9973 , +0x877c817c ,0xbf06817c ,0xbf850002 ,0xbeff0380 ,0xbf820001 ,0xbeff03c1 ,0xb96f2a05 ,0x806f816f , -0x8f6f826f ,0x877c8179 , -0xbf06817c ,0xbf850013 , -0x8f76876f ,0xbef603ff , -0x01000000 ,0xbef20378 , -0x8078ff78 ,0x00000080 , -0xbefc0381 ,0xe0304000 , -0x785d0000 ,0xbf8c3f70 , -0x7e008500 ,0x807c817c , -0x8078ff78 ,0x00000080 , -0xbf0a6f7c ,0xbf85fff7 , -0xe0304000 ,0x725d0000 , -0xbf820023 ,0x8f76886f , +0x8f6f826f ,0x907c9973 , +0x877c817c ,0xbf06817c , +0xbf850022 ,0x8f76876f ,0xbef603ff ,0x01000000 ,0xbef20378 ,0x8078ff78 , -0x00000100 ,0xbefc0381 , +0x00000200 ,0xbefc0384 ,0xe0304000 ,0x785d0000 , +0xe0304080 ,0x785d0100 , +0xe0304100 ,0x785d0200 , +0xe0304180 ,0x785d0300 ,0xbf8c3f70 ,0x7e008500 , -0x807c817c ,0x8078ff78 , -0x00000100 ,0xbf0a6f7c , -0xbf85fff7 ,0xb96f1e06 , -0x876fc16f ,0xbf84000e , -0x8f6f836f ,0x806f7c6f , -0xbefe03c1 ,0xbeff0380 , -0xe0304000 ,0x785d0000 , -0xbf8c3f70 ,0x7e008500 , -0x807c817c ,0x8078ff78 , -0x00000080 ,0xbf0a6f7c , -0xbf85fff7 ,0xbeff03c1 , +0x7e028501 ,0x7e048502 , +0x7e068503 ,0x807c847c , +0x8078ff78 ,0x00000200 , +0xbf0a6f7c ,0xbf85ffee ,0xe0304000 ,0x725d0000 , -0x8772ff79 ,0x04000000 , -0xbf840020 ,0xbefe03c1 , -0x877c8179 ,0xbf06817c , -0xbf850002 ,0xbeff0380 , -0xbf820001 ,0xbeff03c1 , -0xb96f4306 ,0x876fc16f , -0xbf840016 ,0x8f6f866f , -0x8f6f826f ,0xbef6036f , +0xe0304080 ,0x725d0100 , +0xe0304100 ,0x725d0200 , +0xe0304180 ,0x725d0300 , +0xbf820032 ,0x8f76886f ,0xbef603ff ,0x01000000 , -0x877c8172 ,0xbf06817c , -0xbefc0380 ,0xbf850007 , -0x807cff7c ,0x00000080 , -0x8078ff78 ,0x00000080 , -0xbf0a6f7c ,0xbf85fffa , -0xbf820006 ,0x807cff7c , -0x00000100 ,0x8078ff78 , -0x00000100 ,0xbf0a6f7c , -0xbf85fffa ,0x877c8179 , -0xbf06817c ,0xbf850003 , -0x8f7687ff ,0x0000006a , -0xbf820002 ,0x8f7688ff , -0x0000006a ,0xbef603ff , -0x01000000 ,0x877c8179 , -0xbf06817c ,0xbf850012 , -0xf4211cba ,0xf0000000 , +0xbef20378 ,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 , -0xbefc0381 ,0xf421003a , -0xf0000000 ,0x8078ff78 , -0x00000080 ,0xbf8cc07f , -0xbe803000 ,0xbf800000 , -0x807c817c ,0xbf0aff7c , -0x0000006a ,0xbf85fff5 , -0xbe800372 ,0xbf820011 , -0xf4211cba ,0xf0000000 , -0x8078ff78 ,0x00000100 , -0xbefc0381 ,0xf421003a , -0xf0000000 ,0x8078ff78 , -0x00000100 ,0xbf8cc07f , -0xbe803000 ,0xbf800000 , -0x807c817c ,0xbf0aff7c , -0x0000006a ,0xbf85fff5 , -0xbe800372 ,0xbef60384 , +0xbf0a6f7c ,0xbf85fff7 , +0xbeff03c1 ,0xe0304000 , +0x725d0000 ,0xe0304080 , +0x725d0100 ,0xe0304100 , +0x725d0200 ,0xe0304180 , +0x725d0300 ,0xb9782a05 , +0x80788178 ,0x907c9973 , +0x877c817c ,0xbf06817c , +0xbf850002 ,0x8f788978 , +0xbf820001 ,0x8f788a78 , +0xb9721e06 ,0x8f728a72 , +0x80787278 ,0x8078ff78 , +0x00000200 ,0x80f8ff78 , +0x00000058 ,0x80f88878 , +0x8f7682ff ,0x0000006a , +0xbef603ff ,0x01000000 , +0xbefc03ff ,0x0000006a , +0xf425003a ,0xf0000000 , +0x80f8a078 ,0xbf8cc07f , +0x80fc827c ,0xbf800000 , +0xbe803100 ,0xf42d003a , +0xf0000000 ,0x80f8c078 , +0xbf8cc07f ,0x80fc887c , +0xbf800000 ,0xbe803100 , +0xbe823102 ,0xbe843104 , +0xbe863106 ,0xf431003a , +0xf0000000 ,0x80f8c078 , +0xbf8cc07f ,0x80fc907c , +0xbf800000 ,0xbe803100 , +0xbe823102 ,0xbe843104 , +0xbe863106 ,0xbe883108 , +0xbe8a310a ,0xbe8c310c , +0xbe8e310e ,0xbf06807c , +0xbf84fff0 ,0xb9782a05 , +0x80788178 ,0x907c9973 , +0x877c817c ,0xbf06817c , +0xbf850002 ,0x8f788978 , +0xbf820001 ,0x8f788a78 , +0xb9721e06 ,0x8f728a72 , +0x80787278 ,0x8078ff78 , +0x00000200 ,0xbef60384 ,0xbef603ff ,0x01000000 , -0x877c8179 ,0xbf06817c , -0xbf850025 ,0xf4211bfa , -0xf0000000 ,0x8078ff78 , -0x00000080 ,0xf4211b3a , -0xf0000000 ,0x8078ff78 , -0x00000080 ,0xf4211b7a , -0xf0000000 ,0x8078ff78 , -0x00000080 ,0xf4211eba , -0xf0000000 ,0x8078ff78 , -0x00000080 ,0xf4211efa , -0xf0000000 ,0x8078ff78 , -0x00000080 ,0xf4211c3a , -0xf0000000 ,0x8078ff78 , -0x00000080 ,0xf4211c7a , -0xf0000000 ,0x8078ff78 , -0x00000080 ,0xf4211cfa , -0xf0000000 ,0x8078ff78 , -0x00000080 ,0xf4211e7a , -0xf0000000 ,0x8078ff78 , -0x00000080 ,0xbf820024 ,0xf4211bfa ,0xf0000000 , -0x8078ff78 ,0x00000100 , -0xf4211b3a ,0xf0000000 , -0x8078ff78 ,0x00000100 , +0x80788478 ,0xf4211b3a , +0xf0000000 ,0x80788478 ,0xf4211b7a ,0xf0000000 , -0x8078ff78 ,0x00000100 , -0xf4211eba ,0xf0000000 , -0x8078ff78 ,0x00000100 , +0x80788478 ,0xf4211eba , +0xf0000000 ,0x80788478 ,0xf4211efa ,0xf0000000 , -0x8078ff78 ,0x00000100 , -0xf4211c3a ,0xf0000000 , -0x8078ff78 ,0x00000100 , +0x80788478 ,0xf4211c3a , +0xf0000000 ,0x80788478 ,0xf4211c7a ,0xf0000000 , -0x8078ff78 ,0x00000100 , +0x80788478 ,0xf4211e7a , +0xf0000000 ,0x80788478 ,0xf4211cfa ,0xf0000000 , -0x8078ff78 ,0x00000100 , -0xf4211e7a ,0xf0000000 , -0x8078ff78 ,0x00000100 , -0xbf8cc07f ,0x876dff6d , +0x80788478 ,0xbf8cc07f , +0xbef2036d ,0x876dff72 ,0x0000ffff ,0xbefc036f ,0xbefe037a ,0xbeff037b ,0x876f71ff ,0x000003ff , -0xb9ef4803 ,0xb9f3f816 , +0xb9ef4803 ,0xb9f9f816 ,0x876f71ff ,0xfffff800 ,0x906f8b6f ,0xb9efa2c3 , -0xb9f9f801 ,0x876fff6d , -0xf0000000 ,0x906f9c6f , -0x8f6f906f ,0xbef20380 , -0x88726f72 ,0x876fff6d , -0x08000000 ,0x906f9b6f , -0x8f6f8f6f ,0x88726f72 , -0x876fff70 ,0x00800000 , -0x906f976f ,0xb9f2f807 , -0xb9f0f802 ,0xbf8a0000 , -0xbe80226c ,0xbf810000 , +0xb9f3f801 ,0x876fff72 , +0xfc000000 ,0x906f9a6f , +0x8f6f906f ,0xbef30380 , +0x88736f73 ,0x876fff72 , +0x02000000 ,0x906f996f , +0x8f6f8f6f ,0x88736f73 , +0x876fff72 ,0x01000000 , +0x906f986f ,0x8f6f996f , +0x88736f73 ,0x876fff70 , +0x00800000 ,0x906f976f , +0xb9f3f807 ,0x87fe7e7e , +0x87ea6a6a ,0xb9f0f802 , +0xbf8a0000 ,0xbe80226c , +0xbf810000 ,0xbf9f0000 ,0xbf9f0000 ,0xbf9f0000 , 0xbf9f0000, 0xbf9f0000, - 0xbf9f0000, 0x00000000, };static const uint32_t cwsr_trap_arcturus_hex[] = { 0xbf820001, 0xbf8202c4,
drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm +903 -1075
2,008 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1563989255-29050-1-git-send-email-jay.cornwall-5C7GfCeVMHo@public.gmane.org
PATCH 2/2 drm/amdkfd: Remove dead code from gfx8/gfx9 trap handlers
--- .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx8.asm | 395 +-------------------- .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm | 375 +------------------ 2 files changed, 5 insertions(+), 765 deletions(-)
drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx8.asm +3 -392
@@ -24,78 +24,6 @@ * PROJECT=vi ./sp3 cwsr_trap_handler_gfx8.asm -hex tmp.hex */ -/* HW (VI) source code for CWSR trap handler */ -/* Version 18 + multiple trap handler */ - -// this performance-optimal version was originally from Seven Xu at SRDC - -// Revison #18 --... -/* Rev History -** #1. Branch from gc dv. //gfxip/gfx8/main/src/test/suites/block/cs/sr/cs_trap_handler.sp3#1,#50, #51, #52-53(Skip, Already Fixed by PV), #54-56(merged),#57-58(mergerd, skiped-already fixed by PV) -** #4. SR Memory Layout: -** 1. VGPR-SGPR-HWREG-{LDS} -** 2. tba_hi.bits.26 - reconfigured as the first wave in tg bits, for defer Save LDS for a threadgroup.. performance concern.. -** #5. Update: 1. Accurate g8sr_ts_save_d timestamp -** #6. Update: 1. Fix s_barrier usage; 2. VGPR s/r using swizzle buffer?(NoNeed, already matched the swizzle pattern, more investigation) -** #7. Update: 1. don't barrier if noLDS -** #8. Branch: 1. Branch to ver#0, which is very similar to gc dv version -** 2. Fix SQ issue by s_sleep 2 -** #9. Update: 1. Fix scc restore failed issue, restore wave_status at last -** 2. optimize s_buffer save by burst 16sgprs... -** #10. Update 1. Optimize restore sgpr by busrt 16 sgprs. -** #11. Update 1. Add 2 more timestamp for debug version -** #12. Update 1. Add VGPR SR using DWx4, some case improve and some case drop performance -** #13. Integ 1. Always use MUBUF for PV trap shader... -** #14. Update 1. s_buffer_store soft clause... -** #15. Update 1. PERF - sclar write with glc:0/mtype0 to allow L2 combine. perf improvement a lot. -** #16. Update 1. PRRF - UNROLL LDS_DMA got 2500cycle save in IP tree -** #17. Update 1. FUNC - LDS_DMA has issues while ATC, replace with ds_read/buffer_store for save part[TODO restore part] -** 2. PERF - Save LDS before save VGPR to cover LDS save long latency... -** #18. Update 1. FUNC - Implicitly estore STATUS.VCCZ, which is not writable by s_setreg_b32 -** 2. FUNC - Handle non-CWSR traps -*/ - -var G8SR_WDMEM_HWREG_OFFSET = 0 -var G8SR_WDMEM_SGPR_OFFSET = 128 // in bytes - -// Keep definition same as the app shader, These 2 time stamps are part of the app shader... Should before any Save and after restore. - -var G8SR_DEBUG_TIMESTAMP = 0 -var G8SR_DEBUG_TS_SAVE_D_OFFSET = 40*4 // ts_save_d timestamp offset relative to SGPR_SR_memory_offset -var s_g8sr_ts_save_s = s[34:35] // save start -var s_g8sr_ts_sq_save_msg = s[36:37] // The save shader send SAVEWAVE msg to spi -var s_g8sr_ts_spi_wrexec = s[38:39] // the SPI write the sr address to SQ -var s_g8sr_ts_save_d = s[40:41] // save end -var s_g8sr_ts_restore_s = s[42:43] // restore start -var s_g8sr_ts_restore_d = s[44:45] // restore end - -var G8SR_VGPR_SR_IN_DWX4 = 0 -var G8SR_SAVE_BUF_RSRC_WORD1_STRIDE_DWx4 = 0x00100000 // DWx4 stride is 4*4Bytes -var G8SR_RESTORE_BUF_RSRC_WORD1_STRIDE_DWx4 = G8SR_SAVE_BUF_RSRC_WORD1_STRIDE_DWx4 - - -/*************************************************************************/ -/* control on how to run the shader */ -/*************************************************************************/ -//any hack that needs to be made to run this code in EMU (either because various EMU code are not ready or no compute save & restore in EMU run) -var EMU_RUN_HACK = 0 -var EMU_RUN_HACK_RESTORE_NORMAL = 0 -var EMU_RUN_HACK_SAVE_NORMAL_EXIT = 0 -var EMU_RUN_HACK_SAVE_SINGLE_WAVE = 0 -var EMU_RUN_HACK_SAVE_FIRST_TIME = 0 //for interrupted restore in which the first save is through EMU_RUN_HACK -var EMU_RUN_HACK_SAVE_FIRST_TIME_TBA_LO = 0 //for interrupted restore in which the first save is through EMU_RUN_HACK -var EMU_RUN_HACK_SAVE_FIRST_TIME_TBA_HI = 0 //for interrupted restore in which the first save is through EMU_RUN_HACK -var SAVE_LDS = 1 -var WG_BASE_ADDR_LO = 0x9000a000 -var WG_BASE_ADDR_HI = 0x0 -var WAVE_SPACE = 0x5000 //memory size that each wave occupies in workgroup state mem -var CTX_SAVE_CONTROL = 0x0 -var CTX_RESTORE_CONTROL = CTX_SAVE_CONTROL -var SIM_RUN_HACK = 0 //any hack that needs to be made to run this code in SIM (either because various RTL code are not ready or no compute save & restore in RTL run) -var SGPR_SAVE_USE_SQC = 1 //use SQC D$ to do the write -var USE_MTBUF_INSTEAD_OF_MUBUF = 0 //because TC EMU currently asserts on 0 of // overload DFMT field to carry 4 more bits of stride for MUBUF opcodes -var SWIZZLE_EN = 0 //whether we use swizzled buffer addressing - /**************************************************************************/ /* variables */ /**************************************************************************/
@@ -226,16 +154,7 @@ shader main type(CS) - if ((EMU_RUN_HACK) && (!EMU_RUN_HACK_RESTORE_NORMAL)) //hack to use trap_id for determining save/restore - //FIXME VCCZ un-init assertion s_getreg_b32 s_save_status, hwreg(HW_REG_STATUS) //save STATUS since we will change SCC - s_and_b32 s_save_tmp, s_save_pc_hi, 0xffff0000 //change SCC - s_cmp_eq_u32 s_save_tmp, 0x007e0000 //Save: trap_id = 0x7e. Restore: trap_id = 0x7f. - s_cbranch_scc0 L_JUMP_TO_RESTORE //do not need to recover STATUS here since we are going to RESTORE - //FIXME s_setreg_b32 hwreg(HW_REG_STATUS), s_save_status //need to recover STATUS since we are going to SAVE - s_branch L_SKIP_RESTORE //NOT restore, SAVE actually - else s_branch L_SKIP_RESTORE //NOT restore. might be a regular trap or save - end L_JUMP_TO_RESTORE: s_branch L_RESTORE //restore
@@ -249,7 +168,7 @@ L_SKIP_RESTORE: s_cbranch_scc1 L_SAVE //this is the operation for save // ********* Handle non-CWSR traps ******************* -if (!EMU_RUN_HACK) + /* read tba and tma for next level trap handler, ttmp4 is used as s_save_status */ s_load_dwordx4 [ttmp8,ttmp9,ttmp10, ttmp11], [tma_lo,tma_hi], 0 s_waitcnt lgkmcnt(0)
@@ -268,7 +187,7 @@ L_EXCP_CASE: s_and_b32 ttmp1, ttmp1, 0xFFFF set_status_without_spi_prio(s_save_status, ttmp2) //restore HW status(SCC) s_rfe_b64 [ttmp0, ttmp1] -end + // ********* End handling of non-CWSR traps ******************* /**************************************************************************/
@@ -276,12 +195,6 @@ end /**************************************************************************/ L_SAVE: - -if G8SR_DEBUG_TIMESTAMP - s_memrealtime s_g8sr_ts_save_s - s_waitcnt lgkmcnt(0) //FIXME, will cause xnack?? -end - s_mov_b32 s_save_tmp, 0 //clear saveCtx bit s_setreg_b32 hwreg(HW_REG_TRAPSTS, SQ_WAVE_TRAPSTS_SAVECTX_SHIFT, 1), s_save_tmp //clear saveCtx bit
@@ -303,16 +216,7 @@ end s_mov_b32 s_save_exec_hi, exec_hi s_mov_b64 exec, 0x0 //clear EXEC to get ready to receive -if G8SR_DEBUG_TIMESTAMP - s_memrealtime s_g8sr_ts_sq_save_msg - s_waitcnt lgkmcnt(0) -end - - if (EMU_RUN_HACK) - - else s_sendmsg sendmsg(MSG_SAVEWAVE) //send SPI a message and wait for SPI's write to EXEC - end // Set SPI_PRIO=2 to avoid starving instruction fetch in the waves we're waiting for. s_or_b32 s_save_tmp, s_save_status, (2 << SQ_WAVE_STATUS_SPI_PRIO_SHIFT)
@@ -321,36 +225,9 @@ end L_SLEEP: s_sleep 0x2 // sleep 1 (64clk) is not enough for 8 waves per SIMD, which will cause SQ hang, since the 7,8th wave could not get arbit to exec inst, while other waves are stuck into the sleep-loop and waiting for wrexec!=0 - if (EMU_RUN_HACK) - - else s_cbranch_execz L_SLEEP - end - -if G8SR_DEBUG_TIMESTAMP - s_memrealtime s_g8sr_ts_spi_wrexec - s_waitcnt lgkmcnt(0) -end /* setup Resource Contants */ - if ((EMU_RUN_HACK) && (!EMU_RUN_HACK_SAVE_SINGLE_WAVE)) - //calculate wd_addr using absolute thread id - v_readlane_b32 s_save_tmp, v9, 0 - s_lshr_b32 s_save_tmp, s_save_tmp, 6 - s_mul_i32 s_save_tmp, s_save_tmp, WAVE_SPACE - s_add_i32 s_save_spi_init_lo, s_save_tmp, WG_BASE_ADDR_LO - s_mov_b32 s_save_spi_init_hi, WG_BASE_ADDR_HI - s_and_b32 s_save_spi_init_hi, s_save_spi_init_hi, CTX_SAVE_CONTROL - else - end - if ((EMU_RUN_HACK) && (EMU_RUN_HACK_SAVE_SINGLE_WAVE)) - s_add_i32 s_save_spi_init_lo, s_save_tmp, WG_BASE_ADDR_LO - s_mov_b32 s_save_spi_init_hi, WG_BASE_ADDR_HI - s_and_b32 s_save_spi_init_hi, s_save_spi_init_hi, CTX_SAVE_CONTROL - else - end - - s_mov_b32 s_save_buf_rsrc0, s_save_spi_init_lo //base_addr_lo s_and_b32 s_save_buf_rsrc1, s_save_spi_init_hi, 0x0000FFFF //base_addr_hi s_or_b32 s_save_buf_rsrc1, s_save_buf_rsrc1, S_SAVE_BUF_RSRC_WORD1_STRIDE
@@ -383,22 +260,10 @@ end s_mov_b32 s_save_buf_rsrc2, 0x4 //NUM_RECORDS in bytes - if (SWIZZLE_EN) - s_add_u32 s_save_buf_rsrc2, s_save_buf_rsrc2, 0x0 //FIXME need to use swizzle to enable bounds checking? - else s_mov_b32 s_save_buf_rsrc2, 0x1000000 //NUM_RECORDS in bytes - end write_hwreg_to_mem(s_save_m0, s_save_buf_rsrc0, s_save_mem_offset) //M0 - - if ((EMU_RUN_HACK) && (EMU_RUN_HACK_SAVE_FIRST_TIME)) - s_add_u32 s_save_pc_lo, s_save_pc_lo, 4 //pc[31:0]+4 - s_addc_u32 s_save_pc_hi, s_save_pc_hi, 0x0 //carry bit over - s_mov_b32 tba_lo, EMU_RUN_HACK_SAVE_FIRST_TIME_TBA_LO - s_mov_b32 tba_hi, EMU_RUN_HACK_SAVE_FIRST_TIME_TBA_HI - end - write_hwreg_to_mem(s_save_pc_lo, s_save_buf_rsrc0, s_save_mem_offset) //PC write_hwreg_to_mem(s_save_pc_hi, s_save_buf_rsrc0, s_save_mem_offset) write_hwreg_to_mem(s_save_exec_lo, s_save_buf_rsrc0, s_save_mem_offset) //EXEC
@@ -440,18 +305,8 @@ end s_add_u32 s_save_alloc_size, s_save_alloc_size, 1 s_lshl_b32 s_save_alloc_size, s_save_alloc_size, 4 //Number of SGPRs = (sgpr_size + 1) * 16 (non-zero value) - if (SGPR_SAVE_USE_SQC) s_lshl_b32 s_save_buf_rsrc2, s_save_alloc_size, 2 //NUM_RECORDS in bytes - else - s_lshl_b32 s_save_buf_rsrc2, s_save_alloc_size, 8 //NUM_RECORDS in bytes (64 threads) - end - - if (SWIZZLE_EN) - s_add_u32 s_save_buf_rsrc2, s_save_buf_rsrc2, 0x0 //FIXME need to use swizzle to enable bounds checking? - else s_mov_b32 s_save_buf_rsrc2, 0x1000000 //NUM_RECORDS in bytes - end - // backup s_save_buf_rsrc0,1 to s_save_pc_lo/hi, since write_16sgpr_to_mem function will change the rsrc0 //s_mov_b64 s_save_pc_lo, s_save_buf_rsrc0
@@ -490,30 +345,14 @@ end s_mov_b32 exec_lo, 0xFFFFFFFF //need every thread from now on s_mov_b32 exec_hi, 0xFFFFFFFF - if (SWIZZLE_EN) - s_add_u32 s_save_buf_rsrc2, s_save_buf_rsrc2, 0x0 //FIXME need to use swizzle to enable bounds checking? - else s_mov_b32 s_save_buf_rsrc2, 0x1000000 //NUM_RECORDS in bytes - end - // VGPR Allocated in 4-GPR granularity -if G8SR_VGPR_SR_IN_DWX4 - // the const stride for DWx4 is 4*4 bytes - s_and_b32 s_save_buf_rsrc1, s_save_buf_rsrc1, 0x0000FFFF // reset const stride to 0 - s_or_b32 s_save_buf_rsrc1, s_save_buf_rsrc1, G8SR_SAVE_BUF_RSRC_WORD1_STRIDE_DWx4 // const stride to 4*4 bytes - - buffer_store_dwordx4 v0, v0, s_save_buf_rsrc0, s_save_mem_offset slc:1 glc:1 - - s_and_b32 s_save_buf_rsrc1, s_save_buf_rsrc1, 0x0000FFFF // reset const stride to 0 - s_or_b32 s_save_buf_rsrc1, s_save_buf_rsrc1, S_SAVE_BUF_RSRC_WORD1_STRIDE // reset const stride to 4 bytes -else buffer_store_dword v0, v0, s_save_buf_rsrc0, s_save_mem_offset slc:1 glc:1 buffer_store_dword v1, v0, s_save_buf_rsrc0, s_save_mem_offset slc:1 glc:1 offset:256 buffer_store_dword v2, v0, s_save_buf_rsrc0, s_save_mem_offset slc:1 glc:1 offset:256*2 buffer_store_dword v3, v0, s_save_buf_rsrc0, s_save_mem_offset slc:1 glc:1 offset:256*3 -end
@@ -549,64 +388,10 @@ end s_add_u32 s_save_mem_offset, s_save_mem_offset, get_hwreg_size_bytes() - if (SWIZZLE_EN) - s_add_u32 s_save_buf_rsrc2, s_save_buf_rsrc2, 0x0 //FIXME need to use swizzle to enable bounds checking? - else s_mov_b32 s_save_buf_rsrc2, 0x1000000 //NUM_RECORDS in bytes - end - s_mov_b32 m0, 0x0 //lds_offset initial value = 0 -var LDS_DMA_ENABLE = 0 -var UNROLL = 0 -if UNROLL==0 && LDS_DMA_ENABLE==1 - s_mov_b32 s3, 256*2 - s_nop 0 - s_nop 0 - s_nop 0 - L_SAVE_LDS_LOOP: - //TODO: looks the 2 buffer_store/load clause for s/r will hurt performance.??? - if (SAVE_LDS) //SPI always alloc LDS space in 128DW granularity - buffer_store_lds_dword s_save_buf_rsrc0, s_save_mem_offset lds:1 // first 64DW - buffer_store_lds_dword s_save_buf_rsrc0, s_save_mem_offset lds:1 offset:256 // second 64DW - end - - s_add_u32 m0, m0, s3 //every buffer_store_lds does 256 bytes - s_add_u32 s_save_mem_offset, s_save_mem_offset, s3 //mem offset increased by 256 bytes - s_cmp_lt_u32 m0, s_save_alloc_size //scc=(m0 < s_save_alloc_size) ? 1 : 0 - s_cbranch_scc1 L_SAVE_LDS_LOOP //LDS save is complete? - -elsif LDS_DMA_ENABLE==1 && UNROLL==1 // UNROOL , has ichace miss - // store from higest LDS address to lowest - s_mov_b32 s3, 256*2 - s_sub_u32 m0, s_save_alloc_size, s3 - s_add_u32 s_save_mem_offset, s_save_mem_offset, m0 - s_lshr_b32 s_save_alloc_size, s_save_alloc_size, 9 // how many 128 trunks... - s_sub_u32 s_save_alloc_size, 128, s_save_alloc_size // store from higheset addr to lowest - s_mul_i32 s_save_alloc_size, s_save_alloc_size, 6*4 // PC offset increment, each LDS save block cost 6*4 Bytes instruction - s_add_u32 s_save_alloc_size, s_save_alloc_size, 3*4 //2is the below 2 inst...//s_addc and s_setpc - s_nop 0 - s_nop 0 - s_nop 0 //pad 3 dw to let LDS_DMA align with 64Bytes - s_getpc_b64 s[0:1] // reuse s[0:1], since s[0:1] already saved - s_add_u32 s0, s0,s_save_alloc_size - s_addc_u32 s1, s1, 0 - s_setpc_b64 s[0:1] - - - for var i =0; i< 128; i++ - // be careful to make here a 64Byte aligned address, which could improve performance... - buffer_store_lds_dword s_save_buf_rsrc0, s_save_mem_offset lds:1 offset:0 // first 64DW - buffer_store_lds_dword s_save_buf_rsrc0, s_save_mem_offset lds:1 offset:256 // second 64DW - - if i!=127 - s_sub_u32 m0, m0, s3 // use a sgpr to shrink 2DW-inst to 1DW inst to improve performance , i.e. pack more LDS_DMA inst to one Cacheline - s_sub_u32 s_save_mem_offset, s_save_mem_offset, s3 - end - end - -else // BUFFER_STORE v_mbcnt_lo_u32_b32 v2, 0xffffffff, 0x0 v_mbcnt_hi_u32_b32 v3, 0xffffffff, v2 // tid v_mul_i32_i24 v2, v3, 8 // tid*8
@@ -628,8 +413,6 @@ L_SAVE_LDS_LOOP_VECTOR: // restore rsrc3 s_mov_b32 s_save_buf_rsrc3, s0 -end - L_SAVE_LDS_DONE:
@@ -647,44 +430,8 @@ L_SAVE_LDS_DONE: s_add_u32 s_save_alloc_size, s_save_alloc_size, 1 s_lshl_b32 s_save_alloc_size, s_save_alloc_size, 2 //Number of VGPRs = (vgpr_size + 1) * 4 (non-zero value) //FIXME for GFX, zero is possible s_lshl_b32 s_save_buf_rsrc2, s_save_alloc_size, 8 //NUM_RECORDS in bytes (64 threads*4) - if (SWIZZLE_EN) - s_add_u32 s_save_buf_rsrc2, s_save_buf_rsrc2, 0x0 //FIXME need to use swizzle to enable bounds checking? - else s_mov_b32 s_save_buf_rsrc2, 0x1000000 //NUM_RECORDS in bytes - end - - - // VGPR Allocated in 4-GPR granularity - -if G8SR_VGPR_SR_IN_DWX4 - // the const stride for DWx4 is 4*4 bytes - s_and_b32 s_save_buf_rsrc1, s_save_buf_rsrc1, 0x0000FFFF // reset const stride to 0 - s_or_b32 s_save_buf_rsrc1, s_save_buf_rsrc1, G8SR_SAVE_BUF_RSRC_WORD1_STRIDE_DWx4 // const stride to 4*4 bytes - - s_mov_b32 m0, 4 // skip first 4 VGPRs - s_cmp_lt_u32 m0, s_save_alloc_size - s_cbranch_scc0 L_SAVE_VGPR_LOOP_END // no more vgprs - s_set_gpr_idx_on m0, 0x1 // This will change M0 - s_add_u32 s_save_alloc_size, s_save_alloc_size, 0x1000 // because above inst change m0 -L_SAVE_VGPR_LOOP: - v_mov_b32 v0, v0 // v0 = v[0+m0] - v_mov_b32 v1, v1 - v_mov_b32 v2, v2 - v_mov_b32 v3, v3 - - - buffer_store_dwordx4 v0, v0, s_save_buf_rsrc0, s_save_mem_offset slc:1 glc:1 - s_add_u32 m0, m0, 4 - s_add_u32 s_save_mem_offset, s_save_mem_offset, 256*4 - s_cmp_lt_u32 m0, s_save_alloc_size - s_cbranch_scc1 L_SAVE_VGPR_LOOP //VGPR save is complete? - s_set_gpr_idx_off -L_SAVE_VGPR_LOOP_END: - - s_and_b32 s_save_buf_rsrc1, s_save_buf_rsrc1, 0x0000FFFF // reset const stride to 0 - s_or_b32 s_save_buf_rsrc1, s_save_buf_rsrc1, S_SAVE_BUF_RSRC_WORD1_STRIDE // reset const stride to 4 bytes -else // VGPR store using dw burst s_mov_b32 m0, 0x4 //VGPR initial index value =0 s_cmp_lt_u32 m0, s_save_alloc_size
@@ -700,52 +447,18 @@ else v_mov_b32 v2, v2 //v0 = v[0+m0] v_mov_b32 v3, v3 //v0 = v[0+m0] - if(USE_MTBUF_INSTEAD_OF_MUBUF) - tbuffer_store_format_x v0, v0, s_save_buf_rsrc0, s_save_mem_offset format:BUF_NUM_FORMAT_FLOAT format: BUF_DATA_FORMAT_32 slc:1 glc:1 - else buffer_store_dword v0, v0, s_save_buf_rsrc0, s_save_mem_offset slc:1 glc:1 buffer_store_dword v1, v0, s_save_buf_rsrc0, s_save_mem_offset slc:1 glc:1 offset:256 buffer_store_dword v2, v0, s_save_buf_rsrc0, s_save_mem_offset slc:1 glc:1 offset:256*2 buffer_store_dword v3, v0, s_save_buf_rsrc0, s_save_mem_offset slc:1 glc:1 offset:256*3 - end s_add_u32 m0, m0, 4 //next vgpr index s_add_u32 s_save_mem_offset, s_save_mem_offset, 256*4 //every buffer_store_dword does 256 bytes s_cmp_lt_u32 m0, s_save_alloc_size //scc = (m0 < s_save_alloc_size) ? 1 : 0 s_cbranch_scc1 L_SAVE_VGPR_LOOP //VGPR save is complete? s_set_gpr_idx_off -end L_SAVE_VGPR_END: - - - - - - - /* S_PGM_END_SAVED */ //FIXME graphics ONLY - if ((EMU_RUN_HACK) && (!EMU_RUN_HACK_SAVE_NORMAL_EXIT)) - s_and_b32 s_save_pc_hi, s_save_pc_hi, 0x0000ffff //pc[47:32] - s_add_u32 s_save_pc_lo, s_save_pc_lo, 4 //pc[31:0]+4 - s_addc_u32 s_save_pc_hi, s_save_pc_hi, 0x0 //carry bit over - s_rfe_b64 s_save_pc_lo //Return to the main shader program - else - end - -// Save Done timestamp -if G8SR_DEBUG_TIMESTAMP - s_memrealtime s_g8sr_ts_save_d - // SGPR SR memory offset : size(VGPR) - get_vgpr_size_bytes(s_save_mem_offset) - s_add_u32 s_save_mem_offset, s_save_mem_offset, G8SR_DEBUG_TS_SAVE_D_OFFSET - s_waitcnt lgkmcnt(0) //FIXME, will cause xnack?? - // Need reset rsrc2?? - s_mov_b32 m0, s_save_mem_offset - s_mov_b32 s_save_buf_rsrc2, 0x1000000 //NUM_RECORDS in bytes - s_buffer_store_dwordx2 s_g8sr_ts_save_d, s_save_buf_rsrc0, m0 glc:1 -end - - s_branch L_END_PGM
@@ -756,27 +469,6 @@ end L_RESTORE: /* Setup Resource Contants */ - if ((EMU_RUN_HACK) && (!EMU_RUN_HACK_RESTORE_NORMAL)) - //calculate wd_addr using absolute thread id - v_readlane_b32 s_restore_tmp, v9, 0 - s_lshr_b32 s_restore_tmp, s_restore_tmp, 6 - s_mul_i32 s_restore_tmp, s_restore_tmp, WAVE_SPACE - s_add_i32 s_restore_spi_init_lo, s_restore_tmp, WG_BASE_ADDR_LO - s_mov_b32 s_restore_spi_init_hi, WG_BASE_ADDR_HI - s_and_b32 s_restore_spi_init_hi, s_restore_spi_init_hi, CTX_RESTORE_CONTROL - else - end - -if G8SR_DEBUG_TIMESTAMP - s_memrealtime s_g8sr_ts_restore_s - s_waitcnt lgkmcnt(0) //FIXME, will cause xnack?? - // tma_lo/hi are sgpr 110, 111, which will not used for 112 SGPR allocated case... - s_mov_b32 s_restore_pc_lo, s_g8sr_ts_restore_s[0] - s_mov_b32 s_restore_pc_hi, s_g8sr_ts_restore_s[1] //backup ts to ttmp0/1, sicne exec will be finally restored.. -end - - - s_mov_b32 s_restore_buf_rsrc0, s_restore_spi_init_lo //base_addr_lo s_and_b32 s_restore_buf_rsrc1, s_restore_spi_init_hi, 0x0000FFFF //base_addr_hi s_or_b32 s_restore_buf_rsrc1, s_restore_buf_rsrc1, S_RESTORE_BUF_RSRC_WORD1_STRIDE
@@ -818,18 +510,12 @@ end s_add_u32 s_restore_mem_offset, s_restore_mem_offset, get_hwreg_size_bytes() //FIXME, Check if offset overflow??? - if (SWIZZLE_EN) - s_add_u32 s_restore_buf_rsrc2, s_restore_buf_rsrc2, 0x0 //FIXME need to use swizzle to enable bounds checking? - else s_mov_b32 s_restore_buf_rsrc2, 0x1000000 //NUM_RECORDS in bytes - end s_mov_b32 m0, 0x0 //lds_offset initial value = 0 L_RESTORE_LDS_LOOP: - if (SAVE_LDS) buffer_load_dword v0, v0, s_restore_buf_rsrc0, s_restore_mem_offset lds:1 // first 64DW buffer_load_dword v0, v0, s_restore_buf_rsrc0, s_restore_mem_offset lds:1 offset:256 // second 64DW - end s_add_u32 m0, m0, 256*2 // 128 DW s_add_u32 s_restore_mem_offset, s_restore_mem_offset, 256*2 //mem offset increased by 128DW s_cmp_lt_u32 m0, s_restore_alloc_size //scc=(m0 < s_restore_alloc_size) ? 1 : 0
@@ -848,40 +534,8 @@ end s_add_u32 s_restore_alloc_size, s_restore_alloc_size, 1 s_lshl_b32 s_restore_alloc_size, s_restore_alloc_size, 2 //Number of VGPRs = (vgpr_size + 1) * 4 (non-zero value) s_lshl_b32 s_restore_buf_rsrc2, s_restore_alloc_size, 8 //NUM_RECORDS in bytes (64 threads*4) - if (SWIZZLE_EN) - s_add_u32 s_restore_buf_rsrc2, s_restore_buf_rsrc2, 0x0 //FIXME need to use swizzle to enable bounds checking? - else s_mov_b32 s_restore_buf_rsrc2, 0x1000000 //NUM_RECORDS in bytes - end - -if G8SR_VGPR_SR_IN_DWX4 - get_vgpr_size_bytes(s_restore_mem_offset) - s_sub_u32 s_restore_mem_offset, s_restore_mem_offset, 256*4 - - // the const stride for DWx4 is 4*4 bytes - s_and_b32 s_restore_buf_rsrc1, s_restore_buf_rsrc1, 0x0000FFFF // reset const stride to 0 - s_or_b32 s_restore_buf_rsrc1, s_restore_buf_rsrc1, G8SR_RESTORE_BUF_RSRC_WORD1_STRIDE_DWx4 // const stride to 4*4 bytes - - s_mov_b32 m0, s_restore_alloc_size - s_set_gpr_idx_on m0, 0x8 // Note.. This will change m0 - -L_RESTORE_VGPR_LOOP: - buffer_load_dwordx4 v0, v0, s_restore_buf_rsrc0, s_restore_mem_offset slc:1 glc:1 - s_waitcnt vmcnt(0) - s_sub_u32 m0, m0, 4 - v_mov_b32 v0, v0 // v[0+m0] = v0 - v_mov_b32 v1, v1 - v_mov_b32 v2, v2 - v_mov_b32 v3, v3 - s_sub_u32 s_restore_mem_offset, s_restore_mem_offset, 256*4 - s_cmp_eq_u32 m0, 0x8000 - s_cbranch_scc0 L_RESTORE_VGPR_LOOP - s_set_gpr_idx_off - - s_and_b32 s_restore_buf_rsrc1, s_restore_buf_rsrc1, 0x0000FFFF // reset const stride to 0 - s_or_b32 s_restore_buf_rsrc1, s_restore_buf_rsrc1, S_RESTORE_BUF_RSRC_WORD1_STRIDE // const stride to 4*4 bytes - -else + // VGPR load using dw burst s_mov_b32 s_restore_mem_offset_save, s_restore_mem_offset // restore start with v1, v0 will be the last s_add_u32 s_restore_mem_offset, s_restore_mem_offset, 256*4
@@ -890,14 +544,10 @@ else s_add_u32 s_restore_alloc_size, s_restore_alloc_size, 0x8000 //add 0x8000 since we compare m0 against it later L_RESTORE_VGPR_LOOP: - if(USE_MTBUF_INSTEAD_OF_MUBUF) - tbuffer_load_format_x v0, v0, s_restore_buf_rsrc0, s_restore_mem_offset format:BUF_NUM_FORMAT_FLOAT format: BUF_DATA_FORMAT_32 slc:1 glc:1 - else buffer_load_dword v0, v0, s_restore_buf_rsrc0, s_restore_mem_offset slc:1 glc:1 buffer_load_dword v1, v0, s_restore_buf_rsrc0, s_restore_mem_offset slc:1 glc:1 offset:256 buffer_load_dword v2, v0, s_restore_buf_rsrc0, s_restore_mem_offset slc:1 glc:1 offset:256*2 buffer_load_dword v3, v0, s_restore_buf_rsrc0, s_restore_mem_offset slc:1 glc:1 offset:256*3 - end s_waitcnt vmcnt(0) //ensure data ready v_mov_b32 v0, v0 //v[0+m0] = v0 v_mov_b32 v1, v1
@@ -909,16 +559,10 @@ else s_cbranch_scc1 L_RESTORE_VGPR_LOOP //VGPR restore (except v0) is complete? s_set_gpr_idx_off /* VGPR restore on v0 */ - if(USE_MTBUF_INSTEAD_OF_MUBUF) - tbuffer_load_format_x v0, v0, s_restore_buf_rsrc0, s_restore_mem_offset_save format:BUF_NUM_FORMAT_FLOAT format: BUF_DATA_FORMAT_32 slc:1 glc:1 - else buffer_load_dword v0, v0, s_restore_buf_rsrc0, s_restore_mem_offset_save slc:1 glc:1 buffer_load_dword v1, v0, s_restore_buf_rsrc0, s_restore_mem_offset_save slc:1 glc:1 offset:256 buffer_load_dword v2, v0, s_restore_buf_rsrc0, s_restore_mem_offset_save slc:1 glc:1 offset:256*2 buffer_load_dword v3, v0, s_restore_buf_rsrc0, s_restore_mem_offset_save slc:1 glc:1 offset:256*3 - end - -end /* restore SGPRs */ //////////////////////////////
@@ -934,16 +578,8 @@ end s_add_u32 s_restore_alloc_size, s_restore_alloc_size, 1 s_lshl_b32 s_restore_alloc_size, s_restore_alloc_size, 4 //Number of SGPRs = (sgpr_size + 1) * 16 (non-zero value) - if (SGPR_SAVE_USE_SQC) s_lshl_b32 s_restore_buf_rsrc2, s_restore_alloc_size, 2 //NUM_RECORDS in bytes - else - s_lshl_b32 s_restore_buf_rsrc2, s_restore_alloc_size, 8 //NUM_RECORDS in bytes (64 threads) - end - if (SWIZZLE_EN) - s_add_u32 s_restore_buf_rsrc2, s_restore_buf_rsrc2, 0x0 //FIXME need to use swizzle to enable bounds checking? - else s_mov_b32 s_restore_buf_rsrc2, 0x1000000 //NUM_RECORDS in bytes - end /* If 112 SGPRs ar allocated, 4 sgprs are not used TBA(108,109),TMA(110,111), However, we are safe to restore these 4 SGPRs anyway, since TBA,TMA will later be restored by HWREG
@@ -972,12 +608,6 @@ end ////////////////////////////// L_RESTORE_HWREG: - -if G8SR_DEBUG_TIMESTAMP - s_mov_b32 s_g8sr_ts_restore_s[0], s_restore_pc_lo - s_mov_b32 s_g8sr_ts_restore_s[1], s_restore_pc_hi -end - // HWREG SR memory offset : size(VGPR)+size(SGPR) get_vgpr_size_bytes(s_restore_mem_offset) get_sgpr_size_bytes(s_restore_tmp)
@@ -985,11 +615,7 @@ end s_mov_b32 s_restore_buf_rsrc2, 0x4 //NUM_RECORDS in bytes - if (SWIZZLE_EN) - s_add_u32 s_restore_buf_rsrc2, s_restore_buf_rsrc2, 0x0 //FIXME need to use swizzle to enable bounds checking? - else s_mov_b32 s_restore_buf_rsrc2, 0x1000000 //NUM_RECORDS in bytes - end read_hwreg_from_mem(s_restore_m0, s_restore_buf_rsrc0, s_restore_mem_offset) //M0 read_hwreg_from_mem(s_restore_pc_lo, s_restore_buf_rsrc0, s_restore_mem_offset) //PC
@@ -1006,16 +632,6 @@ end s_waitcnt lgkmcnt(0) //from now on, it is safe to restore STATUS and IB_STS - //for normal save & restore, the saved PC points to the next inst to execute, no adjustment needs to be made, otherwise: - if ((EMU_RUN_HACK) && (!EMU_RUN_HACK_RESTORE_NORMAL)) - s_add_u32 s_restore_pc_lo, s_restore_pc_lo, 8 //pc[31:0]+8 //two back-to-back s_trap are used (first for save and second for restore) - s_addc_u32 s_restore_pc_hi, s_restore_pc_hi, 0x0 //carry bit over - end - if ((EMU_RUN_HACK) && (EMU_RUN_HACK_RESTORE_NORMAL)) - s_add_u32 s_restore_pc_lo, s_restore_pc_lo, 4 //pc[31:0]+4 // save is hack through s_trap but restore is normal - s_addc_u32 s_restore_pc_hi, s_restore_pc_hi, 0x0 //carry bit over - end - s_mov_b32 m0, s_restore_m0 s_mov_b32 exec_lo, s_restore_exec_lo s_mov_b32 exec_hi, s_restore_exec_hi
@@ -1048,11 +664,6 @@ 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 -if G8SR_DEBUG_TIMESTAMP - s_memrealtime s_g8sr_ts_restore_d - s_waitcnt lgkmcnt(0) -end - // 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
drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm +2 -373
585 lines not on this page · raw message
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1563989255-29050-2-git-send-email-jay.cornwall-5C7GfCeVMHo@public.gmane.org
Deucher, Alexander
Acked-byRe: [PATCH 2/2] drm/amdkfd: Remove dead code from gfx8/gfx9 trap handlers
Series is:
________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Cornwall, Jay <[email protected]>
Sent: Wednesday, July 24, 2019 1:27 PM
To: [email protected] <[email protected]>
Cc: Cornwall, Jay <[email protected]>
Subject: [PATCH 2/2] drm/amdkfd: Remove dead code from gfx8/gfx9 trap handlers
--- .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx8.asm | 395 +-------------------- .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm | 375 +------------------ 2 files changed, 5 insertions(+), 765 deletions(-)
drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx8.asm +3 -392
@@ -24,78 +24,6 @@ * PROJECT=vi ./sp3 cwsr_trap_handler_gfx8.asm -hex tmp.hex */ -/* HW (VI) source code for CWSR trap handler */ -/* Version 18 + multiple trap handler */ - -// this performance-optimal version was originally from Seven Xu at SRDC - -// Revison #18 --... -/* Rev History -** #1. Branch from gc dv. //gfxip/gfx8/main/src/test/suites/block/cs/sr/cs_trap_handler.sp3#1,#50, #51, #52-53(Skip, Already Fixed by PV), #54-56(merged),#57-58(mergerd, skiped-already fixed by PV) -** #4. SR Memory Layout: -** 1. VGPR-SGPR-HWREG-{LDS} -** 2. tba_hi.bits.26 - reconfigured as the first wave in tg bits, for defer Save LDS for a threadgroup.. performance concern.. -** #5. Update: 1. Accurate g8sr_ts_save_d timestamp -** #6. Update: 1. Fix s_barrier usage; 2. VGPR s/r using swizzle buffer?(NoNeed, already matched the swizzle pattern, more investigation) -** #7. Update: 1. don't barrier if noLDS -** #8. Branch: 1. Branch to ver#0, which is very similar to gc dv version -** 2. Fix SQ issue by s_sleep 2 -** #9. Update: 1. Fix scc restore failed issue, restore wave_status at last -** 2. optimize s_buffer save by burst 16sgprs... -** #10. Update 1. Optimize restore sgpr by busrt 16 sgprs. -** #11. Update 1. Add 2 more timestamp for debug version -** #12. Update 1. Add VGPR SR using DWx4, some case improve and some case drop performance -** #13. Integ 1. Always use MUBUF for PV trap shader... -** #14. Update 1. s_buffer_store soft clause... -** #15. Update 1. PERF - sclar write with glc:0/mtype0 to allow L2 combine. perf improvement a lot. -** #16. Update 1. PRRF - UNROLL LDS_DMA got 2500cycle save in IP tree -** #17. Update 1. FUNC - LDS_DMA has issues while ATC, replace with ds_read/buffer_store for save part[TODO restore part] -** 2. PERF - Save LDS before save VGPR to cover LDS save long latency... -** #18. Update 1. FUNC - Implicitly estore STATUS.VCCZ, which is not writable by s_setreg_b32 -** 2. FUNC - Handle non-CWSR traps -*/ - -var G8SR_WDMEM_HWREG_OFFSET = 0 -var G8SR_WDMEM_SGPR_OFFSET = 128 // in bytes - -// Keep definition same as the app shader, These 2 time stamps are part of the app shader... Should before any Save and after restore. - -var G8SR_DEBUG_TIMESTAMP = 0 -var G8SR_DEBUG_TS_SAVE_D_OFFSET = 40*4 // ts_save_d timestamp offset relative to SGPR_SR_memory_offset -var s_g8sr_ts_save_s = s[34:35] // save start -var s_g8sr_ts_sq_save_msg = s[36:37] // The save shader send SAVEWAVE msg to spi -var s_g8sr_ts_spi_wrexec = s[38:39] // the SPI write the sr address to SQ -var s_g8sr_ts_save_d = s[40:41] // save end -var s_g8sr_ts_restore_s = s[42:43] // restore start -var s_g8sr_ts_restore_d = s[44:45] // restore end - -var G8SR_VGPR_SR_IN_DWX4 = 0 -var G8SR_SAVE_BUF_RSRC_WORD1_STRIDE_DWx4 = 0x00100000 // DWx4 stride is 4*4Bytes -var G8SR_RESTORE_BUF_RSRC_WORD1_STRIDE_DWx4 = G8SR_SAVE_BUF_RSRC_WORD1_STRIDE_DWx4 - - -/*************************************************************************/ -/* control on how to run the shader */ -/*************************************************************************/ -//any hack that needs to be made to run this code in EMU (either because various EMU code are not ready or no compute save & restore in EMU run) -var EMU_RUN_HACK = 0 -var EMU_RUN_HACK_RESTORE_NORMAL = 0 -var EMU_RUN_HACK_SAVE_NORMAL_EXIT = 0 -var EMU_RUN_HACK_SAVE_SINGLE_WAVE = 0 -var EMU_RUN_HACK_SAVE_FIRST_TIME = 0 //for interrupted restore in which the first save is through EMU_RUN_HACK -var EMU_RUN_HACK_SAVE_FIRST_TIME_TBA_LO = 0 //for interrupted restore in which the first save is through EMU_RUN_HACK -var EMU_RUN_HACK_SAVE_FIRST_TIME_TBA_HI = 0 //for interrupted restore in which the first save is through EMU_RUN_HACK -var SAVE_LDS = 1 -var WG_BASE_ADDR_LO = 0x9000a000 -var WG_BASE_ADDR_HI = 0x0 -var WAVE_SPACE = 0x5000 //memory size that each wave occupies in workgroup state mem -var CTX_SAVE_CONTROL = 0x0 -var CTX_RESTORE_CONTROL = CTX_SAVE_CONTROL -var SIM_RUN_HACK = 0 //any hack that needs to be made to run this code in SIM (either because various RTL code are not ready or no compute save & restore in RTL run) -var SGPR_SAVE_USE_SQC = 1 //use SQC D$ to do the write -var USE_MTBUF_INSTEAD_OF_MUBUF = 0 //because TC EMU currently asserts on 0 of // overload DFMT field to carry 4 more bits of stride for MUBUF opcodes -var SWIZZLE_EN = 0 //whether we use swizzled buffer addressing - /**************************************************************************/ /* variables */ /**************************************************************************/
@@ -226,16 +154,7 @@ shader main type(CS) - if ((EMU_RUN_HACK) && (!EMU_RUN_HACK_RESTORE_NORMAL)) //hack to use trap_id for determining save/restore - //FIXME VCCZ un-init assertion s_getreg_b32 s_save_status, hwreg(HW_REG_STATUS) //save STATUS since we will change SCC - s_and_b32 s_save_tmp, s_save_pc_hi, 0xffff0000 //change SCC - s_cmp_eq_u32 s_save_tmp, 0x007e0000 //Save: trap_id = 0x7e. Restore: trap_id = 0x7f. - s_cbranch_scc0 L_JUMP_TO_RESTORE //do not need to recover STATUS here since we are going to RESTORE - //FIXME s_setreg_b32 hwreg(HW_REG_STATUS), s_save_status //need to recover STATUS since we are going to SAVE - s_branch L_SKIP_RESTORE //NOT restore, SAVE actually - else s_branch L_SKIP_RESTORE //NOT restore. might be a regular trap or save - end L_JUMP_TO_RESTORE: s_branch L_RESTORE //restore
@@ -249,7 +168,7 @@ L_SKIP_RESTORE: s_cbranch_scc1 L_SAVE //this is the operation for save // ********* Handle non-CWSR traps ******************* -if (!EMU_RUN_HACK) + /* read tba and tma for next level trap handler, ttmp4 is used as s_save_status */ s_load_dwordx4 [ttmp8,ttmp9,ttmp10, ttmp11], [tma_lo,tma_hi], 0 s_waitcnt lgkmcnt(0)
@@ -268,7 +187,7 @@ L_EXCP_CASE: s_and_b32 ttmp1, ttmp1, 0xFFFF set_status_without_spi_prio(s_save_status, ttmp2) //restore HW status(SCC) s_rfe_b64 [ttmp0, ttmp1] -end + // ********* End handling of non-CWSR traps ******************* /**************************************************************************/
@@ -276,12 +195,6 @@ end /**************************************************************************/ L_SAVE: - -if G8SR_DEBUG_TIMESTAMP - s_memrealtime s_g8sr_ts_save_s - s_waitcnt lgkmcnt(0) //FIXME, will cause xnack?? -end - s_mov_b32 s_save_tmp, 0 //clear saveCtx bit s_setreg_b32 hwreg(HW_REG_TRAPSTS, SQ_WAVE_TRAPSTS_SAVECTX_SHIFT, 1), s_save_tmp //clear saveCtx bit
@@ -303,16 +216,7 @@ end s_mov_b32 s_save_exec_hi, exec_hi s_mov_b64 exec, 0x0 //clear EXEC to get ready to receive -if G8SR_DEBUG_TIMESTAMP - s_memrealtime s_g8sr_ts_sq_save_msg - s_waitcnt lgkmcnt(0) -end - - if (EMU_RUN_HACK) - - else s_sendmsg sendmsg(MSG_SAVEWAVE) //send SPI a message and wait for SPI's write to EXEC - end // Set SPI_PRIO=2 to avoid starving instruction fetch in the waves we're waiting for. s_or_b32 s_save_tmp, s_save_status, (2 << SQ_WAVE_STATUS_SPI_PRIO_SHIFT)
@@ -321,36 +225,9 @@ end L_SLEEP: s_sleep 0x2 // sleep 1 (64clk) is not enough for 8 waves per SIMD, which will cause SQ hang, since the 7,8th wave could not get arbit to exec inst, while other waves are stuck into the sleep-loop and waiting for wrexec!=0 - if (EMU_RUN_HACK) - - else s_cbranch_execz L_SLEEP - end - -if G8SR_DEBUG_TIMESTAMP - s_memrealtime s_g8sr_ts_spi_wrexec - s_waitcnt lgkmcnt(0) -end /* setup Resource Contants */ - if ((EMU_RUN_HACK) && (!EMU_RUN_HACK_SAVE_SINGLE_WAVE)) - //calculate wd_addr using absolute thread id - v_readlane_b32 s_save_tmp, v9, 0 - s_lshr_b32 s_save_tmp, s_save_tmp, 6 - s_mul_i32 s_save_tmp, s_save_tmp, WAVE_SPACE - s_add_i32 s_save_spi_init_lo, s_save_tmp, WG_BASE_ADDR_LO - s_mov_b32 s_save_spi_init_hi, WG_BASE_ADDR_HI - s_and_b32 s_save_spi_init_hi, s_save_spi_init_hi, CTX_SAVE_CONTROL - else - end - if ((EMU_RUN_HACK) && (EMU_RUN_HACK_SAVE_SINGLE_WAVE)) - s_add_i32 s_save_spi_init_lo, s_save_tmp, WG_BASE_ADDR_LO - s_mov_b32 s_save_spi_init_hi, WG_BASE_ADDR_HI - s_and_b32 s_save_spi_init_hi, s_save_spi_init_hi, CTX_SAVE_CONTROL - else - end - - s_mov_b32 s_save_buf_rsrc0, s_save_spi_init_lo //base_addr_lo s_and_b32 s_save_buf_rsrc1, s_save_spi_init_hi, 0x0000FFFF //base_addr_hi s_or_b32 s_save_buf_rsrc1, s_save_buf_rsrc1, S_SAVE_BUF_RSRC_WORD1_STRIDE
@@ -383,22 +260,10 @@ end s_mov_b32 s_save_buf_rsrc2, 0x4 //NUM_RECORDS in bytes - if (SWIZZLE_EN) - s_add_u32 s_save_buf_rsrc2, s_save_buf_rsrc2, 0x0 //FIXME need to use swizzle to enable bounds checking? - else s_mov_b32 s_save_buf_rsrc2, 0x1000000 //NUM_RECORDS in bytes - end write_hwreg_to_mem(s_save_m0, s_save_buf_rsrc0, s_save_mem_offset) //M0 - - if ((EMU_RUN_HACK) && (EMU_RUN_HACK_SAVE_FIRST_TIME)) - s_add_u32 s_save_pc_lo, s_save_pc_lo, 4 //pc[31:0]+4 - s_addc_u32 s_save_pc_hi, s_save_pc_hi, 0x0 //carry bit over - s_mov_b32 tba_lo, EMU_RUN_HACK_SAVE_FIRST_TIME_TBA_LO - s_mov_b32 tba_hi, EMU_RUN_HACK_SAVE_FIRST_TIME_TBA_HI - end - write_hwreg_to_mem(s_save_pc_lo, s_save_buf_rsrc0, s_save_mem_offset) //PC write_hwreg_to_mem(s_save_pc_hi, s_save_buf_rsrc0, s_save_mem_offset) write_hwreg_to_mem(s_save_exec_lo, s_save_buf_rsrc0, s_save_mem_offset) //EXEC
@@ -440,18 +305,8 @@ end s_add_u32 s_save_alloc_size, s_save_alloc_size, 1 s_lshl_b32 s_save_alloc_size, s_save_alloc_size, 4 //Number of SGPRs = (sgpr_size + 1) * 16 (non-zero value) - if (SGPR_SAVE_USE_SQC) s_lshl_b32 s_save_buf_rsrc2, s_save_alloc_size, 2 //NUM_RECORDS in bytes - else - s_lshl_b32 s_save_buf_rsrc2, s_save_alloc_size, 8 //NUM_RECORDS in bytes (64 threads) - end - - if (SWIZZLE_EN) - s_add_u32 s_save_buf_rsrc2, s_save_buf_rsrc2, 0x0 //FIXME need to use swizzle to enable bounds checking? - else s_mov_b32 s_save_buf_rsrc2, 0x1000000 //NUM_RECORDS in bytes - end - // backup s_save_buf_rsrc0,1 to s_save_pc_lo/hi, since write_16sgpr_to_mem function will change the rsrc0 //s_mov_b64 s_save_pc_lo, s_save_buf_rsrc0
@@ -490,30 +345,14 @@ end s_mov_b32 exec_lo, 0xFFFFFFFF //need every thread from now on s_mov_b32 exec_hi, 0xFFFFFFFF - if (SWIZZLE_EN) - s_add_u32 s_save_buf_rsrc2, s_save_buf_rsrc2, 0x0 //FIXME need to use swizzle to enable bounds checking? - else s_mov_b32 s_save_buf_rsrc2, 0x1000000 //NUM_RECORDS in bytes - end - // VGPR Allocated in 4-GPR granularity -if G8SR_VGPR_SR_IN_DWX4 - // the const stride for DWx4 is 4*4 bytes - s_and_b32 s_save_buf_rsrc1, s_save_buf_rsrc1, 0x0000FFFF // reset const stride to 0 - s_or_b32 s_save_buf_rsrc1, s_save_buf_rsrc1, G8SR_SAVE_BUF_RSRC_WORD1_STRIDE_DWx4 // const stride to 4*4 bytes - - buffer_store_dwordx4 v0, v0, s_save_buf_rsrc0, s_save_mem_offset slc:1 glc:1 - - s_and_b32 s_save_buf_rsrc1, s_save_buf_rsrc1, 0x0000FFFF // reset const stride to 0 - s_or_b32 s_save_buf_rsrc1, s_save_buf_rsrc1, S_SAVE_BUF_RSRC_WORD1_STRIDE // reset const stride to 4 bytes -else buffer_store_dword v0, v0, s_save_buf_rsrc0, s_save_mem_offset slc:1 glc:1 buffer_store_dword v1, v0, s_save_buf_rsrc0, s_save_mem_offset slc:1 glc:1 offset:256 buffer_store_dword v2, v0, s_save_buf_rsrc0, s_save_mem_offset slc:1 glc:1 offset:256*2 buffer_store_dword v3, v0, s_save_buf_rsrc0, s_save_mem_offset slc:1 glc:1 offset:256*3 -end
@@ -549,64 +388,10 @@ end s_add_u32 s_save_mem_offset, s_save_mem_offset, get_hwreg_size_bytes() - if (SWIZZLE_EN) - s_add_u32 s_save_buf_rsrc2, s_save_buf_rsrc2, 0x0 //FIXME need to use swizzle to enable bounds checking? - else s_mov_b32 s_save_buf_rsrc2, 0x1000000 //NUM_RECORDS in bytes - end - s_mov_b32 m0, 0x0 //lds_offset initial value = 0 -var LDS_DMA_ENABLE = 0 -var UNROLL = 0 -if UNROLL==0 && LDS_DMA_ENABLE==1 - s_mov_b32 s3, 256*2 - s_nop 0 - s_nop 0 - s_nop 0 - L_SAVE_LDS_LOOP: - //TODO: looks the 2 buffer_store/load clause for s/r will hurt performance.??? - if (SAVE_LDS) //SPI always alloc LDS space in 128DW granularity - buffer_store_lds_dword s_save_buf_rsrc0, s_save_mem_offset lds:1 // first 64DW - buffer_store_lds_dword s_save_buf_rsrc0, s_save_mem_offset lds:1 offset:256 // second 64DW - end - - s_add_u32 m0, m0, s3 //every buffer_store_lds does 256 bytes - s_add_u32 s_save_mem_offset, s_save_mem_offset, s3 //mem offset increased by 256 bytes - s_cmp_lt_u32 m0, s_save_alloc_size //scc=(m0 < s_save_alloc_size) ? 1 : 0 - s_cbranch_scc1 L_SAVE_LDS_LOOP //LDS save is complete? - -elsif LDS_DMA_ENABLE==1 && UNROLL==1 // UNROOL , has ichace miss - // store from higest LDS address to lowest - s_mov_b32 s3, 256*2 - s_sub_u32 m0, s_save_alloc_size, s3 - s_add_u32 s_save_mem_offset, s_save_mem_offset, m0 - s_lshr_b32 s_save_alloc_size, s_save_alloc_size, 9 // how many 128 trunks... - s_sub_u32 s_save_alloc_size, 128, s_save_alloc_size // store from higheset addr to lowest - s_mul_i32 s_save_alloc_size, s_save_alloc_size, 6*4 // PC offset increment, each LDS save block cost 6*4 Bytes instruction - s_add_u32 s_save_alloc_size, s_save_alloc_size, 3*4 //2is the below 2 inst...//s_addc and s_setpc - s_nop 0 - s_nop 0 - s_nop 0 //pad 3 dw to let LDS_DMA align with 64Bytes - s_getpc_b64 s[0:1] // reuse s[0:1], since s[0:1] already saved - s_add_u32 s0, s0,s_save_alloc_size - s_addc_u32 s1, s1, 0 - s_setpc_b64 s[0:1] - - - for var i =0; i< 128; i++ - // be careful to make here a 64Byte aligned address, which could improve performance... - buffer_store_lds_dword s_save_buf_rsrc0, s_save_mem_offset lds:1 offset:0 // first 64DW - buffer_store_lds_dword s_save_buf_rsrc0, s_save_mem_offset lds:1 offset:256 // second 64DW - - if i!=127 - s_sub_u32 m0, m0, s3 // use a sgpr to shrink 2DW-inst to 1DW inst to improve performance , i.e. pack more LDS_DMA inst to one Cacheline - s_sub_u32 s_save_mem_offset, s_save_mem_offset, s3 - end - end - -else // BUFFER_STORE v_mbcnt_lo_u32_b32 v2, 0xffffffff, 0x0 v_mbcnt_hi_u32_b32 v3, 0xffffffff, v2 // tid v_mul_i32_i24 v2, v3, 8 // tid*8
@@ -628,8 +413,6 @@ L_SAVE_LDS_LOOP_VECTOR: // restore rsrc3 s_mov_b32 s_save_buf_rsrc3, s0 -end - L_SAVE_LDS_DONE:
@@ -647,44 +430,8 @@ L_SAVE_LDS_DONE: s_add_u32 s_save_alloc_size, s_save_alloc_size, 1 s_lshl_b32 s_save_alloc_size, s_save_alloc_size, 2 //Number of VGPRs = (vgpr_size + 1) * 4 (non-zero value) //FIXME for GFX, zero is possible s_lshl_b32 s_save_buf_rsrc2, s_save_alloc_size, 8 //NUM_RECORDS in bytes (64 threads*4) - if (SWIZZLE_EN) - s_add_u32 s_save_buf_rsrc2, s_save_buf_rsrc2, 0x0 //FIXME need to use swizzle to enable bounds checking? - else s_mov_b32 s_save_buf_rsrc2, 0x1000000 //NUM_RECORDS in bytes - end - - - // VGPR Allocated in 4-GPR granularity - -if G8SR_VGPR_SR_IN_DWX4 - // the const stride for DWx4 is 4*4 bytes - s_and_b32 s_save_buf_rsrc1, s_save_buf_rsrc1, 0x0000FFFF // reset const stride to 0 - s_or_b32 s_save_buf_rsrc1, s_save_buf_rsrc1, G8SR_SAVE_BUF_RSRC_WORD1_STRIDE_DWx4 // const stride to 4*4 bytes - - s_mov_b32 m0, 4 // skip first 4 VGPRs - s_cmp_lt_u32 m0, s_save_alloc_size - s_cbranch_scc0 L_SAVE_VGPR_LOOP_END // no more vgprs - s_set_gpr_idx_on m0, 0x1 // This will change M0 - s_add_u32 s_save_alloc_size, s_save_alloc_size, 0x1000 // because above inst change m0 -L_SAVE_VGPR_LOOP: - v_mov_b32 v0, v0 // v0 = v[0+m0] - v_mov_b32 v1, v1 - v_mov_b32 v2, v2 - v_mov_b32 v3, v3 - - - buffer_store_dwordx4 v0, v0, s_save_buf_rsrc0, s_save_mem_offset slc:1 glc:1 - s_add_u32 m0, m0, 4 - s_add_u32 s_save_mem_offset, s_save_mem_offset, 256*4 - s_cmp_lt_u32 m0, s_save_alloc_size - s_cbranch_scc1 L_SAVE_VGPR_LOOP //VGPR save is complete? - s_set_gpr_idx_off -L_SAVE_VGPR_LOOP_END: - - s_and_b32 s_save_buf_rsrc1, s_save_buf_rsrc1, 0x0000FFFF // reset const stride to 0 - s_or_b32 s_save_buf_rsrc1, s_save_buf_rsrc1, S_SAVE_BUF_RSRC_WORD1_STRIDE // reset const stride to 4 bytes -else // VGPR store using dw burst s_mov_b32 m0, 0x4 //VGPR initial index value =0 s_cmp_lt_u32 m0, s_save_alloc_size
@@ -700,52 +447,18 @@ else v_mov_b32 v2, v2 //v0 = v[0+m0] v_mov_b32 v3, v3 //v0 = v[0+m0] - if(USE_MTBUF_INSTEAD_OF_MUBUF) - tbuffer_store_format_x v0, v0, s_save_buf_rsrc0, s_save_mem_offset format:BUF_NUM_FORMAT_FLOAT format: BUF_DATA_FORMAT_32 slc:1 glc:1 - else buffer_store_dword v0, v0, s_save_buf_rsrc0, s_save_mem_offset slc:1 glc:1 buffer_store_dword v1, v0, s_save_buf_rsrc0, s_save_mem_offset slc:1 glc:1 offset:256 buffer_store_dword v2, v0, s_save_buf_rsrc0, s_save_mem_offset slc:1 glc:1 offset:256*2 buffer_store_dword v3, v0, s_save_buf_rsrc0, s_save_mem_offset slc:1 glc:1 offset:256*3 - end s_add_u32 m0, m0, 4 //next vgpr index s_add_u32 s_save_mem_offset, s_save_mem_offset, 256*4 //every buffer_store_dword does 256 bytes s_cmp_lt_u32 m0, s_save_alloc_size //scc = (m0 < s_save_alloc_size) ? 1 : 0 s_cbranch_scc1 L_SAVE_VGPR_LOOP //VGPR save is complete? s_set_gpr_idx_off -end L_SAVE_VGPR_END: - - - - - - - /* S_PGM_END_SAVED */ //FIXME graphics ONLY - if ((EMU_RUN_HACK) && (!EMU_RUN_HACK_SAVE_NORMAL_EXIT)) - s_and_b32 s_save_pc_hi, s_save_pc_hi, 0x0000ffff //pc[47:32] - s_add_u32 s_save_pc_lo, s_save_pc_lo, 4 //pc[31:0]+4 - s_addc_u32 s_save_pc_hi, s_save_pc_hi, 0x0 //carry bit over - s_rfe_b64 s_save_pc_lo //Return to the main shader program - else - end - -// Save Done timestamp -if G8SR_DEBUG_TIMESTAMP - s_memrealtime s_g8sr_ts_save_d - // SGPR SR memory offset : size(VGPR) - get_vgpr_size_bytes(s_save_mem_offset) - s_add_u32 s_save_mem_offset, s_save_mem_offset, G8SR_DEBUG_TS_SAVE_D_OFFSET - s_waitcnt lgkmcnt(0) //FIXME, will cause xnack?? - // Need reset rsrc2?? - s_mov_b32 m0, s_save_mem_offset - s_mov_b32 s_save_buf_rsrc2, 0x1000000 //NUM_RECORDS in bytes - s_buffer_store_dwordx2 s_g8sr_ts_save_d, s_save_buf_rsrc0, m0 glc:1 -end - - s_branch L_END_PGM
@@ -756,27 +469,6 @@ end L_RESTORE: /* Setup Resource Contants */ - if ((EMU_RUN_HACK) && (!EMU_RUN_HACK_RESTORE_NORMAL)) - //calculate wd_addr using absolute thread id - v_readlane_b32 s_restore_tmp, v9, 0 - s_lshr_b32 s_restore_tmp, s_restore_tmp, 6 - s_mul_i32 s_restore_tmp, s_restore_tmp, WAVE_SPACE - s_add_i32 s_restore_spi_init_lo, s_restore_tmp, WG_BASE_ADDR_LO - s_mov_b32 s_restore_spi_init_hi, WG_BASE_ADDR_HI - s_and_b32 s_restore_spi_init_hi, s_restore_spi_init_hi, CTX_RESTORE_CONTROL - else - end - -if G8SR_DEBUG_TIMESTAMP - s_memrealtime s_g8sr_ts_restore_s - s_waitcnt lgkmcnt(0) //FIXME, will cause xnack?? - // tma_lo/hi are sgpr 110, 111, which will not used for 112 SGPR allocated case... - s_mov_b32 s_restore_pc_lo, s_g8sr_ts_restore_s[0] - s_mov_b32 s_restore_pc_hi, s_g8sr_ts_restore_s[1] //backup ts to ttmp0/1, sicne exec will be finally restored.. -end - - - s_mov_b32 s_restore_buf_rsrc0, s_restore_spi_init_lo //base_addr_lo s_and_b32 s_restore_buf_rsrc1, s_restore_spi_init_hi, 0x0000FFFF //base_addr_hi s_or_b32 s_restore_buf_rsrc1, s_restore_buf_rsrc1, S_RESTORE_BUF_RSRC_WORD1_STRIDE
@@ -818,18 +510,12 @@ end s_add_u32 s_restore_mem_offset, s_restore_mem_offset, get_hwreg_size_bytes() //FIXME, Check if offset overflow??? - if (SWIZZLE_EN) - s_add_u32 s_restore_buf_rsrc2, s_restore_buf_rsrc2, 0x0 //FIXME need to use swizzle to enable bounds checking? - else s_mov_b32 s_restore_buf_rsrc2, 0x1000000 //NUM_RECORDS in bytes - end s_mov_b32 m0, 0x0 //lds_offset initial value = 0 L_RESTORE_LDS_LOOP: - if (SAVE_LDS) buffer_load_dword v0, v0, s_restore_buf_rsrc0, s_restore_mem_offset lds:1 // first 64DW buffer_load_dword v0, v0, s_restore_buf_rsrc0, s_restore_mem_offset lds:1 offset:256 // second 64DW - end s_add_u32 m0, m0, 256*2 // 128 DW s_add_u32 s_restore_mem_offset, s_restore_mem_offset, 256*2 //mem offset increased by 128DW s_cmp_lt_u32 m0, s_restore_alloc_size //scc=(m0 < s_restore_alloc_size) ? 1 : 0
@@ -848,40 +534,8 @@ end s_add_u32 s_restore_alloc_size, s_restore_alloc_size, 1 s_lshl_b32 s_restore_alloc_size, s_restore_alloc_size, 2 //Number of VGPRs = (vgpr_size + 1) * 4 (non-zero value) s_lshl_b32 s_restore_buf_rsrc2, s_restore_alloc_size, 8 //NUM_RECORDS in bytes (64 threads*4) - if (SWIZZLE_EN) - s_add_u32 s_restore_buf_rsrc2, s_restore_buf_rsrc2, 0x0 //FIXME need to use swizzle to enable bounds checking? - else s_mov_b32 s_restore_buf_rsrc2, 0x1000000 //NUM_RECORDS in bytes - end - -if G8SR_VGPR_SR_IN_DWX4 - get_vgpr_size_bytes(s_restore_mem_offset) - s_sub_u32 s_restore_mem_offset, s_restore_mem_offset, 256*4 - - // the const stride for DWx4 is 4*4 bytes - s_and_b32 s_restore_buf_rsrc1, s_restore_buf_rsrc1, 0x0000FFFF // reset const stride to 0 - s_or_b32 s_restore_buf_rsrc1, s_restore_buf_rsrc1, G8SR_RESTORE_BUF_RSRC_WORD1_STRIDE_DWx4 // const stride to 4*4 bytes - - s_mov_b32 m0, s_restore_alloc_size - s_set_gpr_idx_on m0, 0x8 // Note.. This will change m0 - -L_RESTORE_VGPR_LOOP: - buffer_load_dwordx4 v0, v0, s_restore_buf_rsrc0, s_restore_mem_offset slc:1 glc:1 - s_waitcnt vmcnt(0) - s_sub_u32 m0, m0, 4 - v_mov_b32 v0, v0 // v[0+m0] = v0 - v_mov_b32 v1, v1 - v_mov_b32 v2, v2 - v_mov_b32 v3, v3 - s_sub_u32 s_restore_mem_offset, s_restore_mem_offset, 256*4 - s_cmp_eq_u32 m0, 0x8000 - s_cbranch_scc0 L_RESTORE_VGPR_LOOP - s_set_gpr_idx_off - - s_and_b32 s_restore_buf_rsrc1, s_restore_buf_rsrc1, 0x0000FFFF // reset const stride to 0 - s_or_b32 s_restore_buf_rsrc1, s_restore_buf_rsrc1, S_RESTORE_BUF_RSRC_WORD1_STRIDE // const stride to 4*4 bytes - -else + // VGPR load using dw burst s_mov_b32 s_restore_mem_offset_save, s_restore_mem_offset // restore start with v1, v0 will be the last s_add_u32 s_restore_mem_offset, s_restore_mem_offset, 256*4
@@ -890,14 +544,10 @@ else s_add_u32 s_restore_alloc_size, s_restore_alloc_size, 0x8000 //add 0x8000 since we compare m0 against it later L_RESTORE_VGPR_LOOP: - if(USE_MTBUF_INSTEAD_OF_MUBUF) - tbuffer_load_format_x v0, v0, s_restore_buf_rsrc0, s_restore_mem_offset format:BUF_NUM_FORMAT_FLOAT format: BUF_DATA_FORMAT_32 slc:1 glc:1 - else buffer_load_dword v0, v0, s_restore_buf_rsrc0, s_restore_mem_offset slc:1 glc:1 buffer_load_dword v1, v0, s_restore_buf_rsrc0, s_restore_mem_offset slc:1 glc:1 offset:256 buffer_load_dword v2, v0, s_restore_buf_rsrc0, s_restore_mem_offset slc:1 glc:1 offset:256*2 buffer_load_dword v3, v0, s_restore_buf_rsrc0, s_restore_mem_offset slc:1 glc:1 offset:256*3 - end s_waitcnt vmcnt(0) //ensure data ready v_mov_b32 v0, v0 //v[0+m0] = v0 v_mov_b32 v1, v1
@@ -909,16 +559,10 @@ else s_cbranch_scc1 L_RESTORE_VGPR_LOOP //VGPR restore (except v0) is complete? s_set_gpr_idx_off /* VGPR restore on v0 */ - if(USE_MTBUF_INSTEAD_OF_MUBUF) - tbuffer_load_format_x v0, v0, s_restore_buf_rsrc0, s_restore_mem_offset_save format:BUF_NUM_FORMAT_FLOAT format: BUF_DATA_FORMAT_32 slc:1 glc:1 - else buffer_load_dword v0, v0, s_restore_buf_rsrc0, s_restore_mem_offset_save slc:1 glc:1 buffer_load_dword v1, v0, s_restore_buf_rsrc0, s_restore_mem_offset_save slc:1 glc:1 offset:256 buffer_load_dword v2, v0, s_restore_buf_rsrc0, s_restore_mem_offset_save slc:1 glc:1 offset:256*2 buffer_load_dword v3, v0, s_restore_buf_rsrc0, s_restore_mem_offset_save slc:1 glc:1 offset:256*3 - end - -end /* restore SGPRs */ //////////////////////////////
@@ -934,16 +578,8 @@ end s_add_u32 s_restore_alloc_size, s_restore_alloc_size, 1 s_lshl_b32 s_restore_alloc_size, s_restore_alloc_size, 4 //Number of SGPRs = (sgpr_size + 1) * 16 (non-zero value) - if (SGPR_SAVE_USE_SQC) s_lshl_b32 s_restore_buf_rsrc2, s_restore_alloc_size, 2 //NUM_RECORDS in bytes - else - s_lshl_b32 s_restore_buf_rsrc2, s_restore_alloc_size, 8 //NUM_RECORDS in bytes (64 threads) - end - if (SWIZZLE_EN) - s_add_u32 s_restore_buf_rsrc2, s_restore_buf_rsrc2, 0x0 //FIXME need to use swizzle to enable bounds checking? - else s_mov_b32 s_restore_buf_rsrc2, 0x1000000 //NUM_RECORDS in bytes - end /* If 112 SGPRs ar allocated, 4 sgprs are not used TBA(108,109),TMA(110,111), However, we are safe to restore these 4 SGPRs anyway, since TBA,TMA will later be restored by HWREG
@@ -972,12 +608,6 @@ end ////////////////////////////// L_RESTORE_HWREG: - -if G8SR_DEBUG_TIMESTAMP - s_mov_b32 s_g8sr_ts_restore_s[0], s_restore_pc_lo - s_mov_b32 s_g8sr_ts_restore_s[1], s_restore_pc_hi -end - // HWREG SR memory offset : size(VGPR)+size(SGPR) get_vgpr_size_bytes(s_restore_mem_offset) get_sgpr_size_bytes(s_restore_tmp)
@@ -985,11 +615,7 @@ end s_mov_b32 s_restore_buf_rsrc2, 0x4 //NUM_RECORDS in bytes - if (SWIZZLE_EN) - s_add_u32 s_restore_buf_rsrc2, s_restore_buf_rsrc2, 0x0 //FIXME need to use swizzle to enable bounds checking? - else s_mov_b32 s_restore_buf_rsrc2, 0x1000000 //NUM_RECORDS in bytes - end read_hwreg_from_mem(s_restore_m0, s_restore_buf_rsrc0, s_restore_mem_offset) //M0 read_hwreg_from_mem(s_restore_pc_lo, s_restore_buf_rsrc0, s_restore_mem_offset) //PC
@@ -1006,16 +632,6 @@ end s_waitcnt lgkmcnt(0) //from now on, it is safe to restore STATUS and IB_STS - //for normal save & restore, the saved PC points to the next inst to execute, no adjustment needs to be made, otherwise: - if ((EMU_RUN_HACK) && (!EMU_RUN_HACK_RESTORE_NORMAL)) - s_add_u32 s_restore_pc_lo, s_restore_pc_lo, 8 //pc[31:0]+8 //two back-to-back s_trap are used (first for save and second for restore) - s_addc_u32 s_restore_pc_hi, s_restore_pc_hi, 0x0 //carry bit over - end - if ((EMU_RUN_HACK) && (EMU_RUN_HACK_RESTORE_NORMAL)) - s_add_u32 s_restore_pc_lo, s_restore_pc_lo, 4 //pc[31:0]+4 // save is hack through s_trap but restore is normal - s_addc_u32 s_restore_pc_hi, s_restore_pc_hi, 0x0 //carry bit over - end - s_mov_b32 m0, s_restore_m0 s_mov_b32 exec_lo, s_restore_exec_lo s_mov_b32 exec_hi, s_restore_exec_hi
@@ -1048,11 +664,6 @@ 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 -if G8SR_DEBUG_TIMESTAMP - s_memrealtime s_g8sr_ts_restore_d - s_waitcnt lgkmcnt(0) -end - // 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
drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx9.asm +2 -373
585 lines not on this page · raw message
--
2.7.4
_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Zeng, Oak
Reviewed-by Oak ZengRegards,
Oak
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Cornwall, Jay
Sent: Wednesday, July 24, 2019 1:28 PM
To: [email protected]
Cc: Zeng, Oak <[email protected]>; Cornwall, Jay <[email protected]>
Subject: [PATCH 1/2] drm/amdkfd: Replace gfx10 trap handler with correct branch
Previously submitted code was taken from an incorrect branch and was non-functional.
--- drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 578 +++--- .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 1978 +++++++++----------- 2 files changed, 1235 insertions(+), 1321 deletions(-)
drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h +332 -246
@@ -680,24 +680,47 @@ static const uint32_t cwsr_trap_gfx9_hex[] = { };static const uint32_t cwsr_trap_gfx10_hex[] = { -0xbf820001 ,0xbf82012e , -0xb0804004 ,0xb970f802 , -0x8a708670 ,0xb971f803 , -0x8771ff71 ,0x00000400 , -0xbf850008 ,0xb971f803 , -0x8771ff71 ,0x000001ff , -0xbf850001 ,0x806c846c , +0xbf820001 ,0xbf8201b7 , +0xb0804004 ,0xb978f802 , +0x8a788678 ,0xb971f803 , +0x876eff71 ,0x00000400 , +0xbf850033 ,0x876eff71 , +0x00000100 ,0xbf840002 , +0x8878ff78 ,0x00002000 , +0x8a77ff77 ,0xff000000 , +0xb96ef807 ,0x876fff6e , +0x02000000 ,0x8f6f866f , +0x88776f77 ,0x876fff6e , +0x003f8000 ,0x8f6f896f , +0x88776f77 ,0x8a6eff6e , +0x023f8000 ,0xb9eef807 , +0xb970f812 ,0xb971f813 , +0x8ff08870 ,0xf4051bb8 , +0xfa000000 ,0xbf8cc07f , +0xf4051c38 ,0xfa000008 , +0xbf8cc07f ,0x87ee6e6e , +0xbf840001 ,0xbe80206e , +0xb971f803 ,0x8771ff71 , +0x000001ff ,0xbf850002 , +0x806c846c ,0x826d806d , +0x876dff6d ,0x0000ffff , +0x906e8977 ,0x876fff6e , +0x003f8000 ,0x906e8677 , +0x876eff6e ,0x02000000 , +0x886e6f6e ,0xb9eef807 , +0x87fe7e7e ,0x87ea6a6a , +0xb9f8f802 ,0xbe80226c , +0xb971f803 ,0x8771ff71 , +0x00000100 ,0xbf840006 , +0xbef60380 ,0xb9f60203 ,0x876dff6d ,0x0000ffff , -0xbe80226c ,0xb971f803 , -0x8771ff71 ,0x00000100 , -0xbf840006 ,0xbef60380 , -0xb9f60203 ,0x876dff6d , -0x0000ffff ,0x80ec886c , -0x82ed806d ,0xbef60380 , -0xb9f60283 ,0xb973f816 , -0xb9762c07 ,0x8f769c76 , -0x886d766d ,0xb97603c7 , -0x8f769b76 ,0x886d766d , +0x80ec886c ,0x82ed806d , +0xbef60380 ,0xb9f60283 , +0xb972f816 ,0xb9762c07 , +0x8f769a76 ,0x886d766d , +0xb97603c7 ,0x8f769976 , +0x886d766d ,0xb9760647 , +0x8f769876 ,0x886d766d ,0xb976f807 ,0x8776ff76 ,0x00007fff ,0xb9f6f807 ,0xbeee037e ,0xbeef037f ,
@@ -706,276 +729,339 @@ static const uint32_t cwsr_trap_gfx10_hex[] = {0xbef4037e ,0x8775ff7f ,0x0000ffff ,0x8875ff75 ,0x00040000 ,0xbef60380 , -0xbef703ff ,0x00807fac , +0xbef703ff ,0x10807fac ,0x8776ff7f ,0x08000000 ,0x90768376 ,0x88777677 ,0x8776ff7f ,0x70000000 ,0x90768176 ,0x88777677 ,0xbefb037c ,0xbefa0380 , -0xb97202dc ,0x8872727f , -0xbefe03c1 ,0x877c8172 , +0xb97302dc ,0x8f739973 , +0x8873737f ,0xb97a2a05 , +0x807a817a ,0x907c9973 , +0x877c817c ,0xbf06817c , +0xbf850002 ,0x8f7a897a , +0xbf820001 ,0x8f7a8a7a , +0xb9761e06 ,0x8f768a76 , +0x807a767a ,0x807aff7a , +0x00000200 ,0xbef60384 , +0xbef603ff ,0x01000000 , +0xbefe037c ,0xbefc037a , +0xf4611efa ,0xf8000000 , +0x807a847a ,0xbefc037e , +0xbefe037c ,0xbefc037a , +0xf4611b3a ,0xf8000000 , +0x807a847a ,0xbefc037e , +0xbefe037c ,0xbefc037a , +0xf4611b7a ,0xf8000000 , +0x807a847a ,0xbefc037e , +0xbefe037c ,0xbefc037a , +0xf4611bba ,0xf8000000 , +0x807a847a ,0xbefc037e , +0xbefe037c ,0xbefc037a , +0xf4611bfa ,0xf8000000 , +0x807a847a ,0xbefc037e , +0xbefe037c ,0xbefc037a , +0xf4611e3a ,0xf8000000 , +0x807a847a ,0xbefc037e , +0xb971f803 ,0xbefe037c , +0xbefc037a ,0xf4611c7a , +0xf8000000 ,0x807a847a , +0xbefc037e ,0xbefe037c , +0xbefc037a ,0xf4611cba , +0xf8000000 ,0x807a847a , +0xbefc037e ,0xb97bf801 , +0xbefe037c ,0xbefc037a , +0xf4611efa ,0xf8000000 , +0x807a847a ,0xbefc037e , +0x8776ff7f ,0x04000000 , +0xbeef0380 ,0x886f6f76 , +0xb97a2a05 ,0x807a817a , +0x907c9973 ,0x877c817c ,0xbf06817c ,0xbf850002 , -0xbeff0380 ,0xbf820001 , -0xbeff03c1 ,0xb9712a05 , -0x80718171 ,0x8f718271 , -0x877c8172 ,0xbf06817c , -0xbf85000d ,0x8f768771 , +0x8f7a897a ,0xbf820001 , +0x8f7a8a7a ,0xb9761e06 , +0x8f768a76 ,0x807a767a , +0x8f7682ff ,0x0000006a , +0xbef603ff ,0x01000000 , +0xbef20374 ,0x80747a74 , +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 , +0xf469003a ,0xfa000000 , +0xf469013a ,0xfa000010 , +0xf465023a ,0xfa000020 , +0x8074c074 ,0x82758075 , +0xbef40372 ,0xbefa0380 , +0xbefe03c1 ,0x907c9973 , +0x877c817c ,0xbf06817c , +0xbf850002 ,0xbeff0380 , +0xbf820002 ,0xbeff03c1 , +0xbf82000b ,0xbef603ff , +0x01000000 ,0xe0704000 , +0x7a5d0000 ,0xe0704080 , +0x7a5d0100 ,0xe0704100 , +0x7a5d0200 ,0xe0704180 , +0x7a5d0300 ,0xbf82000a ,0xbef603ff ,0x01000000 , -0xbefc0380 ,0x7e008700 , -0xe0704000 ,0x7a5d0000 , -0x807c817c ,0x807aff7a , -0x00000080 ,0xbf0a717c , -0xbf85fff8 ,0xbf82001b , -0x8f768871 ,0xbef603ff , -0x01000000 ,0xbefc0380 , -0x7e008700 ,0xe0704000 , -0x7a5d0000 ,0x807c817c , -0x807aff7a ,0x00000100 , -0xbf0a717c ,0xbf85fff8 , -0xb9711e06 ,0x8771c171 , -0xbf84000c ,0x8f718371 , -0x80717c71 ,0xbefe03c1 , -0xbeff0380 ,0x7e008700 ,0xe0704000 ,0x7a5d0000 , -0x807c817c ,0x807aff7a , -0x00000080 ,0xbf0a717c , -0xbf85fff8 ,0xbf8a0000 , -0x8776ff72 ,0x04000000 , -0xbf84002b ,0xbefe03c1 , -0x877c8172 ,0xbf06817c , +0xe0704100 ,0x7a5d0100 , +0xe0704200 ,0x7a5d0200 , +0xe0704300 ,0x7a5d0300 , +0xbefe03c1 ,0x907c9973 , +0x877c817c ,0xbf06817c ,0xbf850002 ,0xbeff0380 ,0xbf820001 ,0xbeff03c1 ,0xb9714306 ,0x8771c171 , -0xbf840021 ,0x8f718671 , +0xbf840046 ,0xbf8a0000 , +0x8776ff6f ,0x04000000 , +0xbf840042 ,0x8f718671 ,0x8f718271 ,0xbef60371 , +0xb97a2a05 ,0x807a817a , +0x907c9973 ,0x877c817c , +0xbf06817c ,0xbf850002 , +0x8f7a897a ,0xbf820001 , +0x8f7a8a7a ,0xb9761e06 , +0x8f768a76 ,0x807a767a , +0x807aff7a ,0x00000200 , +0x807aff7a ,0x00000080 ,0xbef603ff ,0x01000000 ,0xd7650000 ,0x000100c1 ,0xd7660000 ,0x000200c1 , -0x16000084 ,0x877c8172 , -0xbf06817c ,0xbefc0380 , -0xbf85000a ,0x807cff7c , -0x00000080 ,0x807aff7a , -0x00000080 ,0xd5250000 , -0x0001ff00 ,0x00000080 , -0xbf0a717c ,0xbf85fff7 , -0xbf820009 ,0x807cff7c , -0x00000100 ,0x807aff7a , -0x00000100 ,0xd5250000 , -0x0001ff00 ,0x00000100 , -0xbf0a717c ,0xbf85fff7 , -0x877c8172 ,0xbf06817c , -0xbf850003 ,0x8f7687ff , -0x0000006a ,0xbf820002 , -0x8f7688ff ,0x0000006a , -0xbef603ff ,0x01000000 , -0x877c8172 ,0xbf06817c , -0xbefc0380 ,0xbf800000 , -0xbf85000b ,0xbe802e00 , -0x7e000200 ,0xe0704000 , -0x7a5d0000 ,0x807aff7a , -0x00000080 ,0x807c817c , -0xbf0aff7c ,0x0000006a , -0xbf85fff6 ,0xbf82000a , -0xbe802e00 ,0x7e000200 , -0xe0704000 ,0x7a5d0000 , -0x807aff7a ,0x00000100 , -0x807c817c ,0xbf0aff7c , -0x0000006a ,0xbf85fff6 , -0xbef60384 ,0xbef603ff , -0x01000000 ,0x877c8172 , -0xbf06817c ,0xbf850030 , -0x7e00027b ,0xe0704000 , -0x7a5d0000 ,0x807aff7a , -0x00000080 ,0x7e00026c , -0xe0704000 ,0x7a5d0000 , -0x807aff7a ,0x00000080 , -0x7e00026d ,0xe0704000 , -0x7a5d0000 ,0x807aff7a , -0x00000080 ,0x7e00026e , -0xe0704000 ,0x7a5d0000 , -0x807aff7a ,0x00000080 , -0x7e00026f ,0xe0704000 , -0x7a5d0000 ,0x807aff7a , -0x00000080 ,0x7e000270 , +0x16000084 ,0x907c9973 , +0x877c817c ,0xbf06817c , +0xbefc0380 ,0xbf850012 , +0xbe8303ff ,0x00000080 , +0xbf800000 ,0xbf800000 , +0xbf800000 ,0xd8d80000 , +0x01000000 ,0xbf8c0000 , +0xe0704000 ,0x7a5d0100 , +0x807c037c ,0x807a037a , +0xd5250000 ,0x0001ff00 , +0x00000080 ,0xbf0a717c , +0xbf85fff4 ,0xbf820011 , +0xbe8303ff ,0x00000100 , +0xbf800000 ,0xbf800000 , +0xbf800000 ,0xd8d80000 , +0x01000000 ,0xbf8c0000 , +0xe0704000 ,0x7a5d0100 , +0x807c037c ,0x807a037a , +0xd5250000 ,0x0001ff00 , +0x00000100 ,0xbf0a717c , +0xbf85fff4 ,0xbefe03c1 , +0x907c9973 ,0x877c817c , +0xbf06817c ,0xbf850004 , +0xbefa03ff ,0x00000200 , +0xbeff0380 ,0xbf820003 , +0xbefa03ff ,0x00000400 , +0xbeff03c1 ,0xb9712a05 , +0x80718171 ,0x8f718271 , +0x907c9973 ,0x877c817c , +0xbf06817c ,0xbf850018 , +0x8f768771 ,0xbef603ff , +0x01000000 ,0xbefc0384 , +0xbf0a717c ,0xbf840038 , +0x7e008700 ,0x7e028701 , +0x7e048702 ,0x7e068703 ,0xe0704000 ,0x7a5d0000 , -0x807aff7a ,0x00000080 , -0xb971f803 ,0x7e000271 , +0xe0704080 ,0x7a5d0100 , +0xe0704100 ,0x7a5d0200 , +0xe0704180 ,0x7a5d0300 , +0x807c847c ,0x807aff7a , +0x00000200 ,0xbf0a717c , +0xbf85ffef ,0xbf820026 , +0x8f768871 ,0xbef603ff , +0x01000000 ,0xbefc0384 , +0xbf0a717c ,0xbf840020 , +0x7e008700 ,0x7e028701 , +0x7e048702 ,0x7e068703 ,0xe0704000 ,0x7a5d0000 , +0xe0704100 ,0x7a5d0100 , +0xe0704200 ,0x7a5d0200 , +0xe0704300 ,0x7a5d0300 , +0x807c847c ,0x807aff7a , +0x00000400 ,0xbf0a717c , +0xbf85ffef ,0xb9711e06 , +0x8771c171 ,0xbf84000c , +0x8f718371 ,0x80717c71 , +0xbefe03c1 ,0xbeff0380 , +0x7e008700 ,0xe0704000 , +0x7a5d0000 ,0x807c817c ,0x807aff7a ,0x00000080 , -0x7e000273 ,0xe0704000 , -0x7a5d0000 ,0x807aff7a , -0x00000080 ,0xb97bf801 , -0x7e00027b ,0xe0704000 , -0x7a5d0000 ,0x807aff7a , -0x00000080 ,0xbf82002f , -0x7e00027b ,0xe0704000 , -0x7a5d0000 ,0x807aff7a , -0x00000100 ,0x7e00026c , -0xe0704000 ,0x7a5d0000 , -0x807aff7a ,0x00000100 , -0x7e00026d ,0xe0704000 , -0x7a5d0000 ,0x807aff7a , -0x00000100 ,0x7e00026e , -0xe0704000 ,0x7a5d0000 , -0x807aff7a ,0x00000100 , -0x7e00026f ,0xe0704000 , -0x7a5d0000 ,0x807aff7a , -0x00000100 ,0x7e000270 , -0xe0704000 ,0x7a5d0000 , -0x807aff7a ,0x00000100 , -0xb971f803 ,0x7e000271 , -0xe0704000 ,0x7a5d0000 , -0x807aff7a ,0x00000100 , -0x7e000273 ,0xe0704000 , -0x7a5d0000 ,0x807aff7a , -0x00000100 ,0xb97bf801 , -0x7e00027b ,0xe0704000 , -0x7a5d0000 ,0x807aff7a , -0x00000100 ,0xbf820119 , -0xbef4037e ,0x8775ff7f , -0x0000ffff ,0x8875ff75 , -0x00040000 ,0xbef60380 , -0xbef703ff ,0x00807fac , -0x8772ff7f ,0x08000000 , -0x90728372 ,0x88777277 , -0x8772ff7f ,0x70000000 , -0x90728172 ,0x88777277 , -0xb97902dc ,0x8879797f , -0xbef80380 ,0xbefe03c1 , -0x877c8179 ,0xbf06817c , +0xbf0a717c ,0xbf85fff8 , +0xbf82013d ,0xbef4037e , +0x8775ff7f ,0x0000ffff , +0x8875ff75 ,0x00040000 , +0xbef60380 ,0xbef703ff , +0x10807fac ,0x8772ff7f , +0x08000000 ,0x90728372 , +0x88777277 ,0x8772ff7f , +0x70000000 ,0x90728172 , +0x88777277 ,0xb97302dc , +0x8f739973 ,0x8873737f , +0x8772ff7f ,0x04000000 , +0xbf840036 ,0xbefe03c1 , +0x907c9973 ,0x877c817c , +0xbf06817c ,0xbf850002 , +0xbeff0380 ,0xbf820001 , +0xbeff03c1 ,0xb96f4306 , +0x876fc16f ,0xbf84002b , +0x8f6f866f ,0x8f6f826f , +0xbef6036f ,0xb9782a05 , +0x80788178 ,0x907c9973 , +0x877c817c ,0xbf06817c , +0xbf850002 ,0x8f788978 , +0xbf820001 ,0x8f788a78 , +0xb9721e06 ,0x8f728a72 , +0x80787278 ,0x8078ff78 , +0x00000200 ,0x8078ff78 , +0x00000080 ,0xbef603ff , +0x01000000 ,0x907c9973 , +0x877c817c ,0xbf06817c , +0xbefc0380 ,0xbf850009 , +0xe0310000 ,0x781d0000 , +0x807cff7c ,0x00000080 , +0x8078ff78 ,0x00000080 , +0xbf0a6f7c ,0xbf85fff8 , +0xbf820008 ,0xe0310000 , +0x781d0000 ,0x807cff7c , +0x00000100 ,0x8078ff78 , +0x00000100 ,0xbf0a6f7c , +0xbf85fff8 ,0xbef80380 , +0xbefe03c1 ,0x907c9973 , +0x877c817c ,0xbf06817c ,0xbf850002 ,0xbeff0380 ,0xbf820001 ,0xbeff03c1 ,0xb96f2a05 ,0x806f816f , -0x8f6f826f ,0x877c8179 , -0xbf06817c ,0xbf850013 , -0x8f76876f ,0xbef603ff , -0x01000000 ,0xbef20378 , -0x8078ff78 ,0x00000080 , -0xbefc0381 ,0xe0304000 , -0x785d0000 ,0xbf8c3f70 , -0x7e008500 ,0x807c817c , -0x8078ff78 ,0x00000080 , -0xbf0a6f7c ,0xbf85fff7 , -0xe0304000 ,0x725d0000 , -0xbf820023 ,0x8f76886f , +0x8f6f826f ,0x907c9973 , +0x877c817c ,0xbf06817c , +0xbf850022 ,0x8f76876f ,0xbef603ff ,0x01000000 ,0xbef20378 ,0x8078ff78 , -0x00000100 ,0xbefc0381 , +0x00000200 ,0xbefc0384 ,0xe0304000 ,0x785d0000 , +0xe0304080 ,0x785d0100 , +0xe0304100 ,0x785d0200 , +0xe0304180 ,0x785d0300 ,0xbf8c3f70 ,0x7e008500 , -0x807c817c ,0x8078ff78 , -0x00000100 ,0xbf0a6f7c , -0xbf85fff7 ,0xb96f1e06 , -0x876fc16f ,0xbf84000e , -0x8f6f836f ,0x806f7c6f , -0xbefe03c1 ,0xbeff0380 , -0xe0304000 ,0x785d0000 , -0xbf8c3f70 ,0x7e008500 , -0x807c817c ,0x8078ff78 , -0x00000080 ,0xbf0a6f7c , -0xbf85fff7 ,0xbeff03c1 , +0x7e028501 ,0x7e048502 , +0x7e068503 ,0x807c847c , +0x8078ff78 ,0x00000200 , +0xbf0a6f7c ,0xbf85ffee ,0xe0304000 ,0x725d0000 , -0x8772ff79 ,0x04000000 , -0xbf840020 ,0xbefe03c1 , -0x877c8179 ,0xbf06817c , -0xbf850002 ,0xbeff0380 , -0xbf820001 ,0xbeff03c1 , -0xb96f4306 ,0x876fc16f , -0xbf840016 ,0x8f6f866f , -0x8f6f826f ,0xbef6036f , +0xe0304080 ,0x725d0100 , +0xe0304100 ,0x725d0200 , +0xe0304180 ,0x725d0300 , +0xbf820032 ,0x8f76886f ,0xbef603ff ,0x01000000 , -0x877c8172 ,0xbf06817c , -0xbefc0380 ,0xbf850007 , -0x807cff7c ,0x00000080 , -0x8078ff78 ,0x00000080 , -0xbf0a6f7c ,0xbf85fffa , -0xbf820006 ,0x807cff7c , -0x00000100 ,0x8078ff78 , -0x00000100 ,0xbf0a6f7c , -0xbf85fffa ,0x877c8179 , -0xbf06817c ,0xbf850003 , -0x8f7687ff ,0x0000006a , -0xbf820002 ,0x8f7688ff , -0x0000006a ,0xbef603ff , -0x01000000 ,0x877c8179 , -0xbf06817c ,0xbf850012 , -0xf4211cba ,0xf0000000 , +0xbef20378 ,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 , -0xbefc0381 ,0xf421003a , -0xf0000000 ,0x8078ff78 , -0x00000080 ,0xbf8cc07f , -0xbe803000 ,0xbf800000 , -0x807c817c ,0xbf0aff7c , -0x0000006a ,0xbf85fff5 , -0xbe800372 ,0xbf820011 , -0xf4211cba ,0xf0000000 , -0x8078ff78 ,0x00000100 , -0xbefc0381 ,0xf421003a , -0xf0000000 ,0x8078ff78 , -0x00000100 ,0xbf8cc07f , -0xbe803000 ,0xbf800000 , -0x807c817c ,0xbf0aff7c , -0x0000006a ,0xbf85fff5 , -0xbe800372 ,0xbef60384 , +0xbf0a6f7c ,0xbf85fff7 , +0xbeff03c1 ,0xe0304000 , +0x725d0000 ,0xe0304080 , +0x725d0100 ,0xe0304100 , +0x725d0200 ,0xe0304180 , +0x725d0300 ,0xb9782a05 , +0x80788178 ,0x907c9973 , +0x877c817c ,0xbf06817c , +0xbf850002 ,0x8f788978 , +0xbf820001 ,0x8f788a78 , +0xb9721e06 ,0x8f728a72 , +0x80787278 ,0x8078ff78 , +0x00000200 ,0x80f8ff78 , +0x00000058 ,0x80f88878 , +0x8f7682ff ,0x0000006a , +0xbef603ff ,0x01000000 , +0xbefc03ff ,0x0000006a , +0xf425003a ,0xf0000000 , +0x80f8a078 ,0xbf8cc07f , +0x80fc827c ,0xbf800000 , +0xbe803100 ,0xf42d003a , +0xf0000000 ,0x80f8c078 , +0xbf8cc07f ,0x80fc887c , +0xbf800000 ,0xbe803100 , +0xbe823102 ,0xbe843104 , +0xbe863106 ,0xf431003a , +0xf0000000 ,0x80f8c078 , +0xbf8cc07f ,0x80fc907c , +0xbf800000 ,0xbe803100 , +0xbe823102 ,0xbe843104 , +0xbe863106 ,0xbe883108 , +0xbe8a310a ,0xbe8c310c , +0xbe8e310e ,0xbf06807c , +0xbf84fff0 ,0xb9782a05 , +0x80788178 ,0x907c9973 , +0x877c817c ,0xbf06817c , +0xbf850002 ,0x8f788978 , +0xbf820001 ,0x8f788a78 , +0xb9721e06 ,0x8f728a72 , +0x80787278 ,0x8078ff78 , +0x00000200 ,0xbef60384 ,0xbef603ff ,0x01000000 , -0x877c8179 ,0xbf06817c , -0xbf850025 ,0xf4211bfa , -0xf0000000 ,0x8078ff78 , -0x00000080 ,0xf4211b3a , -0xf0000000 ,0x8078ff78 , -0x00000080 ,0xf4211b7a , -0xf0000000 ,0x8078ff78 , -0x00000080 ,0xf4211eba , -0xf0000000 ,0x8078ff78 , -0x00000080 ,0xf4211efa , -0xf0000000 ,0x8078ff78 , -0x00000080 ,0xf4211c3a , -0xf0000000 ,0x8078ff78 , -0x00000080 ,0xf4211c7a , -0xf0000000 ,0x8078ff78 , -0x00000080 ,0xf4211cfa , -0xf0000000 ,0x8078ff78 , -0x00000080 ,0xf4211e7a , -0xf0000000 ,0x8078ff78 , -0x00000080 ,0xbf820024 ,0xf4211bfa ,0xf0000000 , -0x8078ff78 ,0x00000100 , -0xf4211b3a ,0xf0000000 , -0x8078ff78 ,0x00000100 , +0x80788478 ,0xf4211b3a , +0xf0000000 ,0x80788478 ,0xf4211b7a ,0xf0000000 , -0x8078ff78 ,0x00000100 , -0xf4211eba ,0xf0000000 , -0x8078ff78 ,0x00000100 , +0x80788478 ,0xf4211eba , +0xf0000000 ,0x80788478 ,0xf4211efa ,0xf0000000 , -0x8078ff78 ,0x00000100 , -0xf4211c3a ,0xf0000000 , -0x8078ff78 ,0x00000100 , +0x80788478 ,0xf4211c3a , +0xf0000000 ,0x80788478 ,0xf4211c7a ,0xf0000000 , -0x8078ff78 ,0x00000100 , +0x80788478 ,0xf4211e7a , +0xf0000000 ,0x80788478 ,0xf4211cfa ,0xf0000000 , -0x8078ff78 ,0x00000100 , -0xf4211e7a ,0xf0000000 , -0x8078ff78 ,0x00000100 , -0xbf8cc07f ,0x876dff6d , +0x80788478 ,0xbf8cc07f , +0xbef2036d ,0x876dff72 ,0x0000ffff ,0xbefc036f ,0xbefe037a ,0xbeff037b ,0x876f71ff ,0x000003ff , -0xb9ef4803 ,0xb9f3f816 , +0xb9ef4803 ,0xb9f9f816 ,0x876f71ff ,0xfffff800 ,0x906f8b6f ,0xb9efa2c3 , -0xb9f9f801 ,0x876fff6d , -0xf0000000 ,0x906f9c6f , -0x8f6f906f ,0xbef20380 , -0x88726f72 ,0x876fff6d , -0x08000000 ,0x906f9b6f , -0x8f6f8f6f ,0x88726f72 , -0x876fff70 ,0x00800000 , -0x906f976f ,0xb9f2f807 , -0xb9f0f802 ,0xbf8a0000 , -0xbe80226c ,0xbf810000 , +0xb9f3f801 ,0x876fff72 , +0xfc000000 ,0x906f9a6f , +0x8f6f906f ,0xbef30380 , +0x88736f73 ,0x876fff72 , +0x02000000 ,0x906f996f , +0x8f6f8f6f ,0x88736f73 , +0x876fff72 ,0x01000000 , +0x906f986f ,0x8f6f996f , +0x88736f73 ,0x876fff70 , +0x00800000 ,0x906f976f , +0xb9f3f807 ,0x87fe7e7e , +0x87ea6a6a ,0xb9f0f802 , +0xbf8a0000 ,0xbe80226c , +0xbf810000 ,0xbf9f0000 ,0xbf9f0000 ,0xbf9f0000 , 0xbf9f0000, 0xbf9f0000, - 0xbf9f0000, 0x00000000, };static const uint32_t cwsr_trap_arcturus_hex[] = { 0xbf820001, 0xbf8202c4,
drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm +903 -1075
2,008 lines not on this page · raw message
Signature · 10 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx