Revert "performance: Optimize heap handling when mitigate dc flush"

This reverts commit 452f4b1dd1.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>

shared/source/gmm_helper/cache_settings_helper.cpp

@@ -47,7 +47,7 @@ bool CacheSettingsHelper::preferNoCpuAccess(GMM_RESOURCE_USAGE_TYPE_ENUM gmmReso
 }
 
 GMM_RESOURCE_USAGE_TYPE_ENUM CacheSettingsHelper::getDefaultUsageTypeWithCachingEnabled(AllocationType allocationType, const ProductHelper &productHelper) {
-    if (productHelper.overrideUsageForDcFlushMitigation(allocationType)) {
+    if (productHelper.overridePatAndUsageForDcFlushMitigation(allocationType)) {
         return getDefaultUsageTypeWithCachingDisabled(allocationType, productHelper);
     }
 

shared/source/os_interface/product_helper.h

@@ -135,9 +135,7 @@ class ProductHelper {
     virtual bool isDcFlushAllowed() const = 0;
     virtual bool isDcFlushMitigated() const = 0;
     virtual bool mitigateDcFlush() const = 0;
-    virtual bool overrideUsageForDcFlushMitigation(AllocationType allocationType) const = 0;
+    virtual bool overridePatAndUsageForDcFlushMitigation(AllocationType allocationType) const = 0;
-    virtual bool overridePatToUCAndTwoWayCohForDcFlushMitigation(AllocationType allocationType) const = 0;
-    virtual bool overridePatToUCAndOneWayCohForDcFlushMitigation(AllocationType allocationType) const = 0;
     virtual bool overrideCacheableForDcFlushMitigation(AllocationType allocationType) const = 0;
     virtual uint32_t computeMaxNeededSubSliceSpace(const HardwareInfo &hwInfo) const = 0;
     virtual bool getUuid(NEO::DriverModel *driverModel, const uint32_t subDeviceCount, const uint32_t deviceIndex, std::array<uint8_t, ProductHelper::uuidSize> &uuid) const = 0;

shared/source/os_interface/product_helper.inl

@@ -416,12 +416,7 @@ bool ProductHelperHw<gfxProduct>::isDcFlushMitigated() const {
 }
 
 template <PRODUCT_FAMILY gfxProduct>
-bool ProductHelperHw<gfxProduct>::overrideUsageForDcFlushMitigation(AllocationType allocationType) const {
+bool ProductHelperHw<gfxProduct>::overridePatAndUsageForDcFlushMitigation(AllocationType allocationType) const {
-    return this->isDcFlushMitigated() && (this->overridePatToUCAndTwoWayCohForDcFlushMitigation(allocationType) || overridePatToUCAndOneWayCohForDcFlushMitigation(allocationType));
-}
-
-template <PRODUCT_FAMILY gfxProduct>
-bool ProductHelperHw<gfxProduct>::overridePatToUCAndTwoWayCohForDcFlushMitigation(AllocationType allocationType) const {
     return this->isDcFlushMitigated() &&
            (this->overrideCacheableForDcFlushMitigation(allocationType) ||
             allocationType == AllocationType::timestampPacketTagBuffer ||
@@ -429,14 +424,6 @@ bool ProductHelperHw<gfxProduct>::overridePatToUCAndTwoWayCohForDcFlushMitigatio
             allocationType == AllocationType::gpuTimestampDeviceBuffer);
 }
 
-template <PRODUCT_FAMILY gfxProduct>
-bool ProductHelperHw<gfxProduct>::overridePatToUCAndOneWayCohForDcFlushMitigation(AllocationType allocationType) const {
-    return this->isDcFlushMitigated() &&
-           (this->overrideCacheableForDcFlushMitigation(allocationType) ||
-            allocationType == AllocationType::internalHeap ||
-            allocationType == AllocationType::linearStream);
-}
-
 template <PRODUCT_FAMILY gfxProduct>
 bool ProductHelperHw<gfxProduct>::overrideCacheableForDcFlushMitigation(AllocationType allocationType) const {
     return this->isDcFlushMitigated() &&
@@ -446,6 +433,8 @@ bool ProductHelperHw<gfxProduct>::overrideCacheableForDcFlushMitigation(Allocati
             allocationType == AllocationType::svmCpu ||
             allocationType == AllocationType::svmZeroCopy ||
             allocationType == AllocationType::internalHostMemory ||
+            allocationType == AllocationType::internalHeap ||
+            allocationType == AllocationType::linearStream ||
             allocationType == AllocationType::printfSurface);
 }
 

shared/source/os_interface/product_helper_hw.h

@@ -77,9 +77,7 @@ class ProductHelperHw : public ProductHelper {
     bool isDcFlushAllowed() const override;
     bool isDcFlushMitigated() const override;
     bool mitigateDcFlush() const override;
-    bool overrideUsageForDcFlushMitigation(AllocationType allocationType) const override;
+    bool overridePatAndUsageForDcFlushMitigation(AllocationType allocationType) const override;
-    bool overridePatToUCAndTwoWayCohForDcFlushMitigation(AllocationType allocationType) const override;
-    bool overridePatToUCAndOneWayCohForDcFlushMitigation(AllocationType allocationType) const override;
     bool overrideCacheableForDcFlushMitigation(AllocationType allocationType) const override;
     uint32_t computeMaxNeededSubSliceSpace(const HardwareInfo &hwInfo) const override;
     bool getUuid(NEO::DriverModel *driverModel, uint32_t subDeviceCount, uint32_t deviceIndex, std::array<uint8_t, ProductHelper::uuidSize> &uuid) const override;

shared/source/xe2_hpg_core/windows/product_helper_lnl.cpp

@@ -28,14 +28,10 @@ int ProductHelperHw<gfxProduct>::configureHardwareCustom(HardwareInfo *hwInfo, O
 
 template <>
 uint64_t ProductHelperHw<gfxProduct>::overridePatIndex(bool isUncachedType, uint64_t patIndex, AllocationType allocationType) const {
-    if (this->overridePatToUCAndTwoWayCohForDcFlushMitigation(allocationType)) {
+    if (this->overridePatAndUsageForDcFlushMitigation(allocationType)) {
         return 2; // L3: WB, L4: UC, 2-Way coh
     }
 
-    if (this->overridePatToUCAndOneWayCohForDcFlushMitigation(allocationType)) {
-        return 1; // L3: WB, L4: UC, 1-Way coh
-    }
-
     return patIndex;
 }
 

shared/test/common/mocks/mock_product_helper.cpp

@@ -292,17 +292,7 @@ bool ProductHelperHw<IGFX_UNKNOWN>::mitigateDcFlush() const {
 }
 
 template <>
-bool ProductHelperHw<IGFX_UNKNOWN>::overridePatToUCAndTwoWayCohForDcFlushMitigation(AllocationType allocationType) const {
+bool ProductHelperHw<IGFX_UNKNOWN>::overridePatAndUsageForDcFlushMitigation(AllocationType allocationType) const {
-    return false;
-}
-
-template <>
-bool ProductHelperHw<IGFX_UNKNOWN>::overrideUsageForDcFlushMitigation(AllocationType allocationType) const {
-    return false;
-}
-
-template <>
-bool ProductHelperHw<IGFX_UNKNOWN>::overridePatToUCAndOneWayCohForDcFlushMitigation(AllocationType allocationType) const {
     return false;
 }
 

shared/test/unit_test/os_interface/product_helper_tests.cpp

@@ -311,12 +311,12 @@ HWTEST_F(ProductHelperTest, givenVariousValuesWhenGettingAubStreamSteppingFromHw
     EXPECT_EQ(AubMemDump::SteppingValues::A, mockProductHelper.getAubStreamSteppingFromHwRevId(pInHwInfo));
 }
 
-HWTEST_F(ProductHelperTest, givenDcFlushMitigationWhenOverridePatToUCAndTwoWayCohForDcFlushMitigationThenReturnCorrectValue) {
+HWTEST_F(ProductHelperTest, givenDcFlushMitigationWhenOverridePatAndUsageForDcFlushMitigationThenReturnCorrectValue) {
     DebugManagerStateRestore restorer;
     if (!productHelper->isDcFlushMitigated()) {
         for (auto i = 0; i < static_cast<int>(AllocationType::count); ++i) {
             auto allocationType = static_cast<AllocationType>(i);
-            EXPECT_FALSE(productHelper->overridePatToUCAndTwoWayCohForDcFlushMitigation(allocationType));
+            EXPECT_FALSE(productHelper->overridePatAndUsageForDcFlushMitigation(allocationType));
         }
     }
     debugManager.flags.AllowDcFlush.set(0);
@@ -334,9 +334,9 @@ HWTEST_F(ProductHelperTest, givenDcFlushMitigationWhenOverridePatToUCAndTwoWayCo
             allocationType == AllocationType::linearStream ||
             allocationType == AllocationType::internalHeap ||
             allocationType == AllocationType::printfSurface) {
-            EXPECT_EQ(productHelper->overrideUsageForDcFlushMitigation(allocationType), productHelper->isDcFlushMitigated());
+            EXPECT_EQ(productHelper->overridePatAndUsageForDcFlushMitigation(allocationType), productHelper->isDcFlushMitigated());
         } else {
-            EXPECT_FALSE(productHelper->overridePatToUCAndTwoWayCohForDcFlushMitigation(allocationType));
+            EXPECT_FALSE(productHelper->overridePatAndUsageForDcFlushMitigation(allocationType));
         }
     }
 }

shared/test/unit_test/xe2_hpg_core/lnl/product_helper_tests_lnl.cpp

@@ -146,6 +146,8 @@ LNLTEST_F(LnlProductHelper, givenExternalHostPtrWhenMitigateDcFlushThenOverrideC
             allocationType == AllocationType::svmZeroCopy ||
             allocationType == AllocationType::internalHostMemory ||
             allocationType == AllocationType::commandBuffer ||
+            allocationType == AllocationType::internalHeap ||
+            allocationType == AllocationType::linearStream ||
             allocationType == AllocationType::printfSurface) {
             EXPECT_TRUE(productHelper->overrideAllocationCacheable(allocationData));
         } else {

shared/test/unit_test/xe2_hpg_core/lnl/windows/product_helper_tests_lnl_windows.cpp

@@ -40,8 +40,6 @@ LNLTEST_F(LnlProductHelperWindows, givenProductHelperWhenOverridePatIndexCalledT
     EXPECT_EQ(expectedPatIndex, productHelper->overridePatIndex(0u, expectedPatIndex, AllocationType::internalHostMemory));
     EXPECT_EQ(expectedPatIndex, productHelper->overridePatIndex(0u, expectedPatIndex, AllocationType::timestampPacketTagBuffer));
     EXPECT_EQ(expectedPatIndex, productHelper->overridePatIndex(0u, expectedPatIndex, AllocationType::tagBuffer));
-    EXPECT_EQ(expectedPatIndex, productHelper->overridePatIndex(0u, expectedPatIndex, AllocationType::linearStream));
-    EXPECT_EQ(expectedPatIndex, productHelper->overridePatIndex(0u, expectedPatIndex, AllocationType::internalHeap));
 
     debugManager.flags.AllowDcFlush.set(0);
 
@@ -53,10 +51,6 @@ LNLTEST_F(LnlProductHelperWindows, givenProductHelperWhenOverridePatIndexCalledT
     EXPECT_EQ(expectedPatIndexOverride, productHelper->overridePatIndex(0u, expectedPatIndex, AllocationType::internalHostMemory));
     EXPECT_EQ(expectedPatIndexOverride, productHelper->overridePatIndex(0u, expectedPatIndex, AllocationType::timestampPacketTagBuffer));
     EXPECT_EQ(expectedPatIndexOverride, productHelper->overridePatIndex(0u, expectedPatIndex, AllocationType::tagBuffer));
-
-    expectedPatIndexOverride = 1u;
-    EXPECT_EQ(expectedPatIndexOverride, productHelper->overridePatIndex(0u, expectedPatIndex, AllocationType::linearStream));
-    EXPECT_EQ(expectedPatIndexOverride, productHelper->overridePatIndex(0u, expectedPatIndex, AllocationType::internalHeap));
 }
 
 LNLTEST_F(LnlProductHelperWindows, givenProductHelperWhenIsStagingBuffersEnabledThenTrueIsReturned) {