Revert "performance: Set L1 cache policy to WB on PTL"

This reverts commit 577de97.

Signed-off-by: Compute-Runtime-Validation <[email protected]>

Author: Compute-Runtime-Validation

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<L0DebuggerHwFixture>;
 using L0DebuggerParameterizedTests = L0DebuggerHwParameterizedFixture;
 using L0DebuggerGlobalStatelessTest = Test<L0DebuggerHwGlobalStatelessFixture>;

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<ModuleFixture>;
 
 TEST_F(ModuleTest, GivenGeneralRegisterFileDescriptorWhenGetKernelPropertiesIsCalledThenDescriptorIsCorrectlySet) {

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;

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<uint8_t>(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<FamilyType>::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<uint8_t>(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);

shared/source/xe3_core/definitions/enable_xe3_core_products.inl

@@ -6,13 +6,6 @@
  */
 
 #ifdef SUPPORT_PTL
-
-template <>
-uint32_t L1CachePolicyHelper<IGFX_PTL>::getDefaultL1CachePolicy(bool isDebuggerActive) {
-    using GfxFamily = HwMapper<IGFX_PTL>::GfxFamily;
-    return GfxFamily::STATE_BASE_ADDRESS::L1_CACHE_CONTROL_WB;
-}
-
 template struct L1CachePolicyHelper<IGFX_PTL>;
 static EnableGfxProductHw<IGFX_PTL> enableGfxProductHwPTL;
 #endif

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<productFamily>::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;

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);

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;
 

shared/test/unit_test/xe3_core/test_encode_xe3_core.cpp

@@ -593,7 +593,7 @@ XE3_CORETEST_F(Xe3SbaTest, givenSpecificProductFamilyWhenAppendingSbaThenProgram
 
     StateBaseAddressHelper<FamilyType>::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) {