From 55dcca993c20639f5ceefbf3e6b916fed6a668ee Mon Sep 17 00:00:00 2001 From: Filip Hazubski Date: Tue, 26 Apr 2022 10:38:46 +0000 Subject: [PATCH] Apply getPaddingForISAAllocation PVC implementation to PVC and later platforms Signed-off-by: Filip Hazubski --- opencl/test/unit_test/helpers/hw_helper_tests.cpp | 2 +- .../unit_test/helpers/hw_helper_tests_pvc_and_later.cpp | 5 +++++ .../unit_test/xe_hpc_core/excludes_ocl_xe_hpc_core.cpp | 1 - shared/source/helpers/hw_helper_pvc_and_later.inl | 8 ++++++++ shared/source/xe_hpc_core/hw_helper_xe_hpc_core.cpp | 8 -------- .../unit_test/xe_hpc_core/hw_helper_xe_hpc_core_tests.cpp | 5 ----- 6 files changed, 14 insertions(+), 15 deletions(-) diff --git a/opencl/test/unit_test/helpers/hw_helper_tests.cpp b/opencl/test/unit_test/helpers/hw_helper_tests.cpp index f97ad57fd1..2e6fdb6822 100644 --- a/opencl/test/unit_test/helpers/hw_helper_tests.cpp +++ b/opencl/test/unit_test/helpers/hw_helper_tests.cpp @@ -83,7 +83,7 @@ HWTEST_F(HwHelperTest, givenHwHelperWhenAskingForTimestampPacketAlignmentThenRet EXPECT_EQ(expectedAlignment, helper.getTimestampPacketAllocatorAlignment()); } -HWTEST_F(HwHelperTest, givenHwHelperWhenGettingISAPaddingThenCorrectValueIsReturned) { +HWTEST2_F(HwHelperTest, givenHwHelperWhenGettingISAPaddingThenCorrectValueIsReturned, IsAtMostXeHpgCore) { auto &hwHelper = HwHelper::get(pDevice->getHardwareInfo().platform.eRenderCoreFamily); EXPECT_EQ(hwHelper.getPaddingForISAAllocation(), 512u); } diff --git a/opencl/test/unit_test/helpers/hw_helper_tests_pvc_and_later.cpp b/opencl/test/unit_test/helpers/hw_helper_tests_pvc_and_later.cpp index 36b698dbb6..69fb95a589 100644 --- a/opencl/test/unit_test/helpers/hw_helper_tests_pvc_and_later.cpp +++ b/opencl/test/unit_test/helpers/hw_helper_tests_pvc_and_later.cpp @@ -198,3 +198,8 @@ HWTEST2_F(HwHelperTestPvcAndLater, WhenIsCooperativeDispatchSupportedThenCorrect } } } + +HWTEST2_F(HwHelperTestPvcAndLater, givenHwHelperWhenGettingISAPaddingThenCorrectValueIsReturned, IsAtLeastXeHpcCore) { + auto &hwHelper = HwHelper::get(pDevice->getHardwareInfo().platform.eRenderCoreFamily); + EXPECT_EQ(hwHelper.getPaddingForISAAllocation(), 0xE00u); +} diff --git a/opencl/test/unit_test/xe_hpc_core/excludes_ocl_xe_hpc_core.cpp b/opencl/test/unit_test/xe_hpc_core/excludes_ocl_xe_hpc_core.cpp index bdb87f619f..82bfd73a43 100644 --- a/opencl/test/unit_test/xe_hpc_core/excludes_ocl_xe_hpc_core.cpp +++ b/opencl/test/unit_test/xe_hpc_core/excludes_ocl_xe_hpc_core.cpp @@ -22,7 +22,6 @@ HWTEST_EXCLUDE_PRODUCT(DrmMemoryManagerTest, givenDrmAllocationWithHostPtrWhenIt HWTEST_EXCLUDE_PRODUCT(DrmMemoryManagerTest, givenDrmAllocationWithWithAlignmentFromUserptrWhenItIsCreatedWithIncorrectCacheRegionThenReturnNull, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(ClDeviceHelperTests, givenDeviceWithoutClosBasedCacheReservationSupportWhenQueryingNumCacheClosDeviceInfoThenReturnZeroCacheClosRegions, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(HwHelperTest, whenGettingNumberOfCacheRegionsThenReturnZero, IGFX_XE_HPC_CORE); -HWTEST_EXCLUDE_PRODUCT(HwHelperTest, givenHwHelperWhenGettingISAPaddingThenCorrectValueIsReturned, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(LocalWorkSizeTest, givenDispatchInfoWhenWorkSizeInfoIsCreatedThenTestEuFusionFtr, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, whenCallingGetDeviceMemoryNameThenDdrIsReturned, IGFX_XE_HPC_CORE); HWTEST_EXCLUDE_PRODUCT(HwInfoConfigTest, givenHardwareInfoWhenCallingIsMaxThreadsForWorkgroupWARequiredThenFalseIsReturned, IGFX_XE_HPC_CORE); diff --git a/shared/source/helpers/hw_helper_pvc_and_later.inl b/shared/source/helpers/hw_helper_pvc_and_later.inl index 899b391db3..9cc5901844 100644 --- a/shared/source/helpers/hw_helper_pvc_and_later.inl +++ b/shared/source/helpers/hw_helper_pvc_and_later.inl @@ -65,4 +65,12 @@ bool HwHelperHw::isEngineTypeRemappingToHwSpecificRequired() const { return true; } +template <> +size_t HwHelperHw::getPaddingForISAAllocation() const { + if (DebugManager.flags.ForceExtendedKernelIsaSize.get() >= 1) { + return 0xE00 + (MemoryConstants::pageSize * DebugManager.flags.ForceExtendedKernelIsaSize.get()); + } + return 0xE00; +} + } // namespace NEO 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 da255561b3..7fac5a37fd 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 @@ -165,14 +165,6 @@ uint32_t HwHelperHw::getMaxNumSamplers() const { return 0; } -template <> -size_t HwHelperHw::getPaddingForISAAllocation() const { - if (DebugManager.flags.ForceExtendedKernelIsaSize.get() >= 1) { - return 0xE00 + (MemoryConstants::pageSize * DebugManager.flags.ForceExtendedKernelIsaSize.get()); - } - return 0xE00; -} - template <> size_t MemorySynchronizationCommands::getSizeForSingleAdditionalSynchronization(const HardwareInfo &hwInfo) { const auto &hwInfoConfig = *HwInfoConfig::get(hwInfo.platform.eProductFamily); diff --git a/shared/test/unit_test/xe_hpc_core/hw_helper_xe_hpc_core_tests.cpp b/shared/test/unit_test/xe_hpc_core/hw_helper_xe_hpc_core_tests.cpp index 13ebf5136d..0d402dd588 100644 --- a/shared/test/unit_test/xe_hpc_core/hw_helper_xe_hpc_core_tests.cpp +++ b/shared/test/unit_test/xe_hpc_core/hw_helper_xe_hpc_core_tests.cpp @@ -54,11 +54,6 @@ XE_HPC_CORETEST_F(HwHelperXeHpcCoreTest, WhenGettingIsCpuImageTransferPreferredT EXPECT_TRUE(hwHelper.isCpuImageTransferPreferred(*defaultHwInfo)); } -XE_HPC_CORETEST_F(HwHelperXeHpcCoreTest, givenHwHelperWhenGettingISAPaddingThenCorrectValueIsReturned) { - auto &hwHelper = NEO::HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily); - EXPECT_EQ(hwHelper.getPaddingForISAAllocation(), 0xE00u); -} - XE_HPC_CORETEST_F(HwHelperXeHpcCoreTest, givenHwHelperWhenGettingIfRevisionSpecificBinaryBuiltinIsRequiredThenTrueIsReturned) { auto &hwHelper = NEO::HwHelper::get(defaultHwInfo->platform.eRenderCoreFamily); EXPECT_TRUE(hwHelper.isRevisionSpecificBinaryBuiltinRequired());