From 14e31c693cd293951ccf3da2450109e27d1559f7 Mon Sep 17 00:00:00 2001 From: Kamil Kopryk Date: Tue, 20 Dec 2022 17:49:26 +0000 Subject: [PATCH] Refactor: dont use global gfxCoreHelper getter in ocl files Related-To: NEO-6853 Signed-off-by: Kamil Kopryk --- .../compression_aub_tests_xehp_and_later.cpp | 9 +++++---- .../test/unit_test/command_queue/command_queue_tests.cpp | 2 +- .../unit_test/command_queue/local_work_size_tests.cpp | 5 +++-- opencl/test/unit_test/kernel/kernel_tests.cpp | 4 ++-- .../unit_test/memory_manager/memory_manager_tests.cpp | 4 +++- 5 files changed, 14 insertions(+), 10 deletions(-) diff --git a/opencl/test/unit_test/aub_tests/command_queue/compression_aub_tests_xehp_and_later.cpp b/opencl/test/unit_test/aub_tests/command_queue/compression_aub_tests_xehp_and_later.cpp index 21c4404273..41f1b113b3 100644 --- a/opencl/test/unit_test/aub_tests/command_queue/compression_aub_tests_xehp_and_later.cpp +++ b/opencl/test/unit_test/aub_tests/command_queue/compression_aub_tests_xehp_and_later.cpp @@ -37,7 +37,9 @@ struct CompressionXeHPAndLater : public AUBFixture, DebugManager.flags.EnableLocalMemory.set(useLocalMemory); DebugManager.flags.NodeOrdinal.set(GetParam()); - auto &gfxCoreHelper = GfxCoreHelper::get(defaultHwInfo->platform.eRenderCoreFamily); + AUBFixture::setUp(defaultHwInfo.get()); + + auto &gfxCoreHelper = device->getGfxCoreHelper(); auto expectedEngine = static_cast(GetParam()); bool engineSupported = false; @@ -52,7 +54,6 @@ struct CompressionXeHPAndLater : public AUBFixture, GTEST_SKIP(); } - AUBFixture::setUp(defaultHwInfo.get()); auto &ftrTable = device->getHardwareInfo().featureTable; if ((!ftrTable.flags.ftrFlatPhysCCS) || (!ftrTable.flags.ftrLocalMemory && useLocalMemory)) { @@ -129,7 +130,7 @@ void CompressionXeHPAndLater::givenCompressedImage2DFromBufferW auto compressedBuffer = std::unique_ptr(Buffer::create(context, CL_MEM_COPY_HOST_PTR | CL_MEM_COMPRESSED_HINT_INTEL, bufferSize, writePattern, retVal)); EXPECT_EQ(CL_SUCCESS, retVal); - //now create image2DFromBuffer + // now create image2DFromBuffer cl_image_desc imageDescriptor = {}; imageDescriptor.mem_object = compressedBuffer.get(); @@ -170,7 +171,7 @@ void CompressionXeHPAndLater::givenCompressedImage2DFromBufferW expectMemory(destMemory, writePattern, imageSize); - //make sure our objects are in in fact compressed + // make sure our objects are in in fact compressed auto graphicsAllocation = compressedBuffer->getGraphicsAllocation(device->getRootDeviceIndex()); EXPECT_NE(nullptr, graphicsAllocation->getDefaultGmm()); EXPECT_TRUE(graphicsAllocation->getDefaultGmm()->isCompressionEnabled); diff --git a/opencl/test/unit_test/command_queue/command_queue_tests.cpp b/opencl/test/unit_test/command_queue/command_queue_tests.cpp index 7032f6f505..1631e2532f 100644 --- a/opencl/test/unit_test/command_queue/command_queue_tests.cpp +++ b/opencl/test/unit_test/command_queue/command_queue_tests.cpp @@ -957,7 +957,7 @@ HWTEST_F(CommandQueueTests, givenNodeOrdinalSetWithRenderEngineWhenCreatingComma cl_queue_properties propertiesCooperativeQueue[] = {CL_QUEUE_FAMILY_INTEL, userPropertiesEngineGroupType, CL_QUEUE_INDEX_INTEL, userPropertiesEngineIndex, 0}; - const GfxCoreHelper &gfxCoreHelper = GfxCoreHelper::get(defaultHwInfo->platform.eRenderCoreFamily); + const auto &gfxCoreHelper = pDevice->getGfxCoreHelper(); EXPECT_NE(gfxCoreHelper.getEngineGroupType(static_cast(forcedEngine), EngineUsage::Regular, *defaultHwInfo), static_cast(userPropertiesEngineGroupType)); EXPECT_NE(expectedEngineIndex, userPropertiesEngineIndex); diff --git a/opencl/test/unit_test/command_queue/local_work_size_tests.cpp b/opencl/test/unit_test/command_queue/local_work_size_tests.cpp index 59fe5792ac..600e3163eb 100644 --- a/opencl/test/unit_test/command_queue/local_work_size_tests.cpp +++ b/opencl/test/unit_test/command_queue/local_work_size_tests.cpp @@ -8,6 +8,7 @@ #include "shared/source/helpers/local_work_size.h" #include "shared/test/common/helpers/debug_manager_state_restore.h" #include "shared/test/common/mocks/mock_device.h" +#include "shared/test/common/mocks/mock_execution_environment.h" #include "shared/test/common/test_macros/hw_test.h" #include "opencl/source/command_queue/cl_local_work_size.h" @@ -31,8 +32,8 @@ TEST(localWorkSizeTest, givenDisableEUFusionWhenCreatingWorkSizeInfoThenCorrectM false, // yTiledSurface true // disableEUFusion ); - - auto &gfxCoreHelper = GfxCoreHelper::get(defaultHwInfo->platform.eRenderCoreFamily); + MockExecutionEnvironment mockExecutionEnvironment{}; + auto &gfxCoreHelper = mockExecutionEnvironment.rootDeviceEnvironments[0]->getHelper(); bool fusedDispatchEnabled = gfxCoreHelper.isFusedEuDispatchEnabled(*defaultHwInfo, true); auto wgsMultiple = fusedDispatchEnabled ? 2 : 1; diff --git a/opencl/test/unit_test/kernel/kernel_tests.cpp b/opencl/test/unit_test/kernel/kernel_tests.cpp index c901b8b056..c3c1317286 100644 --- a/opencl/test/unit_test/kernel/kernel_tests.cpp +++ b/opencl/test/unit_test/kernel/kernel_tests.cpp @@ -317,7 +317,7 @@ TEST_F(KernelTests, GivenRequiredDisabledEUFusionFlagWhenGettingPreferredWorkGro kernelInfo.kernelDescriptor.kernelAttributes.flags.requiresDisabledEUFusion = true; MockKernel kernel(pProgram, kernelInfo, *pClDevice); - auto &gfxCoreHelper = GfxCoreHelper::get(defaultHwInfo->platform.eRenderCoreFamily); + auto &gfxCoreHelper = pClDevice->getGfxCoreHelper(); bool fusedDispatchEnabled = gfxCoreHelper.isFusedEuDispatchEnabled(*defaultHwInfo, true); auto expectedValue = kernelInfo.getMaxSimdSize() * (fusedDispatchEnabled ? 2 : 1); @@ -345,7 +345,7 @@ TEST_F(KernelTests, GivenCFEFusedEUDispatchEnabledAndRequiredDisabledUEFusionWhe kernelInfo.kernelDescriptor.kernelAttributes.flags.requiresDisabledEUFusion = true; MockKernel kernel(pProgram, kernelInfo, *pClDevice); - auto &gfxCoreHelper = GfxCoreHelper::get(defaultHwInfo->platform.eRenderCoreFamily); + auto &gfxCoreHelper = pClDevice->getGfxCoreHelper(); bool fusedDispatchEnabled = gfxCoreHelper.isFusedEuDispatchEnabled(*defaultHwInfo, true); auto expectedValue = kernelInfo.getMaxSimdSize() * (fusedDispatchEnabled ? 2 : 1); diff --git a/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp b/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp index dca0a4d837..92b75044c6 100644 --- a/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp +++ b/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp @@ -2558,7 +2558,9 @@ TEST(MemoryManagerTest, givenCachelineAlignedPointerAndProperDescriptorValuesWhe TEST(MemoryManagerTest, givenForcedLinearImages3DImageAndProperDescriptorValuesWhenIsCopyRequiredIsCalledThenFalseIsReturned) { DebugManagerStateRestore dbgRestorer; DebugManager.flags.ForceLinearImages.set(true); - auto &gfxCoreHelper = GfxCoreHelper::get(defaultHwInfo->platform.eRenderCoreFamily); + + MockExecutionEnvironment mockExecutionEnvironment{}; + auto &gfxCoreHelper = mockExecutionEnvironment.rootDeviceEnvironments[0]->getHelper(); ImageInfo imgInfo{};