From 5b35887bd15b631437adbb75ca2ede5ad38576c5 Mon Sep 17 00:00:00 2001 From: Compute-Runtime-Validation Date: Sun, 10 Nov 2024 10:53:47 +0100 Subject: [PATCH] Revert "feature: enable wmtp on BMG" This reverts commit f95a6339a58a226615a2fe55c03aef33da262782. Signed-off-by: Compute-Runtime-Validation --- .../xe2_hpg_core/bmg/definitions/wmtp_setup_bmg.inl | 10 ++++++++++ .../enable_compiler_product_helper_bmg.cpp | 6 ++++++ .../xe2_hpg_core/bmg/product_helper_tests_bmg.cpp | 3 ++- 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 shared/source/xe2_hpg_core/bmg/definitions/wmtp_setup_bmg.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/enable_compiler_product_helper_bmg.cpp b/shared/source/xe2_hpg_core/enable_compiler_product_helper_bmg.cpp index cce5b20c2e..0cc96af253 100644 --- a/shared/source/xe2_hpg_core/enable_compiler_product_helper_bmg.cpp +++ b/shared/source/xe2_hpg_core/enable_compiler_product_helper_bmg.cpp @@ -14,6 +14,7 @@ #include "shared/source/helpers/compiler_product_helper_xe_hpc_and_later.inl" #include "platforms.h" +#include "wmtp_setup_bmg.inl" namespace NEO { template <> @@ -21,6 +22,11 @@ uint32_t CompilerProductHelperHw::getDefaultHwIpVersion() const { return AOT::BMG_G21_A0; } +template <> +bool CompilerProductHelperHw::isMidThreadPreemptionSupported(const HardwareInfo &hwInfo) const { + return hwInfo.featureTable.flags.ftrWalkerMTP && wmtpSupported; +} + static EnableCompilerProductHelper enableCompilerProductHelperBMG; } // namespace NEO diff --git a/shared/test/unit_test/xe2_hpg_core/bmg/product_helper_tests_bmg.cpp b/shared/test/unit_test/xe2_hpg_core/bmg/product_helper_tests_bmg.cpp index c0b390da43..8261c22868 100644 --- a/shared/test/unit_test/xe2_hpg_core/bmg/product_helper_tests_bmg.cpp +++ b/shared/test/unit_test/xe2_hpg_core/bmg/product_helper_tests_bmg.cpp @@ -18,6 +18,7 @@ #include "aubstream/product_family.h" #include "platforms.h" +#include "wmtp_setup_bmg.inl" using namespace NEO; @@ -93,7 +94,7 @@ BMGTEST_F(BmgProductHelper, givenCompilerProductHelperWhenGetMidThreadPreemption hwInfo.featureTable.flags.ftrWalkerMTP = false; EXPECT_FALSE(compilerProductHelper->isMidThreadPreemptionSupported(hwInfo)); hwInfo.featureTable.flags.ftrWalkerMTP = true; - EXPECT_TRUE(compilerProductHelper->isMidThreadPreemptionSupported(hwInfo)); + EXPECT_EQ(wmtpSupported, compilerProductHelper->isMidThreadPreemptionSupported(hwInfo)); } BMGTEST_F(BmgProductHelper, givenProductHelperWhenCheckingIsBufferPoolAllocatorSupportedThenCorrectValueIsReturned) {