diff --git a/opencl/source/cl_device/cl_device_caps.cpp b/opencl/source/cl_device/cl_device_caps.cpp index beffef43b7..fe672a7e25 100644 --- a/opencl/source/cl_device/cl_device_caps.cpp +++ b/opencl/source/cl_device/cl_device_caps.cpp @@ -369,23 +369,21 @@ void ClDevice::initializeCaps() { deviceInfo.crossDeviceSharedMemCapabilities = productHelper.getCrossDeviceSharedMemCapabilities(); deviceInfo.sharedSystemMemCapabilities = productHelper.getSharedSystemMemCapabilities(&hwInfo); - if (compilerProductHelper.isDotIntegerProductExtensionSupported()) { - deviceInfo.integerDotCapabilities = CL_DEVICE_INTEGER_DOT_PRODUCT_INPUT_4x8BIT_KHR | CL_DEVICE_INTEGER_DOT_PRODUCT_INPUT_4x8BIT_PACKED_KHR; - deviceInfo.integerDotAccelerationProperties8Bit = { - CL_TRUE, // signed_accelerated; - CL_TRUE, // unsigned_accelerated; - CL_TRUE, // mixed_signedness_accelerated; - CL_TRUE, // accumulating_saturating_signed_accelerated; - CL_TRUE, // accumulating_saturating_unsigned_accelerated; - CL_TRUE}; // accumulating_saturating_mixed_signedness_accelerated; - deviceInfo.integerDotAccelerationProperties4x8BitPacked = { - CL_TRUE, // signed_accelerated; - CL_TRUE, // unsigned_accelerated; - CL_TRUE, // mixed_signedness_accelerated; - CL_TRUE, // accumulating_saturating_signed_accelerated; - CL_TRUE, // accumulating_saturating_unsigned_accelerated; - CL_TRUE}; // accumulating_saturating_mixed_signedness_accelerated; - } + deviceInfo.integerDotCapabilities = CL_DEVICE_INTEGER_DOT_PRODUCT_INPUT_4x8BIT_KHR | CL_DEVICE_INTEGER_DOT_PRODUCT_INPUT_4x8BIT_PACKED_KHR; + deviceInfo.integerDotAccelerationProperties8Bit = { + CL_TRUE, // signed_accelerated; + CL_TRUE, // unsigned_accelerated; + CL_TRUE, // mixed_signedness_accelerated; + CL_TRUE, // accumulating_saturating_signed_accelerated; + CL_TRUE, // accumulating_saturating_unsigned_accelerated; + CL_TRUE}; // accumulating_saturating_mixed_signedness_accelerated; + deviceInfo.integerDotAccelerationProperties4x8BitPacked = { + CL_TRUE, // signed_accelerated; + CL_TRUE, // unsigned_accelerated; + CL_TRUE, // mixed_signedness_accelerated; + CL_TRUE, // accumulating_saturating_signed_accelerated; + CL_TRUE, // accumulating_saturating_unsigned_accelerated; + CL_TRUE}; // accumulating_saturating_mixed_signedness_accelerated; initializeOsSpecificCaps(); getOpenclCFeaturesList(hwInfo, deviceInfo.openclCFeatures, getDevice().getCompilerProductHelper(), releaseHelper); 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 5e1752d795..de44c8c31e 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 @@ -544,8 +544,7 @@ TEST_F(clGetDeviceInfoTests, givenClDeviceWhenGetInfoForIntegerDotCapsThenCorrec sizeof(integerDotCapabilities), &integerDotCapabilities, ¶mRetSize); - auto &compilerHelper = pDevice->getDevice().getCompilerProductHelper(); - EXPECT_EQ(((integerDotCapabilities & CL_DEVICE_INTEGER_DOT_PRODUCT_INPUT_4x8BIT_KHR) && (integerDotCapabilities & CL_DEVICE_INTEGER_DOT_PRODUCT_INPUT_4x8BIT_PACKED_KHR)), compilerHelper.isDotIntegerProductExtensionSupported()); + EXPECT_TRUE(((integerDotCapabilities & CL_DEVICE_INTEGER_DOT_PRODUCT_INPUT_4x8BIT_KHR) && (integerDotCapabilities & CL_DEVICE_INTEGER_DOT_PRODUCT_INPUT_4x8BIT_PACKED_KHR))); } TEST_F(clGetDeviceInfoTests, givenClDeviceWhenGetInfoForIntegerDot8BitPropertiesThenCorrectValuesAreSet) { @@ -558,13 +557,12 @@ TEST_F(clGetDeviceInfoTests, givenClDeviceWhenGetInfoForIntegerDot8BitProperties sizeof(integerDotAccelerationProperties8Bit), &integerDotAccelerationProperties8Bit, ¶mRetSize); - auto &compilerHelper = pDevice->getDevice().getCompilerProductHelper(); - EXPECT_EQ(integerDotAccelerationProperties8Bit.accumulating_saturating_mixed_signedness_accelerated, compilerHelper.isDotIntegerProductExtensionSupported()); - EXPECT_EQ(integerDotAccelerationProperties8Bit.accumulating_saturating_signed_accelerated, compilerHelper.isDotIntegerProductExtensionSupported()); - EXPECT_EQ(integerDotAccelerationProperties8Bit.accumulating_saturating_unsigned_accelerated, compilerHelper.isDotIntegerProductExtensionSupported()); - EXPECT_EQ(integerDotAccelerationProperties8Bit.mixed_signedness_accelerated, compilerHelper.isDotIntegerProductExtensionSupported()); - EXPECT_EQ(integerDotAccelerationProperties8Bit.signed_accelerated, compilerHelper.isDotIntegerProductExtensionSupported()); - EXPECT_EQ(integerDotAccelerationProperties8Bit.unsigned_accelerated, compilerHelper.isDotIntegerProductExtensionSupported()); + EXPECT_TRUE(integerDotAccelerationProperties8Bit.accumulating_saturating_mixed_signedness_accelerated); + EXPECT_TRUE(integerDotAccelerationProperties8Bit.accumulating_saturating_signed_accelerated); + EXPECT_TRUE(integerDotAccelerationProperties8Bit.accumulating_saturating_unsigned_accelerated); + EXPECT_TRUE(integerDotAccelerationProperties8Bit.mixed_signedness_accelerated); + EXPECT_TRUE(integerDotAccelerationProperties8Bit.signed_accelerated); + EXPECT_TRUE(integerDotAccelerationProperties8Bit.unsigned_accelerated); } TEST_F(clGetDeviceInfoTests, givenClDeviceWhenGetInfoForIntegerDot8BitPackedPropertiesThenCorrectValuesAreSet) { @@ -577,12 +575,11 @@ TEST_F(clGetDeviceInfoTests, givenClDeviceWhenGetInfoForIntegerDot8BitPackedProp sizeof(integerDotAccelerationProperties8BitPacked), &integerDotAccelerationProperties8BitPacked, ¶mRetSize); - auto &compilerHelper = pDevice->getDevice().getCompilerProductHelper(); - EXPECT_EQ(integerDotAccelerationProperties8BitPacked.accumulating_saturating_mixed_signedness_accelerated, compilerHelper.isDotIntegerProductExtensionSupported()); - EXPECT_EQ(integerDotAccelerationProperties8BitPacked.accumulating_saturating_signed_accelerated, compilerHelper.isDotIntegerProductExtensionSupported()); - EXPECT_EQ(integerDotAccelerationProperties8BitPacked.accumulating_saturating_unsigned_accelerated, compilerHelper.isDotIntegerProductExtensionSupported()); - EXPECT_EQ(integerDotAccelerationProperties8BitPacked.mixed_signedness_accelerated, compilerHelper.isDotIntegerProductExtensionSupported()); - EXPECT_EQ(integerDotAccelerationProperties8BitPacked.signed_accelerated, compilerHelper.isDotIntegerProductExtensionSupported()); - EXPECT_EQ(integerDotAccelerationProperties8BitPacked.unsigned_accelerated, compilerHelper.isDotIntegerProductExtensionSupported()); + EXPECT_TRUE(integerDotAccelerationProperties8BitPacked.accumulating_saturating_mixed_signedness_accelerated); + EXPECT_TRUE(integerDotAccelerationProperties8BitPacked.accumulating_saturating_signed_accelerated); + EXPECT_TRUE(integerDotAccelerationProperties8BitPacked.accumulating_saturating_unsigned_accelerated); + EXPECT_TRUE(integerDotAccelerationProperties8BitPacked.mixed_signedness_accelerated); + EXPECT_TRUE(integerDotAccelerationProperties8BitPacked.signed_accelerated); + EXPECT_TRUE(integerDotAccelerationProperties8BitPacked.unsigned_accelerated); } } // namespace ULT diff --git a/opencl/test/unit_test/device/device_caps_tests.cpp b/opencl/test/unit_test/device/device_caps_tests.cpp index 361302fbb2..169cd49e01 100644 --- a/opencl/test/unit_test/device/device_caps_tests.cpp +++ b/opencl/test/unit_test/device/device_caps_tests.cpp @@ -109,10 +109,8 @@ struct DeviceGetCapsTest : public ::testing::Test { EXPECT_STREQ("__opencl_c_ext_fp64_global_atomic_min_max", (++openclCFeatureIterator)->name); EXPECT_STREQ("__opencl_c_ext_fp64_local_atomic_min_max", (++openclCFeatureIterator)->name); } - if (clDevice.getDevice().getCompilerProductHelper().isDotIntegerProductExtensionSupported()) { - EXPECT_STREQ("__opencl_c_integer_dot_product_input_4x8bit", (++openclCFeatureIterator)->name); - EXPECT_STREQ("__opencl_c_integer_dot_product_input_4x8bit_packed", (++openclCFeatureIterator)->name); - } + EXPECT_STREQ("__opencl_c_integer_dot_product_input_4x8bit", (++openclCFeatureIterator)->name); + EXPECT_STREQ("__opencl_c_integer_dot_product_input_4x8bit_packed", (++openclCFeatureIterator)->name); verifyAnyRemainingOpenclCFeatures(releaseHelper, openclCFeatureIterator); EXPECT_EQ(clDevice.getDeviceInfo().openclCFeatures.end(), ++openclCFeatureIterator); } @@ -880,54 +878,49 @@ TEST_F(DeviceGetCapsTest, givenClDeviceWhenCapsInitializedThenIntegerDotInput4xB UltClDeviceFactory deviceFactory{1, 0}; auto pClDevice = deviceFactory.rootDevices[0]; pClDevice->initializeCaps(); - auto &compilerHelper = pClDevice->getDevice().getCompilerProductHelper(); - EXPECT_EQ((pClDevice->deviceInfo.integerDotCapabilities & CL_DEVICE_INTEGER_DOT_PRODUCT_INPUT_4x8BIT_KHR) != 0, compilerHelper.isDotIntegerProductExtensionSupported()); + EXPECT_TRUE((pClDevice->deviceInfo.integerDotCapabilities & CL_DEVICE_INTEGER_DOT_PRODUCT_INPUT_4x8BIT_KHR) != 0); } TEST_F(DeviceGetCapsTest, givenClDeviceWhenCapsInitializedThenIntegerDotInput4xBitPackedCapIsSet) { UltClDeviceFactory deviceFactory{1, 0}; auto pClDevice = deviceFactory.rootDevices[0]; pClDevice->initializeCaps(); - auto &compilerHelper = pClDevice->getDevice().getCompilerProductHelper(); - EXPECT_EQ((pClDevice->deviceInfo.integerDotCapabilities & CL_DEVICE_INTEGER_DOT_PRODUCT_INPUT_4x8BIT_PACKED_KHR) != 0, compilerHelper.isDotIntegerProductExtensionSupported()); + EXPECT_TRUE((pClDevice->deviceInfo.integerDotCapabilities & CL_DEVICE_INTEGER_DOT_PRODUCT_INPUT_4x8BIT_PACKED_KHR) != 0); } TEST_F(DeviceGetCapsTest, givenClDeviceWhenCapsInitializedThenAllFieldsInIntegerDotAccPropertiesAreTrue) { UltClDeviceFactory deviceFactory{1, 0}; auto pClDevice = deviceFactory.rootDevices[0]; pClDevice->initializeCaps(); - auto &compilerHelper = pClDevice->getDevice().getCompilerProductHelper(); - EXPECT_EQ(pClDevice->deviceInfo.integerDotAccelerationProperties8Bit.accumulating_saturating_mixed_signedness_accelerated, compilerHelper.isDotIntegerProductExtensionSupported()); - EXPECT_EQ(pClDevice->deviceInfo.integerDotAccelerationProperties8Bit.accumulating_saturating_signed_accelerated, compilerHelper.isDotIntegerProductExtensionSupported()); - EXPECT_EQ(pClDevice->deviceInfo.integerDotAccelerationProperties8Bit.accumulating_saturating_unsigned_accelerated, compilerHelper.isDotIntegerProductExtensionSupported()); - EXPECT_EQ(pClDevice->deviceInfo.integerDotAccelerationProperties8Bit.mixed_signedness_accelerated, compilerHelper.isDotIntegerProductExtensionSupported()); - EXPECT_EQ(pClDevice->deviceInfo.integerDotAccelerationProperties8Bit.signed_accelerated, compilerHelper.isDotIntegerProductExtensionSupported()); - EXPECT_EQ(pClDevice->deviceInfo.integerDotAccelerationProperties8Bit.unsigned_accelerated, compilerHelper.isDotIntegerProductExtensionSupported()); + EXPECT_TRUE(pClDevice->deviceInfo.integerDotAccelerationProperties8Bit.accumulating_saturating_mixed_signedness_accelerated); + EXPECT_TRUE(pClDevice->deviceInfo.integerDotAccelerationProperties8Bit.accumulating_saturating_signed_accelerated); + EXPECT_TRUE(pClDevice->deviceInfo.integerDotAccelerationProperties8Bit.accumulating_saturating_unsigned_accelerated); + EXPECT_TRUE(pClDevice->deviceInfo.integerDotAccelerationProperties8Bit.mixed_signedness_accelerated); + EXPECT_TRUE(pClDevice->deviceInfo.integerDotAccelerationProperties8Bit.signed_accelerated); + EXPECT_TRUE(pClDevice->deviceInfo.integerDotAccelerationProperties8Bit.unsigned_accelerated); } TEST_F(DeviceGetCapsTest, givenClDeviceWhenCapsInitializedThenAllFieldsInIntegerDotAccPackedPropertiesAreTrue) { UltClDeviceFactory deviceFactory{1, 0}; auto pClDevice = deviceFactory.rootDevices[0]; pClDevice->initializeCaps(); - auto &compilerHelper = pClDevice->getDevice().getCompilerProductHelper(); - EXPECT_EQ(pClDevice->deviceInfo.integerDotAccelerationProperties4x8BitPacked.accumulating_saturating_mixed_signedness_accelerated, compilerHelper.isDotIntegerProductExtensionSupported()); - EXPECT_EQ(pClDevice->deviceInfo.integerDotAccelerationProperties4x8BitPacked.accumulating_saturating_signed_accelerated, compilerHelper.isDotIntegerProductExtensionSupported()); - EXPECT_EQ(pClDevice->deviceInfo.integerDotAccelerationProperties4x8BitPacked.accumulating_saturating_unsigned_accelerated, compilerHelper.isDotIntegerProductExtensionSupported()); - EXPECT_EQ(pClDevice->deviceInfo.integerDotAccelerationProperties4x8BitPacked.mixed_signedness_accelerated, compilerHelper.isDotIntegerProductExtensionSupported()); - EXPECT_EQ(pClDevice->deviceInfo.integerDotAccelerationProperties4x8BitPacked.signed_accelerated, compilerHelper.isDotIntegerProductExtensionSupported()); - EXPECT_EQ(pClDevice->deviceInfo.integerDotAccelerationProperties4x8BitPacked.unsigned_accelerated, compilerHelper.isDotIntegerProductExtensionSupported()); + EXPECT_TRUE(pClDevice->deviceInfo.integerDotAccelerationProperties4x8BitPacked.accumulating_saturating_mixed_signedness_accelerated); + EXPECT_TRUE(pClDevice->deviceInfo.integerDotAccelerationProperties4x8BitPacked.accumulating_saturating_signed_accelerated); + EXPECT_TRUE(pClDevice->deviceInfo.integerDotAccelerationProperties4x8BitPacked.accumulating_saturating_unsigned_accelerated); + EXPECT_TRUE(pClDevice->deviceInfo.integerDotAccelerationProperties4x8BitPacked.mixed_signedness_accelerated); + EXPECT_TRUE(pClDevice->deviceInfo.integerDotAccelerationProperties4x8BitPacked.signed_accelerated); + EXPECT_TRUE(pClDevice->deviceInfo.integerDotAccelerationProperties4x8BitPacked.unsigned_accelerated); } TEST_F(DeviceGetCapsTest, givenClDeviceWhenEnableIntegerDotExtensionEnalbedThenDotIntegerExtensionIsInExtensionString) { UltClDeviceFactory deviceFactory{1, 0}; auto pClDevice = deviceFactory.rootDevices[0]; pClDevice->initializeCaps(); - auto &compilerHelper = pClDevice->getDevice().getCompilerProductHelper(); static const char *const supportedExtensions[] = { "cl_khr_integer_dot_product "}; for (auto extension : supportedExtensions) { auto foundOffset = pClDevice->deviceExtensions.find(extension); - EXPECT_EQ(foundOffset != std::string::npos, compilerHelper.isDotIntegerProductExtensionSupported()); + EXPECT_TRUE(foundOffset != std::string::npos); } } diff --git a/shared/source/compiler_interface/oclc_extensions.cpp b/shared/source/compiler_interface/oclc_extensions.cpp index 7b0a4f246a..afae032acf 100644 --- a/shared/source/compiler_interface/oclc_extensions.cpp +++ b/shared/source/compiler_interface/oclc_extensions.cpp @@ -102,13 +102,11 @@ void getOpenclCFeaturesList(const HardwareInfo &hwInfo, OpenClCFeaturesContainer strcpy_s(openClCFeature.name, CL_NAME_VERSION_MAX_NAME_SIZE, "__opencl_c_ext_fp64_local_atomic_min_max"); openclCFeatures.push_back(openClCFeature); } - if (compilerProductHelper.isDotIntegerProductExtensionSupported()) { - strcpy_s(openClCFeature.name, CL_NAME_VERSION_MAX_NAME_SIZE, "__opencl_c_integer_dot_product_input_4x8bit"); - openclCFeatures.push_back(openClCFeature); + strcpy_s(openClCFeature.name, CL_NAME_VERSION_MAX_NAME_SIZE, "__opencl_c_integer_dot_product_input_4x8bit"); + openclCFeatures.push_back(openClCFeature); - strcpy_s(openClCFeature.name, CL_NAME_VERSION_MAX_NAME_SIZE, "__opencl_c_integer_dot_product_input_4x8bit_packed"); - openclCFeatures.push_back(openClCFeature); - } + strcpy_s(openClCFeature.name, CL_NAME_VERSION_MAX_NAME_SIZE, "__opencl_c_integer_dot_product_input_4x8bit_packed"); + openclCFeatures.push_back(openClCFeature); getOpenclCFeaturesListExtra(releaseHelper, openclCFeatures); } diff --git a/shared/source/gen12lp/enable_compiler_product_helper_adln.cpp b/shared/source/gen12lp/enable_compiler_product_helper_adln.cpp index 79a78d8d9f..550a27d65c 100644 --- a/shared/source/gen12lp/enable_compiler_product_helper_adln.cpp +++ b/shared/source/gen12lp/enable_compiler_product_helper_adln.cpp @@ -12,7 +12,6 @@ #include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl" #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl" #include "shared/source/helpers/compiler_product_helper_product_config_default.inl" -#include "shared/source/helpers/compiler_product_helper_tgllp_and_later.inl" #include "compiler_product_helper_adln.inl" #include "neo_aot_platforms.h" diff --git a/shared/source/gen12lp/enable_compiler_product_helper_adlp.cpp b/shared/source/gen12lp/enable_compiler_product_helper_adlp.cpp index 97cf964004..95cfcc1dcb 100644 --- a/shared/source/gen12lp/enable_compiler_product_helper_adlp.cpp +++ b/shared/source/gen12lp/enable_compiler_product_helper_adlp.cpp @@ -12,7 +12,6 @@ #include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl" #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl" #include "shared/source/helpers/compiler_product_helper_product_config_default.inl" -#include "shared/source/helpers/compiler_product_helper_tgllp_and_later.inl" #include "compiler_product_helper_adlp.inl" #include "neo_aot_platforms.h" diff --git a/shared/source/gen12lp/enable_compiler_product_helper_adls.cpp b/shared/source/gen12lp/enable_compiler_product_helper_adls.cpp index c8c251a745..d9f9230656 100644 --- a/shared/source/gen12lp/enable_compiler_product_helper_adls.cpp +++ b/shared/source/gen12lp/enable_compiler_product_helper_adls.cpp @@ -12,7 +12,6 @@ #include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl" #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl" #include "shared/source/helpers/compiler_product_helper_product_config_default.inl" -#include "shared/source/helpers/compiler_product_helper_tgllp_and_later.inl" #include "neo_aot_platforms.h" diff --git a/shared/source/gen12lp/enable_compiler_product_helper_dg1.cpp b/shared/source/gen12lp/enable_compiler_product_helper_dg1.cpp index 4b3348db6a..65c285b607 100644 --- a/shared/source/gen12lp/enable_compiler_product_helper_dg1.cpp +++ b/shared/source/gen12lp/enable_compiler_product_helper_dg1.cpp @@ -12,7 +12,6 @@ #include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl" #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl" #include "shared/source/helpers/compiler_product_helper_product_config_default.inl" -#include "shared/source/helpers/compiler_product_helper_tgllp_and_later.inl" #include "neo_aot_platforms.h" diff --git a/shared/source/gen12lp/enable_compiler_product_helper_rkl.cpp b/shared/source/gen12lp/enable_compiler_product_helper_rkl.cpp index 18fb1f68b2..e934b60603 100644 --- a/shared/source/gen12lp/enable_compiler_product_helper_rkl.cpp +++ b/shared/source/gen12lp/enable_compiler_product_helper_rkl.cpp @@ -12,7 +12,6 @@ #include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl" #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl" #include "shared/source/helpers/compiler_product_helper_product_config_default.inl" -#include "shared/source/helpers/compiler_product_helper_tgllp_and_later.inl" #include "neo_aot_platforms.h" diff --git a/shared/source/gen12lp/enable_compiler_product_helper_tgllp.cpp b/shared/source/gen12lp/enable_compiler_product_helper_tgllp.cpp index a70ec458cf..365bba0a5b 100644 --- a/shared/source/gen12lp/enable_compiler_product_helper_tgllp.cpp +++ b/shared/source/gen12lp/enable_compiler_product_helper_tgllp.cpp @@ -12,7 +12,6 @@ #include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl" #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl" #include "shared/source/helpers/compiler_product_helper_product_config_default.inl" -#include "shared/source/helpers/compiler_product_helper_tgllp_and_later.inl" #include "neo_aot_platforms.h" diff --git a/shared/source/helpers/CMakeLists.txt b/shared/source/helpers/CMakeLists.txt index 6b2dca39c7..7082fce762 100644 --- a/shared/source/helpers/CMakeLists.txt +++ b/shared/source/helpers/CMakeLists.txt @@ -47,7 +47,6 @@ set(NEO_CORE_HELPERS ${CMAKE_CURRENT_SOURCE_DIR}/compiler_product_helper_disable_subgroup_local_block_io.inl ${CMAKE_CURRENT_SOURCE_DIR}/compiler_product_helper_enable_subgroup_local_block_io.inl ${CMAKE_CURRENT_SOURCE_DIR}/compiler_product_helper_product_config_default.inl - ${CMAKE_CURRENT_SOURCE_DIR}/compiler_product_helper_tgllp_and_later.inl ${CMAKE_CURRENT_SOURCE_DIR}/compiler_product_helper_xe_hp_and_later.inl ${CMAKE_CURRENT_SOURCE_DIR}/compiler_product_helper_xe_hpc_and_later.inl ${CMAKE_CURRENT_SOURCE_DIR}/compiler_options_parser.cpp diff --git a/shared/source/helpers/compiler_product_helper.h b/shared/source/helpers/compiler_product_helper.h index 10ceef37e5..46282a1cf5 100644 --- a/shared/source/helpers/compiler_product_helper.h +++ b/shared/source/helpers/compiler_product_helper.h @@ -69,7 +69,6 @@ class CompilerProductHelper { virtual bool isSubgroupBufferPrefetchSupported() const = 0; virtual bool isForceToStatelessRequired() const = 0; virtual bool failBuildProgramWithStatefulAccessPreference() const = 0; - virtual bool isDotIntegerProductExtensionSupported() const = 0; virtual bool isSpirSupported(const ReleaseHelper *releaseHelper) const = 0; virtual bool oclocEnforceZebinFormat() const = 0; virtual void setProductConfigForHwInfo(HardwareInfo &hwInfo, HardwareIpVersion config) const = 0; @@ -125,7 +124,6 @@ class CompilerProductHelperHw : public CompilerProductHelper { bool isSubgroupBufferPrefetchSupported() const override; bool isForceToStatelessRequired() const override; bool failBuildProgramWithStatefulAccessPreference() const override; - bool isDotIntegerProductExtensionSupported() const override; bool isSpirSupported(const ReleaseHelper *releaseHelper) const override; bool oclocEnforceZebinFormat() const override; void setProductConfigForHwInfo(HardwareInfo &hwInfo, HardwareIpVersion config) const override; diff --git a/shared/source/helpers/compiler_product_helper_base.inl b/shared/source/helpers/compiler_product_helper_base.inl index 395672c748..c7446a6e56 100644 --- a/shared/source/helpers/compiler_product_helper_base.inl +++ b/shared/source/helpers/compiler_product_helper_base.inl @@ -90,7 +90,8 @@ std::string CompilerProductHelperHw::getDeviceExtensions(const Hardw "cl_khr_suggested_local_work_size " "cl_intel_split_work_group_barrier " "cl_khr_int64_base_atomics " - "cl_khr_int64_extended_atomics "; + "cl_khr_int64_extended_atomics " + "cl_khr_integer_dot_product "; auto supportsFp64 = hwInfo.capabilityTable.ftrSupportsFP64; if (debugManager.flags.OverrideDefaultFP64Settings.get() != -1) { @@ -188,9 +189,6 @@ std::string CompilerProductHelperHw::getDeviceExtensions(const Hardw if (isSubgroupBufferPrefetchSupported()) { extensions += "cl_intel_subgroup_buffer_prefetch "; } - if (isDotIntegerProductExtensionSupported()) { - extensions += "cl_khr_integer_dot_product "; - } if (isSpirSupported(releaseHelper)) { extensions += "cl_khr_spir "; } diff --git a/shared/source/helpers/compiler_product_helper_tgllp_and_later.inl b/shared/source/helpers/compiler_product_helper_tgllp_and_later.inl deleted file mode 100644 index 22491eaad4..0000000000 --- a/shared/source/helpers/compiler_product_helper_tgllp_and_later.inl +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (C) 2023-2025 Intel Corporation - * - * SPDX-License-Identifier: MIT - * - */ - -#include "shared/source/helpers/compiler_product_helper.h" - -namespace NEO { -template -bool CompilerProductHelperHw::isDotIntegerProductExtensionSupported() const { - return true; -} - -} // 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 2e52f5d436..f63339ec78 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 @@ -9,7 +9,6 @@ #include "shared/source/helpers/compiler_product_helper_base.inl" #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl" #include "shared/source/helpers/compiler_product_helper_mtl_and_later.inl" -#include "shared/source/helpers/compiler_product_helper_tgllp_and_later.inl" #include "shared/source/helpers/compiler_product_helper_xe_hp_and_later.inl" #include "shared/source/helpers/compiler_product_helper_xe_hpc_and_later.inl" diff --git a/shared/source/xe2_hpg_core/enable_compiler_product_helper_lnl.cpp b/shared/source/xe2_hpg_core/enable_compiler_product_helper_lnl.cpp index de3f9cd817..f2b85404f9 100644 --- a/shared/source/xe2_hpg_core/enable_compiler_product_helper_lnl.cpp +++ b/shared/source/xe2_hpg_core/enable_compiler_product_helper_lnl.cpp @@ -9,7 +9,6 @@ #include "shared/source/helpers/compiler_product_helper_base.inl" #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl" #include "shared/source/helpers/compiler_product_helper_mtl_and_later.inl" -#include "shared/source/helpers/compiler_product_helper_tgllp_and_later.inl" #include "shared/source/helpers/compiler_product_helper_xe_hp_and_later.inl" #include "shared/source/helpers/compiler_product_helper_xe_hpc_and_later.inl" diff --git a/shared/source/xe3_core/enable_compiler_product_helper_ptl.cpp b/shared/source/xe3_core/enable_compiler_product_helper_ptl.cpp index 01adc42eab..b9ccc6cfec 100644 --- a/shared/source/xe3_core/enable_compiler_product_helper_ptl.cpp +++ b/shared/source/xe3_core/enable_compiler_product_helper_ptl.cpp @@ -9,7 +9,6 @@ #include "shared/source/helpers/compiler_product_helper_base.inl" #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl" #include "shared/source/helpers/compiler_product_helper_mtl_and_later.inl" -#include "shared/source/helpers/compiler_product_helper_tgllp_and_later.inl" #include "shared/source/helpers/compiler_product_helper_xe_hp_and_later.inl" #include "shared/source/helpers/compiler_product_helper_xe_hpc_and_later.inl" diff --git a/shared/source/xe_hpc_core/enable_compiler_product_helper_pvc.cpp b/shared/source/xe_hpc_core/enable_compiler_product_helper_pvc.cpp index 4ae2123fbe..e32d6692bd 100644 --- a/shared/source/xe_hpc_core/enable_compiler_product_helper_pvc.cpp +++ b/shared/source/xe_hpc_core/enable_compiler_product_helper_pvc.cpp @@ -9,7 +9,6 @@ #include "shared/source/helpers/compiler_product_helper.h" #include "shared/source/helpers/compiler_product_helper_base.inl" #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl" -#include "shared/source/helpers/compiler_product_helper_tgllp_and_later.inl" #include "shared/source/helpers/compiler_product_helper_xe_hp_and_later.inl" #include "shared/source/helpers/compiler_product_helper_xe_hpc_and_later.inl" #include "shared/source/xe_hpc_core/hw_cmds.h" diff --git a/shared/source/xe_hpg_core/enable_compiler_product_helper_dg2.cpp b/shared/source/xe_hpg_core/enable_compiler_product_helper_dg2.cpp index 52cd19828a..04e21c5032 100644 --- a/shared/source/xe_hpg_core/enable_compiler_product_helper_dg2.cpp +++ b/shared/source/xe_hpg_core/enable_compiler_product_helper_dg2.cpp @@ -10,7 +10,6 @@ #include "shared/source/helpers/compiler_product_helper_base.inl" #include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl" #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl" -#include "shared/source/helpers/compiler_product_helper_tgllp_and_later.inl" #include "shared/source/helpers/compiler_product_helper_xe_hp_and_later.inl" #include "shared/source/xe_hpg_core/hw_cmds_dg2.h" diff --git a/shared/source/xe_hpg_core/xe_lpg/compiler_product_helper_xe_lpg.inl b/shared/source/xe_hpg_core/xe_lpg/compiler_product_helper_xe_lpg.inl index a501048131..f8ff31e7a8 100644 --- a/shared/source/xe_hpg_core/xe_lpg/compiler_product_helper_xe_lpg.inl +++ b/shared/source/xe_hpg_core/xe_lpg/compiler_product_helper_xe_lpg.inl @@ -10,7 +10,6 @@ #include "shared/source/helpers/compiler_product_helper_before_xe_hpc.inl" #include "shared/source/helpers/compiler_product_helper_enable_subgroup_local_block_io.inl" #include "shared/source/helpers/compiler_product_helper_mtl_and_later.inl" -#include "shared/source/helpers/compiler_product_helper_tgllp_and_later.inl" #include "shared/source/helpers/compiler_product_helper_xe_hp_and_later.inl" #include "neo_aot_platforms.h" diff --git a/shared/test/common/mocks/mock_compiler_product_helper.h b/shared/test/common/mocks/mock_compiler_product_helper.h index 6cdf81a04a..a2fb127d19 100644 --- a/shared/test/common/mocks/mock_compiler_product_helper.h +++ b/shared/test/common/mocks/mock_compiler_product_helper.h @@ -31,7 +31,6 @@ class MockCompilerProductHelper : public CompilerProductHelper { ADDMETHOD_CONST_NOBASE(isSubgroupBufferPrefetchSupported, bool, false, ()); ADDMETHOD_CONST_NOBASE(isForceToStatelessRequired, bool, false, ()); ADDMETHOD_CONST_NOBASE(failBuildProgramWithStatefulAccessPreference, bool, false, ()); - ADDMETHOD_CONST_NOBASE(isDotIntegerProductExtensionSupported, bool, false, ()); ADDMETHOD_CONST_NOBASE(oclocEnforceZebinFormat, bool, false, ()); ADDMETHOD_CONST_NOBASE_VOIDRETURN(setProductConfigForHwInfo, (HardwareInfo & hwInfo, HardwareIpVersion config)); ADDMETHOD_CONST_NOBASE(getCachingPolicyOptions, const char *, nullptr, (bool isDebuggerActive)); diff --git a/shared/test/unit_test/helpers/compiler_product_helper_tests.cpp b/shared/test/unit_test/helpers/compiler_product_helper_tests.cpp index 46173507b4..852818a2bf 100644 --- a/shared/test/unit_test/helpers/compiler_product_helper_tests.cpp +++ b/shared/test/unit_test/helpers/compiler_product_helper_tests.cpp @@ -382,12 +382,6 @@ TEST_F(CompilerProductHelperFixture, givenHwInfoWithCLVersion30ThenReportsClKhrE EXPECT_FALSE(hasSubstr(extensions, std::string("cl_khr_external_memory"))); } -HWTEST2_F(CompilerProductHelperFixture, GivenAtLeastGen12lpDeviceWhenCheckingIfIntegerDotExtensionIsSupportedThenTrueReturned, MatchAny) { - auto &compilerProductHelper = pDevice->getCompilerProductHelper(); - - EXPECT_TRUE(compilerProductHelper.isDotIntegerProductExtensionSupported()); -} - HWTEST2_F(CompilerProductHelperFixture, givenConfigWhenMatchConfigWithRevIdThenProperConfigIsReturned, IsNotPvcOrDg2) { auto &compilerProductHelper = pDevice->getCompilerProductHelper(); auto &hwInfo = *pDevice->getRootDeviceEnvironment().getMutableHardwareInfo();