Revert "fix: do not prefer image compression on xe_lpg for linux and WSL"

This reverts commit 8814b6a.

Resolves: NEO-14286
Signed-off-by: Jaroslaw Warchulski <jaroslaw.warchulski@intel.com>

Author: jwarchul

opencl/source/mem_obj/image.cpp

@@ -211,7 +211,7 @@ Image *Image::create(Context *context,
 
     auto &clGfxCoreHelper = defaultDevice->getRootDeviceEnvironment().getHelper<ClGfxCoreHelper>();
     bool preferCompression = MemObjHelper::isSuitableForCompression(!imgInfo.linearStorage, memoryProperties,
-                                                                    *context, defaultProductHelper.isImageSuitableForCompression());
+                                                                    *context, true);
     preferCompression &= clGfxCoreHelper.allowImageCompression(surfaceFormat->oclImageFormat);
     preferCompression &= !clGfxCoreHelper.isFormatRedescribable(surfaceFormat->oclImageFormat);
 

opencl/test/unit_test/mem_obj/image_tests.cpp

@@ -1113,13 +1113,7 @@ HWTEST_F(ImageCompressionTests, givenTiledImageWhenCreatingAllocationThenPreferC
     ASSERT_NE(nullptr, image);
     EXPECT_EQ(defaultHwInfo->capabilityTable.supportsImages, image->isTiledAllocation());
     EXPECT_TRUE(myMemoryManager->mockMethodCalled);
-
-    auto isImageSuitableForCompression = context.getDevice(0)->getProductHelper().isImageSuitableForCompression();
-    if (isImageSuitableForCompression) {
-        EXPECT_EQ(defaultHwInfo->capabilityTable.supportsImages, myMemoryManager->capturedPreferCompressed);
-    } else {
-        EXPECT_FALSE(myMemoryManager->capturedPreferCompressed);
-    }
+    EXPECT_EQ(defaultHwInfo->capabilityTable.supportsImages, myMemoryManager->capturedPreferCompressed);
 }
 
 TEST_F(ImageCompressionTests, givenNonTiledImageWhenCreatingAllocationThenDontPreferCompression) {

opencl/test/unit_test/xe_hpg_core/image_tests_xe_hpg_core.cpp

@@ -48,13 +48,7 @@ XE_HPG_CORETEST_F(ImageCompressionTests, givenDifferentImageFormatsWhenCreatingI
 
         ASSERT_NE(nullptr, image);
         EXPECT_TRUE(myMemoryManager->mockMethodCalled);
-
-        auto isImageSuitableForCompression = context.getDevice(0)->getProductHelper().isImageSuitableForCompression();
-        if (isImageSuitableForCompression) {
-            EXPECT_EQ(format.isCompressable, myMemoryManager->capturedPreferCompressed);
-        } else {
-            EXPECT_FALSE(myMemoryManager->capturedPreferCompressed);
-        }
+        EXPECT_EQ(format.isCompressable, myMemoryManager->capturedPreferCompressed);
     }
 }
 
@@ -70,13 +64,7 @@ XE_HPG_CORETEST_F(ImageCompressionTests, givenRedescribableFormatWhenCreatingAll
         mockContext.get(), ClMemoryPropertiesHelper::createMemoryProperties(flags, 0, 0, &context.getDevice(0)->getDevice()),
         flags, 0, surfaceFormat, &imageDesc, nullptr, retVal));
     ASSERT_NE(nullptr, image);
