Disable cl_khr_3d_image_writes when image are not supported

Change-Id: I1a9fc02135dac60156de3d7cc2abe61d685149df
Signed-off-by: Katarzyna Cencelewska <[email protected]>

Author: kcencele

runtime/device/device_caps.cpp

@@ -178,6 +178,7 @@ void Device::initializeCaps() {
         deviceExtensions += "cl_khr_image2d_from_buffer ";
         deviceExtensions += "cl_khr_depth_images ";
         deviceExtensions += "cl_intel_media_block_io ";
+        deviceExtensions += "cl_khr_3d_image_writes ";
     }
 
     auto sharingAllowed = (HwHelper::getSubDevicesCount(&hwInfo) == 1u);

runtime/platform/extensions.cpp

@@ -13,8 +13,7 @@
 
 namespace NEO {
 
-const char *deviceExtensionsList = "cl_khr_3d_image_writes "
-                                   "cl_khr_byte_addressable_store "
+const char *deviceExtensionsList = "cl_khr_byte_addressable_store "
                                    "cl_khr_fp16 "
                                    "cl_khr_global_int32_base_atomics "
                                    "cl_khr_global_int32_extended_atomics "
@@ -61,6 +60,10 @@ std::string getExtensionsList(const HardwareInfo &hwInfo) {
         allExtensionsList += "cl_khr_int64_extended_atomics ";
     }
 
+    if (hwInfo.capabilityTable.supportsImages) {
+        allExtensionsList += "cl_khr_3d_image_writes ";
+    }
+
     if (hwInfo.capabilityTable.supportsVme) {
         allExtensionsList += "cl_intel_motion_estimation cl_intel_device_side_avc_motion_estimation ";
     }
@@ -85,7 +88,8 @@ std::string convertEnabledExtensionsToCompilerInternalOptions(const char *enable
     while ((pos = extensionsList.find(" ", pos)) != std::string::npos) {
         extensionsList.replace(pos, 1, ",+");
     }
-    extensionsList = " -cl-ext=-all,+" + extensionsList + " ";
+    extensionsList = " -cl-ext=-all,+" + extensionsList + ",+cl_khr_3d_image_writes ";
+
     return extensionsList;
 }
 

unit_tests/api/cl_get_device_info_tests.inl

@@ -163,7 +163,6 @@ TEST_F(clGetDeviceInfoTests, GivenClDeviceExtensionsParamWhenGettingDeviceInfoTh
 
     std::string extensionString(paramValue.get());
     std::string supportedExtensions[] = {
-        "cl_khr_3d_image_writes ",
         "cl_khr_byte_addressable_store ",
         "cl_khr_fp16 ",
         "cl_khr_global_int32_base_atomics ",

unit_tests/api/gl/cl_get_gl_device_info_tests.cpp

@@ -49,7 +49,6 @@ TEST_P(GetDeviceGlInfoStr, StringType) {
         std::string extensionString(paramValue);
         size_t currentOffset = 0u;
         std::string supportedExtensions[] = {
-            "cl_khr_3d_image_writes ",
             "cl_khr_byte_addressable_store ",
             "cl_khr_fp16 ",
             "cl_khr_global_int32_base_atomics ",

unit_tests/device/device_caps_tests.cpp

@@ -427,8 +427,10 @@ TEST_F(DeviceGetCapsTest, givenOpenCLVersion21WhenCapsAreCreatedThenDeviceReport
     }
     if (hwInfo->capabilityTable.supportsImages) {
         EXPECT_THAT(caps.deviceExtensions, testing::HasSubstr(std::string("cl_intel_spirv_media_block_io")));
+        EXPECT_THAT(caps.deviceExtensions, testing::HasSubstr(std::string("cl_khr_3d_image_writes")));
     } else {
         EXPECT_THAT(caps.deviceExtensions, testing::Not(testing::HasSubstr(std::string("cl_intel_spirv_media_block_io"))));
+        EXPECT_THAT(caps.deviceExtensions, testing::Not(std::string("cl_khr_3d_image_writes")));
     }
     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")));
@@ -454,6 +456,23 @@ TEST_F(DeviceGetCapsTest, givenNotSupportImagesWhenCapsAreCreatedThenDeviceNotRe
     EXPECT_THAT(caps.deviceExtensions, testing::Not(testing::HasSubstr(std::string("cl_intel_spirv_media_block_io"))));
 }
 
+TEST_F(DeviceGetCapsTest, givenSupportImagesWhenCapsAreCreatedThenDeviceReportsClKhr3dImageWritesExtensions) {
+    HardwareInfo hwInfo = *platformDevices[0];
+    hwInfo.capabilityTable.supportsImages = true;
+    std::unique_ptr<MockDevice> device(MockDevice::createWithNewExecutionEnvironment<MockDevice>(&hwInfo));
+    const auto &caps = device->getDeviceInfo();
+
+    EXPECT_THAT(caps.deviceExtensions, testing::HasSubstr(std::string("cl_khr_3d_image_writes")));
+}
+
+TEST_F(DeviceGetCapsTest, givenNotSupportImagesWhenCapsAreCreatedThenDeviceNotReportsClKhr3dImageWritesExtensions) {
+    HardwareInfo hwInfo = *platformDevices[0];
+    hwInfo.capabilityTable.supportsImages = false;
+    std::unique_ptr<MockDevice> device(MockDevice::createWithNewExecutionEnvironment<MockDevice>(&hwInfo));
+    const auto &caps = device->getDeviceInfo();
+    EXPECT_THAT(caps.deviceExtensions, testing::Not(testing::HasSubstr(std::string("cl_khr_3d_image_writes"))));
+}
+
 TEST_F(DeviceGetCapsTest, givenOpenCLVersion12WhenCapsAreCreatedThenDeviceDoesntReportClIntelSpirvExtensions) {
     DebugManagerStateRestore dbgRestorer;
     DebugManager.flags.ForceOCLVersion.set(12);

unit_tests/platform/platform_tests.cpp

@@ -246,7 +246,6 @@ TEST_F(PlatformTest, givenSupportingCl21WhenPlatformSupportsFp64ThenFillMatching
     const HardwareInfo *hwInfo;
     hwInfo = platformDevices[0];
     std::string extensionsList = getExtensionsList(*hwInfo);
-    EXPECT_THAT(extensionsList, ::testing::HasSubstr(std::string("cl_khr_3d_image_writes")));
 
     std::string compilerExtensions = convertEnabledExtensionsToCompilerInternalOptions(extensionsList.c_str());
     EXPECT_THAT(compilerExtensions, ::testing::HasSubstr(std::string(" -cl-ext=-all,+cl")));
@@ -273,6 +272,9 @@ TEST_F(PlatformTest, givenSupportingCl21WhenPlatformSupportsFp64ThenFillMatching
         EXPECT_THAT(compilerExtensions, ::testing::HasSubstr(std::string("cl_khr_fp64")));
     }
 
+    if (hwInfo->capabilityTable.supportsImages) {
+        EXPECT_THAT(extensionsList, ::testing::HasSubstr(std::string("cl_khr_3d_image_writes")));
+    }
     EXPECT_THAT(compilerExtensions, ::testing::EndsWith(std::string(" ")));
 }
 
@@ -282,7 +284,9 @@ TEST_F(PlatformTest, givenNotSupportingCl21WhenPlatformNotSupportFp64ThenNotFill
     TesthwInfo.capabilityTable.clVersionSupport = 10;
 
     std::string extensionsList = getExtensionsList(TesthwInfo);
-    EXPECT_THAT(extensionsList, ::testing::HasSubstr(std::string("cl_khr_3d_image_writes")));
+    if (TesthwInfo.capabilityTable.supportsImages) {
+        EXPECT_THAT(extensionsList, ::testing::HasSubstr(std::string("cl_khr_3d_image_writes")));
+    }
 
     std::string compilerExtensions = convertEnabledExtensionsToCompilerInternalOptions(extensionsList.c_str());
     EXPECT_THAT(compilerExtensions, ::testing::HasSubstr(std::string("-cl-ext=-all,+cl")));