fix: use release helper to get ftrXe2Compression value

MaciejPlewka · Compute-Runtime-Automation · commit 54e62da55318 · 2024-12-23T13:28:06.000+01:00
Related-To: NEO-13381, NEO-13526
Signed-off-by: Maciej Plewka &lt;maciej.plewka@intel.com&gt;
diff --git a/shared/source/helpers/hw_info.cpp b/shared/source/helpers/hw_info.cpp
@@ -152,7 +152,7 @@ void setupDefaultGtSysInfo(HardwareInfo *hwInfo, const ReleaseHelper *releaseHel
     gtSysInfo->ThreadCount = gtSysInfo->EUCount * releaseHelper->getNumThreadsPerEu();
 }
 
-void setupDefaultFeatureTableAndWorkaroundTable(HardwareInfo *hwInfo) {
+void setupDefaultFeatureTableAndWorkaroundTable(HardwareInfo *hwInfo, const ReleaseHelper &releaseHelper) {
     FeatureTable *featureTable = &hwInfo->featureTable;
 
     featureTable->flags.ftrAstcHdr2D = true;
@@ -172,6 +172,8 @@ void setupDefaultFeatureTableAndWorkaroundTable(HardwareInfo *hwInfo) {
     featureTable->flags.ftrTranslationTable = true;
     featureTable->flags.ftrUserModeTranslationTable = true;
 
+    featureTable->flags.ftrXe2Compression = releaseHelper.getFtrXe2Compression();
+
     WorkaroundTable *workaroundTable = &hwInfo->workaroundTable;
 
     workaroundTable->flags.wa4kAlignUVOffsetNV12LinearSurface = true;
diff --git a/shared/source/helpers/hw_info.h b/shared/source/helpers/hw_info.h
@@ -168,7 +168,7 @@ void setHwInfoValuesFromConfig(const uint64_t hwInfoConfig, HardwareInfo &hwInfo
 bool parseHwInfoConfigString(const std::string &hwInfoConfigStr, uint64_t &hwInfoConfig);
 aub_stream::EngineType getChosenEngineType(const HardwareInfo &hwInfo);
 void setupDefaultGtSysInfo(HardwareInfo *hwInfo, const ReleaseHelper *releaseHelper);
-void setupDefaultFeatureTableAndWorkaroundTable(HardwareInfo *hwInfo);
+void setupDefaultFeatureTableAndWorkaroundTable(HardwareInfo *hwInfo, const ReleaseHelper &releaseHelper);
 uint32_t getNumSubSlicesPerSlice(const HardwareInfo &hwInfo);
 
 } // namespace NEO
diff --git a/shared/source/xe2_hpg_core/hw_cmds_bmg.h b/shared/source/xe2_hpg_core/hw_cmds_bmg.h
@@ -18,7 +18,7 @@ struct BMG : public Xe2HpgCoreFamily {
     static WorkaroundTable workaroundTable;
     static const RuntimeCapabilityTable capabilityTable;
     static void (*setupHardwareInfo)(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig, const ReleaseHelper *releaseHelper);
-    static void setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo);
+    static void setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo, const ReleaseHelper &releaseHelper);
     static void setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const ReleaseHelper *releaseHelper);
     static void adjustHardwareInfo(HardwareInfo *hwInfo);
 
diff --git a/shared/source/xe2_hpg_core/hw_cmds_lnl.h b/shared/source/xe2_hpg_core/hw_cmds_lnl.h
@@ -18,7 +18,7 @@ struct LNL : public Xe2HpgCoreFamily {
     static WorkaroundTable workaroundTable;
     static const RuntimeCapabilityTable capabilityTable;
     static void (*setupHardwareInfo)(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig, const ReleaseHelper *releaseHelper);
-    static void setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo);
+    static void setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo, const ReleaseHelper &releaseHelper);
     static void setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const ReleaseHelper *releaseHelper);
     static void adjustHardwareInfo(HardwareInfo *hwInfo);
 
diff --git a/shared/source/xe2_hpg_core/hw_info_bmg.cpp b/shared/source/xe2_hpg_core/hw_info_bmg.cpp
@@ -86,16 +86,15 @@ const RuntimeCapabilityTable BMG::capabilityTable{
     0                                                         // cxlType
 };
 
