From 82670ee7fcc4f2b0f660f17a49f40cbd0ce01d70 Mon Sep 17 00:00:00 2001 From: Felix Kuehling Date: Wed, 29 May 2019 00:23:30 -0400 Subject: [PATCH] kfdtest: Allocate PM4 queue and dispatch earlier KFDEvictTest.QueueTest Allocating these before the big memory allocations minimizes the chances of spurious out of memory errors. Change-Id: I94aff9ec7ea34d4dc98ae08ac4cf9dc335b3df7f Signed-off-by: Felix Kuehling [ROCm/ROCR-Runtime commit: 396a85e97b665f0d345444937149232f90988183] --- .../rocr-runtime/tests/kfdtest/src/KFDEvictTest.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/projects/rocr-runtime/tests/kfdtest/src/KFDEvictTest.cpp b/projects/rocr-runtime/tests/kfdtest/src/KFDEvictTest.cpp index 5ad8dea59a..cdc6c792b0 100644 --- a/projects/rocr-runtime/tests/kfdtest/src/KFDEvictTest.cpp +++ b/projects/rocr-runtime/tests/kfdtest/src/KFDEvictTest.cpp @@ -574,6 +574,13 @@ TEST_F(KFDEvictTest, QueueTest) { HsaMemoryBuffer addrBuffer(PAGE_SIZE, defaultGPUNode); HsaMemoryBuffer resultBuffer(PAGE_SIZE, defaultGPUNode); + m_pIsaGen->CompileShader(CreateShader().c_str(), "ReadMemory", isaBuffer); + + PM4Queue pm4Queue; + ASSERT_SUCCESS(pm4Queue.Create(defaultGPUNode)); + + Dispatch dispatch0(isaBuffer); + std::vector pBuffers; AllocBuffers(defaultGPUNode, count, vramBufSize, pBuffers); @@ -591,12 +598,6 @@ TEST_F(KFDEvictTest, QueueTest) { for (i = 0; i < wavefront_num; i++) *(localBufAddr + i) = pBuffers[i]; - m_pIsaGen->CompileShader(CreateShader().c_str(), "ReadMemory", isaBuffer); - - PM4Queue pm4Queue; - ASSERT_SUCCESS(pm4Queue.Create(defaultGPUNode)); - - Dispatch dispatch0(isaBuffer); dispatch0.SetArgs(localBufAddr, result); dispatch0.SetDim(wavefront_num, 1, 1); /* Submit the packet and start shader */