Merge pull request #2356 from npmiller/hip-images

[HIP] Disable SYCL images by default

Author: martygrant

source/adapters/cuda/device.cpp

@@ -292,7 +292,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
       logger::always(
           "Images are not fully supported by the CUDA BE, their support is "
           "disabled by default. Their partial support can be activated by "
-          "setting SYCL_PI_CUDA_ENABLE_IMAGE_SUPPORT environment variable at "
+          "setting UR_CUDA_ENABLE_IMAGE_SUPPORT environment variable at "
           "runtime.");
     }
 

source/adapters/hip/device.cpp

@@ -12,6 +12,7 @@
 #include "adapter.hpp"
 #include "context.hpp"
 #include "event.hpp"
+#include "logger/ur_logger.hpp"
 
 #include <sstream>
 
@@ -223,7 +224,19 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
     return ReturnValue(uint64_t{MaxAlloc});
   }
   case UR_DEVICE_INFO_IMAGE_SUPPORTED: {
-    return ReturnValue(ur_bool_t{true});
+    bool Enabled = false;
+
+    if (std::getenv("UR_HIP_ENABLE_IMAGE_SUPPORT") != nullptr) {
+      Enabled = true;
+    } else {
+      logger::always(
+          "Images are not fully supported by the HIP BE, their support is "
+          "disabled by default. Their partial support can be activated by "
+          "setting UR_HIP_ENABLE_IMAGE_SUPPORT environment variable at "
+          "runtime.");
+    }
+
+    return ReturnValue(Enabled);
   }
   case UR_DEVICE_INFO_MAX_READ_IMAGE_ARGS: {
     // This call doesn't match to HIP as it doesn't have images, but instead

test/conformance/memory/memory_adapter_hip.match

@@ -1,6 +1,4 @@
 urMemImageCreateTest.InvalidSize/*
-urMemImageGetInfoTest.Success/*
 urMemBufferCreateWithNativeHandleTest.Success/*
 urMemBufferCreateWithNativeHandleTest.SuccessWithOwnedNativeHandle/*
 urMemBufferCreateWithNativeHandleTest.SuccessWithUnOwnedNativeHandle/*
-urMemImageCreateWithNativeHandleTest.Success/*