Revert "Revert "Expose spirv extensions""

This reverts commit 469fe40.

Change-Id: I8b634ef05a3b7e4e6abb05b42eacae24b7871632

Author: AdamCetnerowski

runtime/device/device_caps.cpp

@@ -144,6 +144,9 @@ void Device::initializeCaps() {
         deviceInfo.independentForwardProgress = true;
         deviceExtensions += "cl_khr_subgroups ";
         deviceExtensions += "cl_khr_il_program ";
+        deviceExtensions += "cl_intel_spirv_side_avc_motion_estimation ";
+        deviceExtensions += "cl_intel_spirv_media_block_io ";
+        deviceExtensions += "cl_intel_spirv_subgroups ";
     } else {
         deviceInfo.independentForwardProgress = false;
     }

runtime/platform/extensions.cpp

@@ -42,6 +42,9 @@ std::string getExtensionsList(const HardwareInfo &hwInfo) {
     if (hwInfo.capabilityTable.clVersionSupport >= 21) {
         allExtensionsList += "cl_khr_subgroups ";
         allExtensionsList += "cl_khr_il_program ";
+        allExtensionsList += "cl_intel_spirv_side_avc_motion_estimation ";
+        allExtensionsList += "cl_intel_spirv_media_block_io ";
+        allExtensionsList += "cl_intel_spirv_subgroups ";
     }
 
     if (hwInfo.capabilityTable.ftrSupportsFP64) {

unit_tests/device/device_caps_tests.cpp

@@ -399,6 +399,28 @@ TEST(Device_GetCaps, givenOpenCLVersion20WhenCapsAreCreatedThenDeviceDoesntRepor
     EXPECT_THAT(caps.deviceExtensions, testing::Not(testing::HasSubstr(std::string("cl_khr_il_program"))));
 }
 
+TEST(Device_GetCaps, givenOpenCLVersion21WhenCapsAreCreatedThenDeviceReportsClIntelSpirvExtensions) {
+    DebugManagerStateRestore dbgRestorer;
+    DebugManager.flags.ForceOCLVersion.set(21);
+    auto device = std::unique_ptr<Device>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(platformDevices[0]));
+    const auto &caps = device->getDeviceInfo();
+
+    EXPECT_THAT(caps.deviceExtensions, testing::HasSubstr(std::string("cl_intel_spirv_side_avc_motion_estimation")));
+    EXPECT_THAT(caps.deviceExtensions, testing::HasSubstr(std::string("cl_intel_spirv_media_block_io")));
+    EXPECT_THAT(caps.deviceExtensions, testing::HasSubstr(std::string("cl_intel_spirv_subgroups")));
+}
+
+TEST(Device_GetCaps, givenOpenCLVersion12WhenCapsAreCreatedThenDeviceDoesntReportClIntelSpirvExtensions) {
+    DebugManagerStateRestore dbgRestorer;
+    DebugManager.flags.ForceOCLVersion.set(12);
+    auto device = std::unique_ptr<Device>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(platformDevices[0]));
+    const auto &caps = device->getDeviceInfo();
+
+    EXPECT_THAT(caps.deviceExtensions, testing::Not(testing::HasSubstr(std::string("cl_intel_spirv_side_avc_motion_estimation"))));
+    EXPECT_THAT(caps.deviceExtensions, testing::Not(testing::HasSubstr(std::string("cl_intel_spirv_media_block_io"))));
+    EXPECT_THAT(caps.deviceExtensions, testing::Not(testing::HasSubstr(std::string("cl_intel_spirv_subgroups"))));
+}
+
 TEST(Device_GetCaps, givenEnableNV12setToTrueWhenCapsAreCreatedThenDeviceReportsNV12Extension) {
     DebugManagerStateRestore dbgRestorer;
     DebugManager.flags.EnableNV12.set(true);

unit_tests/platform/platform_tests.cpp

@@ -217,6 +217,9 @@ TEST_F(PlatformTest, givenSupportingCl21WhenPlatformSupportsFp64ThenFillMatching
     if (hwInfo->capabilityTable.clVersionSupport > 20) {
         EXPECT_THAT(compilerExtensions, ::testing::HasSubstr(std::string("cl_khr_subgroups")));
         EXPECT_THAT(compilerExtensions, ::testing::HasSubstr(std::string("cl_khr_il_program")));
+        EXPECT_THAT(compilerExtensions, ::testing::HasSubstr(std::string("cl_intel_spirv_side_avc_motion_estimation")));
+        EXPECT_THAT(compilerExtensions, ::testing::HasSubstr(std::string("cl_intel_spirv_media_block_io")));
+        EXPECT_THAT(compilerExtensions, ::testing::HasSubstr(std::string("cl_intel_spirv_subgroups")));
     }
 
     if (hwInfo->capabilityTable.ftrSupportsFP64) {