From fa285af0ea9819e62a34707ebbd59e7583e40bc7 Mon Sep 17 00:00:00 2001 From: "Milczarek, Slawomir" Date: Tue, 13 Apr 2021 11:03:51 +0000 Subject: [PATCH] Prepare unit test helper to move to share code Related-To: NEO-5161 Signed-off-by: Milczarek, Slawomir --- .../unit_test/command_queue/enqueue_copy_buffer_tests.cpp | 3 ++- .../unit_test/command_queue/enqueue_fill_buffer_tests.cpp | 3 ++- .../test/unit_test/command_queue/enqueue_kernel_1_tests.cpp | 2 +- .../unit_test/command_queue/enqueue_read_buffer_tests.cpp | 3 ++- .../unit_test/command_queue/enqueue_write_buffer_tests.cpp | 3 ++- opencl/test/unit_test/helpers/unit_test_helper.h | 6 ++---- opencl/test/unit_test/helpers/unit_test_helper.inl | 2 +- 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_tests.cpp index f2fada936a..f3a817e27c 100644 --- a/opencl/test/unit_test/command_queue/enqueue_copy_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_copy_buffer_tests.cpp @@ -202,8 +202,9 @@ HWTEST_F(EnqueueCopyBufferTest, WhenCopyingBufferThenIndirectDataGetsAdded) { EXPECT_NE(0u, multiDispatchInfo.size()); auto kernel = multiDispatchInfo.begin()->getKernel(); + auto kernelDescriptor = &kernel->getKernelInfo().kernelDescriptor; - EXPECT_TRUE(UnitTestHelper::evaluateDshUsage(dshBefore, pDSH->getUsed(), kernel, rootDeviceIndex)); + EXPECT_TRUE(UnitTestHelper::evaluateDshUsage(dshBefore, pDSH->getUsed(), kernelDescriptor, rootDeviceIndex)); EXPECT_NE(iohBefore, pIOH->getUsed()); if (kernel->requiresSshForBuffers()) { EXPECT_NE(sshBefore, pSSH->getUsed()); diff --git a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp index 2e84417612..41be6c126e 100644 --- a/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_fill_buffer_tests.cpp @@ -115,8 +115,9 @@ HWTEST_F(EnqueueFillBufferCmdTests, WhenFillingBufferThenIndirectDataGetsAdded) EXPECT_NE(0u, multiDispatchInfo.size()); auto kernel = multiDispatchInfo.begin()->getKernel(); + auto kernelDescriptor = &kernel->getKernelInfo().kernelDescriptor; - EXPECT_TRUE(UnitTestHelper::evaluateDshUsage(dshBefore, pDSH->getUsed(), kernel, rootDeviceIndex)); + EXPECT_TRUE(UnitTestHelper::evaluateDshUsage(dshBefore, pDSH->getUsed(), kernelDescriptor, rootDeviceIndex)); EXPECT_NE(iohBefore, pIOH->getUsed()); if (kernel->requiresSshForBuffers()) { EXPECT_NE(sshBefore, pSSH->getUsed()); diff --git a/opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp index 12b7e4e971..e490ebb6ee 100644 --- a/opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_kernel_1_tests.cpp @@ -431,7 +431,7 @@ HWTEST_F(EnqueueKernelTest, WhenEnqueingKernelThenIndirectDataIsAdded) { auto sshBefore = pSSH->getUsed(); callOneWorkItemNDRKernel(); - EXPECT_TRUE(UnitTestHelper::evaluateDshUsage(dshBefore, pDSH->getUsed(), pKernel, rootDeviceIndex)); + EXPECT_TRUE(UnitTestHelper::evaluateDshUsage(dshBefore, pDSH->getUsed(), &pKernel->getKernelInfo().kernelDescriptor, rootDeviceIndex)); EXPECT_NE(iohBefore, pIOH->getUsed()); if (pKernel->requiresSshForBuffers() || (pKernel->getKernelInfo().patchInfo.imageMemObjKernelArgs.size() > 0)) { EXPECT_NE(sshBefore, pSSH->getUsed()); diff --git a/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp index e355494a4b..064ae6522d 100644 --- a/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_read_buffer_tests.cpp @@ -156,8 +156,9 @@ HWTEST_F(EnqueueReadBufferTypeTest, addsIndirectData) { EXPECT_NE(0u, multiDispatchInfo.size()); auto kernel = multiDispatchInfo.begin()->getKernel(); + auto kernelDescriptor = &kernel->getKernelInfo().kernelDescriptor; - EXPECT_TRUE(UnitTestHelper::evaluateDshUsage(dshBefore, pDSH->getUsed(), kernel, rootDeviceIndex)); + EXPECT_TRUE(UnitTestHelper::evaluateDshUsage(dshBefore, pDSH->getUsed(), kernelDescriptor, rootDeviceIndex)); EXPECT_NE(iohBefore, pIOH->getUsed()); if (kernel->requiresSshForBuffers()) { EXPECT_NE(sshBefore, pSSH->getUsed()); diff --git a/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp b/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp index baadd47f7e..50d56e4f36 100644 --- a/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp +++ b/opencl/test/unit_test/command_queue/enqueue_write_buffer_tests.cpp @@ -154,8 +154,9 @@ HWTEST_F(EnqueueWriteBufferTypeTest, WhenWritingBufferThenIndirectDataIsAdded) { EXPECT_NE(0u, multiDispatchInfo.size()); auto kernel = multiDispatchInfo.begin()->getKernel(); + auto kernelDescriptor = &kernel->getKernelInfo().kernelDescriptor; - EXPECT_TRUE(UnitTestHelper::evaluateDshUsage(dshBefore, pDSH->getUsed(), kernel, rootDeviceIndex)); + EXPECT_TRUE(UnitTestHelper::evaluateDshUsage(dshBefore, pDSH->getUsed(), kernelDescriptor, rootDeviceIndex)); EXPECT_NE(iohBefore, pIOH->getUsed()); if (kernel->requiresSshForBuffers()) { EXPECT_NE(sshBefore, pSSH->getUsed()); diff --git a/opencl/test/unit_test/helpers/unit_test_helper.h b/opencl/test/unit_test/helpers/unit_test_helper.h index 39aea94b4d..bc93ffdc6e 100644 --- a/opencl/test/unit_test/helpers/unit_test_helper.h +++ b/opencl/test/unit_test/helpers/unit_test_helper.h @@ -8,20 +8,18 @@ #pragma once #include "shared/source/helpers/aux_translation.h" -#include "opencl/source/helpers/properties_helper.h" - #include "hw_cmds.h" namespace NEO { -class Kernel; +struct KernelDescriptor; struct HardwareInfo; template struct UnitTestHelper { static bool isL3ConfigProgrammable(); - static bool evaluateDshUsage(size_t sizeBeforeEnqueue, size_t sizeAfterEnqueue, Kernel *kernel, uint32_t rootDeviceIndex); + static bool evaluateDshUsage(size_t sizeBeforeEnqueue, size_t sizeAfterEnqueue, const KernelDescriptor *kernelDescriptor, uint32_t rootDeviceIndex); static bool isPageTableManagerSupported(const HardwareInfo &hwInfo); diff --git a/opencl/test/unit_test/helpers/unit_test_helper.inl b/opencl/test/unit_test/helpers/unit_test_helper.inl index ee639297f9..4b3a6bf493 100644 --- a/opencl/test/unit_test/helpers/unit_test_helper.inl +++ b/opencl/test/unit_test/helpers/unit_test_helper.inl @@ -13,7 +13,7 @@ bool UnitTestHelper::isL3ConfigProgrammable() { }; template -bool UnitTestHelper::evaluateDshUsage(size_t sizeBeforeEnqueue, size_t sizeAfterEnqueue, Kernel *kernel, uint32_t rootDeviceIndex) { +bool UnitTestHelper::evaluateDshUsage(size_t sizeBeforeEnqueue, size_t sizeAfterEnqueue, const KernelDescriptor *kernelDescriptor, uint32_t rootDeviceIndex) { if (sizeBeforeEnqueue != sizeAfterEnqueue) { return true; }