AI/rocm-systems
2
0
Forkuj 0
Kod Zgłoszenia Oczekujące zmiany Actions Packages Projekty Wydania Wiki Aktywność

Use camel case for KFDDBGTest shaders

Przeglądaj źródła 
Debug test shaders should use camel case and suffix *Isa to match other
test shader naming convention.

Signed-off-by: Jonathan Kim <jonathan.kim@amd.com>
Change-Id: I64e14183ba1c7c9664b13a742a0e5683866e8223


[ROCm/ROCR-Runtime commit: fcec22716a]
This commit is contained in:
Jonathan Kim
2023-09-12 15:38:12 -04:00
rodzic 805eeffa32
commit 8283807bca
3 zmienionych plików z 16 dodań i 16 usunięć
Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files
projects/rocr-runtime/tests/kfdtest/src/KFDDBGTest.cpp
+7 -7
Wyświetl plik
@@ -266,8 +266,8 @@ TEST_F(KFDDBGTest, HitTrapEvent) {
0x1000));
// compile and dispatch shader
ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(jump_to_trap_gfx, isaBuf.As<char*>()));
ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(trap_handler_gfx, trap.As<char*>()));
ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(JumpToTrapIsa, isaBuf.As<char*>()));
ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(TrapHandlerIsa, trap.As<char*>()));
uint32_t rDebug;
ASSERT_SUCCESS(hsaKmtRuntimeEnable(&rDebug, true));
@@ -341,7 +341,7 @@ TEST_F(KFDDBGTest, HitTrapOnWaveStartEndEvent) {
// compile and dispatch shader
ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(NoopIsa, isaBuf.As<char*>()));
ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(trap_handler_gfx, trap.As<char*>()));
ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(TrapHandlerIsa, trap.As<char*>()));
uint32_t rDebug;
ASSERT_SUCCESS(hsaKmtRuntimeEnable(&rDebug, true));
@@ -422,7 +422,7 @@ TEST_F(KFDDBGTest, SuspendQueues) {
HsaMemoryBuffer isaBuf(PAGE_SIZE, defaultGPUNode, true, false, true);
// compile and dispatch shader
ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(jump_to_trap_gfx, isaBuf.As<char*>()));
ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(JumpToTrapIsa, isaBuf.As<char*>()));
uint32_t rDebug;
ASSERT_SUCCESS(hsaKmtRuntimeEnable(&rDebug, true));
@@ -635,9 +635,9 @@ TEST_F(KFDDBGTest, HitAddressWatch) {
HsaMemoryBuffer trap(PAGE_SIZE*2, defaultGPUNode, true, false, true);
HsaMemoryBuffer tmaBuf(PAGE_SIZE, defaultGPUNode, false, false, false);
ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(watch_read_isa, readerBuf.As<char*>()));
ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(watch_write_isa, writerBuf.As<char*>()));
ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(trap_handler_gfx, trap.As<char*>()));
ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(WatchReadIsa, readerBuf.As<char*>()));
ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(WatchWriteIsa, writerBuf.As<char*>()));
ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(TrapHandlerIsa, trap.As<char*>()));
ASSERT_SUCCESS(hsaKmtSetTrapHandler(defaultGPUNode,
trap.As<void *>(),
0x1000,
projects/rocr-runtime/tests/kfdtest/src/ShaderStore.cpp
+4 -4
Wyświetl plik
@@ -901,7 +901,7 @@ const char *GwsAtomicIncreaseIsa =
s_endpgm
)";
const char *jump_to_trap_gfx =
const char *JumpToTrapIsa =
SHADER_START
SHADER_MACROS_U32
R"(
@@ -918,7 +918,7 @@ const char *jump_to_trap_gfx =
s_endpgm
)";
const char *trap_handler_gfx =
const char *TrapHandlerIsa =
SHADER_START
R"(
CHECK_VMFAULT:
@@ -998,12 +998,12 @@ const char *trap_handler_gfx =
"s_waitcnt vmcnt(0) & lgkmcnt(0)\n"\
"s_endpgm\n"
const char *watch_read_isa =
const char *WatchReadIsa =
WATCH_START
"flat_load_dword v7, v[0:1]"
WATCH_END;
const char *watch_write_isa =
const char *WatchWriteIsa =
WATCH_START
"flat_store_dword v[0:1], v4"
WATCH_END;
projects/rocr-runtime/tests/kfdtest/src/ShaderStore.hpp
+5 -5
Wyświetl plik
@@ -63,12 +63,12 @@ extern const char *GwsInitIsa;
extern const char *GwsAtomicIncreaseIsa;
/* HitTrapEvent */
extern const char *jump_to_trap_gfx;
extern const char *trap_handler_gfx;
extern const char *JumpToTrapIsa;
extern const char *TrapHandlerIsa;
/* HitWatchPointEvent */
extern const char *watch_read_isa;
extern const char *watch_write_isa;
extern const char *watch_atomic_isa;
extern const char *WatchReadIsa;
extern const char *WatchWriteIsa;
extern const char *WatchAtomicIsa;
#endif // _SHADERSTORE_H_