From cb42ad18bff5ef29859cd6d42371cc4d9f13b78c Mon Sep 17 00:00:00 2001 From: Graham Sider Date: Wed, 5 Oct 2022 16:04:11 -0400 Subject: [PATCH] kfdtest: Rename IterateIsa to PersistentIterateIsa To avoid confusion since this shader has changed to be persistent (original IterateIsa may be re-used for debugger tests). Signed-off-by: Graham Sider Change-Id: I4643692765fc7665933257e89d5b922e779ad2e5 [ROCm/ROCR-Runtime commit: 6467664ec7207a7708cd9f09b0c8473e72dc8e53] --- projects/rocr-runtime/tests/kfdtest/src/KFDCWSRTest.cpp | 4 ++-- projects/rocr-runtime/tests/kfdtest/src/ShaderStore.cpp | 4 ++-- projects/rocr-runtime/tests/kfdtest/src/ShaderStore.hpp | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/rocr-runtime/tests/kfdtest/src/KFDCWSRTest.cpp b/projects/rocr-runtime/tests/kfdtest/src/KFDCWSRTest.cpp index da66efda19..743b03d1b3 100644 --- a/projects/rocr-runtime/tests/kfdtest/src/KFDCWSRTest.cpp +++ b/projects/rocr-runtime/tests/kfdtest/src/KFDCWSRTest.cpp @@ -51,7 +51,7 @@ static inline uint32_t checkCWSREnabled() { /** * KFDCWSRTest.BasicTest * - * This test dispatches the IterateIsa shader, which continuously increments a vgpr for + * This test dispatches the PersistentIterateIsa shader, which continuously increments a vgpr for * (num_witems / WAVE_SIZE) waves. While this shader is running, dequeue/requeue requests * are sent in a loop to trigger CWSRs. * @@ -83,7 +83,7 @@ TEST_P(KFDCWSRTest, BasicTest) { if ((m_FamilyId >= FAMILY_VI) && (checkCWSREnabled())) { HsaMemoryBuffer isaBuffer(PAGE_SIZE, defaultGPUNode, true, false, true); - ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(IterateIsa, isaBuffer.As())); + ASSERT_SUCCESS(m_pAsm->RunAssembleBuf(PersistentIterateIsa, isaBuffer.As())); unsigned stopval = 0x1234'5678; unsigned outval = 0x8765'4321; diff --git a/projects/rocr-runtime/tests/kfdtest/src/ShaderStore.cpp b/projects/rocr-runtime/tests/kfdtest/src/ShaderStore.cpp index 4ae13a17ca..fc97d6490e 100644 --- a/projects/rocr-runtime/tests/kfdtest/src/ShaderStore.cpp +++ b/projects/rocr-runtime/tests/kfdtest/src/ShaderStore.cpp @@ -39,7 +39,7 @@ const std::vector ShaderList = { WriteFlagAndValueIsa, WriteAndSignalIsa, LoopIsa, - IterateIsa, + PersistentIterateIsa, ReadMemoryIsa, GwsInitIsa, GwsAtomicIncreaseIsa, @@ -463,7 +463,7 @@ const char *LoopIsa = R"( * v6 - register storing known-value output for mangle testing * v7 - counter */ -const char *IterateIsa = SHADER_MACROS R"( +const char *PersistentIterateIsa = SHADER_MACROS R"( // Compute address of output buffer v_mov_b32 v0, s4 // use workgroup id as index v_lshlrev_b32 v0, 2, v0 // v0 *= 4 diff --git a/projects/rocr-runtime/tests/kfdtest/src/ShaderStore.hpp b/projects/rocr-runtime/tests/kfdtest/src/ShaderStore.hpp index e0151a6537..c655030f9b 100644 --- a/projects/rocr-runtime/tests/kfdtest/src/ShaderStore.hpp +++ b/projects/rocr-runtime/tests/kfdtest/src/ShaderStore.hpp @@ -48,7 +48,7 @@ extern const char *WriteAndSignalIsa; extern const char *LoopIsa; /* KFDCWSRTest */ -extern const char *IterateIsa; +extern const char *PersistentIterateIsa; /* KFDEvictTest */ extern const char *ReadMemoryIsa;