fix: adjust wmtp feature flag in configureHardwareCustom method

this allows to adjust the flag independently on driver model type

Signed-off-by: Mateusz Jablonski <[email protected]>

Author: JablonskiMateusz

shared/source/xe2_hpg_core/hw_info_bmg.cpp

@@ -15,7 +15,6 @@
 #include "shared/source/xe2_hpg_core/hw_cmds_bmg.h"
 
 #include "aubstream/engine_node.h"
-#include "wmtp_setup_bmg.inl"
 
 namespace NEO {
 
@@ -95,7 +94,7 @@ void BMG::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo) {
     featureTable->flags.ftrFlatPhysCCS = true;
     featureTable->flags.ftrE2ECompression = true;
     featureTable->flags.ftrTile64Optimization = true;
-    featureTable->flags.ftrWalkerMTP = wmtpSupported;
+    featureTable->flags.ftrWalkerMTP = true;
     featureTable->flags.ftrXe2Compression = true;
     featureTable->flags.ftrXe2PlusTiling = true;
     featureTable->flags.ftrL3TransientDataFlush = true;

shared/source/xe2_hpg_core/hw_info_lnl.cpp

@@ -15,7 +15,6 @@
 #include "shared/source/xe2_hpg_core/hw_cmds_lnl.h"
 
 #include "aubstream/engine_node.h"
-#include "wmtp_setup_lnl.inl"
 
 namespace NEO {
 
@@ -93,7 +92,7 @@ void LNL::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo) {
     featureTable->flags.ftrFlatPhysCCS = true;
     featureTable->flags.ftrE2ECompression = true;
     featureTable->flags.ftrTile64Optimization = true;
-    featureTable->flags.ftrWalkerMTP = wmtpSupported;
+    featureTable->flags.ftrWalkerMTP = true;
     featureTable->flags.ftrXe2Compression = true;
     featureTable->flags.ftrXe2PlusTiling = true;
     featureTable->flags.ftrPml5Support = true;

shared/source/xe2_hpg_core/linux/product_helper_bmg.cpp

@@ -19,6 +19,8 @@ constexpr static auto gfxProduct = IGFX_BMG;
 #include "shared/source/xe2_hpg_core/bmg/os_agnostic_product_helper_bmg.inl"
 #include "shared/source/xe2_hpg_core/os_agnostic_product_helper_xe2_hpg_core.inl"
 
+#include "wmtp_setup_bmg.inl"
+
 namespace NEO {
 #include "shared/source/os_interface/linux/product_helper_xe_hpc_and_later.inl"
 
@@ -27,6 +29,7 @@ int ProductHelperHw<gfxProduct>::configureHardwareCustom(HardwareInfo *hwInfo, O
     enableCompression(hwInfo);
 
     hwInfo->featureTable.flags.ftr57bGPUAddressing = (hwInfo->capabilityTable.gpuAddressSpace == maxNBitValue(57));
+    hwInfo->featureTable.flags.ftrWalkerMTP &= wmtpSupported;
 
     enableBlitterOperationsSupport(hwInfo);
 

shared/source/xe2_hpg_core/linux/product_helper_lnl.cpp

@@ -20,6 +20,8 @@ constexpr static auto gfxProduct = IGFX_LUNARLAKE;
 #include "shared/source/xe2_hpg_core/lnl/os_agnostic_product_helper_lnl.inl"
 #include "shared/source/xe2_hpg_core/os_agnostic_product_helper_xe2_hpg_core.inl"
 
+#include "wmtp_setup_lnl.inl"
+
 namespace NEO {
 
 #include "shared/source/os_interface/linux/product_helper_xe_hpc_and_later.inl"
@@ -29,6 +31,7 @@ int ProductHelperHw<gfxProduct>::configureHardwareCustom(HardwareInfo *hwInfo, O
     enableCompression(hwInfo);
 
     hwInfo->featureTable.flags.ftr57bGPUAddressing = (hwInfo->capabilityTable.gpuAddressSpace == maxNBitValue(57));
+    hwInfo->featureTable.flags.ftrWalkerMTP &= wmtpSupported;
 
     enableBlitterOperationsSupport(hwInfo);
 

shared/test/unit_test/xe2_hpg_core/bmg/hw_info_tests_bmg.cpp

@@ -17,8 +17,6 @@
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
 
-#include "wmtp_setup_bmg.inl"
-
 using namespace NEO;
 
 using BmgHwInfoTest = ::testing::Test;
@@ -65,7 +63,7 @@ BMGTEST_F(BmgHwInfoTest, givenBoolWhenCallBmgHardwareInfoSetupThenFeatureTableAn
         EXPECT_FALSE(featureTable.flags.ftrTileY);
         EXPECT_FALSE(featureTable.flags.ftrMultiTileArch);
         EXPECT_EQ(1u, featureTable.ftrBcsInfo.to_ulong());
-        EXPECT_EQ(wmtpSupported && setParamBool, featureTable.flags.ftrWalkerMTP);
+        EXPECT_EQ(setParamBool, featureTable.flags.ftrWalkerMTP);
         EXPECT_EQ(setParamBool, featureTable.flags.ftrXe2Compression);
         EXPECT_EQ(setParamBool, featureTable.flags.ftrXe2PlusTiling);
         EXPECT_EQ(setParamBool, featureTable.flags.ftrL3TransientDataFlush);

shared/test/unit_test/xe2_hpg_core/bmg/linux/product_helper_tests_bmg_linux.cpp

@@ -14,6 +14,7 @@
 #include "shared/test/unit_test/os_interface/linux/product_helper_linux_tests.h"
 
 #include "per_product_test_definitions.h"
+#include "wmtp_setup_bmg.inl"
 
 using namespace NEO;
 
@@ -32,6 +33,20 @@ BMGTEST_F(BmgProductHelperLinux, WhenConfiguringHwInfoThenZeroIsReturned) {
     EXPECT_EQ(0, ret);
 }
 
+BMGTEST_F(BmgProductHelperLinux, whenConfiguringHwInfoThenWmtpFlagIsAdjusted) {
+
+    outHwInfo.featureTable.flags.ftrWalkerMTP = false;
+    int ret = productHelper->configureHardwareCustom(&outHwInfo, osInterface);
+    EXPECT_EQ(0, ret);
+
+    EXPECT_FALSE(outHwInfo.featureTable.flags.ftrWalkerMTP);
+
+    outHwInfo.featureTable.flags.ftrWalkerMTP = true;
+    ret = productHelper->configureHardwareCustom(&outHwInfo, osInterface);
+    EXPECT_EQ(0, ret);
+    EXPECT_EQ(wmtpSupported, outHwInfo.featureTable.flags.ftrWalkerMTP);
+}
+
 BMGTEST_F(BmgProductHelperLinux, given57bAddressSpaceWhenConfiguringHwInfoThenSetFtrFlag) {
 
     outHwInfo.featureTable.flags.ftr57bGPUAddressing = false;

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

@@ -17,8 +17,6 @@
 #include "shared/test/common/test_macros/header/per_product_test_definitions.h"
 #include "shared/test/common/test_macros/test.h"
 
-#include "wmtp_setup_lnl.inl"
-
 using namespace NEO;
 
 using LnlHwInfoTest = ::testing::Test;
@@ -67,7 +65,7 @@ LNLTEST_F(LnlHwInfoTest, givenBoolWhenCallLnlHardwareInfoSetupThenFeatureTableAn
         EXPECT_EQ(setParamBool, featureTable.flags.ftrXe2PlusTiling);
         EXPECT_EQ(setParamBool, featureTable.flags.ftrPml5Support);
         EXPECT_EQ(false, featureTable.flags.ftrTileY);
-        EXPECT_EQ(wmtpSupported && setParamBool, featureTable.flags.ftrWalkerMTP);
+        EXPECT_EQ(setParamBool, featureTable.flags.ftrWalkerMTP);
         EXPECT_EQ(setParamBool, workaroundTable.flags.wa4kAlignUVOffsetNV12LinearSurface);
         EXPECT_EQ(1u, featureTable.ftrBcsInfo.to_ulong());
     }

shared/test/unit_test/xe2_hpg_core/lnl/linux/product_helper_tests_lnl_linux.cpp

@@ -14,6 +14,7 @@
 #include "shared/test/unit_test/os_interface/linux/product_helper_linux_tests.h"
 
 #include "per_product_test_definitions.h"
+#include "wmtp_setup_lnl.inl"
 
 using namespace NEO;
 
@@ -32,6 +33,20 @@ LNLTEST_F(LnlProductHelperLinux, WhenConfiguringHwInfoThenZeroIsReturned) {
     EXPECT_EQ(0, ret);
 }
 
+LNLTEST_F(LnlProductHelperLinux, whenConfiguringHwInfoThenWmtpFlagIsAdjusted) {
+
+    outHwInfo.featureTable.flags.ftrWalkerMTP = false;
+    int ret = productHelper->configureHardwareCustom(&outHwInfo, osInterface);
+    EXPECT_EQ(0, ret);
+
+    EXPECT_FALSE(outHwInfo.featureTable.flags.ftrWalkerMTP);
+
+    outHwInfo.featureTable.flags.ftrWalkerMTP = true;
+    ret = productHelper->configureHardwareCustom(&outHwInfo, osInterface);
+    EXPECT_EQ(0, ret);
+    EXPECT_EQ(wmtpSupported, outHwInfo.featureTable.flags.ftrWalkerMTP);
+}
+
 LNLTEST_F(LnlProductHelperLinux, given57bAddressSpaceWhenConfiguringHwInfoThenSetFtrFlag) {
 
     outHwInfo.featureTable.flags.ftr57bGPUAddressing = false;