Merge pull request #1678 from steffenlarsen/steffen/composite_devices_not_supported_and_empty

Fix return of component and composite device info queries

Author: kbenzie

source/adapters/cuda/device.cpp

@@ -1073,8 +1073,6 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
     return ReturnValue(false);
   case UR_DEVICE_INFO_COMPONENT_DEVICES:
   case UR_DEVICE_INFO_COMPOSITE_DEVICE:
-    // These two are exclusive of L0.
-    return ReturnValue(0);
   case UR_DEVICE_INFO_MAX_READ_WRITE_IMAGE_ARGS:
   case UR_DEVICE_INFO_GPU_EU_COUNT:
   case UR_DEVICE_INFO_GPU_EU_SIMD_WIDTH:

source/adapters/hip/device.cpp

@@ -879,14 +879,12 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
     return ReturnValue(false);
   case UR_DEVICE_INFO_ESIMD_SUPPORT:
     return ReturnValue(false);
-  case UR_DEVICE_INFO_COMPONENT_DEVICES:
-  case UR_DEVICE_INFO_COMPOSITE_DEVICE:
-    // These two are exclusive of L0.
-    return ReturnValue(0);
   case UR_DEVICE_INFO_TIMESTAMP_RECORDING_SUPPORT_EXP:
     return ReturnValue(true);
 
   // TODO: Investigate if this information is available on HIP.
+  case UR_DEVICE_INFO_COMPONENT_DEVICES:
+  case UR_DEVICE_INFO_COMPOSITE_DEVICE:
   case UR_DEVICE_INFO_GPU_EU_COUNT:
   case UR_DEVICE_INFO_GPU_EU_SIMD_WIDTH:
   case UR_DEVICE_INFO_GPU_EU_SLICES:

source/adapters/level_zero/device.cpp

@@ -888,7 +888,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(
     // First call to get SubDeviceCount.
     ZE2UR_CALL(zeDeviceGetSubDevices, (DevHandle, &SubDeviceCount, nullptr));
     if (SubDeviceCount == 0)
-      return ReturnValue(0);
+      return ReturnValue(std::nullopt);
 
     std::vector<ze_device_handle_t> SubDevs(SubDeviceCount);
     // Second call to get the actual list of devices.

source/adapters/native_cpu/device.cpp

@@ -309,7 +309,7 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
   case UR_DEVICE_INFO_COMPONENT_DEVICES:
   case UR_DEVICE_INFO_COMPOSITE_DEVICE:
     // These two are exclusive of L0.
-    return ReturnValue(0);
+    return UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION;
 
     CASE_UR_UNSUPPORTED(UR_DEVICE_INFO_MAX_MEMORY_BANDWIDTH);
   case UR_DEVICE_INFO_VIRTUAL_MEMORY_SUPPORT:

source/adapters/opencl/device.cpp

@@ -975,14 +975,12 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
     return ReturnValue(UUID);
   }
 
-  case UR_DEVICE_INFO_COMPONENT_DEVICES:
-  case UR_DEVICE_INFO_COMPOSITE_DEVICE:
-    // These two are exclusive of L0.
-    return ReturnValue(0);
   /* TODO: Check regularly to see if support is enabled in OpenCL. Intel GPU
    * EU device-specific information extensions. Some of the queries are
    * enabled by cl_intel_device_attribute_query extension, but it's not yet in
    * the Registry. */
+  case UR_DEVICE_INFO_COMPONENT_DEVICES:
+  case UR_DEVICE_INFO_COMPOSITE_DEVICE:
   case UR_DEVICE_INFO_PCI_ADDRESS:
   case UR_DEVICE_INFO_GPU_EU_COUNT:
   case UR_DEVICE_INFO_GPU_EU_SIMD_WIDTH:

source/ur/ur.hpp

@@ -16,6 +16,7 @@
 #include <functional>
 #include <iostream>
 #include <mutex>
+#include <optional>
 #include <shared_mutex>
 #include <string>
 #include <thread>
@@ -263,6 +264,12 @@ getInfo<const char *>(size_t param_value_size, void *param_value,
   return getInfoArray(strlen(value) + 1, param_value_size, param_value,
                       param_value_size_ret, value);
 }
+
+inline ur_result_t getInfoEmpty(size_t param_value_size, void *param_value,
+                                size_t *param_value_size_ret) {
+  return getInfoImpl(param_value_size, param_value, param_value_size_ret, 0, 0,
+                     [](void *, int, size_t) {});
+}
 } // namespace ur
 
 class UrReturnHelper {
@@ -296,6 +303,12 @@ class UrReturnHelper {
                                         param_value_size_ret, t);
   }
 
+  // Special case when there is no return value
+  ur_result_t operator()(std::nullopt_t) {
+    return ur::getInfoEmpty(param_value_size, param_value,
+                            param_value_size_ret);
+  }
+
 protected:
   size_t param_value_size;
   void *param_value;