intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2025-12-26 15:03:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Refactor: dont use global gfxCoreHelper getter in ocl files

Browse Source 
Related-To: NEO-6853
Signed-off-by: Kamil Kopryk <kamil.kopryk@intel.com>
This commit is contained in:
Kamil Kopryk
2022-12-20 17:49:26 +00:00
committed by Compute-Runtime-Automation
parent 165a5694fb
commit 14e31c693c
5 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
opencl/test/unit_test/aub_tests/command_queue/compression_aub_tests_xehp_and_later.cpp
View File

@@ -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<aub_stream::EngineType>(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<testLocalMemory>::givenCompressedImage2DFromBufferW
auto compressedBuffer = std::unique_ptr<Buffer>(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<testLocalMemory>::givenCompressedImage2DFromBufferW
expectMemory<FamilyType>(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);

2
opencl/test/unit_test/command_queue/command_queue_tests.cpp
View File

@@ -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<aub_stream::EngineType>(forcedEngine), EngineUsage::Regular, *defaultHwInfo),
static_cast<EngineGroupType>(userPropertiesEngineGroupType));
EXPECT_NE(expectedEngineIndex, userPropertiesEngineIndex);

5
opencl/test/unit_test/command_queue/local_work_size_tests.cpp
View File

@@ -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<GfxCoreHelper>();
bool fusedDispatchEnabled = gfxCoreHelper.isFusedEuDispatchEnabled(*defaultHwInfo, true);
auto wgsMultiple = fusedDispatchEnabled ? 2 : 1;

4
opencl/test/unit_test/kernel/kernel_tests.cpp
View File

@@ -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);

4
opencl/test/unit_test/memory_manager/memory_manager_tests.cpp
View File

@@ -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<GfxCoreHelper>();
ImageInfo imgInfo{};