From 59179fa9d96302af056a904920f467f66eb1360a Mon Sep 17 00:00:00 2001 From: Compute-Runtime-Validation Date: Thu, 30 Oct 2025 04:32:46 +0100 Subject: [PATCH] Revert "performance: Set L1 cache policy to WB on PTL" This reverts commit 577de9770d99bfc251a4017e4abcf0271c10c6fc. Signed-off-by: Compute-Runtime-Validation --- .../unit_tests/sources/debugger/test_l0_debugger_1.cpp | 2 -- .../core/test/unit_tests/sources/module/test_module.cpp | 2 -- opencl/test/unit_test/program/program_tests.cpp | 2 -- .../unit_test/xe3_core/test_cmds_programming_xe3_core.cpp | 7 +++---- .../xe3_core/definitions/enable_xe3_core_products.inl | 7 ------- shared/test/unit_test/helpers/cache_policy_tests.cpp | 4 +--- .../test/unit_test/xe3_core/ptl/excludes_xe3_core_ptl.cpp | 3 --- .../unit_test/xe3_core/ptl/product_helper_tests_ptl.cpp | 5 ----- shared/test/unit_test/xe3_core/test_encode_xe3_core.cpp | 2 +- 9 files changed, 5 insertions(+), 29 deletions(-) diff --git a/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_1.cpp b/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_1.cpp index 75e67b8372..45fc0ae6a4 100644 --- a/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_1.cpp +++ b/level_zero/core/test/unit_tests/sources/debugger/test_l0_debugger_1.cpp @@ -34,8 +34,6 @@ namespace L0 { namespace ult { -HWTEST_EXCLUDE_PRODUCT(L0DebuggerTest, givenDebuggerEnabledAndL1CachePolicyWBWhenAppendingThenDebugSurfaceHasCachePolicyWBP_IsAtLeastXeCore, IGFX_PTL); - using L0DebuggerTest = Test; using L0DebuggerParameterizedTests = L0DebuggerHwParameterizedFixture; using L0DebuggerGlobalStatelessTest = Test; diff --git a/level_zero/core/test/unit_tests/sources/module/test_module.cpp b/level_zero/core/test/unit_tests/sources/module/test_module.cpp index 2e3fdb6b48..5977d6884b 100644 --- a/level_zero/core/test/unit_tests/sources/module/test_module.cpp +++ b/level_zero/core/test/unit_tests/sources/module/test_module.cpp @@ -54,8 +54,6 @@ namespace L0 { namespace ult { -HWTEST_EXCLUDE_PRODUCT(ModuleTranslationUnitTest, givenAtLeastXeHpgCoreWhenGetInternalOptionsThenCorrectBuildOptionIsSet_IsAtLeastXeCore, IGFX_PTL); - using ModuleTest = Test; TEST_F(ModuleTest, GivenGeneralRegisterFileDescriptorWhenGetKernelPropertiesIsCalledThenDescriptorIsCorrectlySet) { diff --git a/opencl/test/unit_test/program/program_tests.cpp b/opencl/test/unit_test/program/program_tests.cpp index 15ad9439d5..65d927ed99 100644 --- a/opencl/test/unit_test/program/program_tests.cpp +++ b/opencl/test/unit_test/program/program_tests.cpp @@ -71,8 +71,6 @@ using namespace NEO; -HWTEST_EXCLUDE_PRODUCT(ProgramTests, givenAtLeastXeHpgCoreWhenGetInternalOptionsThenCorrectBuildOptionIsSet_IsAtLeastXeCore, IGFX_PTL); - void ProgramTests::SetUp() { ClDeviceFixture::setUp(); cl_device_id device = pClDevice; diff --git a/opencl/test/unit_test/xe3_core/test_cmds_programming_xe3_core.cpp b/opencl/test/unit_test/xe3_core/test_cmds_programming_xe3_core.cpp index 91b6adfcad..825fa8e7b2 100644 --- a/opencl/test/unit_test/xe3_core/test_cmds_programming_xe3_core.cpp +++ b/opencl/test/unit_test/xe3_core/test_cmds_programming_xe3_core.cpp @@ -44,7 +44,7 @@ XE3_CORETEST_F(CmdsProgrammingTestsXe3Core, givenL3ToL1DebugFlagWhenStatelessMoc auto actualL1CachePolocy = static_cast(stateBaseAddress->getL1CacheControlCachePolicy()); - const uint8_t expectedL1CachePolicy = pDevice->getHardwareInfo().platform.eProductFamily == IGFX_PTL ? 2 : 0; + const uint8_t expectedL1CachePolicy = 0; EXPECT_EQ(expectedL1CachePolicy, actualL1CachePolocy); } @@ -75,8 +75,7 @@ XE3_CORETEST_F(CmdsProgrammingTestsXe3Core, whenAppendingRssThenProgramWtL1Cache EncodeSurfaceState::encodeBuffer(args); - const uint8_t expectedL1CachePolicy = pDevice->getHardwareInfo().platform.eProductFamily == IGFX_PTL ? 2 : 0; - EXPECT_EQ(expectedL1CachePolicy, rssCmd.getL1CacheControlCachePolicy()); + EXPECT_EQ(FamilyType::RENDER_SURFACE_STATE::L1_CACHE_CONTROL_WBP, rssCmd.getL1CacheControlCachePolicy()); } XE3_CORETEST_F(CmdsProgrammingTestsXe3Core, givenAlignedCacheableReadOnlyBufferThenChoseOclBufferConstPolicy) { @@ -103,7 +102,7 @@ XE3_CORETEST_F(CmdsProgrammingTestsXe3Core, givenAlignedCacheableReadOnlyBufferT auto actualL1CachePolocy = static_cast(surfaceState.getL1CacheControlCachePolicy()); - const uint8_t expectedL1CachePolicy = pDevice->getHardwareInfo().platform.eProductFamily == IGFX_PTL ? 2 : 0; + const uint8_t expectedL1CachePolicy = 0; EXPECT_EQ(expectedL1CachePolicy, actualL1CachePolocy); alignedFree(ptr); diff --git a/shared/source/xe3_core/definitions/enable_xe3_core_products.inl b/shared/source/xe3_core/definitions/enable_xe3_core_products.inl index afd264babb..41f851da54 100644 --- a/shared/source/xe3_core/definitions/enable_xe3_core_products.inl +++ b/shared/source/xe3_core/definitions/enable_xe3_core_products.inl @@ -6,13 +6,6 @@ */ #ifdef SUPPORT_PTL - -template <> -uint32_t L1CachePolicyHelper::getDefaultL1CachePolicy(bool isDebuggerActive) { - using GfxFamily = HwMapper::GfxFamily; - return GfxFamily::STATE_BASE_ADDRESS::L1_CACHE_CONTROL_WB; -} - template struct L1CachePolicyHelper; static EnableGfxProductHw enableGfxProductHwPTL; #endif diff --git a/shared/test/unit_test/helpers/cache_policy_tests.cpp b/shared/test/unit_test/helpers/cache_policy_tests.cpp index a5a50e9ef1..b4b202c5e1 100644 --- a/shared/test/unit_test/helpers/cache_policy_tests.cpp +++ b/shared/test/unit_test/helpers/cache_policy_tests.cpp @@ -26,9 +26,7 @@ HWTEST2_F(ProductHelperTest, givenL1CachePolicyHelperWhenUnsupportedL1PoliciesAn HWTEST2_F(ProductHelperTest, givenAtLeastXeHpgCoreWhenGetL1CachePolicyThenReturnCorrectValue, IsAtLeastXeCore) { using GfxFamily = typename HwMapper::GfxFamily; auto policy = [&]() -> uint32_t { - if constexpr (productFamily == IGFX_PTL) { - return GfxFamily::RENDER_SURFACE_STATE::L1_CACHE_CONTROL_WB; - } else if constexpr (GfxFamily::isHeaplessRequired()) { + if constexpr (GfxFamily::isHeaplessRequired()) { return GfxFamily::RENDER_SURFACE_STATE::L1_CACHE_CONTROL_WBP; } else { return GfxFamily::STATE_BASE_ADDRESS::L1_CACHE_CONTROL_WBP; diff --git a/shared/test/unit_test/xe3_core/ptl/excludes_xe3_core_ptl.cpp b/shared/test/unit_test/xe3_core/ptl/excludes_xe3_core_ptl.cpp index 442f16510e..9760b54128 100644 --- a/shared/test/unit_test/xe3_core/ptl/excludes_xe3_core_ptl.cpp +++ b/shared/test/unit_test/xe3_core/ptl/excludes_xe3_core_ptl.cpp @@ -8,6 +8,3 @@ #include "shared/test/common/test_macros/hw_test_base.h" HWTEST_EXCLUDE_PRODUCT(ProductHelperTest, whenGettingPreferredAllocationMethodThenNoPreferenceIsReturned, IGFX_PTL); -HWTEST_EXCLUDE_PRODUCT(ProductHelperTest, givenProductHelperWhenGetL1CachePolicyThenReturnWriteByPass_IsSbaRequiredAndAtLeastXeCore, IGFX_PTL); -HWTEST_EXCLUDE_PRODUCT(CompilerProductHelperFixture, givenAtLeastXeHpgCoreWhenGetCachingPolicyOptionsThenReturnWriteByPassPolicyOption_IsAtLeastXeCore, IGFX_PTL); -HWTEST_EXCLUDE_PRODUCT(SbaTest, givenStateBaseAddressAndDebugFlagSetWhenAppendExtraCacheSettingsThenProgramCorrectL1CachePolicy_IsSbaRequiredAndAtLeastXeCore, IGFX_PTL); diff --git a/shared/test/unit_test/xe3_core/ptl/product_helper_tests_ptl.cpp b/shared/test/unit_test/xe3_core/ptl/product_helper_tests_ptl.cpp index 0f8106bcf1..047337a686 100644 --- a/shared/test/unit_test/xe3_core/ptl/product_helper_tests_ptl.cpp +++ b/shared/test/unit_test/xe3_core/ptl/product_helper_tests_ptl.cpp @@ -75,11 +75,6 @@ PTLTEST_F(PtlProductHelper, givenProductHelperWhenCheckingIsBufferPoolAllocatorS EXPECT_TRUE(productHelper->isBufferPoolAllocatorSupported()); } -PTLTEST_F(ProductHelperTest, givenProductHelperWhenGetL1CachePolicyThenReturnWriteByPass) { - EXPECT_EQ(2u, productHelper->getL1CachePolicy(false)); - EXPECT_EQ(2u, productHelper->getL1CachePolicy(true)); -} - PTLTEST_F(PtlProductHelper, givenDebugFlagWhenCheckingIsResolveDependenciesByPipeControlsSupportedThenTheFlagDerivedValueIsReturned) { DebugManagerStateRestore restorer; diff --git a/shared/test/unit_test/xe3_core/test_encode_xe3_core.cpp b/shared/test/unit_test/xe3_core/test_encode_xe3_core.cpp index bc121e5590..86276a4a31 100644 --- a/shared/test/unit_test/xe3_core/test_encode_xe3_core.cpp +++ b/shared/test/unit_test/xe3_core/test_encode_xe3_core.cpp @@ -593,7 +593,7 @@ XE3_CORETEST_F(Xe3SbaTest, givenSpecificProductFamilyWhenAppendingSbaThenProgram StateBaseAddressHelper::appendStateBaseAddressParameters(args); - EXPECT_EQ(pDevice->getHardwareInfo().platform.eProductFamily == IGFX_PTL ? 2 : 0, sbaCmd.getL1CacheControlCachePolicy()); + EXPECT_EQ(FamilyType::STATE_BASE_ADDRESS::L1_CACHE_CONTROL_WBP, sbaCmd.getL1CacheControlCachePolicy()); } XE3_CORETEST_F(Xe3SbaTest, givenL1CachingOverrideWhenStateBaseAddressIsProgrammedThenItMatchesTheOverrideValue) {