Skip to content

Commit c6ee706

Browse files
RafalMaziejukIntelCompute-Runtime-Automation
RafalMaziejukIntel
authored and
Compute-Runtime-Automation
committed
Move isPageTableManagerSupported function from HwHelper to HwInfoConfig
Signed-off-by: Rafal Maziejuk <[email protected]> Related-To: NEO-4541
1 parent 78fa40f commit c6ee706

34 files changed

+204
-89
lines changed

‎opencl/source/sharings/d3d/d3d_texture.cpp‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include "shared/source/helpers/get_info.h"
1414
#include "shared/source/helpers/hw_helper.h"
1515
#include "shared/source/memory_manager/memory_manager.h"
16+
#include "shared/source/os_interface/hw_info_config.h"
1617

1718
#include "opencl/source/cl_device/cl_device.h"
1819
#include "opencl/source/context/context.h"
@@ -117,8 +118,9 @@ Image *D3DTexture<D3D>::create2d(Context *context, D3DTexture2d *d3dTexture, cl_
117118
}
118119

119120
if (alloc->getDefaultGmm()->unifiedAuxTranslationCapable()) {
120-
alloc->getDefaultGmm()->isCompressionEnabled = hwHelper.isPageTableManagerSupported(*hwInfo) ? memoryManager->mapAuxGpuVA(alloc)
121-
: true;
121+
const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo->platform.eProductFamily);
122+
alloc->getDefaultGmm()->isCompressionEnabled = hwInfoConfig.isPageTableManagerSupported(*hwInfo) ? memoryManager->mapAuxGpuVA(alloc)
123+
: true;
122124
}
123125
auto multiGraphicsAllocation = MultiGraphicsAllocation(rootDeviceIndex);
124126
multiGraphicsAllocation.addAllocation(alloc);
@@ -203,8 +205,9 @@ Image *D3DTexture<D3D>::create3d(Context *context, D3DTexture3d *d3dTexture, cl_
203205
imgInfo.surfaceFormat = &clSurfaceFormat->surfaceFormat;
204206

205207
if (alloc->getDefaultGmm()->unifiedAuxTranslationCapable()) {
206-
alloc->getDefaultGmm()->isCompressionEnabled = hwHelper.isPageTableManagerSupported(*hwInfo) ? memoryManager->mapAuxGpuVA(alloc)
207-
: true;
208+
const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo->platform.eProductFamily);
209+
alloc->getDefaultGmm()->isCompressionEnabled = hwInfoConfig.isPageTableManagerSupported(*hwInfo) ? memoryManager->mapAuxGpuVA(alloc)
210+
: true;
208211
}
209212
auto multiGraphicsAllocation = MultiGraphicsAllocation(rootDeviceIndex);
210213
multiGraphicsAllocation.addAllocation(alloc);

‎opencl/source/sharings/gl/windows/gl_texture_windows.cpp‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include "shared/source/helpers/hw_helper.h"
1414
#include "shared/source/helpers/hw_info.h"
1515
#include "shared/source/memory_manager/memory_manager.h"
16+
#include "shared/source/os_interface/hw_info_config.h"
1617

