Revert aspect queries to call_nocheck

codeplaysoftware · Apr 9, 2024 · ff907c2 · ff907c2
1 parent 54d1812
commit ff907c2
Showing 1 changed file with 33 additions and 24 deletions.
diff --git a/sycl/source/detail/device_impl.cpp b/sycl/source/detail/device_impl.cpp
@@ -584,45 +584,54 @@ bool device_impl::has(aspect Aspect) const {
   }
   case aspect::ext_oneapi_bindless_sampled_image_fetch_1d_usm: {
     pi_bool support = PI_FALSE;
-    getPlugin()->call<detail::PiApiKind::piDeviceGetInfo>(
-        MDevice, PI_EXT_ONEAPI_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_1D_USM,
-        sizeof(pi_bool), &support, nullptr);
-    return support;
+    bool call_successful =
+        getPlugin()->call_nocheck<detail::PiApiKind::piDeviceGetInfo>(
+            MDevice,
+            PI_EXT_ONEAPI_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_1D_USM,
+            sizeof(pi_bool), &support, nullptr) == PI_SUCCESS;
+    return call_successful && support;
   }
   case aspect::ext_oneapi_bindless_sampled_image_fetch_1d: {
     pi_bool support = PI_FALSE;
-    getPlugin()->call<detail::PiApiKind::piDeviceGetInfo>(
-        MDevice, PI_EXT_ONEAPI_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_1D,
-        sizeof(pi_bool), &support, nullptr);
-    return support;
+    bool call_successful =
+        getPlugin()->call_nocheck<detail::PiApiKind::piDeviceGetInfo>(
+            MDevice, PI_EXT_ONEAPI_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_1D,
+            sizeof(pi_bool), &support, nullptr) == PI_SUCCESS;
+    return call_successful && support;
   }
   case aspect::ext_oneapi_bindless_sampled_image_fetch_2d_usm: {
     pi_bool support = PI_FALSE;
-    getPlugin()->call<detail::PiApiKind::piDeviceGetInfo>(
-        MDevice, PI_EXT_ONEAPI_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_2D_USM,
-        sizeof(pi_bool), &support, nullptr);
-    return support;
+    bool call_successful =
+        getPlugin()->call_nocheck<detail::PiApiKind::piDeviceGetInfo>(
+            MDevice,
+            PI_EXT_ONEAPI_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_2D_USM,
+            sizeof(pi_bool), &support, nullptr) == PI_SUCCESS;
+    return call_successful && support;
   }
   case aspect::ext_oneapi_bindless_sampled_image_fetch_2d: {
     pi_bool support = PI_FALSE;
-    getPlugin()->call<detail::PiApiKind::piDeviceGetInfo>(
-        MDevice, PI_EXT_ONEAPI_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_2D,
-        sizeof(pi_bool), &support, nullptr);
-    return support;
+    bool call_successful =
+        getPlugin()->call_nocheck<detail::PiApiKind::piDeviceGetInfo>(
+            MDevice, PI_EXT_ONEAPI_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_2D,
+            sizeof(pi_bool), &support, nullptr) == PI_SUCCESS;
+    return call_successful && support;
   }
   case aspect::ext_oneapi_bindless_sampled_image_fetch_3d_usm: {
     pi_bool support = PI_FALSE;
-    getPlugin()->call<detail::PiApiKind::piDeviceGetInfo>(
-        MDevice, PI_EXT_ONEAPI_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_3D_USM,
-        sizeof(pi_bool), &support, nullptr);
-    return support;
+    bool call_successful =
+        getPlugin()->call_nocheck<detail::PiApiKind::piDeviceGetInfo>(
+            MDevice,
+            PI_EXT_ONEAPI_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_3D_USM,
+            sizeof(pi_bool), &support, nullptr) == PI_SUCCESS;
+    return call_successful && support;
   }
   case aspect::ext_oneapi_bindless_sampled_image_fetch_3d: {
     pi_bool support = PI_FALSE;
-    getPlugin()->call<detail::PiApiKind::piDeviceGetInfo>(
-        MDevice, PI_EXT_ONEAPI_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_3D,
-        sizeof(pi_bool), &support, nullptr);
-    return support;
+    bool call_successful =
+        getPlugin()->call_nocheck<detail::PiApiKind::piDeviceGetInfo>(
+            MDevice, PI_EXT_ONEAPI_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_3D,
+            sizeof(pi_bool), &support, nullptr) == PI_SUCCESS;
+    return call_successful && support;
   }
   case aspect::ext_intel_esimd: {
     pi_bool support = PI_FALSE;