From be855d7a4712580125e01847450bc14978eca707 Mon Sep 17 00:00:00 2001 From: Kamil Kopryk Date: Wed, 25 Jan 2023 16:13:28 +0000 Subject: [PATCH] refactor: don't use global ProductHelper getter 10/n Related-To: NEO-6853 Signed-off-by: Kamil Kopryk --- .../sources/cmdqueue/test_cmdqueue_3.cpp | 4 ++-- .../source/metrics/metric_oa_query_imp.cpp | 2 +- .../compression_aub_tests_xehp_and_later.cpp | 4 ++-- .../fixtures/multicontext_aub_fixture.cpp | 2 +- .../command_queue/command_queue_tests.cpp | 4 ++-- opencl/test/unit_test/device/device_tests.cpp | 17 ++++++------- .../device/get_device_info_tests.cpp | 2 +- .../unit_test/device/sub_device_tests.cpp | 12 ++++------ .../execution_environment_tests.cpp | 2 +- .../gen12lp/hw_helper_tests_gen12lp.inl | 14 +++++------ .../memory_manager/mem_obj_surface_tests.cpp | 2 +- .../memory_manager/memory_manager_tests.cpp | 24 +++++++++---------- .../performance_counters_tests.cpp | 2 +- .../windows/wddm_memory_manager_tests.cpp | 4 ++-- .../windows/wddm_memory_manager_tests.h | 5 ++-- .../gl/windows/gl_os_sharing_tests.cpp | 4 ++-- .../hw_helper_tests_xe_hpc_core.cpp | 22 ++++++++--------- shared/source/device/device.cpp | 3 +-- .../execution_environment.cpp | 2 +- shared/source/gen12lp/hw_helper_gen12lp.cpp | 3 ++- shared/source/helpers/hw_helper.h | 4 ++-- .../helpers/hw_helper_bdw_and_later.inl | 4 ++-- .../helpers/hw_helper_xehp_and_later.inl | 5 ++-- .../xe_hpc_core/hw_helper_xe_hpc_core.cpp | 5 ++-- .../fixtures/memory_allocator_fixture.h | 4 ++-- .../fixtures/memory_manager_fixture.cpp | 2 +- .../linux/device_command_stream_fixture.cpp | 4 ++-- .../linux/drm_command_stream_fixture.h | 2 +- .../os_interface/windows/wddm_fixture.h | 13 ++++------ .../common/test_macros/test_checks_shared.cpp | 4 ++-- .../aub_command_stream_receiver_1_tests.cpp | 3 +-- .../aub_command_stream_receiver_2_tests.cpp | 6 ++--- ...nd_stream_receiver_with_aub_dump_tests.cpp | 4 ++-- .../tbx_command_stream_tests.cpp | 3 +-- .../unit_test/gen11/hw_helper_tests_gen11.cpp | 2 +- .../unit_test/gen8/hw_helper_tests_gen8.cpp | 2 +- .../unit_test/gen9/hw_helper_tests_gen9.cpp | 2 +- .../unit_test/helpers/hw_helper_tests.cpp | 4 ++-- .../helpers/hw_helper_tests_pvc_and_later.cpp | 9 ++++--- ...nager_allocate_in_preferred_pool_tests.cpp | 2 +- .../memory_manager/surface_tests.cpp | 6 ++--- .../linux/drm_command_stream_tests.cpp | 8 +++---- .../linux/drm_command_stream_tests_1.cpp | 2 +- ...and_stream_xehp_and_later_prelim_tests.cpp | 6 ++--- .../windows/device_command_stream_tests.cpp | 4 ++-- .../windows/os_context_win_tests.cpp | 6 ++--- .../windows/os_interface_win_tests.cpp | 2 +- .../os_interface/windows/wddm20_tests.cpp | 5 ++-- .../os_interface/windows/wddm23_tests.cpp | 4 ++-- .../windows/wddm_preemption_tests.cpp | 4 ++-- .../wddm_residency_controller_tests.cpp | 6 ++--- .../windows/wddm_shared_allocations_test.cpp | 2 +- .../os_interface/windows/wddm_tests.cpp | 2 +- .../unit_test/preemption/preemption_tests.cpp | 3 +-- .../pvc/engine_node_helper_tests_pvc.cpp | 18 +++++++------- .../xe_hpg_core/dg2/hw_helper_tests_dg2.cpp | 4 ++-- 56 files changed, 143 insertions(+), 157 deletions(-) diff --git a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_3.cpp b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_3.cpp index f85583cc6a..809fd158a1 100644 --- a/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_3.cpp +++ b/level_zero/core/test/unit_tests/sources/cmdqueue/test_cmdqueue_3.cpp @@ -653,9 +653,9 @@ struct EngineInstancedDeviceExecuteTests : public ::testing::Test { } bool multiCcsDevice(const NEO::RootDeviceEnvironment &rootDeviceEnvironment, uint32_t expectedNumCcs) { - auto &hwInfo = *rootDeviceEnvironment.getHardwareInfo(); + auto &gfxCoreHelper = rootDeviceEnvironment.getHelper(); - auto gpgpuEngines = gfxCoreHelper.getGpgpuEngineInstances(hwInfo); + auto gpgpuEngines = gfxCoreHelper.getGpgpuEngineInstances(rootDeviceEnvironment); uint32_t numCcs = 0; diff --git a/level_zero/tools/source/metrics/metric_oa_query_imp.cpp b/level_zero/tools/source/metrics/metric_oa_query_imp.cpp index a8522d3999..f002cb57c7 100644 --- a/level_zero/tools/source/metrics/metric_oa_query_imp.cpp +++ b/level_zero/tools/source/metrics/metric_oa_query_imp.cpp @@ -244,7 +244,7 @@ void MetricsLibrary::getSubDeviceClientOptions( bool MetricsLibrary::createContext() { auto &device = metricSource.getDevice(); const auto &gfxCoreHelper = device.getGfxCoreHelper(); - const auto &asyncComputeEngines = gfxCoreHelper.getGpgpuEngineInstances(device.getHwInfo()); + const auto &asyncComputeEngines = gfxCoreHelper.getGpgpuEngineInstances(device.getNEODevice()->getRootDeviceEnvironment()); ContextCreateData_1_0 createData = {}; ClientOptionsData_1_0 clientOptions[6] = {}; ClientData_1_0 clientData = {}; 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 41f1b113b3..0e518fcfe9 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 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2022 Intel Corporation + * Copyright (C) 2022-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -43,7 +43,7 @@ struct CompressionXeHPAndLater : public AUBFixture, auto expectedEngine = static_cast(GetParam()); bool engineSupported = false; - for (auto &engine : gfxCoreHelper.getGpgpuEngineInstances(*defaultHwInfo)) { + for (auto &engine : gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment())) { if (engine.first == expectedEngine) { engineSupported = true; break; diff --git a/opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.cpp b/opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.cpp index 6f87ed9290..327b0875be 100644 --- a/opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.cpp +++ b/opencl/test/unit_test/aub_tests/fixtures/multicontext_aub_fixture.cpp @@ -58,7 +58,7 @@ void MulticontextAubFixture::setUp(uint32_t numberOfTiles, EnabledCommandStreame auto &gfxCoreHelper = platform()->peekExecutionEnvironment()->rootDeviceEnvironments[rootDeviceIndex]->getHelper(); auto engineType = getChosenEngineType(localHwInfo); auto renderEngine = aub_stream::NUM_ENGINES; - for (auto &engine : gfxCoreHelper.getGpgpuEngineInstances(localHwInfo)) { + for (auto &engine : gfxCoreHelper.getGpgpuEngineInstances(*platform()->peekExecutionEnvironment()->rootDeviceEnvironments[rootDeviceIndex])) { if (!EngineHelpers::isCcs(engine.first)) { renderEngine = engine.first; break; 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 c8d42831a7..c96af955aa 100644 --- a/opencl/test/unit_test/command_queue/command_queue_tests.cpp +++ b/opencl/test/unit_test/command_queue/command_queue_tests.cpp @@ -2574,7 +2574,7 @@ struct CommandQueueOnSpecificEngineTests : ::testing::Test { template class MockGfxCoreHelper : public GfxCoreHelperHw { public: - const EngineInstancesContainer getGpgpuEngineInstances(const HardwareInfo &hwInfo) const override { + const EngineInstancesContainer getGpgpuEngineInstances(const RootDeviceEnvironment &rootDeviceEnvironment) const override { EngineInstancesContainer result{}; for (int i = 0; i < rcsCount; i++) { result.push_back({aub_stream::ENGINE_RCS, EngineUsage::Regular}); @@ -2772,7 +2772,7 @@ HWTEST_F(CommandQueueOnSpecificEngineTests, givenDebugFlagSetWhenCreatingCmdQueu class MyMockGfxCoreHelper : public GfxCoreHelperHw { public: - const EngineInstancesContainer getGpgpuEngineInstances(const HardwareInfo &hwInfo) const override { + const EngineInstancesContainer getGpgpuEngineInstances(const RootDeviceEnvironment &rootDeviceEnvironment) const override { EngineInstancesContainer result{}; result.push_back({aub_stream::ENGINE_CCS, EngineUsage::Regular}); diff --git a/opencl/test/unit_test/device/device_tests.cpp b/opencl/test/unit_test/device/device_tests.cpp index 11b52a2ebb..594732a67c 100644 --- a/opencl/test/unit_test/device/device_tests.cpp +++ b/opencl/test/unit_test/device/device_tests.cpp @@ -72,7 +72,7 @@ TEST_F(DeviceTest, givenDeviceWhenAskedForSpecificEngineThenReturnIt) { MockClDevice mockClDevice{MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)}; auto &gfxCoreHelper = mockClDevice.getGfxCoreHelper(); - auto &engines = gfxCoreHelper.getGpgpuEngineInstances(hwInfo); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(mockClDevice.getRootDeviceEnvironment()); for (uint32_t i = 0; i < engines.size(); i++) { auto &deviceEngine = mockClDevice.getEngine(engines[i].first, EngineUsage::Regular); EXPECT_EQ(deviceEngine.osContext->getEngineType(), engines[i].first); @@ -90,7 +90,7 @@ TEST_F(DeviceTest, givenDebugVariableToAlwaysChooseEngineZeroWhenNotExistingEngi DebugManagerStateRestore restore; DebugManager.flags.OverrideInvalidEngineWithDefault.set(true); auto &gfxCoreHelper = pDevice->getGfxCoreHelper(); - auto &engines = gfxCoreHelper.getGpgpuEngineInstances(*defaultHwInfo); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(pDevice->getRootDeviceEnvironment()); auto &deviceEngine = pDevice->getEngine(engines[0].first, EngineUsage::Regular); auto ¬ExistingEngine = pDevice->getEngine(aub_stream::ENGINE_VCS, EngineUsage::Regular); EXPECT_EQ(¬ExistingEngine, &deviceEngine); @@ -272,7 +272,7 @@ TEST(DeviceCreation, givenDeviceWhenItIsCreatedThenOsContextIsRegistredInMemoryM auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(&hwInfo)); auto memoryManager = device->getMemoryManager(); auto &gfxCoreHelper = device->getGfxCoreHelper(); - auto numEnginesForDevice = gfxCoreHelper.getGpgpuEngineInstances(hwInfo).size(); + auto numEnginesForDevice = gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment()).size(); if (device->getNumGenericSubDevices() > 1) { numEnginesForDevice *= device->getNumGenericSubDevices(); numEnginesForDevice += device->allEngines.size(); @@ -302,11 +302,8 @@ TEST(DeviceCreation, givenMultiRootDeviceWhenTheyAreCreatedThenEachOsContextHasU MockDevice *devices[] = {device1.get(), device2.get()}; auto ®isteredEngines = executionEnvironment->memoryManager->getRegisteredEngines(); - - auto &hwInfo = device1->getHardwareInfo(); auto &gfxCoreHelper = device1->getGfxCoreHelper(); - - const auto &numGpgpuEngines = static_cast(gfxCoreHelper.getGpgpuEngineInstances(hwInfo).size()); + const auto &numGpgpuEngines = static_cast(gfxCoreHelper.getGpgpuEngineInstances(device1->getRootDeviceEnvironment()).size()); size_t numExpectedGenericEnginesPerDevice = numGpgpuEngines; size_t numExpectedEngineInstancedEnginesPerDevice = 0; @@ -375,9 +372,9 @@ TEST(DeviceCreation, givenMultiRootDeviceWhenTheyAreCreatedThenEachDeviceHasSepe executionEnvironment->rootDeviceEnvironments[i]->initGmm(); executionEnvironment->rootDeviceEnvironments[i]->getMutableHardwareInfo()->capabilityTable.blitterOperationsSupported = true; } - auto hwInfo = *executionEnvironment->rootDeviceEnvironments[0]->getHardwareInfo(); + auto &gfxCoreHelper = executionEnvironment->rootDeviceEnvironments[0]->getHelper(); - const auto &numGpgpuEngines = gfxCoreHelper.getGpgpuEngineInstances(hwInfo).size(); + const auto &numGpgpuEngines = gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment->rootDeviceEnvironments[0]).size(); auto device1 = std::unique_ptr(Device::create(executionEnvironment, 0u)); auto device2 = std::unique_ptr(Device::create(executionEnvironment, 1u)); @@ -458,7 +455,7 @@ HWTEST_F(DeviceTest, givenDebugFlagWhenCreatingRootDeviceWithoutSubDevicesThenWo TEST(DeviceCreation, givenDeviceWhenCheckingGpgpuEnginesCountThenNumberGreaterThanZeroIsReturned) { auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(nullptr)); auto &gfxCoreHelper = device->getGfxCoreHelper(); - EXPECT_GT(gfxCoreHelper.getGpgpuEngineInstances(device->getHardwareInfo()).size(), 0u); + EXPECT_GT(gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment()).size(), 0u); } TEST(DeviceCreation, givenDeviceWhenCheckingParentDeviceThenCorrectValueIsReturned) { diff --git a/opencl/test/unit_test/device/get_device_info_tests.cpp b/opencl/test/unit_test/device/get_device_info_tests.cpp index fd1f041e15..0fe4b7cbc5 100644 --- a/opencl/test/unit_test/device/get_device_info_tests.cpp +++ b/opencl/test/unit_test/device/get_device_info_tests.cpp @@ -676,7 +676,7 @@ TEST(GetDeviceInfo, WhenQueryingGenericAddressSpaceSupportThenProperValueIsRetur template class MockGfxCoreHelper : public GfxCoreHelperHw { public: - const EngineInstancesContainer getGpgpuEngineInstances(const HardwareInfo &hwInfo) const override { + const EngineInstancesContainer getGpgpuEngineInstances(const RootDeviceEnvironment &rootDeviceEnvironment) const override { EngineInstancesContainer result{}; for (int i = 0; i < ccsCount; i++) { result.push_back({static_cast(aub_stream::ENGINE_CCS + i), EngineUsage::Regular}); diff --git a/opencl/test/unit_test/device/sub_device_tests.cpp b/opencl/test/unit_test/device/sub_device_tests.cpp index daf6ca33de..0d05264739 100644 --- a/opencl/test/unit_test/device/sub_device_tests.cpp +++ b/opencl/test/unit_test/device/sub_device_tests.cpp @@ -242,7 +242,7 @@ TEST(RootDevicesTest, givenRootDeviceWithoutSubdevicesWhenCreateEnginesThenDevic executionEnvironment->rootDeviceEnvironments[0]->initGmm(); MockDevice device(executionEnvironment, 0); auto &gfxCoreHelper = device.getGfxCoreHelper(); - auto &gpgpuEngines = gfxCoreHelper.getGpgpuEngineInstances(hwInfo); + auto &gpgpuEngines = gfxCoreHelper.getGpgpuEngineInstances(device.getRootDeviceEnvironment()); EXPECT_EQ(0u, device.allEngines.size()); device.createEngines(); @@ -369,9 +369,8 @@ struct EngineInstancedDeviceTests : public ::testing::Test { template bool hasAllEngines(MockDeviceT *device) { - auto &hwInfo = device->getHardwareInfo(); auto &gfxCoreHelper = device->getGfxCoreHelper(); - auto &gpgpuEngines = gfxCoreHelper.getGpgpuEngineInstances(hwInfo); + auto &gpgpuEngines = gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment()); for (size_t i = 0; i < gpgpuEngines.size(); i++) { if (device->allEngines[i].getEngineType() != gpgpuEngines[i].first) { @@ -383,9 +382,8 @@ struct EngineInstancedDeviceTests : public ::testing::Test { } bool multiCcsDevice(const RootDeviceEnvironment &rootDeviceEnvironment, uint32_t expectedNumCcs) { - auto &hwInfo = *rootDeviceEnvironment.getHardwareInfo(); auto &gfxCoreHelper = rootDeviceEnvironment.getHelper(); - auto gpgpuEngines = gfxCoreHelper.getGpgpuEngineInstances(hwInfo); + auto gpgpuEngines = gfxCoreHelper.getGpgpuEngineInstances(rootDeviceEnvironment); uint32_t numCcs = 0; @@ -588,10 +586,8 @@ TEST_F(EngineInstancedDeviceTests, givenEngineInstancedSubDeviceWhenEngineCreati EXPECT_TRUE(createDevices(genericDevicesCount, ccsCount)); auto subDevice = static_cast(rootDevice->getSubDevice(0)); - - auto &hwInfo = rootDevice->getHardwareInfo(); auto &gfxCoreHelper = rootDevice->getGfxCoreHelper(); - auto &gpgpuEngines = gfxCoreHelper.getGpgpuEngineInstances(hwInfo); + auto &gpgpuEngines = gfxCoreHelper.getGpgpuEngineInstances(rootDevice->getRootDeviceEnvironment()); subDevice->engineInstanced = true; subDevice->failOnCreateEngine = true; diff --git a/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp b/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp index 0537c90796..7000814ac3 100644 --- a/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp +++ b/opencl/test/unit_test/execution_environment/execution_environment_tests.cpp @@ -441,7 +441,7 @@ TEST(ExecutionEnvironment, whenCalculateMaxOsContexCountThenGlobalVariableHasPro for (const auto &rootDeviceEnvironment : executionEnvironment.rootDeviceEnvironments) { auto hwInfo = rootDeviceEnvironment->getHardwareInfo(); auto &gfxCoreHelper = rootDeviceEnvironment->getHelper(); - auto osContextCount = gfxCoreHelper.getGpgpuEngineInstances(*hwInfo).size(); + auto osContextCount = gfxCoreHelper.getGpgpuEngineInstances(*rootDeviceEnvironment).size(); auto subDevicesCount = GfxCoreHelper::getSubDevicesCount(hwInfo); bool hasRootCsr = subDevicesCount > 1; auto ccsCount = hwInfo->gtSystemInfo.CCSInfo.NumberOfCCSEnabled; diff --git a/opencl/test/unit_test/gen12lp/hw_helper_tests_gen12lp.inl b/opencl/test/unit_test/gen12lp/hw_helper_tests_gen12lp.inl index 510f223ee6..400aac0efb 100644 --- a/opencl/test/unit_test/gen12lp/hw_helper_tests_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/hw_helper_tests_gen12lp.inl @@ -112,7 +112,7 @@ GEN12LPTEST_F(GfxCoreHelperTestGen12Lp, givenFtrCcsNodeNotSetAndBcsInfoSetWhenGe auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(4u, device->allEngines.size()); - auto &engines = gfxCoreHelper.getGpgpuEngineInstances(hwInfo); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment()); EXPECT_EQ(4u, engines.size()); EXPECT_EQ(aub_stream::ENGINE_RCS, engines[0].first); EXPECT_EQ(aub_stream::ENGINE_RCS, engines[1].first); @@ -129,7 +129,7 @@ GEN12LPTEST_F(GfxCoreHelperTestGen12Lp, givenFtrCcsNodeNotSetAndCcsDefualtEngine auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(3u, device->allEngines.size()); - auto &engines = gfxCoreHelper.getGpgpuEngineInstances(hwInfo); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment()); EXPECT_EQ(3u, engines.size()); EXPECT_EQ(aub_stream::ENGINE_RCS, engines[0].first); EXPECT_EQ(aub_stream::ENGINE_RCS, engines[1].first); @@ -145,7 +145,7 @@ GEN12LPTEST_F(GfxCoreHelperTestGen12Lp, givenFtrCcsNodeNotSetWhenGetGpgpuEngines auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(3u, device->allEngines.size()); - auto &engines = gfxCoreHelper.getGpgpuEngineInstances(hwInfo); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment()); EXPECT_EQ(3u, engines.size()); EXPECT_EQ(aub_stream::ENGINE_RCS, engines[0].first); @@ -162,7 +162,7 @@ GEN12LPTEST_F(GfxCoreHelperTestGen12Lp, givenFtrCcsNodeSetWhenGetGpgpuEnginesThe auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(4u, device->allEngines.size()); - auto &engines = gfxCoreHelper.getGpgpuEngineInstances(hwInfo); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment()); EXPECT_EQ(4u, engines.size()); EXPECT_EQ(aub_stream::ENGINE_CCS, engines[0].first); EXPECT_EQ(aub_stream::ENGINE_RCS, engines[1].first); @@ -180,7 +180,7 @@ GEN12LPTEST_F(GfxCoreHelperTestGen12Lp, givenFtrCcsNodeSetFtrGpGpuMidThreadLevel auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(3u, device->allEngines.size()); - auto &engines = gfxCoreHelper.getGpgpuEngineInstances(hwInfo); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment()); EXPECT_EQ(3u, engines.size()); EXPECT_EQ(aub_stream::ENGINE_RCS, engines[0].first); EXPECT_EQ(aub_stream::ENGINE_RCS, engines[1].first); @@ -197,7 +197,7 @@ GEN12LPTEST_F(GfxCoreHelperTestGen12Lp, givenFtrCcsNodeSetFtrGpGpuMidThreadLevel auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(4u, device->allEngines.size()); - auto &engines = gfxCoreHelper.getGpgpuEngineInstances(hwInfo); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment()); EXPECT_EQ(4u, engines.size()); EXPECT_EQ(aub_stream::ENGINE_CCS, engines[0].first); EXPECT_EQ(aub_stream::ENGINE_RCS, engines[1].first); @@ -214,7 +214,7 @@ GEN12LPTEST_F(GfxCoreHelperTestGen12Lp, givenFtrCcsNodeSetAndDefaultRcsWhenGetGp auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(3u, device->allEngines.size()); - auto &engines = gfxCoreHelper.getGpgpuEngineInstances(hwInfo); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment()); EXPECT_EQ(3u, engines.size()); EXPECT_EQ(aub_stream::ENGINE_RCS, engines[0].first); EXPECT_EQ(aub_stream::ENGINE_RCS, engines[1].first); diff --git a/opencl/test/unit_test/memory_manager/mem_obj_surface_tests.cpp b/opencl/test/unit_test/memory_manager/mem_obj_surface_tests.cpp index efd6f7b504..eb8b2023ed 100644 --- a/opencl/test/unit_test/memory_manager/mem_obj_surface_tests.cpp +++ b/opencl/test/unit_test/memory_manager/mem_obj_surface_tests.cpp @@ -46,7 +46,7 @@ HWTEST_F(SurfaceTest, GivenSurfaceWhenInterfaceIsUsedThenSurfaceBehavesCorrectly auto csr = std::make_unique>(execStamp, *executionEnvironment, 0, deviceBitfield); auto hwInfo = *defaultHwInfo; auto &gfxCoreHelper = executionEnvironment->rootDeviceEnvironments[0]->getHelper(); - auto engine = gfxCoreHelper.getGpgpuEngineInstances(hwInfo)[0]; + auto engine = gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment->rootDeviceEnvironments[0])[0]; auto osContext = executionEnvironment->memoryManager->createAndRegisterOsContext(csr.get(), EngineDescriptorHelper::getDefaultDescriptor(engine, PreemptionHelper::getDefaultPreemptionMode(hwInfo))); csr->setupContext(*osContext); 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 6c8499952e..df427ad24f 100644 --- a/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp +++ b/opencl/test/unit_test/memory_manager/memory_manager_tests.cpp @@ -242,7 +242,7 @@ TEST_F(MemoryAllocatorTest, GivenAlignmentWhenAllocatingSystemMemoryThenAllocate TEST_F(MemoryAllocatorTest, WhenAllocatingGraphicsMemoryThenAllocationHasCorrectProperties) { unsigned int alignment = 4096; auto &gfxCoreHelper = this->device->getGfxCoreHelper(); - memoryManager->createAndRegisterOsContext(csr, EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*defaultHwInfo)[0], + memoryManager->createAndRegisterOsContext(csr, EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment())[0], PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo))); auto allocation = memoryManager->allocateGraphicsMemoryWithProperties(MockAllocationProperties{csr->getRootDeviceIndex(), MemoryConstants::pageSize}); @@ -831,7 +831,7 @@ TEST(OsAgnosticMemoryManager, givenDestroyedTagAllocationWhenWaitForCompletiionT std::unique_ptr csr(createCommandStream(executionEnvironment, 0u, deviceBitfield)); executionEnvironment.memoryManager.reset(memoryManager); auto &gfxCoreHelper = executionEnvironment.rootDeviceEnvironments[0]->getHelper(); - auto osContext = memoryManager->createAndRegisterOsContext(csr.get(), EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*defaultHwInfo)[0], + auto osContext = memoryManager->createAndRegisterOsContext(csr.get(), EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment.rootDeviceEnvironments[0])[0], PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo))); auto allocation = memoryManager->allocateGraphicsMemoryWithProperties(MockAllocationProperties{0, MemoryConstants::pageSize}); @@ -1714,7 +1714,7 @@ TEST(OsAgnosticMemoryManager, givenMemoryManagerWhenGpuAddressIsSetThenAllocatio std::unique_ptr csr(createCommandStream(executionEnvironment, 0u, deviceBitfield)); executionEnvironment.memoryManager.reset(memoryManager); auto &gfxCoreHelper = executionEnvironment.rootDeviceEnvironments[0]->getHelper(); - auto osContext = memoryManager->createAndRegisterOsContext(csr.get(), EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*defaultHwInfo)[0], + auto osContext = memoryManager->createAndRegisterOsContext(csr.get(), EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment.rootDeviceEnvironments[0])[0], PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo))); MockAllocationProperties properties = {0, MemoryConstants::pageSize}; @@ -1992,7 +1992,7 @@ TEST_F(MemoryManagerWithCsrTest, givenAllocationThatWasUsedAndIsCompletedWhenche TEST_F(MemoryManagerWithCsrTest, givenAllocationThatWasUsedAndIsNotCompletedWhencheckGpuUsageAndDestroyGraphicsAllocationsIsCalledThenItIsAddedToTemporaryAllocationList) { auto &gfxCoreHelper = csr->getGfxCoreHelper(); - memoryManager->createAndRegisterOsContext(csr.get(), EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*defaultHwInfo)[0], + memoryManager->createAndRegisterOsContext(csr.get(), EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment.rootDeviceEnvironments[0])[0], PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo))); auto usedAllocationAndNotGpuCompleted = memoryManager->allocateGraphicsMemoryWithProperties(MockAllocationProperties{csr->getRootDeviceIndex(), MemoryConstants::pageSize}); @@ -2221,7 +2221,7 @@ TEST(ResidencyDataTest, givenOsContextWhenItIsRegisteredToMemoryManagerThenRefCo executionEnvironment.memoryManager.reset(memoryManager); DeviceBitfield deviceBitfield(1); std::unique_ptr csr(createCommandStream(executionEnvironment, 0u, deviceBitfield)); - memoryManager->createAndRegisterOsContext(csr.get(), EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*defaultHwInfo)[0], + memoryManager->createAndRegisterOsContext(csr.get(), EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment.rootDeviceEnvironments[0])[0], PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo))); EXPECT_EQ(1u, memoryManager->getRegisteredEnginesCount()); EXPECT_EQ(1, memoryManager->registeredEngines[0].osContext->getRefInternalCount()); @@ -2249,7 +2249,7 @@ TEST(ResidencyDataTest, givenDeviceBitfieldWhenCreatingOsContextThenSetValidValu std::unique_ptr csr(createCommandStream(executionEnvironment, 0u, deviceBitfield)); PreemptionMode preemptionMode = PreemptionMode::MidThread; auto &gfxCoreHelper = executionEnvironment.rootDeviceEnvironments[0]->getHelper(); - memoryManager->createAndRegisterOsContext(csr.get(), EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*defaultHwInfo)[0], + memoryManager->createAndRegisterOsContext(csr.get(), EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment.rootDeviceEnvironments[0])[0], preemptionMode, deviceBitfield)); EXPECT_EQ(2u, memoryManager->registeredEngines[0].osContext->getNumSupportedDevices()); @@ -2265,9 +2265,9 @@ TEST(ResidencyDataTest, givenTwoOsContextsWhenTheyAreRegisteredFromHigherToLower std::unique_ptr csr(createCommandStream(executionEnvironment, 0u, deviceBitfield)); std::unique_ptr csr1(createCommandStream(executionEnvironment, 1u, deviceBitfield)); auto &gfxCoreHelper = executionEnvironment.rootDeviceEnvironments[0]->getHelper(); - memoryManager->createAndRegisterOsContext(csr.get(), EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*defaultHwInfo)[0], + memoryManager->createAndRegisterOsContext(csr.get(), EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment.rootDeviceEnvironments[0])[0], PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo))); - memoryManager->createAndRegisterOsContext(csr1.get(), EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*defaultHwInfo)[0], + memoryManager->createAndRegisterOsContext(csr1.get(), EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment.rootDeviceEnvironments[0])[0], PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo))); EXPECT_EQ(2u, memoryManager->getRegisteredEnginesCount()); EXPECT_EQ(1, memoryManager->registeredEngines[0].osContext->getRefInternalCount()); @@ -2277,7 +2277,7 @@ TEST(ResidencyDataTest, givenTwoOsContextsWhenTheyAreRegisteredFromHigherToLower TEST(ResidencyDataTest, givenGpgpuEnginesWhenAskedForMaxOsContextCountThenValueIsGreaterOrEqual) { MockExecutionEnvironment mockExecutionEnvironment{}; auto &gfxCoreHelper = mockExecutionEnvironment.rootDeviceEnvironments[0]->getHelper(); - auto &engines = gfxCoreHelper.getGpgpuEngineInstances(*defaultHwInfo); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(*mockExecutionEnvironment.rootDeviceEnvironments[0]); EXPECT_TRUE(MemoryManager::maxOsContextCount >= engines.size()); } @@ -2291,9 +2291,9 @@ TEST(ResidencyDataTest, givenResidencyDataWhenUpdateCompletionDataIsCalledThenIt MockResidencyData residency(MemoryManager::maxOsContextCount); - MockOsContext osContext(0u, EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*defaultHwInfo)[0], + MockOsContext osContext(0u, EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*mockExecutionEnvironment.rootDeviceEnvironments[0])[0], PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo))); - MockOsContext osContext2(1u, EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*defaultHwInfo)[0], + MockOsContext osContext2(1u, EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*mockExecutionEnvironment.rootDeviceEnvironments[0])[0], PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo))); auto lastFenceValue = 45llu; @@ -2996,7 +2996,7 @@ HWTEST_F(PageTableManagerTest, givenNullPageTableManagerWhenMapAuxGpuVaThenRetur auto csr = std::unique_ptr(createCommandStream(*executionEnvironment, 1u, 1)); auto hwInfo = *defaultHwInfo; auto &gfxCoreHelper = executionEnvironment->rootDeviceEnvironments[0]->getHelper(); - memoryManager->createAndRegisterOsContext(csr.get(), EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(hwInfo)[0], + memoryManager->createAndRegisterOsContext(csr.get(), EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment->rootDeviceEnvironments[0])[0], PreemptionHelper::getDefaultPreemptionMode(hwInfo))); for (auto engine : memoryManager->getRegisteredEngines()) { diff --git a/opencl/test/unit_test/os_interface/performance_counters_tests.cpp b/opencl/test/unit_test/os_interface/performance_counters_tests.cpp index 5f8c161a55..ce3b65e8e8 100644 --- a/opencl/test/unit_test/os_interface/performance_counters_tests.cpp +++ b/opencl/test/unit_test/os_interface/performance_counters_tests.cpp @@ -217,7 +217,7 @@ struct PerformanceCountersMetricsLibraryTest : public PerformanceCountersMetrics PerformanceCountersMetricsLibraryFixture::setUp(); auto hwInfo = rootDeviceEnvironment->getHardwareInfo(); auto &gfxCoreHelper = rootDeviceEnvironment->getHelper(); - osContext = std::make_unique(0, EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*hwInfo)[0], + osContext = std::make_unique(0, EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*rootDeviceEnvironment)[0], PreemptionHelper::getDefaultPreemptionMode(*hwInfo))); queue->getGpgpuCommandStreamReceiver().setupContext(*osContext); } diff --git a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp index 102e3e729c..814156c261 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp +++ b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp @@ -575,7 +575,7 @@ TEST_F(WddmMemoryManagerSimpleTest, givenNonZeroFenceValuesOnMultipleEnginesRegi auto hwInfo = executionEnvironment->rootDeviceEnvironments[rootDeviceIndex]->getHardwareInfo(); auto &gfxCoreHelper = executionEnvironment->rootDeviceEnvironments[rootDeviceIndex]->getHelper(); OsContext *osContext = memoryManager->createAndRegisterOsContext(csr.get(), - EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*hwInfo)[1], + EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment->rootDeviceEnvironments[rootDeviceIndex])[1], PreemptionHelper::getDefaultPreemptionMode(*hwInfo), deviceBitfield)); osContext->ensureContextInitialized(); ASSERT_EQ(2u, memoryManager->getRegisteredEnginesCount()); @@ -610,7 +610,7 @@ TEST_F(WddmMemoryManagerSimpleTest, givenNonZeroFenceValueOnSomeOfMultipleEngine executionEnvironment->rootDeviceEnvironments[rootDeviceIndex]->memoryOperationsInterface = std::make_unique(wddm2); auto &gfxCoreHelper = executionEnvironment->rootDeviceEnvironments[rootDeviceIndex]->getHelper(); auto hwInfo = executionEnvironment->rootDeviceEnvironments[rootDeviceIndex]->getHardwareInfo(); - memoryManager->createAndRegisterOsContext(csr.get(), EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*hwInfo)[1], + memoryManager->createAndRegisterOsContext(csr.get(), EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment->rootDeviceEnvironments[rootDeviceIndex])[1], PreemptionHelper::getDefaultPreemptionMode(*hwInfo), deviceBitfield)); ASSERT_EQ(2u, memoryManager->getRegisteredEnginesCount()); diff --git a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h index ff21d780bf..c606ecc93f 100644 --- a/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h +++ b/opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.h @@ -68,7 +68,7 @@ class MockWddmMemoryManagerFixture { csr.reset(createCommandStream(*executionEnvironment, 0u, 1)); auto hwInfo = rootDeviceEnvironment->getHardwareInfo(); auto &gfxCoreHelper = rootDeviceEnvironment->getHelper(); - osContext = memoryManager->createAndRegisterOsContext(csr.get(), EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*hwInfo)[0], + osContext = memoryManager->createAndRegisterOsContext(csr.get(), EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*rootDeviceEnvironment)[0], PreemptionHelper::getDefaultPreemptionMode(*hwInfo))); osContext->ensureContextInitialized(); @@ -121,8 +121,7 @@ class WddmMemoryManagerFixtureWithGmockWddm : public ExecutionEnvironmentFixture ASSERT_NE(nullptr, memoryManager); csr.reset(createCommandStream(*executionEnvironment, 0u, 1)); auto &gfxCoreHelper = executionEnvironment->rootDeviceEnvironments[0]->getHelper(); - auto hwInfo = executionEnvironment->rootDeviceEnvironments[0]->getHardwareInfo(); - osContext = memoryManager->createAndRegisterOsContext(csr.get(), EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*hwInfo)[0], + osContext = memoryManager->createAndRegisterOsContext(csr.get(), EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment->rootDeviceEnvironments[0])[0], preemptionMode)); osContext->incRefInternal(); } diff --git a/opencl/test/unit_test/sharings/gl/windows/gl_os_sharing_tests.cpp b/opencl/test/unit_test/sharings/gl/windows/gl_os_sharing_tests.cpp index b8b82b2845..8c22494c9a 100644 --- a/opencl/test/unit_test/sharings/gl/windows/gl_os_sharing_tests.cpp +++ b/opencl/test/unit_test/sharings/gl/windows/gl_os_sharing_tests.cpp @@ -337,7 +337,7 @@ TEST_F(GlArbSyncEventOsTest, GivenCallToSignalArbSyncObjectWhenSignalSynchroniza wddm->init(); auto &gfxCoreHelper = this->rootDeviceEnvironment->getHelper(); OsContextWin osContext(*wddm, 0, 0u, - EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*defaultHwInfo)[0], preemptionMode)); + EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*rootDeviceEnvironment)[0], preemptionMode)); CL_GL_SYNC_INFO syncInfo = {}; syncInfo.serverSynchronizationObject = 0x5cU; @@ -397,7 +397,7 @@ TEST_F(GlArbSyncEventOsTest, GivenCallToSignalArbSyncObjectWhenSignalSynchroniza auto preemptionMode = PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo); wddm->init(); auto &gfxCoreHelper = this->rootDeviceEnvironment->getHelper(); - OsContextWin osContext(*wddm, 0, 0u, EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*defaultHwInfo)[0], preemptionMode)); + OsContextWin osContext(*wddm, 0, 0u, EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*rootDeviceEnvironment)[0], preemptionMode)); CL_GL_SYNC_INFO syncInfo = {}; syncInfo.submissionSynchronizationObject = 0x7cU; diff --git a/opencl/test/unit_test/xe_hpc_core/hw_helper_tests_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/hw_helper_tests_xe_hpc_core.cpp index ff9d495325..c4bf28592b 100644 --- a/opencl/test/unit_test/xe_hpc_core/hw_helper_tests_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/hw_helper_tests_xe_hpc_core.cpp @@ -132,7 +132,7 @@ XE_HPC_CORETEST_F(GfxCoreHelperTestsXeHpcCore, givenCccsDisabledButDebugVariable auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(13u, device->allEngines.size()); - auto &engines = gfxCoreHelper.getGpgpuEngineInstances(hwInfo); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment()); EXPECT_EQ(13u, engines.size()); EXPECT_EQ(aub_stream::ENGINE_CCS, engines[0].first); @@ -164,7 +164,7 @@ XE_HPC_CORETEST_F(GfxCoreHelperTestsXeHpcCore, givenCccsDisabledWhenIsCooperativ auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(12u, device->allEngines.size()); - auto &engines = gfxCoreHelper.getGpgpuEngineInstances(hwInfo); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment()); EXPECT_EQ(12u, engines.size()); EXPECT_EQ(aub_stream::ENGINE_CCS, engines[0].first); @@ -195,7 +195,7 @@ XE_HPC_CORETEST_F(GfxCoreHelperTestsXeHpcCore, givenBcsDisabledWhenIsCooperative auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(numEngines, device->allEngines.size()); - auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getHardwareInfo()); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment()); EXPECT_EQ(numEngines, engines.size()); struct EnginePropertiesMap { @@ -240,7 +240,7 @@ XE_HPC_CORETEST_F(GfxCoreHelperTestsXeHpcCore, givenOneBcsEnabledWhenIsCooperati auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(numEngines, device->allEngines.size()); - auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getHardwareInfo()); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment()); EXPECT_EQ(numEngines, engines.size()); struct EnginePropertiesMap { @@ -291,7 +291,7 @@ XE_HPC_CORETEST_F(GfxCoreHelperTestsXeHpcCore, givenNotAllCopyEnginesWhenIsCoope auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(numEngines, device->allEngines.size()); - auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getHardwareInfo()); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment()); EXPECT_EQ(numEngines, engines.size()); struct EnginePropertiesMap { @@ -335,7 +335,7 @@ XE_HPC_CORETEST_F(GfxCoreHelperTestsXeHpcCore, givenOneCcsEnabledWhenIsCooperati auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(numEngines, device->allEngines.size()); - auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getHardwareInfo()); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment()); EXPECT_EQ(numEngines, engines.size()); struct EnginePropertiesMap { @@ -385,7 +385,7 @@ XE_HPC_CORETEST_F(GfxCoreHelperTestsXeHpcCore, givenCccsAsDefaultEngineWhenIsCoo auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(numEngines, device->allEngines.size()); - auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getHardwareInfo()); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment()); EXPECT_EQ(numEngines, engines.size()); struct EnginePropertiesMap { @@ -441,7 +441,7 @@ XE_HPC_CORETEST_F(GfxCoreHelperTestsXeHpcCore, whenIsCooperativeEngineSupportedE auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(numEngines, device->allEngines.size()); - auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getHardwareInfo()); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment()); EXPECT_EQ(numEngines, engines.size()); struct EnginePropertiesMap { @@ -497,7 +497,7 @@ XE_HPC_CORETEST_F(GfxCoreHelperTestsXeHpcCore, whenIsCooperativeEngineSupportedE auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(numEngines, device->allEngines.size()); - auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getHardwareInfo()); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment()); EXPECT_EQ(numEngines, engines.size()); struct EnginePropertiesMap { @@ -548,7 +548,7 @@ XE_HPC_CORETEST_F(GfxCoreHelperTestsXeHpcCore, givenCcsDisabledAndNumberOfCcsEna auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(3u, device->allEngines.size()); - auto &engines = gfxCoreHelper.getGpgpuEngineInstances(hwInfo); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment()); EXPECT_EQ(3u, engines.size()); EXPECT_EQ(aub_stream::ENGINE_CCCS, engines[0].first); @@ -566,7 +566,7 @@ XE_HPC_CORETEST_F(GfxCoreHelperTestsXeHpcCore, givenCcsDisabledWhenGetGpgpuEngin auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(3u, device->allEngines.size()); - auto &engines = gfxCoreHelper.getGpgpuEngineInstances(hwInfo); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment()); EXPECT_EQ(3u, engines.size()); EXPECT_EQ(aub_stream::ENGINE_CCCS, engines[0].first); diff --git a/shared/source/device/device.cpp b/shared/source/device/device.cpp index 27d104197b..cc682bedb6 100644 --- a/shared/source/device/device.cpp +++ b/shared/source/device/device.cpp @@ -296,9 +296,8 @@ bool Device::createEngines() { return createEngine(0, {engineInstancedType, EngineUsage::Regular}); } - auto &hwInfo = getHardwareInfo(); auto &gfxCoreHelper = getGfxCoreHelper(); - auto gpgpuEngines = gfxCoreHelper.getGpgpuEngineInstances(hwInfo); + auto gpgpuEngines = gfxCoreHelper.getGpgpuEngineInstances(getRootDeviceEnvironment()); uint32_t deviceCsrIndex = 0; for (auto &engine : gpgpuEngines) { diff --git a/shared/source/execution_environment/execution_environment.cpp b/shared/source/execution_environment/execution_environment.cpp index e9c5f93092..ba3f9b2753 100644 --- a/shared/source/execution_environment/execution_environment.cpp +++ b/shared/source/execution_environment/execution_environment.cpp @@ -85,7 +85,7 @@ void ExecutionEnvironment::calculateMaxOsContextCount() { for (const auto &rootDeviceEnvironment : this->rootDeviceEnvironments) { auto hwInfo = rootDeviceEnvironment->getHardwareInfo(); auto &gfxCoreHelper = rootDeviceEnvironment->getHelper(); - auto osContextCount = static_cast(gfxCoreHelper.getGpgpuEngineInstances(*hwInfo).size()); + auto osContextCount = static_cast(gfxCoreHelper.getGpgpuEngineInstances(*rootDeviceEnvironment).size()); auto subDevicesCount = GfxCoreHelper::getSubDevicesCount(hwInfo); auto ccsCount = hwInfo->gtSystemInfo.CCSInfo.NumberOfCCSEnabled; bool hasRootCsr = subDevicesCount > 1; diff --git a/shared/source/gen12lp/hw_helper_gen12lp.cpp b/shared/source/gen12lp/hw_helper_gen12lp.cpp index 2494eba300..521758067e 100644 --- a/shared/source/gen12lp/hw_helper_gen12lp.cpp +++ b/shared/source/gen12lp/hw_helper_gen12lp.cpp @@ -96,7 +96,8 @@ uint32_t GfxCoreHelperHw::getMetricsLibraryGenId() const { } template <> -const EngineInstancesContainer GfxCoreHelperHw::getGpgpuEngineInstances(const HardwareInfo &hwInfo) const { +const EngineInstancesContainer GfxCoreHelperHw::getGpgpuEngineInstances(const RootDeviceEnvironment &rootDeviceEnvironment) const { + auto &hwInfo = *rootDeviceEnvironment.getHardwareInfo(); auto defaultEngine = getChosenEngineType(hwInfo); EngineInstancesContainer engines; diff --git a/shared/source/helpers/hw_helper.h b/shared/source/helpers/hw_helper.h index 84205b4591..e30e3b30cc 100644 --- a/shared/source/helpers/hw_helper.h +++ b/shared/source/helpers/hw_helper.h @@ -81,7 +81,7 @@ class GfxCoreHelper { uint32_t surfaceType, bool forceNonAuxMode, bool useL1Cache) const = 0; - virtual const EngineInstancesContainer getGpgpuEngineInstances(const HardwareInfo &hwInfo) const = 0; + virtual const EngineInstancesContainer getGpgpuEngineInstances(const RootDeviceEnvironment &rootDeviceEnvironment) const = 0; virtual EngineGroupType getEngineGroupType(aub_stream::EngineType engineType, EngineUsage engineUsage, const HardwareInfo &hwInfo) const = 0; virtual const StackVec getDeviceSubGroupSizes() const = 0; virtual const StackVec getThreadsPerEUConfigs() const = 0; @@ -252,7 +252,7 @@ class GfxCoreHelperHw : public GfxCoreHelper { MOCKABLE_VIRTUAL void setL1CachePolicy(bool useL1Cache, typename GfxFamily::RENDER_SURFACE_STATE *surfaceState, const HardwareInfo *hwInfo) const; - const EngineInstancesContainer getGpgpuEngineInstances(const HardwareInfo &hwInfo) const override; + const EngineInstancesContainer getGpgpuEngineInstances(const RootDeviceEnvironment &rootDeviceEnvironment) const override; EngineGroupType getEngineGroupType(aub_stream::EngineType engineType, EngineUsage engineUsage, const HardwareInfo &hwInfo) const override; diff --git a/shared/source/helpers/hw_helper_bdw_and_later.inl b/shared/source/helpers/hw_helper_bdw_and_later.inl index 4bd19e8962..bbfb4274cc 100644 --- a/shared/source/helpers/hw_helper_bdw_and_later.inl +++ b/shared/source/helpers/hw_helper_bdw_and_later.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019-2022 Intel Corporation + * Copyright (C) 2019-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -57,7 +57,7 @@ bool GfxCoreHelperHw::isAssignEngineRoundRobinSupported(const Hardwar } template -const EngineInstancesContainer GfxCoreHelperHw::getGpgpuEngineInstances(const HardwareInfo &hwInfo) const { +const EngineInstancesContainer GfxCoreHelperHw::getGpgpuEngineInstances(const RootDeviceEnvironment &rootDeviceEnvironment) const { return { {aub_stream::ENGINE_RCS, EngineUsage::Regular}, {aub_stream::ENGINE_RCS, EngineUsage::LowPriority}, diff --git a/shared/source/helpers/hw_helper_xehp_and_later.inl b/shared/source/helpers/hw_helper_xehp_and_later.inl index 10db4d7448..49292a7859 100644 --- a/shared/source/helpers/hw_helper_xehp_and_later.inl +++ b/shared/source/helpers/hw_helper_xehp_and_later.inl @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Intel Corporation + * Copyright (C) 2021-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -69,7 +69,8 @@ bool GfxCoreHelperHw::isUpdateTaskCountFromWaitSupported() const { } template -const EngineInstancesContainer GfxCoreHelperHw::getGpgpuEngineInstances(const HardwareInfo &hwInfo) const { +const EngineInstancesContainer GfxCoreHelperHw::getGpgpuEngineInstances(const RootDeviceEnvironment &rootDeviceEnvironment) const { + auto &hwInfo = *rootDeviceEnvironment.getHardwareInfo(); auto defaultEngine = getChosenEngineType(hwInfo); EngineInstancesContainer engines; diff --git a/shared/source/xe_hpc_core/hw_helper_xe_hpc_core.cpp b/shared/source/xe_hpc_core/hw_helper_xe_hpc_core.cpp index c7659b048e..b9c7b483c8 100644 --- a/shared/source/xe_hpc_core/hw_helper_xe_hpc_core.cpp +++ b/shared/source/xe_hpc_core/hw_helper_xe_hpc_core.cpp @@ -40,9 +40,10 @@ uint8_t GfxCoreHelperHw::getBarriersCountFromHasBarriers(uint8_t hasBarr } template <> -const EngineInstancesContainer GfxCoreHelperHw::getGpgpuEngineInstances(const HardwareInfo &hwInfo) const { +const EngineInstancesContainer GfxCoreHelperHw::getGpgpuEngineInstances(const RootDeviceEnvironment &rootDeviceEnvironment) const { + auto &hwInfo = *rootDeviceEnvironment.getHardwareInfo(); auto defaultEngine = getChosenEngineType(hwInfo); - auto &productHelper = *ProductHelper::get(hwInfo.platform.eProductFamily); + auto &productHelper = rootDeviceEnvironment.getHelper(); EngineInstancesContainer engines; diff --git a/shared/test/common/fixtures/memory_allocator_fixture.h b/shared/test/common/fixtures/memory_allocator_fixture.h index 0a7b82233a..c9fa241f25 100644 --- a/shared/test/common/fixtures/memory_allocator_fixture.h +++ b/shared/test/common/fixtures/memory_allocator_fixture.h @@ -30,9 +30,9 @@ class MemoryAllocatorFixture : public MemoryManagementFixture { memoryManager = new MockMemoryManager(false, false, *executionEnvironment); executionEnvironment->memoryManager.reset(memoryManager); csr = &device->getGpgpuCommandStreamReceiver(); - auto &hwInfo = device->getHardwareInfo(); + auto &gfxCoreHelper = device->getGfxCoreHelper(); - auto engineType = gfxCoreHelper.getGpgpuEngineInstances(hwInfo)[0].first; + auto engineType = gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment())[0].first; auto osContext = memoryManager->createAndRegisterOsContext(csr, EngineDescriptorHelper::getDefaultDescriptor({engineType, EngineUsage::Regular}, PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo))); csr->setupContext(*osContext); diff --git a/shared/test/common/fixtures/memory_manager_fixture.cpp b/shared/test/common/fixtures/memory_manager_fixture.cpp index 52e86c5e44..70767b3497 100644 --- a/shared/test/common/fixtures/memory_manager_fixture.cpp +++ b/shared/test/common/fixtures/memory_manager_fixture.cpp @@ -27,7 +27,7 @@ void MemoryManagerWithCsrFixture::setUp() { csr->tagAddress = ¤tGpuTag; auto hwInfo = executionEnvironment.rootDeviceEnvironments[0]->getHardwareInfo(); auto &gfxCoreHelper = executionEnvironment.rootDeviceEnvironments[0]->getHelper(); - auto engine = gfxCoreHelper.getGpgpuEngineInstances(*hwInfo)[0]; + auto engine = gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment.rootDeviceEnvironments[0])[0]; auto osContext = memoryManager->createAndRegisterOsContext(csr.get(), EngineDescriptorHelper::getDefaultDescriptor({engine.first, EngineUsage::Regular}, PreemptionHelper::getDefaultPreemptionMode(*hwInfo))); csr->setupContext(*osContext); diff --git a/shared/test/common/os_interface/linux/device_command_stream_fixture.cpp b/shared/test/common/os_interface/linux/device_command_stream_fixture.cpp index 940466651c..b0aea59cfe 100644 --- a/shared/test/common/os_interface/linux/device_command_stream_fixture.cpp +++ b/shared/test/common/os_interface/linux/device_command_stream_fixture.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2021-2022 Intel Corporation + * Copyright (C) 2021-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -221,7 +221,7 @@ DrmMockCustom::DrmMockCustom(RootDeviceEnvironment &rootDeviceEnvironment) : Drm(std::make_unique(mockFd, mockPciPath), rootDeviceEnvironment) { reset(); auto &gfxCoreHelper = rootDeviceEnvironment.getHelper(); - ioctl_expected.contextCreate = static_cast(gfxCoreHelper.getGpgpuEngineInstances(*NEO::defaultHwInfo).size()); + ioctl_expected.contextCreate = static_cast(gfxCoreHelper.getGpgpuEngineInstances(rootDeviceEnvironment).size()); ioctl_expected.contextDestroy = ioctl_expected.contextCreate.load(); setupIoctlHelper(rootDeviceEnvironment.getHardwareInfo()->platform.eProductFamily); createVirtualMemoryAddressSpace(NEO::GfxCoreHelper::getSubDevicesCount(rootDeviceEnvironment.getHardwareInfo())); diff --git a/shared/test/common/os_interface/linux/drm_command_stream_fixture.h b/shared/test/common/os_interface/linux/drm_command_stream_fixture.h index e0795f1df4..b6c0f5fd18 100644 --- a/shared/test/common/os_interface/linux/drm_command_stream_fixture.h +++ b/shared/test/common/os_interface/linux/drm_command_stream_fixture.h @@ -51,7 +51,7 @@ class DrmCommandStreamTest : public ::testing::Test { auto &gfxCoreHelper = executionEnvironment.rootDeviceEnvironments[0]->getHelper(); mock->createVirtualMemoryAddressSpace(GfxCoreHelper::getSubDevicesCount(hwInfo)); osContext = std::make_unique(*mock, 0, 0u, - EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*hwInfo)[0], + EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment.rootDeviceEnvironments[0])[0], PreemptionHelper::getDefaultPreemptionMode(*hwInfo))); osContext->ensureContextInitialized(); diff --git a/shared/test/common/os_interface/windows/wddm_fixture.h b/shared/test/common/os_interface/windows/wddm_fixture.h index 97626e64e1..9e14663162 100644 --- a/shared/test/common/os_interface/windows/wddm_fixture.h +++ b/shared/test/common/os_interface/windows/wddm_fixture.h @@ -49,9 +49,9 @@ struct WddmFixture : public Test { wddm->init(); executionEnvironment->initializeMemoryManager(); memoryManager = std::make_unique(*executionEnvironment); - auto hwInfo = rootDeviceEnvironment->getHardwareInfo(); + auto &gfxCoreHelper = rootDeviceEnvironment->getHelper(); - auto engine = gfxCoreHelper.getGpgpuEngineInstances(*hwInfo)[0]; + auto engine = gfxCoreHelper.getGpgpuEngineInstances(*rootDeviceEnvironment)[0]; osContext = std::make_unique(*osInterface->getDriverModel()->as(), 0, 0u, EngineDescriptorHelper::getDefaultDescriptor(engine, preemptionMode)); osContext->ensureContextInitialized(); mockTemporaryResources = static_cast(wddm->temporaryResources.get()); @@ -82,9 +82,8 @@ struct WddmFixtureLuid : public Test { osInterface = rootDeviceEnvironment->osInterface.get(); auto preemptionMode = PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo); wddm->init(); - auto hwInfo = rootDeviceEnvironment->getHardwareInfo(); auto &gfxCoreHelper = rootDeviceEnvironment->getHelper(); - auto engine = gfxCoreHelper.getGpgpuEngineInstances(*hwInfo)[0]; + auto engine = gfxCoreHelper.getGpgpuEngineInstances(*rootDeviceEnvironment)[0]; osContext = std::make_unique(*osInterface->getDriverModel()->as(), 0, 0u, EngineDescriptorHelper::getDefaultDescriptor(engine, preemptionMode)); osContext->ensureContextInitialized(); mockTemporaryResources = static_cast(wddm->temporaryResources.get()); @@ -120,9 +119,8 @@ struct WddmFixtureWithMockGdiDll : public GdiDllFixture, public MockExecutionEnv wddm->init(); wddm->wddmInterface.reset(wddmMockInterface); - auto hwInfo = rootDeviceEnvironment->getHardwareInfo(); auto &gfxCoreHelper = rootDeviceEnvironment->getHelper(); - auto engine = gfxCoreHelper.getGpgpuEngineInstances(*hwInfo)[0]; + auto engine = gfxCoreHelper.getGpgpuEngineInstances(*rootDeviceEnvironment)[0]; osContext = std::make_unique(*osInterface->getDriverModel()->as(), 0, 0u, EngineDescriptorHelper::getDefaultDescriptor(engine, preemptionMode)); osContext->ensureContextInitialized(); } @@ -169,9 +167,8 @@ struct WddmFixtureWithMockGdiDllWddmNoCleanup : public GdiDllFixture, public Moc wddm->init(); wddm->wddmInterface.reset(wddmMockInterface); - auto hwInfo = rootDeviceEnvironment->getHardwareInfo(); auto &gfxCoreHelper = rootDeviceEnvironment->getHelper(); - auto engine = gfxCoreHelper.getGpgpuEngineInstances(*hwInfo)[0]; + auto engine = gfxCoreHelper.getGpgpuEngineInstances(*rootDeviceEnvironment)[0]; osContext = std::make_unique(*osInterface->getDriverModel()->as(), 0, 0u, EngineDescriptorHelper::getDefaultDescriptor(engine, preemptionMode)); osContext->ensureContextInitialized(); } diff --git a/shared/test/common/test_macros/test_checks_shared.cpp b/shared/test/common/test_macros/test_checks_shared.cpp index c07fb16bb4..c9bcadf023 100644 --- a/shared/test/common/test_macros/test_checks_shared.cpp +++ b/shared/test/common/test_macros/test_checks_shared.cpp @@ -17,7 +17,7 @@ using namespace NEO; bool TestChecks::supportsBlitter(const RootDeviceEnvironment &rootDeviceEnvironment) { auto &gfxCoreHelper = rootDeviceEnvironment.getHelper(); auto hwInfo = rootDeviceEnvironment.getMutableHardwareInfo(); - auto engines = gfxCoreHelper.getGpgpuEngineInstances(*hwInfo); + auto engines = gfxCoreHelper.getGpgpuEngineInstances(rootDeviceEnvironment); for (const auto &engine : engines) { if (engine.first == aub_stream::EngineType::ENGINE_BCS) { return hwInfo->capabilityTable.blitterOperationsSupported; @@ -29,7 +29,7 @@ bool TestChecks::supportsBlitter(const RootDeviceEnvironment &rootDeviceEnvironm bool TestChecks::fullySupportsBlitter(const RootDeviceEnvironment &rootDeviceEnvironment) { auto &gfxCoreHelper = rootDeviceEnvironment.getHelper(); auto hwInfo = rootDeviceEnvironment.getMutableHardwareInfo(); - auto engines = gfxCoreHelper.getGpgpuEngineInstances(*hwInfo); + auto engines = gfxCoreHelper.getGpgpuEngineInstances(rootDeviceEnvironment); for (const auto &engine : engines) { if (engine.first == aub_stream::EngineType::ENGINE_BCS) { auto &productHelper = rootDeviceEnvironment.getHelper(); diff --git a/shared/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp b/shared/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp index b17e79242b..519410828e 100644 --- a/shared/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp +++ b/shared/test/unit_test/command_stream/aub_command_stream_receiver_1_tests.cpp @@ -268,9 +268,8 @@ HWTEST_F(AubCommandStreamReceiverTests, givenGraphicsAllocationWhenMakeResidentC HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverWhenMultipleInstancesInitializeTheirEnginesThenUniqueGlobalGttAddressesAreGenerated) { pDevice->executionEnvironment->rootDeviceEnvironments[0]->aubCenter.reset(new AubCenter()); - auto &hwInfo = pDevice->getHardwareInfo(); auto &gfxCoreHelper = pDevice->getGfxCoreHelper(); - auto engineInstance = gfxCoreHelper.getGpgpuEngineInstances(hwInfo)[0]; + auto engineInstance = gfxCoreHelper.getGpgpuEngineInstances(pDevice->getRootDeviceEnvironment())[0]; MockOsContext osContext(0, EngineDescriptorHelper::getDefaultDescriptor(engineInstance)); auto aubCsr1 = std::make_unique>("", true, *pDevice->executionEnvironment, pDevice->getRootDeviceIndex(), pDevice->getDeviceBitfield()); diff --git a/shared/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp b/shared/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp index 7e06a5b9f4..cfdbc0e1d8 100644 --- a/shared/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp +++ b/shared/test/unit_test/command_stream/aub_command_stream_receiver_2_tests.cpp @@ -588,9 +588,8 @@ HWTEST_F(AubCommandStreamReceiverNoHostPtrTests, givenAubCommandStreamReceiverWh ExecutionEnvironment *executionEnvironment = new MockExecutionEnvironment(); auto memoryManager = new OsAgnosticMemoryManagerForImagesWithNoHostPtr(*executionEnvironment); executionEnvironment->memoryManager.reset(memoryManager); - auto hwInfo = executionEnvironment->rootDeviceEnvironments[0]->getHardwareInfo(); auto &gfxCoreHelper = executionEnvironment->rootDeviceEnvironments[0]->getHelper(); - auto engineInstance = gfxCoreHelper.getGpgpuEngineInstances(*hwInfo)[0]; + auto engineInstance = gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment->rootDeviceEnvironments[0])[0]; UltDeviceFactory deviceFactory{1, 0, *executionEnvironment}; DeviceBitfield deviceBitfield(1); MockOsContext osContext(0, EngineDescriptorHelper::getDefaultDescriptor(engineInstance, deviceBitfield)); @@ -842,9 +841,8 @@ HWTEST_F(AubCommandStreamReceiverTests, whenAubCommandStreamReceiverIsCreatedThe HWTEST_F(AubCommandStreamReceiverTests, givenAubCommandStreamReceiverWhenEngineIsInitializedThenDumpHandleIsGenerated) { MockExecutionEnvironment executionEnvironment(defaultHwInfo.get()); - auto hwInfo = executionEnvironment.rootDeviceEnvironments[0]->getHardwareInfo(); auto &gfxCoreHelper = executionEnvironment.rootDeviceEnvironments[0]->getHelper(); - auto engineInstance = gfxCoreHelper.getGpgpuEngineInstances(*hwInfo)[0]; + auto engineInstance = gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment.rootDeviceEnvironments[0])[0]; DeviceBitfield deviceBitfield(1); MockOsContext osContext(0, EngineDescriptorHelper::getDefaultDescriptor(engineInstance, deviceBitfield)); executionEnvironment.initializeMemoryManager(); diff --git a/shared/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp b/shared/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp index dd36030429..2f448950b9 100644 --- a/shared/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp +++ b/shared/test/unit_test/command_stream/command_stream_receiver_with_aub_dump_tests.cpp @@ -191,7 +191,7 @@ HWTEST_F(CommandStreamReceiverWithAubDumpSimpleTest, givenCsrWithAubDumpWhenSett auto hwInfo = executionEnvironment->rootDeviceEnvironments[0]->getHardwareInfo(); auto &gfxCoreHelper = executionEnvironment->rootDeviceEnvironments[0]->getHelper(); - MockOsContext osContext(0, EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*hwInfo)[0], + MockOsContext osContext(0, EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment->rootDeviceEnvironments[0])[0], PreemptionHelper::getDefaultPreemptionMode(*hwInfo))); csrWithAubDump.setupContext(osContext); @@ -374,7 +374,7 @@ struct CommandStreamReceiverTagTests : public ::testing::Test { CsrT csr(std::forward(args)...); auto hwInfo = csr.peekExecutionEnvironment().rootDeviceEnvironments[0]->getHardwareInfo(); auto &gfxCoreHelper = executionEnvironment->rootDeviceEnvironments[0]->getHelper(); - MockOsContext osContext(0, EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*hwInfo)[0], + MockOsContext osContext(0, EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment->rootDeviceEnvironments[0])[0], PreemptionHelper::getDefaultPreemptionMode(*hwInfo))); csr.setupContext(osContext); diff --git a/shared/test/unit_test/command_stream/tbx_command_stream_tests.cpp b/shared/test/unit_test/command_stream/tbx_command_stream_tests.cpp index caa98ef2f5..21631d1bed 100644 --- a/shared/test/unit_test/command_stream/tbx_command_stream_tests.cpp +++ b/shared/test/unit_test/command_stream/tbx_command_stream_tests.cpp @@ -564,9 +564,8 @@ HWTEST_F(TbxCommandStreamTests, givenTbxCsrWhenHardwareContextIsCreatedThenTbxSt } HWTEST_F(TbxCommandStreamTests, givenTbxCsrWhenOsContextIsSetThenCreateHardwareContext) { - auto hwInfo = pDevice->getHardwareInfo(); auto &gfxCoreHelper = pDevice->getGfxCoreHelper(); - MockOsContext osContext(0, EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(hwInfo)[0], pDevice->getDeviceBitfield())); + MockOsContext osContext(0, EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(pDevice->getRootDeviceEnvironment())[0], pDevice->getDeviceBitfield())); std::string fileName = ""; MockAubManager *mockManager = new MockAubManager(); MockAubCenter *mockAubCenter = new MockAubCenter(pDevice->getRootDeviceEnvironment(), false, fileName, CommandStreamReceiverType::CSR_TBX); diff --git a/shared/test/unit_test/gen11/hw_helper_tests_gen11.cpp b/shared/test/unit_test/gen11/hw_helper_tests_gen11.cpp index 6dcc517aad..039ed079a8 100644 --- a/shared/test/unit_test/gen11/hw_helper_tests_gen11.cpp +++ b/shared/test/unit_test/gen11/hw_helper_tests_gen11.cpp @@ -34,7 +34,7 @@ GEN11TEST_F(GfxCoreHelperTestGen11, WhenAdjustingDefaultEngineTypeThenEngineType GEN11TEST_F(GfxCoreHelperTestGen11, whenGetGpgpuEnginesThenReturnThreeRcsEngines) { auto &gfxCoreHelper = getHelper(); - auto gpgpuEngines = gfxCoreHelper.getGpgpuEngineInstances(pDevice->getHardwareInfo()); + auto gpgpuEngines = gfxCoreHelper.getGpgpuEngineInstances(pDevice->getRootDeviceEnvironment()); EXPECT_EQ(3u, gpgpuEngines.size()); EXPECT_EQ(aub_stream::ENGINE_RCS, gpgpuEngines[0].first); EXPECT_EQ(aub_stream::ENGINE_RCS, gpgpuEngines[1].first); diff --git a/shared/test/unit_test/gen8/hw_helper_tests_gen8.cpp b/shared/test/unit_test/gen8/hw_helper_tests_gen8.cpp index 9d03c1827d..bd9dca9845 100644 --- a/shared/test/unit_test/gen8/hw_helper_tests_gen8.cpp +++ b/shared/test/unit_test/gen8/hw_helper_tests_gen8.cpp @@ -37,7 +37,7 @@ GEN8TEST_F(GfxCoreHelperTestGen8, WhenAdjustingDefaultEngineTypeThenEngineTypeIs GEN8TEST_F(GfxCoreHelperTestGen8, whenGetGpgpuEnginesThenReturnThreeEngines) { auto &gfxCoreHelper = getHelper(); - auto gpgpuEngines = gfxCoreHelper.getGpgpuEngineInstances(pDevice->getHardwareInfo()); + auto gpgpuEngines = gfxCoreHelper.getGpgpuEngineInstances(pDevice->getRootDeviceEnvironment()); EXPECT_EQ(3u, gpgpuEngines.size()); EXPECT_EQ(aub_stream::ENGINE_RCS, gpgpuEngines[0].first); EXPECT_EQ(aub_stream::ENGINE_RCS, gpgpuEngines[1].first); diff --git a/shared/test/unit_test/gen9/hw_helper_tests_gen9.cpp b/shared/test/unit_test/gen9/hw_helper_tests_gen9.cpp index edc5b52aac..bb9ee7b646 100644 --- a/shared/test/unit_test/gen9/hw_helper_tests_gen9.cpp +++ b/shared/test/unit_test/gen9/hw_helper_tests_gen9.cpp @@ -46,7 +46,7 @@ GEN9TEST_F(GfxCoreHelperTestGen9, givenDebuggingActiveWhenSipKernelTypeIsQueried GEN9TEST_F(GfxCoreHelperTestGen9, whenGetGpgpuEnginesThenReturnThreeRcsEngines) { auto &gfxCoreHelper = getHelper(); - auto gpgpuEngines = gfxCoreHelper.getGpgpuEngineInstances(pDevice->getHardwareInfo()); + auto gpgpuEngines = gfxCoreHelper.getGpgpuEngineInstances(pDevice->getRootDeviceEnvironment()); EXPECT_EQ(3u, gpgpuEngines.size()); EXPECT_EQ(aub_stream::ENGINE_RCS, gpgpuEngines[0].first); EXPECT_EQ(aub_stream::ENGINE_RCS, gpgpuEngines[1].first); diff --git a/shared/test/unit_test/helpers/hw_helper_tests.cpp b/shared/test/unit_test/helpers/hw_helper_tests.cpp index d3eeab4743..49124b4165 100644 --- a/shared/test/unit_test/helpers/hw_helper_tests.cpp +++ b/shared/test/unit_test/helpers/hw_helper_tests.cpp @@ -1242,11 +1242,11 @@ HWTEST_F(GfxCoreHelperTest, givenGetRenderSurfaceStatePitchCalledThenCorrectValu } HWTEST_F(GfxCoreHelperTest, whenBlitterSupportIsDisabledThenDontExposeAnyBcsEngine) { - auto hwInfo = *defaultHwInfo; + auto &hwInfo = *this->pDevice->getExecutionEnvironment()->rootDeviceEnvironments[0]->getMutableHardwareInfo(); hwInfo.capabilityTable.blitterOperationsSupported = false; hwInfo.featureTable.ftrBcsInfo.set(0); const auto &gfxCoreHelper = getHelper(); - auto engineUsageTypes = gfxCoreHelper.getGpgpuEngineInstances(hwInfo); + auto engineUsageTypes = gfxCoreHelper.getGpgpuEngineInstances(*this->pDevice->getExecutionEnvironment()->rootDeviceEnvironments[0]); for (auto &engineUsageType : engineUsageTypes) { EXPECT_FALSE(EngineHelpers::isBcs(engineUsageType.first)); } 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 fb6f031808..8a3139576b 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 @@ -14,6 +14,7 @@ #include "shared/test/common/helpers/hw_helper_tests.h" #include "shared/test/common/helpers/mock_hw_info_config_hw.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" using GfxCoreHelperTestPvcAndLater = GfxCoreHelperTest; @@ -185,7 +186,7 @@ HWTEST2_F(GfxCoreHelperTestPvcAndLater, givenForceBCSForInternalCopyEngineVariab auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); auto &gfxCoreHelper = device->getGfxCoreHelper(); - auto &engines = gfxCoreHelper.getGpgpuEngineInstances(hwInfo); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment()); EXPECT_GE(engines.size(), 9u); bool found = false; @@ -199,7 +200,9 @@ HWTEST2_F(GfxCoreHelperTestPvcAndLater, givenForceBCSForInternalCopyEngineVariab using GfxCoreHelperTestCooperativeEngine = GfxCoreHelperTestPvcAndLater; HWTEST2_F(GfxCoreHelperTestCooperativeEngine, givenCooperativeContextSupportedWhenGetEngineInstancesThenReturnCorrectAmountOfCooperativeCcs, IsXeHpcCore) { - HardwareInfo hwInfo = *defaultHwInfo; + MockExecutionEnvironment mockExecutionEnvironment{}; + + HardwareInfo &hwInfo = *mockExecutionEnvironment.rootDeviceEnvironments[0]->getMutableHardwareInfo(); hwInfo.gtSystemInfo.CCSInfo.NumberOfCCSEnabled = 2; hwInfo.featureTable.flags.ftrCCSNode = true; auto &gfxCoreHelper = getHelper(); @@ -212,7 +215,7 @@ HWTEST2_F(GfxCoreHelperTestCooperativeEngine, givenCooperativeContextSupportedWh continue; } hwInfo.platform.usRevId = hwRevId; - auto engineInstances = gfxCoreHelper.getGpgpuEngineInstances(hwInfo); + auto engineInstances = gfxCoreHelper.getGpgpuEngineInstances(*mockExecutionEnvironment.rootDeviceEnvironments[0]); size_t ccsCount = 0u; size_t cooperativeCcsCount = 0u; for (auto &engineInstance : engineInstances) { diff --git a/shared/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp b/shared/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp index 6b1d47b080..61b17a5d67 100644 --- a/shared/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp +++ b/shared/test/unit_test/memory_manager/memory_manager_allocate_in_preferred_pool_tests.cpp @@ -1023,7 +1023,7 @@ TEST(MemoryManagerTest, givenPropertiesWithOsContextWhenGetAllocationDataIsCalle MockExecutionEnvironment mockExecutionEnvironment{}; auto &gfxCoreHelper = mockExecutionEnvironment.rootDeviceEnvironments[0]->getHelper(); - MockOsContext osContext(0u, EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*defaultHwInfo)[0])); + MockOsContext osContext(0u, EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*mockExecutionEnvironment.rootDeviceEnvironments[0])[0])); properties.osContext = &osContext; diff --git a/shared/test/unit_test/memory_manager/surface_tests.cpp b/shared/test/unit_test/memory_manager/surface_tests.cpp index be595df500..bf4a6ae3af 100644 --- a/shared/test/unit_test/memory_manager/surface_tests.cpp +++ b/shared/test/unit_test/memory_manager/surface_tests.cpp @@ -64,7 +64,7 @@ HWTEST_TYPED_TEST(SurfaceTest, GivenSurfaceWhenInterfaceIsUsedThenSurfaceBehaves auto hwInfo = *defaultHwInfo; auto &gfxCoreHelper = executionEnvironment->rootDeviceEnvironments[0]->getHelper(); - auto engine = gfxCoreHelper.getGpgpuEngineInstances(hwInfo)[0]; + auto engine = gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment->rootDeviceEnvironments[0])[0]; auto osContext = executionEnvironment->memoryManager->createAndRegisterOsContext(csr.get(), EngineDescriptorHelper::getDefaultDescriptor(engine, PreemptionHelper::getDefaultPreemptionMode(hwInfo))); csr->setupContext(*osContext); @@ -119,7 +119,7 @@ HWTEST_F(GeneralSurfaceTest, givenGeneralSurfaceWhenMigrationNeededThenMoveToGpu auto csr = std::make_unique>(execStamp, *executionEnvironment, 0, deviceBitfield); auto hwInfo = *defaultHwInfo; auto &gfxCoreHelper = executionEnvironment->rootDeviceEnvironments[0]->getHelper(); - auto engine = gfxCoreHelper.getGpgpuEngineInstances(hwInfo)[0]; + auto engine = gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment->rootDeviceEnvironments[0])[0]; auto osContext = executionEnvironment->memoryManager->createAndRegisterOsContext(csr.get(), EngineDescriptorHelper::getDefaultDescriptor(engine, PreemptionHelper::getDefaultPreemptionMode(hwInfo))); csr->setupContext(*osContext); @@ -142,7 +142,7 @@ HWTEST_F(GeneralSurfaceTest, givenGeneralSurfaceWhenMigrationNotNeededThenMoveTo auto csr = std::make_unique>(execStamp, *executionEnvironment, 0, deviceBitfield); auto hwInfo = *defaultHwInfo; auto &gfxCoreHelper = executionEnvironment->rootDeviceEnvironments[0]->getHelper(); - auto engine = gfxCoreHelper.getGpgpuEngineInstances(hwInfo)[0]; + auto engine = gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment->rootDeviceEnvironments[0])[0]; auto osContext = executionEnvironment->memoryManager->createAndRegisterOsContext(csr.get(), EngineDescriptorHelper::getDefaultDescriptor(engine, PreemptionHelper::getDefaultPreemptionMode(hwInfo))); csr->setupContext(*osContext); diff --git a/shared/test/unit_test/os_interface/linux/drm_command_stream_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_command_stream_tests.cpp index d5f89eb880..34b0f7423b 100644 --- a/shared/test/unit_test/os_interface/linux/drm_command_stream_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_command_stream_tests.cpp @@ -1375,7 +1375,7 @@ HWTEST_TEMPLATED_F(DrmCommandStreamEnhancedTest, givenMergeWithResidencyContaine auto &gfxCoreHelper = executionEnvironment->rootDeviceEnvironments[0]->getHelper(); auto osContext = std::make_unique(*mock, rootDeviceIndex, 0u, - EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*defaultHwInfo)[0], + EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment->rootDeviceEnvironments[0])[0], PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo))); auto commandBuffer = mm->allocateGraphicsMemoryWithProperties(MockAllocationProperties{csr->getRootDeviceIndex(), MemoryConstants::pageSize}); @@ -1406,7 +1406,7 @@ HWTEST_TEMPLATED_F(DrmCommandStreamEnhancedTest, givenMergeWithResidencyContaine operationHandler->mergeWithResidencyContainerResult = NEO::MemoryOperationsStatus::OUT_OF_MEMORY; auto &gfxCoreHelper = executionEnvironment->rootDeviceEnvironments[0]->getHelper(); auto osContext = std::make_unique(*mock, rootDeviceIndex, 0u, - EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*defaultHwInfo)[0], + EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment->rootDeviceEnvironments[0])[0], PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo))); auto commandBuffer = mm->allocateGraphicsMemoryWithProperties(MockAllocationProperties{csr->getRootDeviceIndex(), MemoryConstants::pageSize}); @@ -1440,7 +1440,7 @@ HWTEST_TEMPLATED_F(DrmCommandStreamEnhancedTest, givenNoAllocsInMemoryOperationH }; auto &gfxCoreHelper = executionEnvironment->rootDeviceEnvironments[0]->getHelper(); auto osContext = std::make_unique(*mock, rootDeviceIndex, 0u, - EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*defaultHwInfo)[0], + EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment->rootDeviceEnvironments[0])[0], PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo))); auto commandBuffer = mm->allocateGraphicsMemoryWithProperties(MockAllocationProperties{csr->getRootDeviceIndex(), MemoryConstants::pageSize}); @@ -1471,7 +1471,7 @@ HWTEST_TEMPLATED_F(DrmCommandStreamEnhancedTest, givenAllocsInMemoryOperationHan }; auto &gfxCoreHelper = executionEnvironment->rootDeviceEnvironments[0]->getHelper(); auto osContext = std::make_unique(*mock, rootDeviceIndex, 0u, - EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*defaultHwInfo)[0], + EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment->rootDeviceEnvironments[0])[0], PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo))); auto allocation = mm->allocateGraphicsMemoryWithProperties(MockAllocationProperties{csr->getRootDeviceIndex(), MemoryConstants::pageSize}); diff --git a/shared/test/unit_test/os_interface/linux/drm_command_stream_tests_1.cpp b/shared/test/unit_test/os_interface/linux/drm_command_stream_tests_1.cpp index 2571406741..700bf3a830 100644 --- a/shared/test/unit_test/os_interface/linux/drm_command_stream_tests_1.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_command_stream_tests_1.cpp @@ -176,7 +176,7 @@ HWTEST_TEMPLATED_F(DrmCommandStreamTest, givenDrmContextIdWhenFlushingThenSetIdT auto &gfxCoreHelper = csr->getGfxCoreHelper(); osContext = std::make_unique(*mock, csr->getRootDeviceIndex(), 1, - EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*defaultHwInfo)[0], + EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*csr->peekExecutionEnvironment().rootDeviceEnvironments[0])[0], PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo))); osContext->ensureContextInitialized(); csr->setupContext(*osContext); diff --git a/shared/test/unit_test/os_interface/linux/drm_command_stream_xehp_and_later_prelim_tests.cpp b/shared/test/unit_test/os_interface/linux/drm_command_stream_xehp_and_later_prelim_tests.cpp index 1f084276ee..6a8732ff5a 100644 --- a/shared/test/unit_test/os_interface/linux/drm_command_stream_xehp_and_later_prelim_tests.cpp +++ b/shared/test/unit_test/os_interface/linux/drm_command_stream_xehp_and_later_prelim_tests.cpp @@ -298,7 +298,7 @@ class DrmCommandStreamForceTileTest : public ::testing::Test { auto &gfxCoreHelper = executionEnvironment.rootDeviceEnvironments[0]->getHelper(); osContext = std::make_unique(*mock, rootDeviceIndex, 0, - EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*hwInfo)[0], + EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment.rootDeviceEnvironments[0])[0], PreemptionHelper::getDefaultPreemptionMode(*hwInfo), DeviceBitfield(3))); osContext->ensureContextInitialized(); @@ -409,7 +409,7 @@ struct DrmImplicitScalingCommandStreamTest : ::testing::Test { auto &gfxCoreHelper = executionEnvironment->rootDeviceEnvironments[0]->getHelper(); osContext = std::make_unique(*drm, 0, 0u, - EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*hwInfo)[0], + EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment->rootDeviceEnvironments[0])[0], PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo), DeviceBitfield(0b11))); osContext->ensureContextInitialized(); @@ -507,7 +507,7 @@ HWCMDTEST_F(IGFX_XE_HP_CORE, DrmImplicitScalingCommandStreamTest, whenForceExecu auto &gfxCoreHelper = executionEnvironment->rootDeviceEnvironments[0]->getHelper(); auto osContext = std::make_unique(*drm, 0, 0u, - EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*hwInfo)[0], + EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment->rootDeviceEnvironments[0])[0], PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo))); osContext->ensureContextInitialized(); auto csr = std::make_unique(*executionEnvironment, 0, osContext->getDeviceBitfield(), diff --git a/shared/test/unit_test/os_interface/windows/device_command_stream_tests.cpp b/shared/test/unit_test/os_interface/windows/device_command_stream_tests.cpp index b7a898f8d5..cc4f074f26 100644 --- a/shared/test/unit_test/os_interface/windows/device_command_stream_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/device_command_stream_tests.cpp @@ -346,7 +346,7 @@ TEST_F(WddmPreemptionHeaderTests, givenWddmCommandStreamReceiverWhenPreemptionIs auto &gfxCoreHelper = executionEnvironment->rootDeviceEnvironments[0]->getHelper(); OsContextWin osContext(*wddm, csr->getRootDeviceIndex(), 0u, - EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*hwInfo)[0], + EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment->rootDeviceEnvironments[0])[0], PreemptionHelper::getDefaultPreemptionMode(*hwInfo))); csr->setupContext(osContext); @@ -373,7 +373,7 @@ TEST_F(WddmPreemptionHeaderTests, givenWddmCommandStreamReceiverWhenPreemptionIs auto &gfxCoreHelper = executionEnvironment->rootDeviceEnvironments[0]->getHelper(); OsContextWin osContext(*wddm, csr->getRootDeviceIndex(), 0u, - EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*hwInfo)[0], + EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment->rootDeviceEnvironments[0])[0], PreemptionHelper::getDefaultPreemptionMode(*hwInfo))); csr->setupContext(osContext); diff --git a/shared/test/unit_test/os_interface/windows/os_context_win_tests.cpp b/shared/test/unit_test/os_interface/windows/os_context_win_tests.cpp index 9afa76d299..17c12eadeb 100644 --- a/shared/test/unit_test/os_interface/windows/os_context_win_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/os_context_win_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -17,7 +17,7 @@ struct OsContextWinTest : public WddmTestWithMockGdiDll { WddmTestWithMockGdiDll::SetUp(); preemptionMode = PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo); auto &gfxCoreHelper = this->rootDeviceEnvironment->getHelper(); - engineTypeUsage = gfxCoreHelper.getGpgpuEngineInstances(*defaultHwInfo)[0]; + engineTypeUsage = gfxCoreHelper.getGpgpuEngineInstances(*rootDeviceEnvironment)[0]; init(); } @@ -75,7 +75,7 @@ struct OsContextWinTestNoCleanup : public WddmTestWithMockGdiDllNoCleanup { preemptionMode = PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo); auto &gfxCoreHelper = this->rootDeviceEnvironment->getHelper(); - engineTypeUsage = gfxCoreHelper.getGpgpuEngineInstances(*defaultHwInfo)[0]; + engineTypeUsage = gfxCoreHelper.getGpgpuEngineInstances(*rootDeviceEnvironment)[0]; init(); } diff --git a/shared/test/unit_test/os_interface/windows/os_interface_win_tests.cpp b/shared/test/unit_test/os_interface/windows/os_interface_win_tests.cpp index 469e23e9e3..3483b6bf04 100644 --- a/shared/test/unit_test/os_interface/windows/os_interface_win_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/os_interface_win_tests.cpp @@ -34,7 +34,7 @@ TEST(OsContextTest, givenWddmWhenCreateOsContextAfterInitWddmThenOsContextIsInit EXPECT_EQ(0u, wddm->registerTrimCallbackResult.called); auto &gfxCoreHelper = rootDeviceEnvironment.getHelper(); auto osContext = std::make_unique(*wddm, 0, 0u, - EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*defaultHwInfo)[0], preemptionMode)); + EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(rootDeviceEnvironment)[0], preemptionMode)); osContext->ensureContextInitialized(); EXPECT_EQ(osContext->getWddm(), wddm); EXPECT_EQ(1u, wddm->registerTrimCallbackResult.called); diff --git a/shared/test/unit_test/os_interface/windows/wddm20_tests.cpp b/shared/test/unit_test/os_interface/windows/wddm20_tests.cpp index f260089ad5..b4ac420356 100644 --- a/shared/test/unit_test/os_interface/windows/wddm20_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/wddm20_tests.cpp @@ -582,9 +582,8 @@ struct WddmContextSchedulingPriorityTests : public Wddm20WithMockGdiDllTestsWith wddm->init(); wddm->wddmInterface.reset(wddmMockInterface); - auto hwInfo = rootDeviceEnvironment->getHardwareInfo(); auto &gfxCoreHelper = rootDeviceEnvironment->getHelper(); - auto engine = gfxCoreHelper.getGpgpuEngineInstances(*hwInfo)[0]; + auto engine = gfxCoreHelper.getGpgpuEngineInstances(*rootDeviceEnvironment)[0]; auto engineDescriptor = EngineDescriptorHelper::getDefaultDescriptor(engine, preemptionMode); engineDescriptor.engineTypeUsage.second = lowPriority ? EngineUsage::LowPriority : EngineUsage::Regular; @@ -651,7 +650,7 @@ TEST_F(Wddm20WithMockGdiDllTestsWithoutWddmInit, givenEngineTypeWhenCreatingCont init(); auto createContextParams = this->getCreateContextDataFcn(); auto &gfxCoreHelper = this->rootDeviceEnvironment->getHelper(); - UINT expected = WddmEngineMapper::engineNodeMap(gfxCoreHelper.getGpgpuEngineInstances(*defaultHwInfo)[0].first); + UINT expected = WddmEngineMapper::engineNodeMap(gfxCoreHelper.getGpgpuEngineInstances(*rootDeviceEnvironment)[0].first); EXPECT_EQ(expected, createContextParams->NodeOrdinal); } diff --git a/shared/test/unit_test/os_interface/windows/wddm23_tests.cpp b/shared/test/unit_test/os_interface/windows/wddm23_tests.cpp index 6225d15e65..02c17b7600 100644 --- a/shared/test/unit_test/os_interface/windows/wddm23_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/wddm23_tests.cpp @@ -44,7 +44,7 @@ struct Wddm23TestsWithoutWddmInit : public ::testing::Test, GdiDllFixture { wddm->wddmInterface.reset(wddmMockInterface); auto &gfxCoreHelper = this->executionEnvironment.rootDeviceEnvironments[0]->getHelper(); osContext = std::make_unique(*wddm, 0, 0u, - EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*defaultHwInfo)[0], preemptionMode)); + EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*this->executionEnvironment.rootDeviceEnvironments[0])[0], preemptionMode)); osContext->ensureContextInitialized(); } @@ -77,7 +77,7 @@ TEST_F(Wddm23Tests, whenCreateContextIsCalledThenEnableHwQueues) { TEST_F(Wddm23Tests, givenPreemptionModeWhenCreateHwQueueCalledThenSetGpuTimeoutIfEnabled) { auto &gfxCoreHelper = this->executionEnvironment.rootDeviceEnvironments[0]->getHelper(); - auto defaultEngine = gfxCoreHelper.getGpgpuEngineInstances(*defaultHwInfo)[0]; + auto defaultEngine = gfxCoreHelper.getGpgpuEngineInstances(*this->executionEnvironment.rootDeviceEnvironments[0])[0]; OsContextWin osContextWithoutPreemption(*wddm, 0, 0u, EngineDescriptorHelper::getDefaultDescriptor(defaultEngine, PreemptionMode::Disabled)); OsContextWin osContextWithPreemption(*wddm, 0, 0, EngineDescriptorHelper::getDefaultDescriptor(defaultEngine, PreemptionMode::MidBatch)); diff --git a/shared/test/unit_test/os_interface/windows/wddm_preemption_tests.cpp b/shared/test/unit_test/os_interface/windows/wddm_preemption_tests.cpp index 63b8ff2f3d..72aa2d83a4 100644 --- a/shared/test/unit_test/os_interface/windows/wddm_preemption_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/wddm_preemption_tests.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2018-2022 Intel Corporation + * Copyright (C) 2018-2023 Intel Corporation * * SPDX-License-Identifier: MIT * @@ -42,7 +42,7 @@ class WddmPreemptionTests : public Test { hwInfo = executionEnvironment->rootDeviceEnvironments[0]->getHardwareInfo(); ASSERT_NE(nullptr, hwInfo); auto &gfxCoreHelper = executionEnvironment->rootDeviceEnvironments[0]->getHelper(); - auto engine = gfxCoreHelper.getGpgpuEngineInstances(*defaultHwInfo)[0]; + auto engine = gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment->rootDeviceEnvironments[0])[0]; osContext = std::make_unique(*wddm, 0, 0u, EngineDescriptorHelper::getDefaultDescriptor(engine, preemptionMode)); osContext->ensureContextInitialized(); } diff --git a/shared/test/unit_test/os_interface/windows/wddm_residency_controller_tests.cpp b/shared/test/unit_test/os_interface/windows/wddm_residency_controller_tests.cpp index decc68d6d2..c59fddf416 100644 --- a/shared/test/unit_test/os_interface/windows/wddm_residency_controller_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/wddm_residency_controller_tests.cpp @@ -127,9 +127,8 @@ struct WddmResidencyControllerWithMockWddmTest : public WddmResidencyControllerT memoryManager = std::make_unique(executionEnvironment); csr.reset(createCommandStream(executionEnvironment, 0u, 1)); - auto hwInfo = executionEnvironment.rootDeviceEnvironments[0]->getHardwareInfo(); auto &gfxCoreHelper = executionEnvironment.rootDeviceEnvironments[0]->getHelper(); - osContext = memoryManager->createAndRegisterOsContext(csr.get(), EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*hwInfo)[0], + osContext = memoryManager->createAndRegisterOsContext(csr.get(), EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment.rootDeviceEnvironments[0])[0], preemptionMode)); osContext->ensureContextInitialized(); @@ -165,9 +164,8 @@ struct WddmResidencyControllerWithGdiAndMemoryManagerTest : ::testing::Test { memoryManager = std::make_unique(executionEnvironment); csr.reset(createCommandStream(executionEnvironment, 0u, 1)); - auto hwInfo = executionEnvironment.rootDeviceEnvironments[0]->getHardwareInfo(); auto &gfxCoreHelper = executionEnvironment.rootDeviceEnvironments[0]->getHelper(); - osContext = memoryManager->createAndRegisterOsContext(csr.get(), EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*hwInfo)[0], + osContext = memoryManager->createAndRegisterOsContext(csr.get(), EngineDescriptorHelper::getDefaultDescriptor(gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment.rootDeviceEnvironments[0])[0], PreemptionHelper::getDefaultPreemptionMode(*defaultHwInfo))); osContext->ensureContextInitialized(); diff --git a/shared/test/unit_test/os_interface/windows/wddm_shared_allocations_test.cpp b/shared/test/unit_test/os_interface/windows/wddm_shared_allocations_test.cpp index f9bed31318..782b2b6340 100644 --- a/shared/test/unit_test/os_interface/windows/wddm_shared_allocations_test.cpp +++ b/shared/test/unit_test/os_interface/windows/wddm_shared_allocations_test.cpp @@ -44,7 +44,7 @@ class WddmSharedTestsFixture : public MockExecutionEnvironmentGmmFixture { wddm->wddmInterface.reset(wddmMockInterface); auto &gfxCoreHelper = rootDeviceEnvironment->getHelper(); - auto engine = gfxCoreHelper.getGpgpuEngineInstances(*defaultHwInfo)[0]; + auto engine = gfxCoreHelper.getGpgpuEngineInstances(*rootDeviceEnvironment)[0]; osContext = std::make_unique(*osInterface->getDriverModel()->as(), 0, 0u, EngineDescriptorHelper::getDefaultDescriptor(engine, preemptionMode)); osContext->ensureContextInitialized(); } diff --git a/shared/test/unit_test/os_interface/windows/wddm_tests.cpp b/shared/test/unit_test/os_interface/windows/wddm_tests.cpp index ca0fa18594..d3e50f86fb 100644 --- a/shared/test/unit_test/os_interface/windows/wddm_tests.cpp +++ b/shared/test/unit_test/os_interface/windows/wddm_tests.cpp @@ -409,7 +409,7 @@ struct WddmSkipResourceCleanupFixtureWithMockGdiDll : public GdiDllFixture, publ wddm->init(); wddm->wddmInterface.reset(wddmMockInterface); auto &gfxCoreHelper = rootDeviceEnvironment->getHelper(); - auto engine = gfxCoreHelper.getGpgpuEngineInstances(*defaultHwInfo)[0]; + auto engine = gfxCoreHelper.getGpgpuEngineInstances(*rootDeviceEnvironment)[0]; osContext = std::make_unique(*osInterface->getDriverModel()->as(), 0, 0u, EngineDescriptorHelper::getDefaultDescriptor(engine, preemptionMode)); osContext->ensureContextInitialized(); } diff --git a/shared/test/unit_test/preemption/preemption_tests.cpp b/shared/test/unit_test/preemption/preemption_tests.cpp index f8a108f4a8..90f0de2d80 100644 --- a/shared/test/unit_test/preemption/preemption_tests.cpp +++ b/shared/test/unit_test/preemption/preemption_tests.cpp @@ -453,10 +453,9 @@ HWTEST_F(MidThreadPreemptionTests, givenMidThreadPreemptionWhenFailingOnCsrSurfa FailingMemoryManager(ExecutionEnvironment &executionEnvironment) : OsAgnosticMemoryManager(executionEnvironment) {} GraphicsAllocation *allocateGraphicsMemoryWithAlignment(const AllocationData &allocationData) override { - auto hwInfo = executionEnvironment.rootDeviceEnvironments[allocationData.rootDeviceIndex]->getHardwareInfo(); auto &gfxCoreHelper = executionEnvironment.rootDeviceEnvironments[allocationData.rootDeviceIndex]->template getHelper(); - if (++allocateGraphicsMemoryCount > gfxCoreHelper.getGpgpuEngineInstances(*hwInfo).size() - 1) { + if (++allocateGraphicsMemoryCount > gfxCoreHelper.getGpgpuEngineInstances(*executionEnvironment.rootDeviceEnvironments[allocationData.rootDeviceIndex]).size() - 1) { return nullptr; } return OsAgnosticMemoryManager::allocateGraphicsMemoryWithAlignment(allocationData); 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 0676169ff7..e1d6ca8c63 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 @@ -114,7 +114,7 @@ PVCTEST_F(EngineNodeHelperPvcTests, givenCccsDisabledButDebugVariableSetWhenGetG auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(9u, device->allEngines.size()); - auto &engines = gfxCoreHelper.getGpgpuEngineInstances(hwInfo); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment()); EXPECT_EQ(9u, engines.size()); EXPECT_EQ(aub_stream::ENGINE_CCS, engines[0].first); @@ -140,7 +140,7 @@ PVCTEST_F(EngineNodeHelperPvcTests, givenCccsDisabledWhenGetGpgpuEnginesCalledTh auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(8u, device->allEngines.size()); - auto &engines = gfxCoreHelper.getGpgpuEngineInstances(hwInfo); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment()); EXPECT_EQ(8u, engines.size()); EXPECT_EQ(aub_stream::ENGINE_CCS, engines[0].first); @@ -192,7 +192,7 @@ PVCTEST_F(EngineNodeHelperPvcTests, givenBcsDisabledWhenGetEnginesCalledThenDont auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(numEngines, device->allEngines.size()); - auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getHardwareInfo()); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment()); EXPECT_EQ(numEngines, engines.size()); struct EnginePropertiesMap { @@ -231,7 +231,7 @@ PVCTEST_F(EngineNodeHelperPvcTests, givenOneBcsEnabledWhenGetEnginesCalledThenCr auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(numEngines, device->allEngines.size()); - auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getHardwareInfo()); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment()); EXPECT_EQ(numEngines, engines.size()); struct EnginePropertiesMap { @@ -276,7 +276,7 @@ PVCTEST_F(EngineNodeHelperPvcTests, givenNotAllCopyEnginesWhenSettingEngineTable auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(numEngines, device->allEngines.size()); - auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getHardwareInfo()); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment()); EXPECT_EQ(numEngines, engines.size()); struct EnginePropertiesMap { @@ -317,7 +317,7 @@ PVCTEST_F(EngineNodeHelperPvcTests, givenOneCcsEnabledWhenGetEnginesCalledThenCr auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(numEngines, device->allEngines.size()); - auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getHardwareInfo()); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment()); EXPECT_EQ(numEngines, engines.size()); struct EnginePropertiesMap { @@ -364,7 +364,7 @@ PVCTEST_F(EngineNodeHelperPvcTests, givenCccsAsDefaultEngineWhenGetEnginesCalled auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(numEngines, device->allEngines.size()); - auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getHardwareInfo()); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment()); EXPECT_EQ(numEngines, engines.size()); struct EnginePropertiesMap { @@ -414,7 +414,7 @@ PVCTEST_F(EngineNodeHelperPvcTests, whenGetGpgpuEnginesThenReturnTwoCccsEnginesA auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(numEngines, device->allEngines.size()); - auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getHardwareInfo()); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment()); EXPECT_EQ(numEngines, engines.size()); struct EnginePropertiesMap { @@ -464,7 +464,7 @@ PVCTEST_F(EngineNodeHelperPvcTests, whenGetGpgpuEnginesThenReturnTwoCccsEnginesA auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(numEngines, device->allEngines.size()); - auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getHardwareInfo()); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment()); 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 4151142b2f..a506ce7c6f 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 @@ -48,7 +48,7 @@ DG2TEST_F(GfxCoreHelperTestDg2, givenRcsDisabledWhenGetGpgpuEnginesCalledThenDon auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(8u, device->allEngines.size()); - auto &engines = gfxCoreHelper.getGpgpuEngineInstances(hwInfo); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment()); EXPECT_EQ(8u, engines.size()); EXPECT_EQ(aub_stream::ENGINE_CCS, engines[0].first); @@ -76,7 +76,7 @@ DG2TEST_F(GfxCoreHelperTestDg2, givenRcsDisabledButDebugVariableSetWhenGetGpgpuE auto device = std::unique_ptr(MockDevice::createWithNewExecutionEnvironment(&hwInfo, 0)); auto &gfxCoreHelper = device->getGfxCoreHelper(); EXPECT_EQ(9u, device->allEngines.size()); - auto &engines = gfxCoreHelper.getGpgpuEngineInstances(hwInfo); + auto &engines = gfxCoreHelper.getGpgpuEngineInstances(device->getRootDeviceEnvironment()); EXPECT_EQ(9u, engines.size()); EXPECT_EQ(aub_stream::ENGINE_CCS, engines[0].first);