From bd5dc1524c4353a47e3794fa5e01811718b91470 Mon Sep 17 00:00:00 2001 From: Filip Hazubski Date: Tue, 24 May 2022 13:42:39 +0000 Subject: [PATCH] Enable cl_intel_split_work_group_barrier extension for all platforms Related-To: NEO-6991, NEO-6993 Signed-off-by: Filip Hazubski --- opencl/test/unit_test/api/cl_get_device_info_tests.inl | 7 ++++--- opencl/test/unit_test/gen12lp/test_device_caps_gen12lp.inl | 1 - .../unit_test/xe_hpg_core/test_device_caps_xe_hpg_core.cpp | 1 - shared/source/compiler_interface/oclc_extensions.cpp | 3 ++- shared/source/gen12lp/hw_helper_gen12lp.cpp | 1 - shared/source/xe_hpg_core/hw_helper_xe_hpg_core.cpp | 1 - 6 files changed, 6 insertions(+), 8 deletions(-) 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 index 459d996bcb..979087fcb9 100644 --- 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,9 +280,10 @@ 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_khr_subgroup_clustered_reduce ", + "cl_intel_device_attribute_query ", + "cl_khr_suggested_local_work_size ", + "cl_intel_split_work_group_barrier "}; 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 index 0567a1dd1e..6972613899 100644 --- a/opencl/test/unit_test/gen12lp/test_device_caps_gen12lp.inl +++ b/opencl/test/unit_test/gen12lp/test_device_caps_gen12lp.inl @@ -27,7 +27,6 @@ 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 index 0318e4f748..612a8148f2 100644 --- 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 @@ -47,7 +47,6 @@ 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 index 919d7bde51..d4f3eeb4a8 100644 --- a/shared/source/compiler_interface/oclc_extensions.cpp +++ b/shared/source/compiler_interface/oclc_extensions.cpp @@ -44,7 +44,8 @@ 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_khr_suggested_local_work_size " + "cl_intel_split_work_group_barrier "; 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 index 2f05ec32eb..ba6e7ef643 100644 --- a/shared/source/gen12lp/hw_helper_gen12lp.cpp +++ b/shared/source/gen12lp/hw_helper_gen12lp.cpp @@ -134,7 +134,6 @@ template <> std::string HwHelperHw::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 index 643077ffcb..d65cc5736a 100644 --- 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,7 +87,6 @@ std::string HwHelperHw::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 ";