-void BMG::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo) {
-    setupDefaultFeatureTableAndWorkaroundTable(hwInfo);
+void BMG::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo, const ReleaseHelper &releaseHelper) {
+    setupDefaultFeatureTableAndWorkaroundTable(hwInfo, releaseHelper);
     FeatureTable *featureTable = &hwInfo->featureTable;
 
     featureTable->flags.ftrLocalMemory = true;
     featureTable->flags.ftrFlatPhysCCS = true;
     featureTable->flags.ftrE2ECompression = true;
     featureTable->flags.ftrTile64Optimization = true;
     featureTable->flags.ftrWalkerMTP = true;
-    featureTable->flags.ftrXe2Compression = true;
     featureTable->flags.ftrXe2PlusTiling = true;
     featureTable->flags.ftrL3TransientDataFlush = true;
     featureTable->flags.ftrPml5Support = true;
@@ -122,7 +121,7 @@ void BMG::setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndW
 
     BMG::adjustHardwareInfo(hwInfo);
     if (setupFeatureTableAndWorkaroundTable) {
-        BMG::setupFeatureAndWorkaroundTable(hwInfo);
+        BMG::setupFeatureAndWorkaroundTable(hwInfo, *releaseHelper);
     }
 }
 
diff --git a/shared/source/xe2_hpg_core/hw_info_lnl.cpp b/shared/source/xe2_hpg_core/hw_info_lnl.cpp
@@ -84,8 +84,8 @@ const RuntimeCapabilityTable LNL::capabilityTable{
     0                                                          // cxlType
 };
 
-void LNL::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo) {
-    setupDefaultFeatureTableAndWorkaroundTable(hwInfo);
+void LNL::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo, const ReleaseHelper &releaseHelper) {
+    setupDefaultFeatureTableAndWorkaroundTable(hwInfo, releaseHelper);
     FeatureTable *featureTable = &hwInfo->featureTable;
 
     featureTable->flags.ftrFlatPhysCCS = true;
@@ -117,7 +117,7 @@ void LNL::setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndW
 
     LNL::adjustHardwareInfo(hwInfo);
     if (setupFeatureTableAndWorkaroundTable) {
-        LNL::setupFeatureAndWorkaroundTable(hwInfo);
+        LNL::setupFeatureAndWorkaroundTable(hwInfo, *releaseHelper);
     }
 }
 void LnlHwConfig::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const ReleaseHelper *releaseHelper) {
diff --git a/shared/source/xe_hpc_core/hw_cmds_pvc.h b/shared/source/xe_hpc_core/hw_cmds_pvc.h
@@ -39,7 +39,7 @@ struct PVC : public XeHpcCoreFamily {
     };
 
     static void (*setupHardwareInfo)(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig, const ReleaseHelper *releaseHelper);
-    static void setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo);
+    static void setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo, const ReleaseHelper &releaseHelper);
     static void setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const ReleaseHelper *releaseHelper);
     static void setupHardwareInfoMultiTileBase(HardwareInfo *hwInfo, bool setupMultiTile);
     static void adjustHardwareInfo(HardwareInfo *hwInfo);
diff --git a/shared/source/xe_hpc_core/hw_info_pvc.cpp b/shared/source/xe_hpc_core/hw_info_pvc.cpp
@@ -96,8 +96,8 @@ const RuntimeCapabilityTable PVC::capabilityTable{
     0                                                          // cxlType
 };
 
-void PVC::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo) {
-    setupDefaultFeatureTableAndWorkaroundTable(hwInfo);
+void PVC::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo, const ReleaseHelper &releaseHelper) {
+    setupDefaultFeatureTableAndWorkaroundTable(hwInfo, releaseHelper);
     FeatureTable *featureTable = &hwInfo->featureTable;
 
     featureTable->flags.ftrLocalMemory = true;
@@ -118,7 +118,7 @@ void PVC::setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndW
     PVC::adjustHardwareInfo(hwInfo);
 
     if (setupFeatureTableAndWorkaroundTable) {
-        setupFeatureAndWorkaroundTable(hwInfo);
+        setupFeatureAndWorkaroundTable(hwInfo, *releaseHelper);
     }
 }
 
diff --git a/shared/source/xe_hpg_core/hw_cmds_arl.h b/shared/source/xe_hpg_core/hw_cmds_arl.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2023 Intel Corporation
+ * Copyright (C) 2023-2024 Intel Corporation
  *
  * SPDX-License-Identifier: MIT
  *
@@ -18,7 +18,7 @@ struct ARL : public XeHpgCoreFamily {
     static WorkaroundTable workaroundTable;
     static const RuntimeCapabilityTable capabilityTable;
     static void (*setupHardwareInfo)(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig, const ReleaseHelper *releaseHelper);
-    static void setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo);
+    static void setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo, const ReleaseHelper &releaseHelper);
     static void setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const ReleaseHelper *releaseHelper);
 };
 
