[SYCL] Fix exception thrown for composite_devices query (#13868)

The sycl_ext_oneapi_composite_device extension specifies that the
composite_devices query should throw if a device returns false for
device::has with ext_oneapi_is_composite. However, the current
implementation simply returns an empty device list if the backend of the
device is not L0. This commit fixes this discrepancy.

Signed-off-by: Larsen, Steffen <[email protected]>

Author: steffenlarsen

sycl/source/detail/device_impl.cpp

@@ -697,14 +697,14 @@ bool device_impl::has(aspect Aspect) const {
     if (getBackend() != backend::ext_oneapi_level_zero)
       return false;
 
-    typename sycl_to_pi<device>::type Result;
-    getPlugin()->call<PiApiKind::piDeviceGetInfo>(
-        getHandleRef(),
-        PiInfoCode<
-            ext::oneapi::experimental::info::device::composite_device>::value,
-        sizeof(Result), &Result, nullptr);
-
-    return Result != nullptr;
+    typename sycl_to_pi<device>::type Result = nullptr;
+    bool CallSuccessful = getPlugin()->call_nocheck<PiApiKind::piDeviceGetInfo>(
+                              getHandleRef(),
+                              PiInfoCode<ext::oneapi::experimental::info::
+                                             device::composite_device>::value,
+                              sizeof(Result), &Result, nullptr) == PI_SUCCESS;
+
+    return CallSuccessful && Result != nullptr;
   }
   case aspect::ext_oneapi_graph: {
     pi_bool SupportsCommandBufferUpdate = false;

sycl/source/detail/device_info.hpp

@@ -1235,8 +1235,6 @@ template <>
 struct get_device_info_impl<
     sycl::device, ext::oneapi::experimental::info::device::composite_device> {
   static sycl::device get(const DeviceImplPtr &Dev) {
-    if (Dev->getBackend() != backend::ext_oneapi_level_zero)
-      return {};
     if (!Dev->has(sycl::aspect::ext_oneapi_is_component))
       throw sycl::exception(make_error_code(errc::invalid),
                             "Only devices with aspect::ext_oneapi_is_component "

sycl/unittests/Extensions/CompositeDevice.cpp

@@ -64,6 +64,21 @@ pi_result after_piDeviceGetInfo(pi_device device, pi_device_info param_name,
   }
 }
 
+pi_result after_piDeviceGetInfo_unsupported(pi_device device,
+                                            pi_device_info param_name,
+                                            size_t param_value_size,
+                                            void *param_value,
+                                            size_t *param_value_size_ret) {
+  switch (param_name) {
+  case PI_EXT_ONEAPI_DEVICE_INFO_COMPOSITE_DEVICE:
+  case PI_EXT_ONEAPI_DEVICE_INFO_COMPONENT_DEVICES:
+    return PI_ERROR_UNSUPPORTED_FEATURE;
+
+  default:
+    return PI_SUCCESS;
+  }
+}
+
 thread_local std::vector<pi_device> DevicesUsedInContextCreation;
 
 pi_result after_piContextCreate(const pi_context_properties *,
@@ -141,3 +156,23 @@ TEST(CompositeDeviceTest, DescendentDeviceSupportInQueue) {
   // so there should be no errors during queue creation below.
   sycl::queue Queue(CompositeDevContext, ComponentDevice);
 }
+
+TEST(CompositeDeviceTest, UnsupportedNegative) {
+  // For the unsupported case, the backend does not need to be L0.
+  sycl::unittest::PiMock Mock;
+  Mock.redefine<sycl::detail::PiApiKind::piDevicesGet>(redefine_piDevicesGet);
+  Mock.redefineAfter<sycl::detail::PiApiKind::piDeviceGetInfo>(
+      after_piDeviceGetInfo_unsupported);
+
+  sycl::platform Plt = Mock.getPlatform();
+
+  sycl::device ComponentDevice = Plt.get_devices()[0];
+  ASSERT_FALSE(ComponentDevice.has(sycl::aspect::ext_oneapi_is_component));
+
+  try {
+    std::ignore = ComponentDevice.get_info<
+        sycl::ext::oneapi::experimental::info::device::composite_device>();
+  } catch (sycl::exception &E) {
+    ASSERT_EQ(E.code(), sycl::make_error_code(sycl::errc::invalid));
+  }
+}