[Bindless][Exp] Add device queries for sampled image fetch

Added the following queries for device capabilities of fetching sampled images: - DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_1D_USM_EXP - DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_1D_EXP - DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_2D_USM_EXP - DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_2D_EXP - DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_3D_USM_EXP - DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_3D_EXP
oneapi-src · Apr 10, 2024 · 21f023f · 21f023f
1 parent ac89abf
commit 21f023f
Show file tree

Hide file tree

Showing 9 changed files with 369 additions and 199 deletions.
diff --git a/include/ur_api.h b/include/ur_api.h
diff --git a/include/ur_print.hpp b/include/ur_print.hpp
@@ -2562,6 +2562,24 @@ inline std::ostream &operator<<(std::ostream &os, enum ur_device_info_t value) {
  case UR_DEVICE_INFO_CUBEMAP_SEAMLESS_FILTERING_SUPPORT_EXP:
  os << "UR_DEVICE_INFO_CUBEMAP_SEAMLESS_FILTERING_SUPPORT_EXP";
  break;
+ case UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_1D_USM_EXP:
+ os << "UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_1D_USM_EXP";
+ break;
+ case UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_1D_EXP:
+ os << "UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_1D_EXP";
+ break;
+ case UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_2D_USM_EXP:
+ os << "UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_2D_USM_EXP";
+ break;
+ case UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_2D_EXP:
+ os << "UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_2D_EXP";
+ break;
+ case UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_3D_USM_EXP:
+ os << "UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_3D_USM_EXP";
+ break;
+ case UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_3D_EXP:
+ os << "UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_3D_EXP";
+ break;
  default:
  os << "unknown enumerator";
  break;
@@ -4190,6 +4208,78 @@ inline ur_result_t printTagged(std::ostream &os, const void *ptr, ur_device_info
 
  os << ")";
  } break;
+ case UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_1D_USM_EXP: {
+ const ur_bool_t *tptr = (const ur_bool_t *)ptr;
+ if (sizeof(ur_bool_t) > size) {
+ os << "invalid size (is: " << size << ", expected: >=" << sizeof(ur_bool_t) << ")";
+ return UR_RESULT_ERROR_INVALID_SIZE;
+ }
+ os << (const void *)(tptr) << " (";
+
+ os << *tptr;
+
+ os << ")";
+ } break;
+ case UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_1D_EXP: {
+ const ur_bool_t *tptr = (const ur_bool_t *)ptr;
+ if (sizeof(ur_bool_t) > size) {
+ os << "invalid size (is: " << size << ", expected: >=" << sizeof(ur_bool_t) << ")";
+ return UR_RESULT_ERROR_INVALID_SIZE;
+ }
+ os << (const void *)(tptr) << " (";
+
+ os << *tptr;
+
+ os << ")";
+ } break;
+ case UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_2D_USM_EXP: {
+ const ur_bool_t *tptr = (const ur_bool_t *)ptr;
+ if (sizeof(ur_bool_t) > size) {
+ os << "invalid size (is: " << size << ", expected: >=" << sizeof(ur_bool_t) << ")";
+ return UR_RESULT_ERROR_INVALID_SIZE;
+ }
+ os << (const void *)(tptr) << " (";
+
+ os << *tptr;
+
+ os << ")";
+ } break;
+ case UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_2D_EXP: {
+ const ur_bool_t *tptr = (const ur_bool_t *)ptr;
+ if (sizeof(ur_bool_t) > size) {
+ os << "invalid size (is: " << size << ", expected: >=" << sizeof(ur_bool_t) << ")";
+ return UR_RESULT_ERROR_INVALID_SIZE;
+ }
+ os << (const void *)(tptr) << " (";
+
+ os << *tptr;
+
+ os << ")";
+ } break;
+ case UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_3D_USM_EXP: {
+ const ur_bool_t *tptr = (const ur_bool_t *)ptr;
+ if (sizeof(ur_bool_t) > size) {
+ os << "invalid size (is: " << size << ", expected: >=" << sizeof(ur_bool_t) << ")";
+ return UR_RESULT_ERROR_INVALID_SIZE;
+ }
+ os << (const void *)(tptr) << " (";
+
+ os << *tptr;
+
+ os << ")";
+ } break;
+ case UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_3D_EXP: {
+ const ur_bool_t *tptr = (const ur_bool_t *)ptr;
+ if (sizeof(ur_bool_t) > size) {
+ os << "invalid size (is: " << size << ", expected: >=" << sizeof(ur_bool_t) << ")";
+ return UR_RESULT_ERROR_INVALID_SIZE;
+ }
+ os << (const void *)(tptr) << " (";
+
+ os << *tptr;
+
+ os << ")";
+ } break;
  default:
  os << "unknown enumerator";
  return UR_RESULT_ERROR_INVALID_ENUMERATION;

diff --git a/scripts/core/EXP-BINDLESS-IMAGES.rst b/scripts/core/EXP-BINDLESS-IMAGES.rst
@@ -91,6 +91,12 @@ Enums
  * ${X}_DEVICE_INFO_INTEROP_SEMAPHORE_EXPORT_SUPPORT_EXP
  * ${X}_DEVICE_INFO_CUBEMAP_SUPPORT_EXP
  * ${X}_DEVICE_INFO_CUBEMAP_SEAMLESS_FILTERING_SUPPORT_EXP
+ * ${X}_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_1D_USM_EXP
+ * ${X}_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_1D_EXP
+ * ${X}_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_2D_USM_EXP
+ * ${X}_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_2D_EXP
+ * ${X}_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_3D_USM_EXP
+ * ${X}_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_3D_EXP
 
 * ${x}_command_t
  * ${X}_COMMAND_INTEROP_SEMAPHORE_WAIT_EXP
@@ -198,6 +204,8 @@ Changelog
 +------------------------------------------------------------------------+
 | 10.0 | Added cubemap image type, sampling properties, and device |
 | | queries. |
++------------------------------------------------------------------------+
+| 11.0 | Added device queries for sampled image fetch capabilities. |
 +----------+-------------------------------------------------------------+
 
 Contributors

diff --git a/scripts/core/exp-bindless-images.yml b/scripts/core/exp-bindless-images.yml
@@ -92,6 +92,24 @@ etors:
  - name: CUBEMAP_SEAMLESS_FILTERING_SUPPORT_EXP
  value: "0x2011"
  desc: "[$x_bool_t] returns true if the device supports sampling cubemapped images across face boundaries"
+ - name: BINDLESS_SAMPLED_IMAGE_FETCH_1D_USM_EXP
+ value: "0x2012"
+ desc: "[$x_bool_t] returns true if the device is capable of fetching USM backed 1D sampled image data."
+ - name: BINDLESS_SAMPLED_IMAGE_FETCH_1D_EXP
+ value: "0x2013"
+ desc: "[$x_bool_t] returns true if the device is capable of fetching non-USM backed 1D sampled image data."
+ - name: BINDLESS_SAMPLED_IMAGE_FETCH_2D_USM_EXP
+ value: "0x2014"
+ desc: "[$x_bool_t] returns true if the device is capable of fetching USM backed 2D sampled image data."
+ - name: BINDLESS_SAMPLED_IMAGE_FETCH_2D_EXP
+ value: "0x2015"
+ desc: "[$x_bool_t] returns true if the device is capable of fetching non-USM backed 2D sampled image data."
+ - name: BINDLESS_SAMPLED_IMAGE_FETCH_3D_USM_EXP
+ value: "0x2016"
+ desc: "[$x_bool_t] returns true if the device is capable of fetching USM backed 3D sampled image data."
+ - name: BINDLESS_SAMPLED_IMAGE_FETCH_3D_EXP
+ value: "0x2017"
+ desc: "[$x_bool_t] returns true if the device is capable of fetching non-USM backed 3D sampled image data."
 --- #--------------------------------------------------------------------------
 type: enum
 extend: true

diff --git a/source/adapters/cuda/device.cpp b/source/adapters/cuda/device.cpp
@@ -925,6 +925,30 @@ UR_APIEXPORT ur_result_t UR_APICALL urDeviceGetInfo(ur_device_handle_t hDevice,
  // CUDA supports cubemap seamless filtering.
  return ReturnValue(true);
  }
+ case UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_1D_USM_EXP: {
+ // CUDA does support fetching 1D USM sampled image data.
+ return ReturnValue(true);
+ }
+ case UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_1D_EXP: {
+ // CUDA does not support fetching 1D non-USM sampled image data.
+ return ReturnValue(false);
+ }
+ case UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_2D_USM_EXP: {
+ // CUDA does support fetching 2D USM sampled image data.
+ return ReturnValue(true);
+ }
+ case UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_2D_EXP: {
+ // CUDA does support fetching 2D non-USM sampled image data.
+ return ReturnValue(true);
+ }
+ case UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_3D_USM_EXP: {
+ // CUDA does not support 3D USM sampled textures
+ return ReturnValue(false);
+ }
+ case UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_3D_EXP: {
+ // CUDA does support fetching 3D non-USM sampled image data.
+ return ReturnValue(true);
+ }
  case UR_DEVICE_INFO_DEVICE_ID: {
  int Value = 0;
  UR_CHECK_ERROR(cuDeviceGetAttribute(

diff --git a/source/loader/layers/validation/ur_valddi.cpp b/source/loader/layers/validation/ur_valddi.cpp
@@ -496,7 +496,7 @@ __urdlllocal ur_result_t UR_APICALL urDeviceGetInfo(
  return UR_RESULT_ERROR_INVALID_NULL_POINTER;
  }
 
- if (UR_DEVICE_INFO_CUBEMAP_SEAMLESS_FILTERING_SUPPORT_EXP < propName) {
+ if (UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_3D_EXP < propName) {
  return UR_RESULT_ERROR_INVALID_ENUMERATION;
  }
 

diff --git a/source/loader/ur_libapi.cpp b/source/loader/ur_libapi.cpp
@@ -842,7 +842,7 @@ ur_result_t UR_APICALL urDeviceGetSelected(
 /// - ::UR_RESULT_ERROR_INVALID_NULL_HANDLE
 /// + `NULL == hDevice`
 /// - ::UR_RESULT_ERROR_INVALID_ENUMERATION
-/// + `::UR_DEVICE_INFO_CUBEMAP_SEAMLESS_FILTERING_SUPPORT_EXP < propName`
+/// + `::UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_3D_EXP < propName`
 /// - ::UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION
 /// + If `propName` is not supported by the adapter.
 /// - ::UR_RESULT_ERROR_INVALID_SIZE

diff --git a/source/ur_api.cpp b/source/ur_api.cpp
@@ -736,7 +736,7 @@ ur_result_t UR_APICALL urDeviceGetSelected(
 /// - ::UR_RESULT_ERROR_INVALID_NULL_HANDLE
 /// + `NULL == hDevice`
 /// - ::UR_RESULT_ERROR_INVALID_ENUMERATION
-/// + `::UR_DEVICE_INFO_CUBEMAP_SEAMLESS_FILTERING_SUPPORT_EXP < propName`
+/// + `::UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_3D_EXP < propName`
 /// - ::UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION
 /// + If `propName` is not supported by the adapter.
 /// - ::UR_RESULT_ERROR_INVALID_SIZE

diff --git a/tools/urinfo/urinfo.hpp b/tools/urinfo/urinfo.hpp
@@ -383,5 +383,23 @@ inline void printDeviceInfos(ur_device_handle_t hDevice,
  std::cout << prefix;
  printDeviceInfo<ur_bool_t>(
  hDevice, UR_DEVICE_INFO_CUBEMAP_SEAMLESS_FILTERING_SUPPORT_EXP);
+ std::cout << prefix;
+ printDeviceInfo<ur_bool_t>(
+ hDevice, UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_1D_USM_EXP);
+ std::cout << prefix;
+ printDeviceInfo<ur_bool_t>(
+ hDevice, UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_1D_EXP);
+ std::cout << prefix;
+ printDeviceInfo<ur_bool_t>(
+ hDevice, UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_2D_USM_EXP);
+ std::cout << prefix;
+ printDeviceInfo<ur_bool_t>(
+ hDevice, UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_2D_EXP);
+ std::cout << prefix;
+ printDeviceInfo<ur_bool_t>(
+ hDevice, UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_3D_USM_EXP);
+ std::cout << prefix;
+ printDeviceInfo<ur_bool_t>(
+ hDevice, UR_DEVICE_INFO_BINDLESS_SAMPLED_IMAGE_FETCH_3D_EXP);
 }
 } // namespace urinfo