1718
#include "opencl/extensions/public/cl_gl_private_intel.h"
1819
#include "opencl/source/cl_device/cl_device.h"
@@ -147,10 +148,10 @@ Image *GlTexture::createSharedGlTexture(Context *context, cl_mem_flags flags, cl
147148
auto glTexture = new GlTexture(sharingFunctions, getClGlObjectType(target), texture, texInfo, target, std::max(miplevel, 0));
148149

149150
if (texInfo.isAuxEnabled && alloc->getDefaultGmm()->unifiedAuxTranslationCapable()) {
150-
auto &hwInfo = context->getDevice(0)->getHardwareInfo();
151-
auto &hwHelper = HwHelper::get(hwInfo.platform.eRenderCoreFamily);
152-
alloc->getDefaultGmm()->isCompressionEnabled = hwHelper.isPageTableManagerSupported(hwInfo) ? memoryManager->mapAuxGpuVA(alloc)
153-
: true;
151+
const auto &hwInfo = context->getDevice(0)->getHardwareInfo();
152+
const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
153+
alloc->getDefaultGmm()->isCompressionEnabled = hwInfoConfig.isPageTableManagerSupported(hwInfo) ? memoryManager->mapAuxGpuVA(alloc)
154+
: true;
154155
}
155156
auto multiGraphicsAllocation = MultiGraphicsAllocation(context->getDevice(0)->getRootDeviceIndex());
156157
multiGraphicsAllocation.addAllocation(alloc);

‎opencl/source/sharings/unified/unified_image.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
#include "shared/source/helpers/hw_helper.h"
1515
#include "shared/source/memory_manager/graphics_allocation.h"
1616
#include "shared/source/memory_manager/memory_manager.h"
17+
#include "shared/source/os_interface/hw_info_config.h"
1718

1819
#include "opencl/source/cl_device/cl_device.h"
1920
#include "opencl/source/context/context.h"
@@ -42,8 +43,8 @@ Image *UnifiedImage::createSharedUnifiedImage(Context *context, cl_mem_flags fla
4243
auto &memoryManager = *context->getMemoryManager();
4344
if (graphicsAllocation->getDefaultGmm()->unifiedAuxTranslationCapable()) {
4445
const auto &hwInfo = context->getDevice(0)->getHardwareInfo();
45-
const auto &hwHelper = HwHelper::get(hwInfo.platform.eRenderCoreFamily);
46-
graphicsAllocation->getDefaultGmm()->isCompressionEnabled = hwHelper.isPageTableManagerSupported(hwInfo) ? memoryManager.mapAuxGpuVA(graphicsAllocation) : true;
46+
const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
47+
graphicsAllocation->getDefaultGmm()->isCompressionEnabled = hwInfoConfig.isPageTableManagerSupported(hwInfo) ? memoryManager.mapAuxGpuVA(graphicsAllocation) : true;
4748
}
4849

4950
const uint32_t baseMipmapIndex = 0u;

‎opencl/test/unit_test/command_stream/command_stream_receiver_tests.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "shared/source/memory_manager/memory_manager.h"
1919
#include "shared/source/memory_manager/surface.h"
2020
#include "shared/source/os_interface/device_factory.h"
21+
#include "shared/source/os_interface/hw_info_config.h"
2122
#include "shared/source/utilities/tag_allocator.h"
2223
#include "shared/test/common/helpers/debug_manager_state_restore.h"
2324
#include "shared/test/common/helpers/engine_descriptor_helper.h"
@@ -1487,7 +1488,7 @@ TEST_F(CommandStreamReceiverPageTableManagerTest, givenDefaultEngineTypeAndNonEx
14871488
MockCommandStreamReceiver commandStreamReceiver(executionEnvironment, 0u, deviceBitfield);
14881489
auto hwInfo = executionEnvironment.rootDeviceEnvironments[0]->getHardwareInfo();
14891490
auto defaultEngineType = getChosenEngineType(*hwInfo);
1490-
bool supportsPageTableManager = HwHelper::get(hwInfo->platform.eRenderCoreFamily).isPageTableManagerSupported(*hwInfo);
1491+
bool supportsPageTableManager = HwInfoConfig::get(hwInfo->platform.eProductFamily)->isPageTableManagerSupported(*hwInfo);
14911492
EXPECT_EQ(nullptr, executionEnvironment.rootDeviceEnvironments[0]->pageTableManager.get());
14921493

14931494
EXPECT_EQ(supportsPageTableManager, commandStreamReceiver.needsPageTableManager(defaultEngineType));

‎opencl/test/unit_test/d3d_sharing/d3d_aux_tests.cpp‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*/
77

88
#include "shared/source/memory_manager/os_agnostic_memory_manager.h"
9+
#include "shared/source/os_interface/hw_info_config.h"
910
#include "shared/source/utilities/arrayref.h"
1011

1112
#include "opencl/source/api/api.h"
@@ -37,9 +38,9 @@ TYPED_TEST_P(D3DAuxTests, given2dSharableTextureWithUnifiedAuxFlagsWhenCreatingT
3738
auto image = std::unique_ptr<Image>(D3DTexture<TypeParam>::create2d(this->context, (D3DTexture2d *)&this->dummyD3DTexture, CL_MEM_READ_WRITE, 4, nullptr));
3839
ASSERT_NE(nullptr, image.get());
3940

40-
auto hwInfo = context->getDevice(0)->getHardwareInfo();
41-
auto &hwHelper = HwHelper::get(hwInfo.platform.eRenderCoreFamily);
42-
uint32_t expectedMapAuxGpuVaCalls = hwHelper.isPageTableManagerSupported(hwInfo) ? 1 : 0;
41+
const auto &hwInfo = context->getDevice(0)->getHardwareInfo();
42+
const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
43+
uint32_t expectedMapAuxGpuVaCalls = hwInfoConfig.isPageTableManagerSupported(hwInfo) ? 1 : 0;
4344

4445
EXPECT_EQ(expectedMapAuxGpuVaCalls, mockMM->mapAuxGpuVACalled);
4546
EXPECT_TRUE(gmm->isCompressionEnabled);
@@ -57,12 +58,12 @@ TYPED_TEST_P(D3DAuxTests, given2dSharableTextureWithUnifiedAuxFlagsWhenFailOnAux
5758
auto image = std::unique_ptr<Image>(D3DTexture<TypeParam>::create2d(this->context, (D3DTexture2d *)&this->dummyD3DTexture, CL_MEM_READ_WRITE, 4, nullptr));
5859
ASSERT_NE(nullptr, image.get());
5960

60-
auto hwInfo = context->getDevice(0)->getHardwareInfo();
61-
auto &hwHelper = HwHelper::get(hwInfo.platform.eRenderCoreFamily);
62-
uint32_t expectedMapAuxGpuVaCalls = hwHelper.isPageTableManagerSupported(hwInfo) ? 1 : 0;
61+
const auto &hwInfo = context->getDevice(0)->getHardwareInfo();
62+
const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
63+
uint32_t expectedMapAuxGpuVaCalls = hwInfoConfig.isPageTableManagerSupported(hwInfo) ? 1 : 0;
6364

6465
EXPECT_EQ(expectedMapAuxGpuVaCalls, mockMM->mapAuxGpuVACalled);
65-
EXPECT_EQ(!hwHelper.isPageTableManagerSupported(hwInfo), gmm->isCompressionEnabled);
66+
EXPECT_EQ(!hwInfoConfig.isPageTableManagerSupported(hwInfo), gmm->isCompressionEnabled);
6667
}
6768

6869
TYPED_TEST_P(D3DAuxTests, given2dSharableTextureWithoutUnifiedAuxFlagsWhenCreatingThenDontMapAuxTable) {
@@ -89,9 +90,9 @@ TYPED_TEST_P(D3DAuxTests, given2dNonSharableTextureWithUnifiedAuxFlagsWhenCreati
8990
auto image = std::unique_ptr<Image>(D3DTexture<TypeParam>::create2d(this->context, (D3DTexture2d *)&this->dummyD3DTexture, CL_MEM_READ_WRITE, 1, nullptr));
9091
ASSERT_NE(nullptr, image.get());
9192

92-
auto hwInfo = context->getDevice(0)->getHardwareInfo();
93-
auto &hwHelper = HwHelper::get(hwInfo.platform.eRenderCoreFamily);
94-
uint32_t expectedMapAuxGpuVaCalls = hwHelper.isPageTableManagerSupported(hwInfo) ? 1 : 0;
93+
const auto &hwInfo = context->getDevice(0)->getHardwareInfo();
94+
const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
95+
uint32_t expectedMapAuxGpuVaCalls = hwInfoConfig.isPageTableManagerSupported(hwInfo) ? 1 : 0;
9596

9697
EXPECT_EQ(expectedMapAuxGpuVaCalls, mockMM->mapAuxGpuVACalled);
9798
EXPECT_TRUE(gmm->isCompressionEnabled);
@@ -106,9 +107,9 @@ TYPED_TEST_P(D3DAuxTests, given3dSharableTextureWithUnifiedAuxFlagsWhenCreatingT
106107
std::unique_ptr<Image> image(D3DTexture<TypeParam>::create3d(this->context, (D3DTexture3d *)&this->dummyD3DTexture, CL_MEM_READ_WRITE, 1, nullptr));
107108
ASSERT_NE(nullptr, image.get());
108109

109-
auto hwInfo = context->getDevice(0)->getHardwareInfo();
110-
auto &hwHelper = HwHelper::get(hwInfo.platform.eRenderCoreFamily);
111-
uint32_t expectedMapAuxGpuVaCalls = hwHelper.isPageTableManagerSupported(hwInfo) ? 1 : 0;
110+
const auto &hwInfo = context->getDevice(0)->getHardwareInfo();
111+
const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
112+
uint32_t expectedMapAuxGpuVaCalls = hwInfoConfig.isPageTableManagerSupported(hwInfo) ? 1 : 0;
112113

113114
EXPECT_EQ(expectedMapAuxGpuVaCalls, mockMM->mapAuxGpuVACalled);
114115
EXPECT_TRUE(gmm->isCompressionEnabled);
@@ -124,12 +125,12 @@ TYPED_TEST_P(D3DAuxTests, given3dSharableTextureWithUnifiedAuxFlagsWhenFailOnAux
124125
std::unique_ptr<Image> image(D3DTexture<TypeParam>::create3d(this->context, (D3DTexture3d *)&this->dummyD3DTexture, CL_MEM_READ_WRITE, 1, nullptr));
125126
ASSERT_NE(nullptr, image.get());
126127

127-
auto hwInfo = context->getDevice(0)->getHardwareInfo();
128-
auto &hwHelper = HwHelper::get(hwInfo.platform.eRenderCoreFamily);
129-
uint32_t expectedMapAuxGpuVaCalls = hwHelper.isPageTableManagerSupported(hwInfo) ? 1 : 0;
128+
const auto &hwInfo = context->getDevice(0)->getHardwareInfo();
129+
const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
130+
uint32_t expectedMapAuxGpuVaCalls = hwInfoConfig.isPageTableManagerSupported(hwInfo) ? 1 : 0;
130131

131132
EXPECT_EQ(expectedMapAuxGpuVaCalls, mockMM->mapAuxGpuVACalled);
132-
EXPECT_EQ(!hwHelper.isPageTableManagerSupported(hwInfo), gmm->isCompressionEnabled);
133+
EXPECT_EQ(!hwInfoConfig.isPageTableManagerSupported(hwInfo), gmm->isCompressionEnabled);
133134
}
134135

135136
TYPED_TEST_P(D3DAuxTests, given3dSharableTextureWithoutUnifiedAuxFlagsWhenCreatingThenDontMapAuxTable) {
@@ -154,9 +155,9 @@ TYPED_TEST_P(D3DAuxTests, given3dNonSharableTextureWithUnifiedAuxFlagsWhenCreati
154155
std::unique_ptr<Image> image(D3DTexture<TypeParam>::create3d(this->context, (D3DTexture3d *)&this->dummyD3DTexture, CL_MEM_READ_WRITE, 1, nullptr));
155156
ASSERT_NE(nullptr, image.get());
156157

157-
auto hwInfo = context->getDevice(0)->getHardwareInfo();
158-
auto &hwHelper = HwHelper::get(hwInfo.platform.eRenderCoreFamily);
159-
uint32_t expectedMapAuxGpuVaCalls = hwHelper.isPageTableManagerSupported(hwInfo) ? 1 : 0;
158+
const auto &hwInfo = context->getDevice(0)->getHardwareInfo();
159+
const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily);
160+
uint32_t expectedMapAuxGpuVaCalls = hwInfoConfig.isPageTableManagerSupported(hwInfo) ? 1 : 0;
160161

161162
EXPECT_EQ(expectedMapAuxGpuVaCalls, mockMM->mapAuxGpuVACalled);
162163
EXPECT_TRUE(gmm->isCompressionEnabled);

‎opencl/test/unit_test/gen12lp/hw_helper_tests_gen12lp.inl‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -91,26 +91,6 @@ GEN12LPTEST_F(HwHelperTestGen12Lp, givenGen12LpPlatformWhenSetupHardwareCapabili
9191
EXPECT_TRUE(hwCaps.isStatelesToStatefullWithOffsetSupported);
9292
}
9393

94-
GEN12LPTEST_F(HwHelperTestGen12Lp, givenCompressionFtrEnabledWhenAskingForPageTableManagerThenReturnCorrectValue) {
95-
auto &helper = HwHelper::get(renderCoreFamily);
96-
97-
hardwareInfo.capabilityTable.ftrRenderCompressedBuffers = false;
98-
hardwareInfo.capabilityTable.ftrRenderCompressedImages = false;
99-
EXPECT_FALSE(helper.isPageTableManagerSupported(hardwareInfo));
100-
101-
hardwareInfo.capabilityTable.ftrRenderCompressedBuffers = true;
102-
hardwareInfo.capabilityTable.ftrRenderCompressedImages = false;
103-
EXPECT_TRUE(helper.isPageTableManagerSupported(hardwareInfo));
104-
105-
hardwareInfo.capabilityTable.ftrRenderCompressedBuffers = false;
106-
hardwareInfo.capabilityTable.ftrRenderCompressedImages = true;
107-
EXPECT_TRUE(helper.isPageTableManagerSupported(hardwareInfo));
108-
109-
hardwareInfo.capabilityTable.ftrRenderCompressedBuffers = true;
110-
hardwareInfo.capabilityTable.ftrRenderCompressedImages = true;
111-
EXPECT_TRUE(helper.isPageTableManagerSupported(hardwareInfo));
112-
}
113-
11494
GEN12LPTEST_F(HwHelperTestGen12Lp, givenDifferentSizesOfAllocationWhenCheckingCompressionPreferenceThenReturnCorrectValue) {
11595
auto &helper = HwHelper::get(renderCoreFamily);
11696

‎opencl/test/unit_test/gen12lp/linux/hw_info_config_tests_gen12lp.cpp‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515

1616
using namespace NEO;
1717

18-
using HwInfoConfigTestWindowsGen12lp = HwInfoConfigTestLinux;
18+
using HwInfoConfigTestLinuxGen12lp = HwInfoConfigTestLinux;
1919

20-
GEN12LPTEST_F(HwInfoConfigTestWindowsGen12lp, givenGen12LpProductWhenAdjustPlatformForProductFamilyCalledThenOverrideWithCorrectFamily) {
20+
GEN12LPTEST_F(HwInfoConfigTestLinuxGen12lp, givenGen12LpProductWhenAdjustPlatformForProductFamilyCalledThenOverrideWithCorrectFamily) {
2121
auto hwInfoConfig = HwInfoConfig::get(productFamily);
2222

2323
PLATFORM *testPlatform = &outHwInfo.platform;
@@ -28,3 +28,23 @@ GEN12LPTEST_F(HwInfoConfigTestWindowsGen12lp, givenGen12LpProductWhenAdjustPlatf
2828
EXPECT_EQ(IGFX_GEN12LP_CORE, testPlatform->eRenderCoreFamily);
2929
EXPECT_EQ(IGFX_GEN12LP_CORE, testPlatform->eDisplayCoreFamily);
3030
}
31+
32+
GEN12LPTEST_F(HwInfoConfigTestLinuxGen12lp, givenCompressionFtrEnabledWhenAskingForPageTableManagerThenReturnCorrectValue) {
33+
const auto &hwInfoConfig = *HwInfoConfig::get(productFamily);
34+
35+
outHwInfo.capabilityTable.ftrRenderCompressedBuffers = false;
36+
outHwInfo.capabilityTable.ftrRenderCompressedImages = false;
37+
EXPECT_FALSE(hwInfoConfig.isPageTableManagerSupported(outHwInfo));
38+
39+
outHwInfo.capabilityTable.ftrRenderCompressedBuffers = true;
40+
outHwInfo.capabilityTable.ftrRenderCompressedImages = false;
41+
EXPECT_TRUE(hwInfoConfig.isPageTableManagerSupported(outHwInfo));
42+
43+
outHwInfo.capabilityTable.ftrRenderCompressedBuffers = false;
44+
outHwInfo.capabilityTable.ftrRenderCompressedImages = true;
45+
EXPECT_TRUE(hwInfoConfig.isPageTableManagerSupported(outHwInfo));
46+
47+
outHwInfo.capabilityTable.ftrRenderCompressedBuffers = true;
48+
outHwInfo.capabilityTable.ftrRenderCompressedImages = true;
49+
EXPECT_TRUE(hwInfoConfig.isPageTableManagerSupported(outHwInfo));
50+
}

‎opencl/test/unit_test/gen12lp/windows/hw_info_config_tests_gen12lp.cpp‎

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ GEN12LPTEST_F(HwInfoConfigTestWindowsGen12lp, givenE2ECSetByKmdWhenConfiguringHw
3131
EXPECT_FALSE(outHwInfo.capabilityTable.ftrRenderCompressedImages);
3232
}
3333

34-
GEN12LPTEST_F(HwInfoConfigTestWindows, givenGen12LpProductWhenAdjustPlatformForProductFamilyCalledThenOverrideWithCorrectFamily) {
34+
GEN12LPTEST_F(HwInfoConfigTestWindowsGen12lp, givenGen12LpProductWhenAdjustPlatformForProductFamilyCalledThenOverrideWithCorrectFamily) {
3535
auto hwInfoConfig = HwInfoConfig::get(productFamily);
3636

3737
PLATFORM *testPlatform = &outHwInfo.platform;
@@ -42,3 +42,23 @@ GEN12LPTEST_F(HwInfoConfigTestWindows, givenGen12LpProductWhenAdjustPlatformForP
4242
EXPECT_EQ(IGFX_GEN12LP_CORE, testPlatform->eRenderCoreFamily);
4343
EXPECT_EQ(IGFX_GEN12LP_CORE, testPlatform->eDisplayCoreFamily);
4444
}
45+
46+
GEN12LPTEST_F(HwInfoConfigTestWindowsGen12lp, givenCompressionFtrEnabledWhenAskingForPageTableManagerThenReturnCorrectValue) {
47+
const auto &hwInfoConfig = *HwInfoConfig::get(productFamily);
48+
49+
outHwInfo.capabilityTable.ftrRenderCompressedBuffers = false;
50+
outHwInfo.capabilityTable.ftrRenderCompressedImages = false;
51+
EXPECT_FALSE(hwInfoConfig.isPageTableManagerSupported(outHwInfo));
52+
53+
outHwInfo.capabilityTable.ftrRenderCompressedBuffers = true;
54+
outHwInfo.capabilityTable.ftrRenderCompressedImages = false;
55+
EXPECT_TRUE(hwInfoConfig.isPageTableManagerSupported(outHwInfo));
56+
57+
outHwInfo.capabilityTable.ftrRenderCompressedBuffers = false;
58+
outHwInfo.capabilityTable.ftrRenderCompressedImages = true;
59+
EXPECT_TRUE(hwInfoConfig.isPageTableManagerSupported(outHwInfo));
60+
61+
outHwInfo.capabilityTable.ftrRenderCompressedBuffers = true;
62+
outHwInfo.capabilityTable.ftrRenderCompressedImages = true;
63+
EXPECT_TRUE(hwInfoConfig.isPageTableManagerSupported(outHwInfo));
64+
}

‎opencl/test/unit_test/helpers/hw_helper_tests.cpp‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -184,11 +184,6 @@ HWTEST2_F(HwHelperTest, givenHwHelperWhenGettingThreadsPerEUConfigsThenNoConfigs
184184
EXPECT_EQ(0U, configs.size());
185185
}
186186

187-
HWTEST_F(HwHelperTest, givenHwHelperWhenAskedForPageTableManagerSupportThenReturnCorrectValue) {
188-
auto &helper = HwHelper::get(renderCoreFamily);
189-
EXPECT_EQ(helper.isPageTableManagerSupported(hardwareInfo), UnitTestHelper<FamilyType>::isPageTableManagerSupported(hardwareInfo));
190-
}
191-
192187
HWCMDTEST_F(IGFX_GEN8_CORE, HwHelperTest, givenHwHelperWhenGetGpuTimeStampInNSIsCalledThenCorrectValueIsReturned) {
193188

194189
auto &helper = HwHelper::get(renderCoreFamily);

‎opencl/test/unit_test/memory_manager/memory_manager_tests.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include "shared/source/memory_manager/graphics_allocation.h"
1313
#include "shared/source/memory_manager/internal_allocation_storage.h"
1414
#include "shared/source/memory_manager/residency.h"
15+
#include "shared/source/os_interface/hw_info_config.h"
1516
#include "shared/source/os_interface/os_context.h"
1617
#include "shared/source/os_interface/os_interface.h"
1718
#include "shared/source/program/program_initialization.h"
@@ -2769,7 +2770,7 @@ HWTEST_F(PageTableManagerTest, givenMemoryManagerThatSupportsPageTableManagerWhe
27692770
bool mapped = memoryManager->mapAuxGpuVA(&allocation);
27702771
auto hwInfo = executionEnvironment->rootDeviceEnvironments[allocation.getRootDeviceIndex()]->getHardwareInfo();
27712772

2772-
EXPECT_EQ(HwHelper::get(hwInfo->platform.eRenderCoreFamily).isPageTableManagerSupported(*hwInfo), mapped);
2773+
EXPECT_EQ(HwInfoConfig::get(hwInfo->platform.eProductFamily)->isPageTableManagerSupported(*hwInfo), mapped);
27732774
}
27742775

27752776
TEST(MemoryManagerTest, givenDebugModuleAreaAllocationTypeWhenCallingGetAllocationDataThenUse32BitFrontWindowsIsSet) {

0 commit comments

Comments
 (0)