Move hwHelper ownership to RootDeviceEnvironment 2/n

Related-To: NEO-6853
Signed-off-by: Kamil Kopryk <kamil.kopryk@intel.com>

UseRootDeviceEnvironment getHelper<CoreHelper> for:
- getMaxBarrierRegisterPerSlice
- getPaddingForISAAllocation
This commit is contained in:
Kamil Kopryk
2022-11-10 12:41:52 +00:00
committed by Compute-Runtime-Automation
parent 10c12bb3a7
commit 002a90c717
16 changed files with 85 additions and 71 deletions

View File

@@ -14,7 +14,7 @@
using HwHelperTestGen11 = HwHelperTest;
GEN11TEST_F(HwHelperTestGen11, WhenGettingMaxBarriersPerSliceThenCorrectSizeIsReturned) {
auto &helper = HwHelper::get(renderCoreFamily);
auto &helper = getHelper<CoreHelper>();
EXPECT_EQ(32u, helper.getMaxBarrierRegisterPerSlice());
}

View File

@@ -16,7 +16,7 @@
using HwHelperTestGen8 = HwHelperTest;
GEN8TEST_F(HwHelperTestGen8, WhenGettingMaxBarriersPerSliceThenCorrectSizeIsReturned) {
auto &helper = HwHelper::get(renderCoreFamily);
auto &helper = getHelper<CoreHelper>();
EXPECT_EQ(16u, helper.getMaxBarrierRegisterPerSlice());
}

View File

@@ -14,7 +14,7 @@
using HwHelperTestGen9 = HwHelperTest;
GEN9TEST_F(HwHelperTestGen9, WhenGettingMaxBarriersPerSliceThenCorrectSizeIsReturned) {
auto &helper = HwHelper::get(renderCoreFamily);
auto &helper = getHelper<CoreHelper>();
EXPECT_EQ(32u, helper.getMaxBarrierRegisterPerSlice());
}

View File

@@ -67,18 +67,18 @@ HWTEST_F(HwHelperTest, givenHwHelperWhenAskingForTimestampPacketAlignmentThenRet
}
HWTEST2_F(HwHelperTest, givenHwHelperWhenGettingISAPaddingThenCorrectValueIsReturned, IsAtMostXeHpgCore) {
auto &hwHelper = HwHelper::get(pDevice->getHardwareInfo().platform.eRenderCoreFamily);
EXPECT_EQ(hwHelper.getPaddingForISAAllocation(), 512u);
auto &helper = getHelper<CoreHelper>();
EXPECT_EQ(helper.getPaddingForISAAllocation(), 512u);
}
HWTEST_F(HwHelperTest, givenForceExtendedKernelIsaSizeSetWhenGettingISAPaddingThenCorrectValueIsReturned) {
DebugManagerStateRestore restore;
auto &hwHelper = HwHelper::get(pDevice->getHardwareInfo().platform.eRenderCoreFamily);
auto &helper = getHelper<CoreHelper>();
auto defaultPadding = hwHelper.getPaddingForISAAllocation();
auto defaultPadding = helper.getPaddingForISAAllocation();
for (int32_t valueToTest : {0, 1, 2, 10}) {
DebugManager.flags.ForceExtendedKernelIsaSize.set(valueToTest);
EXPECT_EQ(hwHelper.getPaddingForISAAllocation(), defaultPadding + MemoryConstants::pageSize * valueToTest);
EXPECT_EQ(helper.getPaddingForISAAllocation(), defaultPadding + MemoryConstants::pageSize * valueToTest);
}
}

View File

@@ -167,8 +167,8 @@ HWTEST2_F(HwHelperTestPvcAndLater, WhenIsCooperativeDispatchSupportedThenCorrect
}
HWTEST2_F(HwHelperTestPvcAndLater, givenHwHelperWhenGettingISAPaddingThenCorrectValueIsReturned, IsAtLeastXeHpcCore) {
auto &hwHelper = HwHelper::get(pDevice->getHardwareInfo().platform.eRenderCoreFamily);
EXPECT_EQ(hwHelper.getPaddingForISAAllocation(), 0xE00u);
auto &helper = getHelper<CoreHelper>();
EXPECT_EQ(helper.getPaddingForISAAllocation(), 0xE00u);
}
using HwHelperTestCooperativeEngine = HwHelperTestPvcAndLater;