-
-    auto isImageSuitableForCompression = context.getDevice(0)->getProductHelper().isImageSuitableForCompression();
-    if (isImageSuitableForCompression) {
-        EXPECT_EQ(defaultHwInfo->capabilityTable.supportsImages, myMemoryManager->capturedPreferCompressed);
-    } else {
-        EXPECT_FALSE(myMemoryManager->capturedPreferCompressed);
-    }
+    EXPECT_EQ(defaultHwInfo->capabilityTable.supportsImages, myMemoryManager->capturedPreferCompressed);
 
     imageFormat.image_channel_order = CL_RG;
     surfaceFormat = Image::getSurfaceFormatFromTable(
@@ -85,10 +73,5 @@ XE_HPG_CORETEST_F(ImageCompressionTests, givenRedescribableFormatWhenCreatingAll
         mockContext.get(), ClMemoryPropertiesHelper::createMemoryProperties(flags, 0, 0, &context.getDevice(0)->getDevice()),
         flags, 0, surfaceFormat, &imageDesc, nullptr, retVal));
     ASSERT_NE(nullptr, image);
-
-    if (isImageSuitableForCompression) {
-        EXPECT_TRUE(myMemoryManager->capturedPreferCompressed);
-    } else {
-        EXPECT_FALSE(myMemoryManager->capturedPreferCompressed);
-    }
-}
+    EXPECT_TRUE(myMemoryManager->capturedPreferCompressed);
+}

shared/source/debug_settings/debug_variables_base.inl

