From bba4a1d30c144be3461fe15061d46176b7a6e99c Mon Sep 17 00:00:00 2001 From: Mateusz Jablonski Date: Wed, 10 Jul 2024 14:13:58 +0000 Subject: [PATCH] fix: disable wmtp on xe2 platforms Signed-off-by: Mateusz Jablonski --- .../xe2_hpg_core/bmg/definitions/wmtp_setup_bmg.inl | 10 ++++++++++ shared/source/xe2_hpg_core/hw_info_bmg.cpp | 4 +++- shared/source/xe2_hpg_core/hw_info_lnl.cpp | 3 ++- .../xe2_hpg_core/lnl/definitions/wmtp_setup_lnl.inl | 10 ++++++++++ .../unit_test/xe2_hpg_core/bmg/hw_info_tests_bmg.cpp | 4 +++- .../unit_test/xe2_hpg_core/lnl/hw_info_tests_lnl.cpp | 4 +++- 6 files changed, 31 insertions(+), 4 deletions(-) create mode 100644 shared/source/xe2_hpg_core/bmg/definitions/wmtp_setup_bmg.inl create mode 100644 shared/source/xe2_hpg_core/lnl/definitions/wmtp_setup_lnl.inl diff --git a/shared/source/xe2_hpg_core/bmg/definitions/wmtp_setup_bmg.inl b/shared/source/xe2_hpg_core/bmg/definitions/wmtp_setup_bmg.inl new file mode 100644 index 0000000000..b072211123 --- /dev/null +++ b/shared/source/xe2_hpg_core/bmg/definitions/wmtp_setup_bmg.inl @@ -0,0 +1,10 @@ +/* + * Copyright (C) 2024 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +namespace NEO { +constexpr bool wmtpSupported = false; +} // namespace NEO diff --git a/shared/source/xe2_hpg_core/hw_info_bmg.cpp b/shared/source/xe2_hpg_core/hw_info_bmg.cpp index 1e843bdbab..bedeb73874 100644 --- a/shared/source/xe2_hpg_core/hw_info_bmg.cpp +++ b/shared/source/xe2_hpg_core/hw_info_bmg.cpp @@ -15,6 +15,8 @@ #include "shared/source/xe2_hpg_core/hw_cmds_bmg.h" #include "aubstream/engine_node.h" +#include "wmtp_setup_bmg.inl" + namespace NEO { const char *HwMapper::abbreviation = "bmg"; @@ -93,7 +95,7 @@ void BMG::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo) { featureTable->flags.ftrFlatPhysCCS = true; featureTable->flags.ftrE2ECompression = true; featureTable->flags.ftrTile64Optimization = true; - featureTable->flags.ftrWalkerMTP = true; + featureTable->flags.ftrWalkerMTP = wmtpSupported; featureTable->flags.ftrXe2Compression = true; featureTable->flags.ftrXe2PlusTiling = true; featureTable->flags.ftrL3TransientDataFlush = true; diff --git a/shared/source/xe2_hpg_core/hw_info_lnl.cpp b/shared/source/xe2_hpg_core/hw_info_lnl.cpp index 5fe99a3d7c..f65ef8529e 100644 --- a/shared/source/xe2_hpg_core/hw_info_lnl.cpp +++ b/shared/source/xe2_hpg_core/hw_info_lnl.cpp @@ -15,6 +15,7 @@ #include "shared/source/xe2_hpg_core/hw_cmds_lnl.h" #include "aubstream/engine_node.h" +#include "wmtp_setup_lnl.inl" namespace NEO { @@ -92,7 +93,7 @@ void LNL::setupFeatureAndWorkaroundTable(HardwareInfo *hwInfo) { featureTable->flags.ftrFlatPhysCCS = true; featureTable->flags.ftrE2ECompression = true; featureTable->flags.ftrTile64Optimization = true; - featureTable->flags.ftrWalkerMTP = true; + featureTable->flags.ftrWalkerMTP = wmtpSupported; featureTable->flags.ftrXe2Compression = true; featureTable->flags.ftrXe2PlusTiling = true; featureTable->flags.ftrPml5Support = true; diff --git a/shared/source/xe2_hpg_core/lnl/definitions/wmtp_setup_lnl.inl b/shared/source/xe2_hpg_core/lnl/definitions/wmtp_setup_lnl.inl new file mode 100644 index 0000000000..b072211123 --- /dev/null +++ b/shared/source/xe2_hpg_core/lnl/definitions/wmtp_setup_lnl.inl @@ -0,0 +1,10 @@ +/* + * Copyright (C) 2024 Intel Corporation + * + * SPDX-License-Identifier: MIT + * + */ + +namespace NEO { +constexpr bool wmtpSupported = false; +} // namespace NEO diff --git a/shared/test/unit_test/xe2_hpg_core/bmg/hw_info_tests_bmg.cpp b/shared/test/unit_test/xe2_hpg_core/bmg/hw_info_tests_bmg.cpp index 1fcd48e2e6..764530b220 100644 --- a/shared/test/unit_test/xe2_hpg_core/bmg/hw_info_tests_bmg.cpp +++ b/shared/test/unit_test/xe2_hpg_core/bmg/hw_info_tests_bmg.cpp @@ -17,6 +17,8 @@ #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; @@ -63,7 +65,7 @@ BMGTEST_F(BmgHwInfoTest, givenBoolWhenCallBmgHardwareInfoSetupThenFeatureTableAn EXPECT_FALSE(featureTable.flags.ftrTileY); EXPECT_FALSE(featureTable.flags.ftrMultiTileArch); EXPECT_EQ(1u, featureTable.ftrBcsInfo.to_ulong()); - EXPECT_EQ(setParamBool, featureTable.flags.ftrWalkerMTP); + EXPECT_EQ(wmtpSupported && setParamBool, featureTable.flags.ftrWalkerMTP); EXPECT_EQ(setParamBool, featureTable.flags.ftrXe2Compression); EXPECT_EQ(setParamBool, featureTable.flags.ftrXe2PlusTiling); EXPECT_EQ(setParamBool, featureTable.flags.ftrL3TransientDataFlush); diff --git a/shared/test/unit_test/xe2_hpg_core/lnl/hw_info_tests_lnl.cpp b/shared/test/unit_test/xe2_hpg_core/lnl/hw_info_tests_lnl.cpp index b8570efc8c..c79296f1fe 100644 --- a/shared/test/unit_test/xe2_hpg_core/lnl/hw_info_tests_lnl.cpp +++ b/shared/test/unit_test/xe2_hpg_core/lnl/hw_info_tests_lnl.cpp @@ -17,6 +17,8 @@ #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; @@ -65,7 +67,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(setParamBool, featureTable.flags.ftrWalkerMTP); + EXPECT_EQ(wmtpSupported && setParamBool, featureTable.flags.ftrWalkerMTP); EXPECT_EQ(setParamBool, workaroundTable.flags.wa4kAlignUVOffsetNV12LinearSurface); EXPECT_EQ(1u, featureTable.ftrBcsInfo.to_ulong()); }