diff --git a/opencl/source/cl_device/cl_device_caps.cpp b/opencl/source/cl_device/cl_device_caps.cpp index 8daea4a6bb..346c12a87b 100644 --- a/opencl/source/cl_device/cl_device_caps.cpp +++ b/opencl/source/cl_device/cl_device_caps.cpp @@ -132,7 +132,6 @@ void ClDevice::initializeCaps() { deviceExtensions += "cl_khr_subgroups "; } - deviceExtensions += "cl_khr_il_program "; deviceInfo.ilsWithVersion[0].version = CL_MAKE_VERSION(1, 2, 0); strcpy_s(deviceInfo.ilsWithVersion[0].name, CL_NAME_VERSION_MAX_NAME_SIZE, spirvName.c_str()); diff --git a/opencl/source/platform/extensions.cpp b/opencl/source/platform/extensions.cpp index 53da8d6301..d3eee56835 100644 --- a/opencl/source/platform/extensions.cpp +++ b/opencl/source/platform/extensions.cpp @@ -32,7 +32,8 @@ const char *deviceExtensionsList = "cl_khr_byte_addressable_store " "cl_khr_throttle_hints " "cl_khr_create_command_queue " "cl_intel_subgroups_char " - "cl_intel_subgroups_long "; + "cl_intel_subgroups_long " + "cl_khr_il_program "; std::string getExtensionsList(const HardwareInfo &hwInfo) { std::string allExtensionsList; @@ -42,7 +43,6 @@ std::string getExtensionsList(const HardwareInfo &hwInfo) { if (hwInfo.capabilityTable.supportsOcl21Features) { allExtensionsList += "cl_khr_subgroups "; - allExtensionsList += "cl_khr_il_program "; if (hwInfo.capabilityTable.supportsVme) { allExtensionsList += "cl_intel_spirv_device_side_avc_motion_estimation "; } 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 96c57d2ce4..6c896cdb94 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 @@ -230,7 +230,8 @@ TEST_F(clGetDeviceInfoTests, GivenClDeviceExtensionsParamWhenGettingDeviceInfoTh "cl_khr_throttle_hints ", "cl_khr_create_command_queue ", "cl_intel_subgroups_char ", - "cl_intel_subgroups_long "}; + "cl_intel_subgroups_long " + "cl_khr_il_program "}; for (auto element = 0u; element < sizeof(supportedExtensions) / sizeof(supportedExtensions[0]); element++) { auto foundOffset = extensionString.find(supportedExtensions[element]); diff --git a/opencl/test/unit_test/device/device_caps_tests.cpp b/opencl/test/unit_test/device/device_caps_tests.cpp index 7466701f12..31f49a1fce 100644 --- a/opencl/test/unit_test/device/device_caps_tests.cpp +++ b/opencl/test/unit_test/device/device_caps_tests.cpp @@ -523,24 +523,6 @@ TEST_F(DeviceGetCapsTest, givenOpenCLVersion20WhenCapsAreCreatedThenDeviceDoesnt EXPECT_THAT(caps.deviceExtensions, testing::Not(testing::HasSubstr(std::string("cl_khr_subgroups")))); } -TEST_F(DeviceGetCapsTest, givenOpenCLVersion21WhenCapsAreCreatedThenDeviceReportsClKhrIlProgramExtension) { - DebugManagerStateRestore dbgRestorer; - DebugManager.flags.ForceOCLVersion.set(21); - auto device = std::make_unique(MockDevice::createWithNewExecutionEnvironment(defaultHwInfo.get())); - const auto &caps = device->getDeviceInfo(); - - EXPECT_THAT(caps.deviceExtensions, testing::HasSubstr(std::string("cl_khr_il_program"))); -} - -TEST_F(DeviceGetCapsTest, givenOpenCLVersion20WhenCapsAreCreatedThenDeviceDoesntReportClKhrIlProgramExtension) { - DebugManagerStateRestore dbgRestorer; - DebugManager.flags.ForceOCLVersion.set(20); - auto device = std::make_unique(MockDevice::createWithNewExecutionEnvironment(defaultHwInfo.get())); - const auto &caps = device->getDeviceInfo(); - - EXPECT_THAT(caps.deviceExtensions, testing::Not(testing::HasSubstr(std::string("cl_khr_il_program")))); -} - TEST_F(DeviceGetCapsTest, givenOpenCLVersion21WhenCapsAreCreatedThenDeviceReportsClIntelSpirvExtensions) { DebugManagerStateRestore dbgRestorer; DebugManager.flags.ForceOCLVersion.set(21); diff --git a/opencl/test/unit_test/platform/platform_tests.cpp b/opencl/test/unit_test/platform/platform_tests.cpp index c6ad78ebdb..3ca5bbdf69 100644 --- a/opencl/test/unit_test/platform/platform_tests.cpp +++ b/opencl/test/unit_test/platform/platform_tests.cpp @@ -280,7 +280,6 @@ TEST_F(PlatformTest, givenSupportingCl21WhenPlatformSupportsFp64ThenFillMatching if (hwInfo->capabilityTable.supportsOcl21Features) { EXPECT_THAT(compilerExtensions, ::testing::HasSubstr(std::string("cl_khr_subgroups"))); - EXPECT_THAT(compilerExtensions, ::testing::HasSubstr(std::string("cl_khr_il_program"))); if (hwInfo->capabilityTable.supportsVme) { EXPECT_THAT(compilerExtensions, ::testing::HasSubstr(std::string("cl_intel_spirv_device_side_avc_motion_estimation"))); } else {