refactor: don't use global gfxCoreHelper getter 5/n

Related-To: NEO-6853
Signed-off-by: Kamil Kopryk <kamil.kopryk@intel.com>
This commit is contained in:
Kamil Kopryk
2023-01-10 17:13:08 +00:00
committed by Compute-Runtime-Automation
parent 2d21d42edb
commit 100f7e3745
7 changed files with 79 additions and 72 deletions

View File

@@ -59,8 +59,9 @@ HWTEST_F(WddmDirectSubmissionTest, givenWddmWhenDirectIsInitializedAndStartedThe
EXPECT_NE(nullptr, wddmDirectSubmission->ringBuffers[1].ringBuffer);
EXPECT_NE(nullptr, wddmDirectSubmission->semaphores);
auto &gfxCoreHelper = device->getGfxCoreHelper();
size_t expectedAllocationsCnt = 3;
if (GfxCoreHelperHw<FamilyType>::get().isRelaxedOrderingSupported()) {
if (gfxCoreHelper.isRelaxedOrderingSupported()) {
expectedAllocationsCnt += 2;
}
@@ -95,8 +96,9 @@ HWTEST_F(WddmDirectSubmissionNoPreemptionTest, givenWddmWhenDirectIsInitializedA
EXPECT_NE(nullptr, wddmDirectSubmission->ringBuffers[1].ringBuffer);
EXPECT_NE(nullptr, wddmDirectSubmission->semaphores);
auto &gfxCoreHelper = device->getGfxCoreHelper();
size_t expectedAllocationsCnt = 3;
if (GfxCoreHelperHw<FamilyType>::get().isRelaxedOrderingSupported()) {
if (gfxCoreHelper.isRelaxedOrderingSupported()) {
expectedAllocationsCnt += 2;
}
@@ -137,9 +139,9 @@ HWTEST_F(WddmDirectSubmissionTest, givenWddmWhenAllocateOsResourcesThenExpectRin
bool ret = wddmDirectSubmission.allocateResources();
EXPECT_TRUE(ret);
auto &gfxCoreHelper = device->getGfxCoreHelper();
size_t expectedAllocationsCnt = 3;
if (GfxCoreHelperHw<FamilyType>::get().isRelaxedOrderingSupported()) {
if (gfxCoreHelper.isRelaxedOrderingSupported()) {
expectedAllocationsCnt += 2;
}
@@ -181,9 +183,9 @@ HWTEST_F(WddmDirectSubmissionTest, givenWddmWhenAllocateOsResourcesResidencyFail
bool ret = wddmDirectSubmission.allocateResources();
EXPECT_FALSE(ret);
auto &gfxCoreHelper = device->getGfxCoreHelper();
size_t expectedAllocationsCnt = 3;
if (GfxCoreHelperHw<FamilyType>::get().isRelaxedOrderingSupported()) {
if (gfxCoreHelper.isRelaxedOrderingSupported()) {
expectedAllocationsCnt += 2;
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2019-2022 Intel Corporation
* Copyright (C) 2019-2023 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -208,7 +208,8 @@ HWTEST2_F(Gen12LpPreambleVfeState, givenDisableEUFusionAndCFEFusedEUDispatchWhen
using ThreadArbitrationGen12Lp = PreambleFixture;
GEN12LPTEST_F(ThreadArbitrationGen12Lp, whenGetDefaultThreadArbitrationPolicyIsCalledThenCorrectPolicyIsReturned) {
EXPECT_EQ(ThreadArbitrationPolicy::AgeBased, GfxCoreHelperHw<FamilyType>::get().getDefaultThreadArbitrationPolicy());
auto &gfxCoreHelper = getHelper<GfxCoreHelper>();
EXPECT_EQ(ThreadArbitrationPolicy::AgeBased, gfxCoreHelper.getDefaultThreadArbitrationPolicy());
}
GEN12LPTEST_F(ThreadArbitrationGen12Lp, whenGetSupportThreadArbitrationPoliciesIsCalledThenEmptyVectorIsReturned) {

View File

@@ -1035,42 +1035,43 @@ HWTEST2_F(ProductHelperCommonTest, givenDebugFlagSetWhenEnablingBlitterOperation
}
HWCMDTEST_F(IGFX_GEN8_CORE, GfxCoreHelperTest, GivenVariousValuesWhenAlignSlmSizeIsCalledThenCorrectValueIsReturned) {
auto &gfxCoreHelper = getHelper<GfxCoreHelper>();
if (::renderCoreFamily == IGFX_GEN8_CORE) {
EXPECT_EQ(0u, GfxCoreHelperHw<FamilyType>::get().alignSlmSize(0));
EXPECT_EQ(4096u, GfxCoreHelperHw<FamilyType>::get().alignSlmSize(1));
EXPECT_EQ(4096u, GfxCoreHelperHw<FamilyType>::get().alignSlmSize(1024));
EXPECT_EQ(4096u, GfxCoreHelperHw<FamilyType>::get().alignSlmSize(1025));
EXPECT_EQ(4096u, GfxCoreHelperHw<FamilyType>::get().alignSlmSize(2048));
EXPECT_EQ(4096u, GfxCoreHelperHw<FamilyType>::get().alignSlmSize(2049));
EXPECT_EQ(4096u, GfxCoreHelperHw<FamilyType>::get().alignSlmSize(4096));
EXPECT_EQ(8192u, GfxCoreHelperHw<FamilyType>::get().alignSlmSize(4097));
EXPECT_EQ(8192u, GfxCoreHelperHw<FamilyType>::get().alignSlmSize(8192));
EXPECT_EQ(16384u, GfxCoreHelperHw<FamilyType>::get().alignSlmSize(8193));
EXPECT_EQ(16384u, GfxCoreHelperHw<FamilyType>::get().alignSlmSize(12288));
EXPECT_EQ(16384u, GfxCoreHelperHw<FamilyType>::get().alignSlmSize(16384));
EXPECT_EQ(32768u, GfxCoreHelperHw<FamilyType>::get().alignSlmSize(16385));
EXPECT_EQ(32768u, GfxCoreHelperHw<FamilyType>::get().alignSlmSize(24576));
EXPECT_EQ(32768u, GfxCoreHelperHw<FamilyType>::get().alignSlmSize(32768));
EXPECT_EQ(65536u, GfxCoreHelperHw<FamilyType>::get().alignSlmSize(32769));
EXPECT_EQ(65536u, GfxCoreHelperHw<FamilyType>::get().alignSlmSize(49152));
EXPECT_EQ(65536u, GfxCoreHelperHw<FamilyType>::get().alignSlmSize(65535));
EXPECT_EQ(65536u, GfxCoreHelperHw<FamilyType>::get().alignSlmSize(65536));
EXPECT_EQ(0u, gfxCoreHelper.alignSlmSize(0));
EXPECT_EQ(4096u, gfxCoreHelper.alignSlmSize(1));
EXPECT_EQ(4096u, gfxCoreHelper.alignSlmSize(1024));
EXPECT_EQ(4096u, gfxCoreHelper.alignSlmSize(1025));
EXPECT_EQ(4096u, gfxCoreHelper.alignSlmSize(2048));
EXPECT_EQ(4096u, gfxCoreHelper.alignSlmSize(2049));
EXPECT_EQ(4096u, gfxCoreHelper.alignSlmSize(4096));
EXPECT_EQ(8192u, gfxCoreHelper.alignSlmSize(4097));
EXPECT_EQ(8192u, gfxCoreHelper.alignSlmSize(8192));
EXPECT_EQ(16384u, gfxCoreHelper.alignSlmSize(8193));
EXPECT_EQ(16384u, gfxCoreHelper.alignSlmSize(12288));
EXPECT_EQ(16384u, gfxCoreHelper.alignSlmSize(16384));
EXPECT_EQ(32768u, gfxCoreHelper.alignSlmSize(16385));
EXPECT_EQ(32768u, gfxCoreHelper.alignSlmSize(24576));
EXPECT_EQ(32768u, gfxCoreHelper.alignSlmSize(32768));
EXPECT_EQ(65536u, gfxCoreHelper.alignSlmSize(32769));
EXPECT_EQ(65536u, gfxCoreHelper.alignSlmSize(49152));
EXPECT_EQ(65536u, gfxCoreHelper.alignSlmSize(65535));
EXPECT_EQ(65536u, gfxCoreHelper.alignSlmSize(65536));
} else {
EXPECT_EQ(0u, GfxCoreHelperHw<FamilyType>::get().alignSlmSize(0));
EXPECT_EQ(1024u, GfxCoreHelperHw<FamilyType>::get().alignSlmSize(1));
EXPECT_EQ(1024u, GfxCoreHelperHw<FamilyType>::get().alignSlmSize(1024));
EXPECT_EQ(2048u, GfxCoreHelperHw<FamilyType>::get().alignSlmSize(1025));
EXPECT_EQ(2048u, GfxCoreHelperHw<FamilyType>::get().alignSlmSize(2048));
EXPECT_EQ(4096u, GfxCoreHelperHw<FamilyType>::get().alignSlmSize(2049));
EXPECT_EQ(4096u, GfxCoreHelperHw<FamilyType>::get().alignSlmSize(4096));
EXPECT_EQ(8192u, GfxCoreHelperHw<FamilyType>::get().alignSlmSize(4097));
EXPECT_EQ(8192u, GfxCoreHelperHw<FamilyType>::get().alignSlmSize(8192));
EXPECT_EQ(16384u, GfxCoreHelperHw<FamilyType>::get().alignSlmSize(8193));
EXPECT_EQ(16384u, GfxCoreHelperHw<FamilyType>::get().alignSlmSize(16384));
EXPECT_EQ(32768u, GfxCoreHelperHw<FamilyType>::get().alignSlmSize(16385));
EXPECT_EQ(32768u, GfxCoreHelperHw<FamilyType>::get().alignSlmSize(32768));
EXPECT_EQ(65536u, GfxCoreHelperHw<FamilyType>::get().alignSlmSize(32769));
EXPECT_EQ(65536u, GfxCoreHelperHw<FamilyType>::get().alignSlmSize(65536));
EXPECT_EQ(0u, gfxCoreHelper.alignSlmSize(0));
EXPECT_EQ(1024u, gfxCoreHelper.alignSlmSize(1));
EXPECT_EQ(1024u, gfxCoreHelper.alignSlmSize(1024));
EXPECT_EQ(2048u, gfxCoreHelper.alignSlmSize(1025));
EXPECT_EQ(2048u, gfxCoreHelper.alignSlmSize(2048));
EXPECT_EQ(4096u, gfxCoreHelper.alignSlmSize(2049));
EXPECT_EQ(4096u, gfxCoreHelper.alignSlmSize(4096));
EXPECT_EQ(8192u, gfxCoreHelper.alignSlmSize(4097));
EXPECT_EQ(8192u, gfxCoreHelper.alignSlmSize(8192));
EXPECT_EQ(16384u, gfxCoreHelper.alignSlmSize(8193));
EXPECT_EQ(16384u, gfxCoreHelper.alignSlmSize(16384));
EXPECT_EQ(32768u, gfxCoreHelper.alignSlmSize(16385));
EXPECT_EQ(32768u, gfxCoreHelper.alignSlmSize(32768));
EXPECT_EQ(65536u, gfxCoreHelper.alignSlmSize(32769));
EXPECT_EQ(65536u, gfxCoreHelper.alignSlmSize(65536));
}
}

View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021-2022 Intel Corporation
* Copyright (C) 2021-2023 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -182,8 +182,8 @@ HWTEST2_F(GfxCoreHelperTestPvcAndLater, givenForceBCSForInternalCopyEngineVariab
DebugManager.flags.ForceBCSForInternalCopyEngine.set(2);
auto device = std::unique_ptr<MockDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(&hwInfo, 0));
auto &engines = GfxCoreHelperHw<FamilyType>::get().getGpgpuEngineInstances(hwInfo);
auto &gfxCoreHelper = device->getGfxCoreHelper();
auto &engines = gfxCoreHelper.getGpgpuEngineInstances(hwInfo);
EXPECT_GE(engines.size(), 9u);
bool found = false;
@@ -200,7 +200,7 @@ HWTEST2_F(GfxCoreHelperTestCooperativeEngine, givenCooperativeContextSupportedWh
HardwareInfo hwInfo = *defaultHwInfo;
hwInfo.gtSystemInfo.CCSInfo.NumberOfCCSEnabled = 2;
hwInfo.featureTable.flags.ftrCCSNode = true;
auto &gfxCoreHelper = GfxCoreHelperHw<FamilyType>::get();
auto &gfxCoreHelper = getHelper<GfxCoreHelper>();
auto &productHelper = *ProductHelper::get(hwInfo.platform.eProductFamily);
uint32_t revisions[] = {REVISION_A0, REVISION_B};

View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021-2022 Intel Corporation
* Copyright (C) 2021-2023 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -9,13 +9,16 @@
#include "shared/test/common/helpers/debug_manager_state_restore.h"
#include "shared/test/common/helpers/unit_test_helper.h"
#include "shared/test/common/mocks/mock_allocation_properties.h"
#include "shared/test/common/mocks/mock_execution_environment.h"
#include "shared/test/unit_test/command_stream/compute_mode_tests.h"
using namespace NEO;
using ThreadArbitrationXeHpc = ::testing::Test;
HWTEST2_F(ThreadArbitrationXeHpc, givenXeHpcWhenCallgetDefaultThreadArbitrationPolicyThenAgeBasedisReturned, IsXeHpcCore) {
EXPECT_EQ(ThreadArbitrationPolicy::RoundRobinAfterDependency, GfxCoreHelperHw<FamilyType>::get().getDefaultThreadArbitrationPolicy());
MockExecutionEnvironment mockExecutionEnvironment{};
auto &gfxCoreHelper = mockExecutionEnvironment.rootDeviceEnvironments[0]->getHelper<GfxCoreHelper>();
EXPECT_EQ(ThreadArbitrationPolicy::RoundRobinAfterDependency, gfxCoreHelper.getDefaultThreadArbitrationPolicy());
}
using XeHpcComputeModeRequirements = ComputeModeRequirements;

View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2021-2022 Intel Corporation
* Copyright (C) 2021-2023 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -111,9 +111,9 @@ PVCTEST_F(EngineNodeHelperPvcTests, givenCccsDisabledButDebugVariableSetWhenGetG
DebugManager.flags.NodeOrdinal.set(static_cast<int32_t>(aub_stream::EngineType::ENGINE_CCCS));
auto device = std::unique_ptr<MockDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(&hwInfo, 0));
auto &gfxCoreHelper = device->getGfxCoreHelper();
EXPECT_EQ(9u, device->allEngines.size());
auto &engines = GfxCoreHelperHw<FamilyType>::get().getGpgpuEngineInstances(hwInfo);
auto &engines = gfxCoreHelper.getGpgpuEngineInstances(hwInfo);
EXPECT_EQ(9u, engines.size());
EXPECT_EQ(aub_stream::ENGINE_CCS, engines[0].first);
@@ -137,9 +137,9 @@ PVCTEST_F(EngineNodeHelperPvcTests, givenCccsDisabledWhenGetGpgpuEnginesCalledTh
hwInfo.gtSystemInfo.CCSInfo.NumberOfCCSEnabled = 4;
auto device = std::unique_ptr<MockDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(&hwInfo, 0));
auto &gfxCoreHelper = device->getGfxCoreHelper();
EXPECT_EQ(8u, device->allEngines.size());
auto &engines = GfxCoreHelperHw<FamilyType>::get().getGpgpuEngineInstances(hwInfo);
auto &engines = gfxCoreHelper.getGpgpuEngineInstances(hwInfo);
EXPECT_EQ(8u, engines.size());
EXPECT_EQ(aub_stream::ENGINE_CCS, engines[0].first);
@@ -189,9 +189,9 @@ PVCTEST_F(EngineNodeHelperPvcTests, givenBcsDisabledWhenGetEnginesCalledThenDont
hwInfo.gtSystemInfo.CCSInfo.NumberOfCCSEnabled = 4;
auto device = std::unique_ptr<MockDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(&hwInfo, 0));
auto &gfxCoreHelper = device->getGfxCoreHelper();
EXPECT_EQ(numEngines, device->allEngines.size());
auto &engines = GfxCoreHelperHw<FamilyType>::get().getGpgpuEngineInstances(device->getHardwareInfo());
auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getHardwareInfo());
EXPECT_EQ(numEngines, engines.size());
struct EnginePropertiesMap {
@@ -228,9 +228,9 @@ PVCTEST_F(EngineNodeHelperPvcTests, givenOneBcsEnabledWhenGetEnginesCalledThenCr
hwInfo.gtSystemInfo.CCSInfo.NumberOfCCSEnabled = 4;
auto device = std::unique_ptr<MockDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(&hwInfo, 0));
auto &gfxCoreHelper = device->getGfxCoreHelper();
EXPECT_EQ(numEngines, device->allEngines.size());
auto &engines = GfxCoreHelperHw<FamilyType>::get().getGpgpuEngineInstances(device->getHardwareInfo());
auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getHardwareInfo());
EXPECT_EQ(numEngines, engines.size());
struct EnginePropertiesMap {
@@ -273,9 +273,9 @@ PVCTEST_F(EngineNodeHelperPvcTests, givenNotAllCopyEnginesWhenSettingEngineTable
hwInfo.gtSystemInfo.CCSInfo.NumberOfCCSEnabled = 1;
auto device = std::unique_ptr<MockDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(&hwInfo, 0));
auto &gfxCoreHelper = device->getGfxCoreHelper();
EXPECT_EQ(numEngines, device->allEngines.size());
auto &engines = GfxCoreHelperHw<FamilyType>::get().getGpgpuEngineInstances(device->getHardwareInfo());
auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getHardwareInfo());
EXPECT_EQ(numEngines, engines.size());
struct EnginePropertiesMap {
@@ -314,9 +314,9 @@ PVCTEST_F(EngineNodeHelperPvcTests, givenOneCcsEnabledWhenGetEnginesCalledThenCr
hwInfo.gtSystemInfo.CCSInfo.NumberOfCCSEnabled = 1;
auto device = std::unique_ptr<MockDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(&hwInfo, 0));
auto &gfxCoreHelper = device->getGfxCoreHelper();
EXPECT_EQ(numEngines, device->allEngines.size());
auto &engines = GfxCoreHelperHw<FamilyType>::get().getGpgpuEngineInstances(device->getHardwareInfo());
auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getHardwareInfo());
EXPECT_EQ(numEngines, engines.size());
struct EnginePropertiesMap {
@@ -361,9 +361,9 @@ PVCTEST_F(EngineNodeHelperPvcTests, givenCccsAsDefaultEngineWhenGetEnginesCalled
hwInfo.gtSystemInfo.CCSInfo.NumberOfCCSEnabled = 4;
auto device = std::unique_ptr<MockDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(&hwInfo, 0));
auto &gfxCoreHelper = device->getGfxCoreHelper();
EXPECT_EQ(numEngines, device->allEngines.size());
auto &engines = GfxCoreHelperHw<FamilyType>::get().getGpgpuEngineInstances(device->getHardwareInfo());
auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getHardwareInfo());
EXPECT_EQ(numEngines, engines.size());
struct EnginePropertiesMap {
@@ -411,9 +411,9 @@ PVCTEST_F(EngineNodeHelperPvcTests, whenGetGpgpuEnginesThenReturnTwoCccsEnginesA
hwInfo.gtSystemInfo.CCSInfo.NumberOfCCSEnabled = 4;
auto device = std::unique_ptr<MockDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(&hwInfo, 0));
auto &gfxCoreHelper = device->getGfxCoreHelper();
EXPECT_EQ(numEngines, device->allEngines.size());
auto &engines = GfxCoreHelperHw<FamilyType>::get().getGpgpuEngineInstances(device->getHardwareInfo());
auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getHardwareInfo());
EXPECT_EQ(numEngines, engines.size());
struct EnginePropertiesMap {
@@ -461,9 +461,9 @@ PVCTEST_F(EngineNodeHelperPvcTests, whenGetGpgpuEnginesThenReturnTwoCccsEnginesA
hwInfo.gtSystemInfo.CCSInfo.NumberOfCCSEnabled = 4;
auto device = std::unique_ptr<MockDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(&hwInfo, 0));
auto &gfxCoreHelper = device->getGfxCoreHelper();
EXPECT_EQ(numEngines, device->allEngines.size());
auto &engines = GfxCoreHelperHw<FamilyType>::get().getGpgpuEngineInstances(device->getHardwareInfo());
auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getHardwareInfo());
EXPECT_EQ(numEngines, engines.size());
struct EnginePropertiesMap {

View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2022 Intel Corporation
* Copyright (C) 2022-2023 Intel Corporation
*
* SPDX-License-Identifier: MIT
*
@@ -41,9 +41,9 @@ DG2TEST_F(GfxCoreHelperTestDg2, givenRcsDisabledWhenGetGpgpuEnginesCalledThenDon
productHelper->configureHardwareCustom(&hwInfo, nullptr);
auto device = std::unique_ptr<MockDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(&hwInfo, 0));
auto &gfxCoreHelper = device->getGfxCoreHelper();
EXPECT_EQ(8u, device->allEngines.size());
auto &engines = GfxCoreHelperHw<FamilyType>::get().getGpgpuEngineInstances(hwInfo);
auto &engines = gfxCoreHelper.getGpgpuEngineInstances(hwInfo);
EXPECT_EQ(8u, engines.size());
EXPECT_EQ(aub_stream::ENGINE_CCS, engines[0].first);
@@ -69,9 +69,9 @@ DG2TEST_F(GfxCoreHelperTestDg2, givenRcsDisabledButDebugVariableSetWhenGetGpgpuE
DebugManager.flags.NodeOrdinal.set(static_cast<int32_t>(aub_stream::EngineType::ENGINE_RCS));
auto device = std::unique_ptr<MockDevice>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(&hwInfo, 0));
auto &gfxCoreHelper = device->getGfxCoreHelper();
EXPECT_EQ(9u, device->allEngines.size());
auto &engines = GfxCoreHelperHw<FamilyType>::get().getGpgpuEngineInstances(hwInfo);
auto &engines = gfxCoreHelper.getGpgpuEngineInstances(hwInfo);
EXPECT_EQ(9u, engines.size());
EXPECT_EQ(aub_stream::ENGINE_CCS, engines[0].first);