From 100f7e374505795de7e224a92ea55b06478ed558 Mon Sep 17 00:00:00 2001 From: Kamil Kopryk Date: Tue, 10 Jan 2023 17:13:08 +0000 Subject: [PATCH] refactor: don't use global gfxCoreHelper getter 5/n Related-To: NEO-6853 Signed-off-by: Kamil Kopryk --- .../windows/wddm_direct_submission_tests.cpp | 14 ++-- .../gen12lp/test_preamble_gen12lp.cpp | 5 +- .../unit_test/helpers/hw_helper_tests.cpp | 69 ++++++++++--------- .../helpers/hw_helper_tests_pvc_and_later.cpp | 8 +-- .../compute_mode_tests_xe_hpc_core.cpp | 7 +- .../pvc/engine_node_helper_tests_pvc.cpp | 38 +++++----- .../xe_hpg_core/dg2/hw_helper_tests_dg2.cpp | 10 +-- 7 files changed, 79 insertions(+), 72 deletions(-) diff --git a/shared/test/unit_test/direct_submission/windows/wddm_direct_submission_tests.cpp b/shared/test/unit_test/direct_submission/windows/wddm_direct_submission_tests.cpp index b9f8064e2e..44ff0ddebc 100644 --- a/shared/test/unit_test/direct_submission/windows/wddm_direct_submission_tests.cpp +++ b/shared/test/unit_test/direct_submission/windows/wddm_direct_submission_tests.cpp @@ -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::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::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::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::get().isRelaxedOrderingSupported()) { + if (gfxCoreHelper.isRelaxedOrderingSupported()) { expectedAllocationsCnt += 2; } diff --git a/shared/test/unit_test/gen12lp/test_preamble_gen12lp.cpp b/shared/test/unit_test/gen12lp/test_preamble_gen12lp.cpp index e93dded9b4..1fe8f5239d 100644 --- a/shared/test/unit_test/gen12lp/test_preamble_gen12lp.cpp +++ b/shared/test/unit_test/gen12lp/test_preamble_gen12lp.cpp @@ -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::get().getDefaultThreadArbitrationPolicy()); + auto &gfxCoreHelper = getHelper(); + EXPECT_EQ(ThreadArbitrationPolicy::AgeBased, gfxCoreHelper.getDefaultThreadArbitrationPolicy()); } GEN12LPTEST_F(ThreadArbitrationGen12Lp, whenGetSupportThreadArbitrationPoliciesIsCalledThenEmptyVectorIsReturned) { diff --git a/shared/test/unit_test/helpers/hw_helper_tests.cpp b/shared/test/unit_test/helpers/hw_helper_tests.cpp index 9d8c14c1c7..b06005abb3 100644 --- a/shared/test/unit_test/helpers/hw_helper_tests.cpp +++ b/shared/test/unit_test/helpers/hw_helper_tests.cpp @@ -1035,42 +1035,43 @@ HWTEST2_F(ProductHelperCommonTest, givenDebugFlagSetWhenEnablingBlitterOperation } HWCMDTEST_F(IGFX_GEN8_CORE, GfxCoreHelperTest, GivenVariousValuesWhenAlignSlmSizeIsCalledThenCorrectValueIsReturned) { + auto &gfxCoreHelper = getHelper(); if (::renderCoreFamily == IGFX_GEN8_CORE) { - EXPECT_EQ(0u, GfxCoreHelperHw::get().alignSlmSize(0)); - EXPECT_EQ(4096u, GfxCoreHelperHw::get().alignSlmSize(1)); - EXPECT_EQ(4096u, GfxCoreHelperHw::get().alignSlmSize(1024)); - EXPECT_EQ(4096u, GfxCoreHelperHw::get().alignSlmSize(1025)); - EXPECT_EQ(4096u, GfxCoreHelperHw::get().alignSlmSize(2048)); - EXPECT_EQ(4096u, GfxCoreHelperHw::get().alignSlmSize(2049)); - EXPECT_EQ(4096u, GfxCoreHelperHw::get().alignSlmSize(4096)); - EXPECT_EQ(8192u, GfxCoreHelperHw::get().alignSlmSize(4097)); - EXPECT_EQ(8192u, GfxCoreHelperHw::get().alignSlmSize(8192)); - EXPECT_EQ(16384u, GfxCoreHelperHw::get().alignSlmSize(8193)); - EXPECT_EQ(16384u, GfxCoreHelperHw::get().alignSlmSize(12288)); - EXPECT_EQ(16384u, GfxCoreHelperHw::get().alignSlmSize(16384)); - EXPECT_EQ(32768u, GfxCoreHelperHw::get().alignSlmSize(16385)); - EXPECT_EQ(32768u, GfxCoreHelperHw::get().alignSlmSize(24576)); - EXPECT_EQ(32768u, GfxCoreHelperHw::get().alignSlmSize(32768)); - EXPECT_EQ(65536u, GfxCoreHelperHw::get().alignSlmSize(32769)); - EXPECT_EQ(65536u, GfxCoreHelperHw::get().alignSlmSize(49152)); - EXPECT_EQ(65536u, GfxCoreHelperHw::get().alignSlmSize(65535)); - EXPECT_EQ(65536u, GfxCoreHelperHw::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::get().alignSlmSize(0)); - EXPECT_EQ(1024u, GfxCoreHelperHw::get().alignSlmSize(1)); - EXPECT_EQ(1024u, GfxCoreHelperHw::get().alignSlmSize(1024)); - EXPECT_EQ(2048u, GfxCoreHelperHw::get().alignSlmSize(1025)); - EXPECT_EQ(2048u, GfxCoreHelperHw::get().alignSlmSize(2048)); - EXPECT_EQ(4096u, GfxCoreHelperHw::get().alignSlmSize(2049)); - EXPECT_EQ(4096u, GfxCoreHelperHw::get().alignSlmSize(4096)); - EXPECT_EQ(8192u, GfxCoreHelperHw::get().alignSlmSize(4097)); - EXPECT_EQ(8192u, GfxCoreHelperHw::get().alignSlmSize(8192)); - EXPECT_EQ(16384u, GfxCoreHelperHw::get().alignSlmSize(8193)); - EXPECT_EQ(16384u, GfxCoreHelperHw::get().alignSlmSize(16384)); - EXPECT_EQ(32768u, GfxCoreHelperHw::get().alignSlmSize(16385)); - EXPECT_EQ(32768u, GfxCoreHelperHw::get().alignSlmSize(32768)); - EXPECT_EQ(65536u, GfxCoreHelperHw::get().alignSlmSize(32769)); - EXPECT_EQ(65536u, GfxCoreHelperHw::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)); } } diff --git a/shared/test/unit_test/helpers/hw_helper_tests_pvc_and_later.cpp b/shared/test/unit_test/helpers/hw_helper_tests_pvc_and_later.cpp index 5c912544ed..5ef71a1a06 100644 --- a/shared/test/unit_test/helpers/hw_helper_tests_pvc_and_later.cpp +++ b/shared/test/unit_test/helpers/hw_helper_tests_pvc_and_later.cpp @@ -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::createWithNewExecutionEnvironment(&hwInfo, 0)); - - auto &engines = GfxCoreHelperHw::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::get(); + auto &gfxCoreHelper = getHelper(); auto &productHelper = *ProductHelper::get(hwInfo.platform.eProductFamily); uint32_t revisions[] = {REVISION_A0, REVISION_B}; diff --git a/shared/test/unit_test/xe_hpc_core/compute_mode_tests_xe_hpc_core.cpp b/shared/test/unit_test/xe_hpc_core/compute_mode_tests_xe_hpc_core.cpp index 382bcad57d..0ad314aae6 100644 --- a/shared/test/unit_test/xe_hpc_core/compute_mode_tests_xe_hpc_core.cpp +++ b/shared/test/unit_test/xe_hpc_core/compute_mode_tests_xe_hpc_core.cpp @@ -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::get().getDefaultThreadArbitrationPolicy()); + MockExecutionEnvironment mockExecutionEnvironment{}; + auto &gfxCoreHelper = mockExecutionEnvironment.rootDeviceEnvironments[0]->getHelper(); + EXPECT_EQ(ThreadArbitrationPolicy::RoundRobinAfterDependency, gfxCoreHelper.getDefaultThreadArbitrationPolicy()); } using XeHpcComputeModeRequirements = ComputeModeRequirements; diff --git a/shared/test/unit_test/xe_hpc_core/pvc/engine_node_helper_tests_pvc.cpp b/shared/test/unit_test/xe_hpc_core/pvc/engine_node_helper_tests_pvc.cpp index 5a4189208a..3d10390b07 100644 --- a/shared/test/unit_test/xe_hpc_core/pvc/engine_node_helper_tests_pvc.cpp +++ b/shared/test/unit_test/xe_hpc_core/pvc/engine_node_helper_tests_pvc.cpp @@ -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(aub_stream::EngineType::ENGINE_CCCS)); auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); - + auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(9u, device->allEngines.size()); - auto &engines = GfxCoreHelperHw::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::createWithNewExecutionEnvironment(&hwInfo, 0)); - + auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(8u, device->allEngines.size()); - auto &engines = GfxCoreHelperHw::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::createWithNewExecutionEnvironment(&hwInfo, 0)); - + auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(numEngines, device->allEngines.size()); - auto &engines = GfxCoreHelperHw::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::createWithNewExecutionEnvironment(&hwInfo, 0)); - + auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(numEngines, device->allEngines.size()); - auto &engines = GfxCoreHelperHw::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::createWithNewExecutionEnvironment(&hwInfo, 0)); - + auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(numEngines, device->allEngines.size()); - auto &engines = GfxCoreHelperHw::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::createWithNewExecutionEnvironment(&hwInfo, 0)); - + auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(numEngines, device->allEngines.size()); - auto &engines = GfxCoreHelperHw::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::createWithNewExecutionEnvironment(&hwInfo, 0)); - + auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(numEngines, device->allEngines.size()); - auto &engines = GfxCoreHelperHw::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::createWithNewExecutionEnvironment(&hwInfo, 0)); - + auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(numEngines, device->allEngines.size()); - auto &engines = GfxCoreHelperHw::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::createWithNewExecutionEnvironment(&hwInfo, 0)); - + auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(numEngines, device->allEngines.size()); - auto &engines = GfxCoreHelperHw::get().getGpgpuEngineInstances(device->getHardwareInfo()); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getHardwareInfo()); EXPECT_EQ(numEngines, engines.size()); struct EnginePropertiesMap { diff --git a/shared/test/unit_test/xe_hpg_core/dg2/hw_helper_tests_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/hw_helper_tests_dg2.cpp index cc54011e4d..b12dbf1e9e 100644 --- a/shared/test/unit_test/xe_hpg_core/dg2/hw_helper_tests_dg2.cpp +++ b/shared/test/unit_test/xe_hpg_core/dg2/hw_helper_tests_dg2.cpp @@ -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::createWithNewExecutionEnvironment(&hwInfo, 0)); - + auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(8u, device->allEngines.size()); - auto &engines = GfxCoreHelperHw::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(aub_stream::EngineType::ENGINE_RCS)); auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); - + auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(9u, device->allEngines.size()); - auto &engines = GfxCoreHelperHw::get().getGpgpuEngineInstances(hwInfo); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(hwInfo); EXPECT_EQ(9u, engines.size()); EXPECT_EQ(aub_stream::ENGINE_CCS, engines[0].first);