Improving reporting VME extensions

Change-Id: Ia7ed2d1587603d8cfed391d8d5f7c1cd1faa1c21
Signed-off-by: Andrzej Koska <[email protected]>
Related-To: NEO-4047

Author: andrzejkoska

runtime/device/device_caps.cpp

@@ -127,7 +127,9 @@ void Device::initializeCaps() {
         deviceInfo.independentForwardProgress = true;
         deviceExtensions += "cl_khr_subgroups ";
         deviceExtensions += "cl_khr_il_program ";
-        deviceExtensions += "cl_intel_spirv_device_side_avc_motion_estimation ";
+        if (supportsVme) {
+            deviceExtensions += "cl_intel_spirv_device_side_avc_motion_estimation ";
+        }
         deviceExtensions += "cl_intel_spirv_media_block_io ";
         deviceExtensions += "cl_intel_spirv_subgroups ";
         deviceExtensions += "cl_khr_spirv_no_integer_wrap_decoration ";

runtime/platform/extensions.cpp

@@ -43,7 +43,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_device_side_avc_motion_estimation ";
+        if (hwInfo.capabilityTable.supportsVme) {
+            allExtensionsList += "cl_intel_spirv_device_side_avc_motion_estimation ";
+        }
         allExtensionsList += "cl_intel_spirv_media_block_io ";
         allExtensionsList += "cl_intel_spirv_subgroups ";
         allExtensionsList += "cl_khr_spirv_no_integer_wrap_decoration ";

unit_tests/device/device_caps_tests.cpp

@@ -406,8 +406,13 @@ TEST_F(DeviceGetCapsTest, givenOpenCLVersion21WhenCapsAreCreatedThenDeviceReport
     DebugManager.flags.ForceOCLVersion.set(21);
     auto device = std::unique_ptr<Device>(MockDevice::createWithNewExecutionEnvironment<MockDevice>(platformDevices[0]));
     const auto &caps = device->getDeviceInfo();
+    const HardwareInfo *hwInfo = platformDevices[0];
 
-    EXPECT_THAT(caps.deviceExtensions, testing::HasSubstr(std::string("cl_intel_spirv_device_side_avc_motion_estimation")));
+    if (hwInfo->capabilityTable.supportsVme) {
+        EXPECT_THAT(caps.deviceExtensions, testing::HasSubstr(std::string("cl_intel_spirv_device_side_avc_motion_estimation")));
+    } else {
+        EXPECT_THAT(caps.deviceExtensions, testing::Not(testing::HasSubstr(std::string("cl_intel_spirv_device_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")));
     EXPECT_THAT(caps.deviceExtensions, testing::HasSubstr(std::string("cl_khr_spirv_no_integer_wrap_decoration")));

unit_tests/platform/platform_tests.cpp

@@ -243,7 +243,11 @@ 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_device_side_avc_motion_estimation")));
+        if (hwInfo->capabilityTable.supportsVme) {
+            EXPECT_THAT(compilerExtensions, ::testing::HasSubstr(std::string("cl_intel_spirv_device_side_avc_motion_estimation")));
+        } else {
+            EXPECT_THAT(compilerExtensions, testing::Not(::testing::HasSubstr(std::string("cl_intel_spirv_device_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")));
         EXPECT_THAT(compilerExtensions, ::testing::HasSubstr(std::string("cl_khr_spirv_no_integer_wrap_decoration")));