intel/compute-runtime
1
0
Fork 0
mirror of https://github.com/intel/compute-runtime.git synced 2026-01-05 09:09:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: don't use global ProductHelper getter in ocl files 3/n

Browse Source 
Related-To: NEO-6853
Signed-off-by: Kamil Kopryk <kamil.kopryk@intel.com>
This commit is contained in:
Kamil Kopryk
2023-01-05 13:40:36 +00:00
committed by Compute-Runtime-Automation
parent 3731ee89d8
commit 347cef9fcb
13 changed files with 57 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
opencl/test/unit_test/os_interface/windows/wddm20_tests.cpp
View File

@@ -788,9 +788,8 @@ TEST_F(Wddm20Tests, WhenMakingNonResidentAndEvictNotNeededThenEvictIsCalledWithP
DebugManagerStateRestore restorer{};
DebugManager.flags.PlaformSupportEvictIfNecessaryFlag.set(1);
auto productFamily = rootDeviceEnvironment->getHardwareInfo()->platform.eProductFamily;
ProductHelper *productHelper = ProductHelper::get(productFamily);
wddm->setPlatformSupportEvictIfNecessaryFlag(*productHelper);
auto &productHelper = rootDeviceEnvironment->getHelper<ProductHelper>();
wddm->setPlatformSupportEvictIfNecessaryFlag(productHelper);
D3DKMT_HANDLE handle = (D3DKMT_HANDLE)0x1234;

15
opencl/test/unit_test/os_interface/windows/wddm_memory_manager_tests.cpp
View File

@@ -1990,7 +1990,8 @@ TEST_F(MockWddmMemoryManagerTest, givenDisabledAsyncDeleterFlagWhenMemoryManager
}
TEST_F(MockWddmMemoryManagerTest, givenPageTableManagerWhenMapAuxGpuVaCalledThenUseWddmToMap) {
if (!ProductHelper::get(defaultHwInfo->platform.eProductFamily)->isPageTableManagerSupported(*defaultHwInfo)) {
auto &productHelper = executionEnvironment->rootDeviceEnvironments[0]->getHelper<ProductHelper>();
if (!productHelper.isPageTableManagerSupported(*defaultHwInfo)) {
GTEST_SKIP();
}
wddm->init();
@@ -2026,7 +2027,8 @@ TEST_F(MockWddmMemoryManagerTest, givenPageTableManagerWhenMapAuxGpuVaCalledThen
}
TEST_F(MockWddmMemoryManagerTest, givenCompressedAllocationWhenMappedGpuVaAndPageTableNotSupportedThenMapAuxVa) {
if (ProductHelper::get(defaultHwInfo->platform.eProductFamily)->isPageTableManagerSupported(*defaultHwInfo)) {
auto &productHelper = executionEnvironment->rootDeviceEnvironments[0]->getHelper<ProductHelper>();
if (!productHelper.isPageTableManagerSupported(*defaultHwInfo)) {
GTEST_SKIP();
}
auto rootDeviceEnvironment = executionEnvironment->rootDeviceEnvironments[1].get();
@@ -2059,7 +2061,8 @@ TEST_F(MockWddmMemoryManagerTest, givenCompressedAllocationWhenMappedGpuVaAndPag
}
TEST_F(MockWddmMemoryManagerTest, givenCompressedAllocationWhenMappedGpuVaAndPageTableSupportedThenMapAuxVa) {
if (!ProductHelper::get(defaultHwInfo->platform.eProductFamily)->isPageTableManagerSupported(*defaultHwInfo)) {
auto &productHelper = executionEnvironment->rootDeviceEnvironments[0]->getHelper<ProductHelper>();
if (!productHelper.isPageTableManagerSupported(*defaultHwInfo)) {
GTEST_SKIP();
}
auto rootDeviceEnvironment = executionEnvironment->rootDeviceEnvironments[1].get();
@@ -2100,7 +2103,8 @@ TEST_F(MockWddmMemoryManagerTest, givenCompressedAllocationWhenMappedGpuVaAndPag
}
TEST_F(MockWddmMemoryManagerTest, givenCompressedAllocationAndPageTableSupportedWhenReleaseingThenUnmapAuxVa) {
if (!ProductHelper::get(defaultHwInfo->platform.eProductFamily)->isPageTableManagerSupported(*defaultHwInfo)) {
auto &productHelper = executionEnvironment->rootDeviceEnvironments[0]->getHelper<ProductHelper>();
if (!productHelper.isPageTableManagerSupported(*defaultHwInfo)) {
GTEST_SKIP();
}
wddm->init();
@@ -2234,7 +2238,8 @@ TEST_F(MockWddmMemoryManagerTest, givenCompressedFlagSetWhenInternalIsUnsetThenD
}
TEST_F(MockWddmMemoryManagerTest, givenCompressedFlagSetWhenInternalIsSetThenUpdateAuxTable) {
if (!ProductHelper::get(defaultHwInfo->platform.eProductFamily)->isPageTableManagerSupported(*defaultHwInfo)) {
auto &productHelper = executionEnvironment->rootDeviceEnvironments[0]->getHelper<ProductHelper>();
if (!productHelper.isPageTableManagerSupported(*defaultHwInfo)) {
GTEST_SKIP();
}
D3DGPU_VIRTUAL_ADDRESS gpuVa = 0;

10
opencl/test/unit_test/os_interface/windows/wddm_residency_controller_tests.cpp
View File

@@ -503,9 +503,8 @@ TEST_F(WddmResidencyControllerWithGdiTest, givenNotUsedAllocationsFromPreviousPe
DebugManagerStateRestore restorer{};
DebugManager.flags.PlaformSupportEvictIfNecessaryFlag.set(1);
auto productFamily = rootDeviceEnvironment->getHardwareInfo()->platform.eProductFamily;
ProductHelper *productHelper = ProductHelper::get(productFamily);
wddm->setPlatformSupportEvictIfNecessaryFlag(*productHelper);
auto &productHelper = rootDeviceEnvironment->getHelper<ProductHelper>();
wddm->setPlatformSupportEvictIfNecessaryFlag(productHelper);
D3DKMT_TRIMNOTIFICATION trimNotification = {0};
trimNotification.Flags.PeriodicTrim = 1;
@@ -588,9 +587,8 @@ TEST_F(WddmResidencyControllerWithGdiAndMemoryManagerTest, givenTripleAllocation
DebugManagerStateRestore restorer{};
DebugManager.flags.PlaformSupportEvictIfNecessaryFlag.set(1);
auto productFamily = executionEnvironment->rootDeviceEnvironments[0]->getHardwareInfo()->platform.eProductFamily;
ProductHelper *productHelper = ProductHelper::get(productFamily);
wddm->setPlatformSupportEvictIfNecessaryFlag(*productHelper);
auto &productHelper = executionEnvironment->rootDeviceEnvironments[0]->getHelper<ProductHelper>();
wddm->setPlatformSupportEvictIfNecessaryFlag(productHelper);
D3DKMT_TRIMNOTIFICATION trimNotification = {0};
trimNotification.Flags.PeriodicTrim = 1;