diff --git a/shared/source/xe_hpg_core/hw_cmds_dg2.h b/shared/source/xe_hpg_core/hw_cmds_dg2.h
@@ -27,7 +27,7 @@ struct DG2 : public XeHpgCoreFamily {
     static WorkaroundTable workaroundTable;
     static const RuntimeCapabilityTable capabilityTable;
     static void (*setupHardwareInfo)(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig, const ReleaseHelper *releaseHelper);
-    static void setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo);
+    static void setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo, const ReleaseHelper &releaseHelper);
     static void setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const ReleaseHelper *releaseHelper);
 
     static bool isG10(const HardwareInfo &hwInfo) {
diff --git a/shared/source/xe_hpg_core/hw_cmds_mtl.h b/shared/source/xe_hpg_core/hw_cmds_mtl.h
@@ -18,7 +18,7 @@ struct MTL : public XeHpgCoreFamily {
     static WorkaroundTable workaroundTable;
     static const RuntimeCapabilityTable capabilityTable;
     static void (*setupHardwareInfo)(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig, const ReleaseHelper *releaseHelper);
-    static void setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo);
+    static void setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo, const ReleaseHelper &releaseHelper);
     static void setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndWorkaroundTable, const ReleaseHelper *releaseHelper);
 };
 
diff --git a/shared/source/xe_hpg_core/hw_info_arl.cpp b/shared/source/xe_hpg_core/hw_info_arl.cpp
@@ -84,8 +84,8 @@ const RuntimeCapabilityTable ARL::capabilityTable{
 WorkaroundTable ARL::workaroundTable = {};
 FeatureTable ARL::featureTable = {};
 
-void ARL::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo) {
-    setupDefaultFeatureTableAndWorkaroundTable(hwInfo);
+void ARL::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo, const ReleaseHelper &releaseHelper) {
+    setupDefaultFeatureTableAndWorkaroundTable(hwInfo, releaseHelper);
     FeatureTable *featureTable = &hwInfo->featureTable;
     WorkaroundTable *workaroundTable = &hwInfo->workaroundTable;
 
@@ -99,7 +99,7 @@ void ARL::setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndW
     setupDefaultGtSysInfo(hwInfo, releaseHelper);
 
     if (setupFeatureTableAndWorkaroundTable) {
-        setupFeatureAndWorkaroundTable(hwInfo);
+        setupFeatureAndWorkaroundTable(hwInfo, *releaseHelper);
     }
 }
 
@@ -115,7 +115,7 @@ void ArlHwConfig::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTable
     ARL::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable, releaseHelper);
 
     if (setupFeatureTableAndWorkaroundTable) {
-        ARL::setupFeatureAndWorkaroundTable(hwInfo);
+        ARL::setupFeatureAndWorkaroundTable(hwInfo, *releaseHelper);
     }
 };
 
diff --git a/shared/source/xe_hpg_core/hw_info_dg2.cpp b/shared/source/xe_hpg_core/hw_info_dg2.cpp
@@ -89,8 +89,8 @@ const RuntimeCapabilityTable DG2::capabilityTable{
 WorkaroundTable DG2::workaroundTable = {};
 FeatureTable DG2::featureTable = {};
 
-void DG2::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo) {
-    setupDefaultFeatureTableAndWorkaroundTable(hwInfo);
+void DG2::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo, const ReleaseHelper &releaseHelper) {
+    setupDefaultFeatureTableAndWorkaroundTable(hwInfo, releaseHelper);
     FeatureTable *featureTable = &hwInfo->featureTable;
 
     featureTable->flags.ftrFlatPhysCCS = true;
@@ -105,7 +105,7 @@ void DG2::setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndW
     setupDefaultGtSysInfo(hwInfo, releaseHelper);
 
     if (setupFeatureTableAndWorkaroundTable) {
-        setupFeatureAndWorkaroundTable(hwInfo);
+        setupFeatureAndWorkaroundTable(hwInfo, *releaseHelper);
     }
 }
 
