From 339229359e57d409f285f1c4496e1239dbfbe969 Mon Sep 17 00:00:00 2001
From: Dominik Dabek <dominik.dabek@intel.com>
Date: Tue, 18 Jun 2024 17:55:25 +0000
Subject: [PATCH] performance(ocl): enable ocl buffer pool DG2

re-enable on DG2 windows
Related-To: NEO-11694

Signed-off-by: Dominik Dabek <dominik.dabek@intel.com>
---
 .../xe_hpg_core/dg2/os_agnostic_product_helper_dg2.inl       | 5 +++++
 shared/source/xe_hpg_core/linux/product_helper_dg2.cpp       | 5 -----
 shared/source/xe_hpg_core/windows/product_helper_dg2.cpp     | 5 -----
 shared/test/unit_test/os_interface/product_helper_tests.cpp  | 2 +-
 .../xe_hpg_core/dg2/linux/product_helper_tests_dg2.cpp       | 2 +-
 .../xe_hpg_core/dg2/windows/product_helper_tests_dg2.cpp     | 2 +-
 6 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/shared/source/xe_hpg_core/dg2/os_agnostic_product_helper_dg2.inl b/shared/source/xe_hpg_core/dg2/os_agnostic_product_helper_dg2.inl
index 41cb0d50b7..238a8f0702 100644
--- a/shared/source/xe_hpg_core/dg2/os_agnostic_product_helper_dg2.inl
+++ b/shared/source/xe_hpg_core/dg2/os_agnostic_product_helper_dg2.inl
@@ -204,6 +204,11 @@ bool ProductHelperHw<gfxProduct>::isResolveDependenciesByPipeControlsSupported(c
     return enabled;
 }
 
+template <>
+bool ProductHelperHw<gfxProduct>::isBufferPoolAllocatorSupported() const {
+    return true;
+}
+
 template <>
 bool ProductHelperHw<gfxProduct>::isUsmPoolAllocatorSupported() const {
     return true;
diff --git a/shared/source/xe_hpg_core/linux/product_helper_dg2.cpp b/shared/source/xe_hpg_core/linux/product_helper_dg2.cpp
index 51a023b578..26f6d0c626 100644
--- a/shared/source/xe_hpg_core/linux/product_helper_dg2.cpp
+++ b/shared/source/xe_hpg_core/linux/product_helper_dg2.cpp
@@ -67,10 +67,5 @@ bool ProductHelperHw<gfxProduct>::getUuid(NEO::DriverModel *driverModel, const u
     return true;
 }
 
-template <>
-bool ProductHelperHw<gfxProduct>::isBufferPoolAllocatorSupported() const {
-    return true;
-}
-
 template class ProductHelperHw<gfxProduct>;
 } // namespace NEO
diff --git a/shared/source/xe_hpg_core/windows/product_helper_dg2.cpp b/shared/source/xe_hpg_core/windows/product_helper_dg2.cpp
index 5ecbe2e1da..bd4122845b 100644
--- a/shared/source/xe_hpg_core/windows/product_helper_dg2.cpp
+++ b/shared/source/xe_hpg_core/windows/product_helper_dg2.cpp
@@ -38,10 +38,5 @@ int ProductHelperHw<gfxProduct>::configureHardwareCustom(HardwareInfo *hwInfo, O
     return 0;
 }
 
-template <>
-bool ProductHelperHw<gfxProduct>::isBufferPoolAllocatorSupported() const {
-    return false;
-}
-
 template class ProductHelperHw<gfxProduct>;
 } // namespace NEO
diff --git a/shared/test/unit_test/os_interface/product_helper_tests.cpp b/shared/test/unit_test/os_interface/product_helper_tests.cpp
index 54ab212adc..bdbc4ee283 100644
--- a/shared/test/unit_test/os_interface/product_helper_tests.cpp
+++ b/shared/test/unit_test/os_interface/product_helper_tests.cpp
@@ -816,7 +816,7 @@ HWTEST2_F(ProductHelperTest, givenProductHelperWhenCheckingIsBufferPoolAllocator
     EXPECT_FALSE(productHelper->isBufferPoolAllocatorSupported());
 }
 
-HWTEST2_F(ProductHelperTest, givenProductHelperWhenCheckingIsBufferPoolAllocatorSupportedThenCorrectValueIsReturned, IsXeLpg) {
+HWTEST2_F(ProductHelperTest, givenProductHelperWhenCheckingIsBufferPoolAllocatorSupportedThenCorrectValueIsReturned, IsXeHpgCore) {
     EXPECT_TRUE(productHelper->isBufferPoolAllocatorSupported());
 }
 
diff --git a/shared/test/unit_test/xe_hpg_core/dg2/linux/product_helper_tests_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/linux/product_helper_tests_dg2.cpp
index bf4387efe1..5494b0e671 100644
--- a/shared/test/unit_test/xe_hpg_core/dg2/linux/product_helper_tests_dg2.cpp
+++ b/shared/test/unit_test/xe_hpg_core/dg2/linux/product_helper_tests_dg2.cpp
@@ -46,4 +46,4 @@ DG2TEST_F(Dg2ProductHelperLinux, GivenDg2WhenConfigureHardwareCustomThenKmdNotif
 
 DG2TEST_F(Dg2ProductHelperLinux, givenProductHelperWhenCheckingIsBufferPoolAllocatorSupportedThenCorrectValueIsReturned) {
     EXPECT_TRUE(productHelper->isBufferPoolAllocatorSupported());
-}
\ No newline at end of file
+}
diff --git a/shared/test/unit_test/xe_hpg_core/dg2/windows/product_helper_tests_dg2.cpp b/shared/test/unit_test/xe_hpg_core/dg2/windows/product_helper_tests_dg2.cpp
index 33f6807e75..0bb4404cf0 100644
--- a/shared/test/unit_test/xe_hpg_core/dg2/windows/product_helper_tests_dg2.cpp
+++ b/shared/test/unit_test/xe_hpg_core/dg2/windows/product_helper_tests_dg2.cpp
@@ -13,5 +13,5 @@ using namespace NEO;
 using Dg2ProductHelperWindows = ProductHelperTestWindows;
 
 HWTEST2_F(Dg2ProductHelperWindows, givenProductHelperWhenCheckingIsBufferPoolAllocatorSupportedThenCorrectValueIsReturned, IsDG2) {
-    EXPECT_FALSE(productHelper->isBufferPoolAllocatorSupported());
+    EXPECT_TRUE(productHelper->isBufferPoolAllocatorSupported());
 }
\ No newline at end of file