@@ -184,7 +184,6 @@ DECLARE_DEBUG_VARIABLE(int32_t, EnableMultiTileCompression, -1, "-1: default, 0:
 DECLARE_DEBUG_VARIABLE(int32_t, OverrideGmmResourceUsageField, -1, "-1: default, >=0: gmm.resourceParams.Usage is set to this value")
 DECLARE_DEBUG_VARIABLE(int32_t, OverrideGmmCacheableField, -1, "-1: default, >=0: gmm Flags.Info.Cacheable is set to this value")
 DECLARE_DEBUG_VARIABLE(int32_t, OverrideBufferSuitableForRenderCompression, -1, "-1: default, 0: Disable, 1: Enable")
-DECLARE_DEBUG_VARIABLE(int32_t, OverrideImageSuitableForRenderCompression, -1, "-1: default, 0: Disable, 1: Enable")
 DECLARE_DEBUG_VARIABLE(int32_t, OverrideL1CacheControlInSurfaceState, -1, "-1: feature inactive, >=0 : following L1 cache control value will be programmed in render surface state (for regular buffers)")
 DECLARE_DEBUG_VARIABLE(int32_t, OverrideL1CacheControlInSurfaceStateForScratchSpace, -1, "-1: feature inactive, >=0 : following L1 cache control value will be programmed in render surface state for scratch space")
 DECLARE_DEBUG_VARIABLE(int32_t, OverridePreferredSlmAllocationSizePerDss, -1, "-1: default, >=0: program value for preferred SLM allocation size per dss")

shared/source/os_interface/product_helper.h

@@ -260,7 +260,6 @@ class ProductHelper {
     virtual uint64_t getPatIndex(CacheRegion cacheRegion, CachePolicy cachePolicy) const = 0;
     virtual bool isSharingWith3dOrMediaAllowed() const = 0;
     virtual bool isL3FlushAfterPostSyncRequired(bool heaplessEnabled) const = 0;
-    virtual bool isImageSuitableForCompression() const = 0;
     virtual void overrideDirectSubmissionTimeouts(std::chrono::microseconds &timeout, std::chrono::microseconds &maxTimeout) const = 0;
 
     virtual ~ProductHelper() = default;

shared/source/os_interface/product_helper.inl

@@ -1010,14 +1010,6 @@ bool ProductHelperHw<gfxProduct>::isL3FlushAfterPostSyncRequired(bool heaplessEn
     return false;
 }
 
-template <PRODUCT_FAMILY gfxProduct>
-bool ProductHelperHw<gfxProduct>::isImageSuitableForCompression() const {
-    if (debugManager.flags.OverrideImageSuitableForRenderCompression.get() != -1) {
-        return !!debugManager.flags.OverrideImageSuitableForRenderCompression.get();
-    }
-    return true;
-}
-
 template <PRODUCT_FAMILY gfxProduct>
 void ProductHelperHw<gfxProduct>::overrideDirectSubmissionTimeouts(std::chrono::microseconds &timeout, std::chrono::microseconds &maxTimeout) const {
 }

shared/source/os_interface/product_helper_hw.h

@@ -200,7 +200,6 @@ class ProductHelperHw : public ProductHelper {
     uint64_t getPatIndex(CacheRegion cacheRegion, CachePolicy cachePolicy) const override;
     bool isSharingWith3dOrMediaAllowed() const override;
     bool isL3FlushAfterPostSyncRequired(bool heaplessEnabled) const override;
-    bool isImageSuitableForCompression() const override;
     void overrideDirectSubmissionTimeouts(std::chrono::microseconds &timeout, std::chrono::microseconds &maxTimeout) const override;
 
     ~ProductHelperHw() override = default;

shared/source/xe_hpg_core/xe_lpg/linux/product_helper_xe_lpg_linux.inl

@@ -5,7 +5,6 @@
  *
  */
 
-#include "shared/source/debug_settings/debug_settings_manager.h"
 #include "shared/source/helpers/hw_info.h"
 #include "shared/source/memory_manager/allocation_type.h"
 #include "shared/source/os_interface/linux/product_helper_mtl_and_later.inl"
@@ -14,8 +13,6 @@
 namespace NEO {
 template <>
 int ProductHelperHw<gfxProduct>::configureHardwareCustom(HardwareInfo *hwInfo, OSInterface *osIface) const {
-    enableCompression(hwInfo);
-
     enableBlitterOperationsSupport(hwInfo);
 
     auto &kmdNotifyProperties = hwInfo->capabilityTable.kmdNotifyProperties;
@@ -52,12 +49,4 @@ bool ProductHelperHw<gfxProduct>::useGemCreateExtInAllocateMemoryByKMD() const {
     return true;
 }
 
-template <>
-bool ProductHelperHw<gfxProduct>::isImageSuitableForCompression() const {
-    if (debugManager.flags.OverrideImageSuitableForRenderCompression.get() != -1) {
-        return !!debugManager.flags.OverrideImageSuitableForRenderCompression.get();
-    }
-    return false;
-}
-
 } // namespace NEO

shared/test/common/test_files/igdrcl.config

@@ -389,7 +389,6 @@ ProgramWalkerPartitionSelfCleanup = -1
 WparidRegisterProgramming = -1
 UsePipeControlAfterPartitionedWalker = -1
 OverrideBufferSuitableForRenderCompression = -1
-OverrideImageSuitableForRenderCompression = -1
 AllowPatchingVfeStateInCommandLists = 0
 PrintMemoryRegionSizes = 0
 OverrideDrmRegion = -1

shared/test/unit_test/os_interface/product_helper_tests.cpp

@@ -1143,17 +1143,3 @@ HWTEST2_F(ProductHelperTest, WhenCheckAssignEngineRoundRobinSupportedThenReturnF
     auto hwInfo = *defaultHwInfo;
     EXPECT_EQ(0u, productHelper->getMaxLocalSubRegionSize(hwInfo));
 }
-
-HWTEST2_F(ProductHelperTest, givenProductHelperWhenAskedIsImageSuitableForCompressionThenReturnTrue, IsNotXeHpgCore) {
-    EXPECT_TRUE(productHelper->isImageSuitableForCompression());
-}
-
-HWTEST_F(ProductHelperTest, givenDebugFlagWhenCheckingIfImageIsSuitableForCompressionThenReturnCorrectValue) {
-    DebugManagerStateRestore restore;
-
-    debugManager.flags.OverrideImageSuitableForRenderCompression.set(0);
-    EXPECT_FALSE(productHelper->isImageSuitableForCompression());
-
-    debugManager.flags.OverrideImageSuitableForRenderCompression.set(1);
-    EXPECT_TRUE(productHelper->isImageSuitableForCompression());
-}