diff --git a/shared/source/xe_hpg_core/hw_info_mtl.cpp b/shared/source/xe_hpg_core/hw_info_mtl.cpp
@@ -85,8 +85,8 @@ const RuntimeCapabilityTable MTL::capabilityTable{
 WorkaroundTable MTL::workaroundTable = {};
 FeatureTable MTL::featureTable = {};
 
-void MTL::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo) {
-    setupDefaultFeatureTableAndWorkaroundTable(hwInfo);
+void MTL::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo, const ReleaseHelper &releaseHelper) {
+    setupDefaultFeatureTableAndWorkaroundTable(hwInfo, releaseHelper);
     FeatureTable *featureTable = &hwInfo->featureTable;
     WorkaroundTable *workaroundTable = &hwInfo->workaroundTable;
 
@@ -100,7 +100,7 @@ void MTL::setupHardwareInfoBase(HardwareInfo *hwInfo, bool setupFeatureTableAndW
     setupDefaultGtSysInfo(hwInfo, releaseHelper);
 
     if (setupFeatureTableAndWorkaroundTable) {
-        setupFeatureAndWorkaroundTable(hwInfo);
+        setupFeatureAndWorkaroundTable(hwInfo, *releaseHelper);
     }
 }
 
@@ -116,7 +116,7 @@ void MtlHwConfig::setupHardwareInfo(HardwareInfo *hwInfo, bool setupFeatureTable
     MTL::setupHardwareInfoBase(hwInfo, setupFeatureTableAndWorkaroundTable, releaseHelper);
 
     if (setupFeatureTableAndWorkaroundTable) {
-        MTL::setupFeatureAndWorkaroundTable(hwInfo);
+        MTL::setupFeatureAndWorkaroundTable(hwInfo, *releaseHelper);
     }
 };
 
diff --git a/shared/test/unit_test/device/neo_device_tests.cpp b/shared/test/unit_test/device/neo_device_tests.cpp
@@ -35,6 +35,7 @@
 #include "shared/test/common/mocks/mock_io_functions.h"
 #include "shared/test/common/mocks/mock_memory_manager.h"
 #include "shared/test/common/mocks/mock_product_helper.h"
+#include "shared/test/common/mocks/mock_release_helper.h"
 #include "shared/test/common/mocks/ult_device_factory.h"
 #include "shared/test/common/test_macros/hw_test.h"
 #include "shared/test/common/test_macros/test.h"
@@ -1930,9 +1931,9 @@ TEST_F(DeviceTests, givenNewUsmPoolingEnabledWhenDeviceInitializedThenUsmMemAllo
 TEST(DeviceWithoutAILTest, givenNoAILWhenCreateDeviceThenDeviceIsCreated) {
     DebugManagerStateRestore dbgRestorer;
     debugManager.flags.EnableAIL.set(false);
-
+    MockReleaseHelper mockReleaseHelper;
     auto hwInfo = *defaultHwInfo;
-    setupDefaultFeatureTableAndWorkaroundTable(&hwInfo);
+    setupDefaultFeatureTableAndWorkaroundTable(&hwInfo, mockReleaseHelper);
     auto device = std::unique_ptr<Device>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(&hwInfo));
 
     EXPECT_NE(nullptr, device.get());
diff --git a/shared/test/unit_test/helpers/hw_info_tests.cpp b/shared/test/unit_test/helpers/hw_info_tests.cpp
@@ -6,6 +6,7 @@
  */
 
 #include "shared/source/helpers/hw_info.h"
+#include "shared/test/common/mocks/mock_release_helper.h"
 #include "shared/test/common/test_macros/test.h"
 
 using namespace NEO;
@@ -14,6 +15,7 @@ TEST(HwInfoTest, whenSettingDefaultFeatureTableAndWorkaroundTableThenProperField
     HardwareInfo hwInfo{};
     FeatureTable expectedFeatureTable{};
     WorkaroundTable expectedWorkaroundTable{};
+    MockReleaseHelper mockReleaseHelper;
 
     expectedFeatureTable.flags.ftrAstcHdr2D = true;
     expectedFeatureTable.flags.ftrAstcLdr2D = true;
@@ -34,7 +36,7 @@ TEST(HwInfoTest, whenSettingDefaultFeatureTableAndWorkaroundTableThenProperField
 
     expectedWorkaroundTable.flags.wa4kAlignUVOffsetNV12LinearSurface = true;
 
-    setupDefaultFeatureTableAndWorkaroundTable(&hwInfo);
+    setupDefaultFeatureTableAndWorkaroundTable(&hwInfo, mockReleaseHelper);
 
     EXPECT_EQ(expectedFeatureTable.asHash(), hwInfo.featureTable.asHash());
     EXPECT_EQ(expectedWorkaroundTable.asHash(), hwInfo.workaroundTable.asHash());

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*`
`2`		`- * Copyright (C) 2023 Intel Corporation`
	`2`	`+ * Copyright (C) 2023-2024 Intel Corporation`
`3`	`3`	`*`
`4`	`4`	`* SPDX-License-Identifier: MIT`
`5`	`5`	`*`
`@@ -18,7 +18,7 @@ struct ARL : public XeHpgCoreFamily {`
`18`	`18`	`static WorkaroundTable workaroundTable;`
`19`	`19`	`static const RuntimeCapabilityTable capabilityTable;`
`20`	`20`	`static void (setupHardwareInfo)(HardwareInfo hwInfo, bool setupFeatureTableAndWorkaroundTable, uint64_t hwInfoConfig, const ReleaseHelper *releaseHelper);`
`21`		`- static void setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo);`
	`21`	`+ static void setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo, const ReleaseHelper &releaseHelper);`
`22`	`22`	`static void setupHardwareInfoBase(HardwareInfo hwInfo, bool setupFeatureTableAndWorkaroundTable, const ReleaseHelper releaseHelper);`
`23`	`23`	`};`
`24`	`24`