From c08aa1d400fe1289b2fc1d5fe861798704d0d0b2 Mon Sep 17 00:00:00 2001
From: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
Date: Sat, 20 Sep 2025 09:04:47 +0200
Subject: [PATCH] Revert "performance: remove TLB invalidations on BMG/Windows"

This reverts commit 1239858eda86d620c04bbfacfd5dfea198e70b98.

Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
---
 .../xe2_hpg_core/bmg/os_agnostic_product_helper_bmg.inl      | 5 -----
 shared/source/xe2_hpg_core/linux/product_helper_bmg.cpp      | 5 +++++
 .../bmg/linux/product_helper_tests_bmg_linux.cpp             | 4 ++++
 .../unit_test/xe2_hpg_core/bmg/product_helper_tests_bmg.cpp  | 4 ----
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/shared/source/xe2_hpg_core/bmg/os_agnostic_product_helper_bmg.inl b/shared/source/xe2_hpg_core/bmg/os_agnostic_product_helper_bmg.inl
index 6b0e4d6189..813facb0ab 100644
--- a/shared/source/xe2_hpg_core/bmg/os_agnostic_product_helper_bmg.inl
+++ b/shared/source/xe2_hpg_core/bmg/os_agnostic_product_helper_bmg.inl
@@ -67,9 +67,4 @@ bool ProductHelperHw<gfxProduct>::isHostUsmPoolAllocatorSupported() const {
     return true;
 }
 
-template <>
-bool ProductHelperHw<gfxProduct>::isTlbFlushRequired() const {
-    return false;
-}
-
 } // namespace NEO
diff --git a/shared/source/xe2_hpg_core/linux/product_helper_bmg.cpp b/shared/source/xe2_hpg_core/linux/product_helper_bmg.cpp
index 335abb91e4..18ae1eb487 100644
--- a/shared/source/xe2_hpg_core/linux/product_helper_bmg.cpp
+++ b/shared/source/xe2_hpg_core/linux/product_helper_bmg.cpp
@@ -33,6 +33,11 @@ bool ProductHelperHw<gfxProduct>::isDisableScratchPagesSupported() const {
     return true;
 }
 
+template <>
+bool ProductHelperHw<gfxProduct>::isTlbFlushRequired() const {
+    return false;
+}
+
 template <>
 uint64_t ProductHelperHw<gfxProduct>::getSharedSystemPatIndex() const {
     return 0;
diff --git a/shared/test/unit_test/xe2_hpg_core/bmg/linux/product_helper_tests_bmg_linux.cpp b/shared/test/unit_test/xe2_hpg_core/bmg/linux/product_helper_tests_bmg_linux.cpp
index c65c1b8ebc..50feb66831 100644
--- a/shared/test/unit_test/xe2_hpg_core/bmg/linux/product_helper_tests_bmg_linux.cpp
+++ b/shared/test/unit_test/xe2_hpg_core/bmg/linux/product_helper_tests_bmg_linux.cpp
@@ -53,6 +53,10 @@ BMGTEST_F(BmgProductHelperLinux, givenProductHelperWhenAskedIfPatIndexProgrammin
     EXPECT_TRUE(productHelper->isVmBindPatIndexProgrammingSupported());
 }
 
+BMGTEST_F(BmgProductHelperLinux, givenProductHelperWhenAskedIfIsTlbFlushRequiredThenFalseIsReturned) {
+    EXPECT_FALSE(productHelper->isTlbFlushRequired());
+}
+
 BMGTEST_F(BmgProductHelperLinux, givenProductHelperWhenAskedIsPageFaultSupportedThenReturnFalse) {
     EXPECT_FALSE(productHelper->isPageFaultSupported());
 }
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 cca259b95d..445b45f287 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
@@ -147,8 +147,4 @@ BMGTEST_F(BmgProductHelper, givenProductHelperWhenCheckingIsHostDeviceUsmPoolAll
         EXPECT_TRUE(productHelper->isHostUsmPoolAllocatorSupported());
         EXPECT_TRUE(productHelper->isDeviceUsmPoolAllocatorSupported());
     }
-}
-
-BMGTEST_F(BmgProductHelper, givenProductHelperWhenAskedIfIsTlbFlushRequiredThenFalseIsReturned) {
-    EXPECT_FALSE(productHelper->isTlbFlushRequired());
 }
\ No newline at end of file