Revert "Enable cl_intel_split_work_group_barrier extension for all platforms"

Compute-Runtime-Validation · Compute-Runtime-Automation · commit b48d4a87d297 · 2022-05-24T09:48:09.000+02:00
This reverts commit 4bb5a49. Signed-off-by: Compute-Runtime-Validation <compute-runtime-validation@intel.com>
diff --git a/opencl/test/unit_test/api/cl_get_device_info_tests.inl b/opencl/test/unit_test/api/cl_get_device_info_tests.inl
@@ -280,10 +280,9 @@ TEST_F(clGetDeviceInfoTests, GivenClDeviceExtensionsParamWhenGettingDeviceInfoTh
         "cl_khr_subgroup_non_uniform_arithmetic ",
         "cl_khr_subgroup_shuffle ",
         "cl_khr_subgroup_shuffle_relative ",
-        "cl_khr_subgroup_clustered_reduce ",
-        "cl_intel_device_attribute_query ",
-        "cl_khr_suggested_local_work_size ",
-        "cl_intel_split_work_group_barrier "};
+        "cl_khr_subgroup_clustered_reduce "
+        "cl_intel_device_attribute_query "
+        "cl_khr_suggested_local_work_size "};
 
     for (auto extension : supportedExtensions) {
         auto foundOffset = extensionString.find(extension);
diff --git a/opencl/test/unit_test/gen12lp/test_device_caps_gen12lp.inl b/opencl/test/unit_test/gen12lp/test_device_caps_gen12lp.inl
@@ -27,6 +27,7 @@ HWTEST2_F(Gen12LpDeviceCaps, givenGen12lpWhenCheckExtensionsThenSubgroupLocalBlo
     const auto &caps = pClDevice->getDeviceInfo();
 
     EXPECT_TRUE(hasSubstr(caps.deviceExtensions, std::string("cl_intel_subgroup_local_block_io")));
+    EXPECT_TRUE(hasSubstr(caps.deviceExtensions, std::string("cl_intel_split_work_group_barrier")));
 }
 
 HWTEST2_F(Gen12LpDeviceCaps, givenGen12lpWhenCheckExtensionsThenDeviceDoesNotReportClKhrSubgroupsExtension, IsTGLLP) {
diff --git a/opencl/test/unit_test/xe_hpg_core/test_device_caps_xe_hpg_core.cpp b/opencl/test/unit_test/xe_hpg_core/test_device_caps_xe_hpg_core.cpp
@@ -43,6 +43,7 @@ XE_HPG_CORETEST_F(XeHpgCoreDeviceCaps, giveDeviceExtensionsWhenDeviceCapsInitial
 
     EXPECT_TRUE(hasSubstr(caps.deviceExtensions, std::string("cl_intel_create_buffer_with_properties")));
     EXPECT_TRUE(hasSubstr(caps.deviceExtensions, std::string("cl_intel_dot_accumulate")));
+    EXPECT_TRUE(hasSubstr(caps.deviceExtensions, std::string("cl_intel_split_work_group_barrier")));
     EXPECT_TRUE(hasSubstr(caps.deviceExtensions, std::string("cl_intel_subgroup_local_block_io")));
     EXPECT_TRUE(hasSubstr(caps.deviceExtensions, std::string("cl_intel_subgroup_matrix_multiply_accumulate")));
     EXPECT_TRUE(hasSubstr(caps.deviceExtensions, std::string("cl_intel_subgroup_split_matrix_multiply_accumulate")));
diff --git a/shared/source/compiler_interface/oclc_extensions.cpp b/shared/source/compiler_interface/oclc_extensions.cpp
@@ -44,8 +44,7 @@ const char *deviceExtensionsList = "cl_khr_byte_addressable_store "
                                    "cl_khr_subgroup_shuffle_relative "
                                    "cl_khr_subgroup_clustered_reduce "
                                    "cl_intel_device_attribute_query "
-                                   "cl_khr_suggested_local_work_size "
-                                   "cl_intel_split_work_group_barrier ";
+                                   "cl_khr_suggested_local_work_size ";
 
 std::string getExtensionsList(const HardwareInfo &hwInfo) {
     std::string allExtensionsList;
diff --git a/shared/source/gen12lp/hw_helper_gen12lp.cpp b/shared/source/gen12lp/hw_helper_gen12lp.cpp
@@ -134,6 +134,7 @@ template <>
 std::string HwHelperHw<Family>::getExtensions() const {
     std::string extensions;
     extensions += "cl_intel_subgroup_local_block_io ";
+    extensions += "cl_intel_split_work_group_barrier ";
 
     return extensions;
 }
diff --git a/shared/source/xe_hpg_core/hw_helper_xe_hpg_core.cpp b/shared/source/xe_hpg_core/hw_helper_xe_hpg_core.cpp
@@ -87,6 +87,7 @@ std::string HwHelperHw<Family>::getExtensions() const {
     std::string extensions;
     extensions += "cl_intel_create_buffer_with_properties ";
     extensions += "cl_intel_dot_accumulate ";
+    extensions += "cl_intel_split_work_group_barrier ";
     extensions += "cl_intel_subgroup_local_block_io ";
     extensions += "cl_intel_subgroup_matrix_multiply_accumulate ";
     extensions += "cl_intel_subgroup_split_matrix_multiply_accumulate ";

Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,7 @@ HWTEST2_F(Gen12LpDeviceCaps, givenGen12lpWhenCheckExtensionsThenSubgroupLocalBlo`
`27`	`27`	`const auto &caps = pClDevice->getDeviceInfo();`
`28`	`28`
`29`	`29`	`EXPECT_TRUE(hasSubstr(caps.deviceExtensions, std::string("cl_intel_subgroup_local_block_io")));`
	`30`	`+ EXPECT_TRUE(hasSubstr(caps.deviceExtensions, std::string("cl_intel_split_work_group_barrier")));`
`30`	`31`	`}`
`31`	`32`
`32`	`33`	`HWTEST2_F(Gen12LpDeviceCaps, givenGen12lpWhenCheckExtensionsThenDeviceDoesNotReportClKhrSubgroupsExtension, IsTGLLP) {`
Original file line number	Diff line number	Diff line change
`@@ -134,6 +134,7 @@ template <>`
`134`	`134`	`std::string HwHelperHw<Family>::getExtensions() const {`
`135`	`135`	`std::string extensions;`
`136`	`136`	`extensions += "cl_intel_subgroup_local_block_io ";`
	`137`	`+ extensions += "cl_intel_split_work_group_barrier ";`
`137`	`138`
`138`	`139`	`return extensions;`
`139`	`140`	`}`