Rework change to not use experimental infrastructure

Signed-off-by: Sarnie, Nick <nick.sarnie@intel.com>
oneapi-src · Aug 17, 2023 · 98ebdf5 · 98ebdf5
1 parent 76a5b09
commit 98ebdf5
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 95 deletions.
diff --git a/include/ur.py b/include/ur.py
@@ -827,6 +827,8 @@ class ur_device_info_v(IntEnum):
                                                     ## is implementation-defined, but newer devices should have a higher
                                                     ## version than older devices.
     VIRTUAL_MEMORY_SUPPORT = 114                    ## [::ur_bool_t] return true if the device supports virtual memory.
+    ESIMD_SUPPORT = 115                             ## [::ur_bool_t] returns true if the device supports ESIMD.
+
     BINDLESS_IMAGES_SUPPORT_EXP = 0x2000            ## [::ur_bool_t] returns true if the device supports the creation of
                                                     ## bindless images
     BINDLESS_IMAGES_SHARED_USM_SUPPORT_EXP = 0x2001 ## [::ur_bool_t] returns true if the device supports the creation of

diff --git a/include/ur_api.h b/include/ur_api.h
@@ -1454,6 +1454,7 @@ typedef enum ur_device_info_t {
                                                                     ///< is implementation-defined, but newer devices should have a higher
                                                                     ///< version than older devices.
     UR_DEVICE_INFO_VIRTUAL_MEMORY_SUPPORT = 114,                    ///< [::ur_bool_t] return true if the device supports virtual memory.
+    UR_DEVICE_INFO_ESIMD_SUPPORT = 115,                             ///< [::ur_bool_t] returns true if the device supports ESIMD.
     UR_DEVICE_INFO_BINDLESS_IMAGES_SUPPORT_EXP = 0x2000,            ///< [::ur_bool_t] returns true if the device supports the creation of
                                                                     ///< bindless images
     UR_DEVICE_INFO_BINDLESS_IMAGES_SHARED_USM_SUPPORT_EXP = 0x2001, ///< [::ur_bool_t] returns true if the device supports the creation of
@@ -1486,7 +1487,6 @@ typedef enum ur_device_info_t {
                                                                     ///< semaphore resources
     UR_DEVICE_INFO_INTEROP_SEMAPHORE_EXPORT_SUPPORT_EXP = 0x200F,   ///< [::ur_bool_t] returns true if the device supports exporting internal
                                                                     ///< event resources
-    UR_DEVICE_INFO_ESIMD_SUPPORT_EXP = 0x2010,                      ///< [::ur_bool_t] returns true if the device supports ESIMD
     /// @cond
     UR_DEVICE_INFO_FORCE_UINT32 = 0x7fffffff
     /// @endcond
@@ -1512,7 +1512,7 @@ typedef enum ur_device_info_t {
 ///     - ::UR_RESULT_ERROR_INVALID_NULL_HANDLE
 ///         + `NULL == hDevice`
 ///     - ::UR_RESULT_ERROR_INVALID_ENUMERATION
-///         + `::UR_DEVICE_INFO_ESIMD_SUPPORT_EXP < propName`
+///         + `::UR_DEVICE_INFO_INTEROP_SEMAPHORE_EXPORT_SUPPORT_EXP < propName`
 ///     - ::UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION
 ///         + If `propName` is not supported by the adapter.
 ///     - ::UR_RESULT_ERROR_INVALID_SIZE

diff --git a/scripts/core/EXP-ESIMD.rst b/scripts/core/EXP-ESIMD.rst
diff --git a/scripts/core/device.yml b/scripts/core/device.yml
@@ -385,6 +385,8 @@ etors:
       desc: "[uint32_t] The device IP version. The meaning of the device IP version is implementation-defined, but newer devices should have a higher version than older devices."
     - name: VIRTUAL_MEMORY_SUPPORT
       desc: "[$x_bool_t] return true if the device supports virtual memory."
+    - name: ESIMD_SUPPORT
+      desc: "[$x_bool_t] return true if the device supports ESIMD."
 --- #--------------------------------------------------------------------------
 type: function
 desc: "Retrieves various information about device"

diff --git a/scripts/core/exp-esimd.yml b/scripts/core/exp-esimd.yml
diff --git a/source/common/ur_params.hpp b/source/common/ur_params.hpp
@@ -2772,6 +2772,10 @@ inline std::ostream &operator<<(std::ostream &os, enum ur_device_info_t value) {
         os << "UR_DEVICE_INFO_VIRTUAL_MEMORY_SUPPORT";
         break;
 
+    case UR_DEVICE_INFO_ESIMD_SUPPORT:
+        os << "UR_DEVICE_INFO_ESIMD_SUPPORT";
+        break;
+
     case UR_DEVICE_INFO_BINDLESS_IMAGES_SUPPORT_EXP:
         os << "UR_DEVICE_INFO_BINDLESS_IMAGES_SUPPORT_EXP";
         break;
@@ -2836,9 +2840,6 @@ inline std::ostream &operator<<(std::ostream &os, enum ur_device_info_t value) {
         os << "UR_DEVICE_INFO_INTEROP_SEMAPHORE_EXPORT_SUPPORT_EXP";
         break;
 
-    case UR_DEVICE_INFO_ESIMD_SUPPORT_EXP:
-        os << "UR_DEVICE_INFO_ESIMD_SUPPORT_EXP";
-        break;
     default:
         os << "unknown enumerator";
         break;
@@ -4414,6 +4415,20 @@ inline void serializeTagged(std::ostream &os, const void *ptr,
         os << ")";
     } break;
 
+    case UR_DEVICE_INFO_ESIMD_SUPPORT: {
+        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;
+        }
+        os << (void *)(tptr) << " (";
+
+        os << *tptr;
+
+        os << ")";
+    } break;
+
     case UR_DEVICE_INFO_BINDLESS_IMAGES_SUPPORT_EXP: {
         const ur_bool_t *tptr = (const ur_bool_t *)ptr;
         if (sizeof(ur_bool_t) > size) {
@@ -4637,20 +4652,6 @@ inline void serializeTagged(std::ostream &os, const void *ptr,
 
         os << ")";
     } break;
-
-    case UR_DEVICE_INFO_ESIMD_SUPPORT_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;
-        }
-        os << (void *)(tptr) << " (";
-
-        os << *tptr;
-
-        os << ")";
-    } break;
     default:
         os << "unknown enumerator";
         break;

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

diff --git a/source/loader/ur_libapi.cpp b/source/loader/ur_libapi.cpp
@@ -768,7 +768,7 @@ ur_result_t UR_APICALL urDeviceGet(
 ///     - ::UR_RESULT_ERROR_INVALID_NULL_HANDLE
 ///         + `NULL == hDevice`
 ///     - ::UR_RESULT_ERROR_INVALID_ENUMERATION
-///         + `::UR_DEVICE_INFO_ESIMD_SUPPORT_EXP < propName`
+///         + `::UR_DEVICE_INFO_INTEROP_SEMAPHORE_EXPORT_SUPPORT_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
@@ -657,7 +657,7 @@ ur_result_t UR_APICALL urDeviceGet(
 ///     - ::UR_RESULT_ERROR_INVALID_NULL_HANDLE
 ///         + `NULL == hDevice`
 ///     - ::UR_RESULT_ERROR_INVALID_ENUMERATION
-///         + `::UR_DEVICE_INFO_ESIMD_SUPPORT_EXP < propName`
+///         + `::UR_DEVICE_INFO_INTEROP_SEMAPHORE_EXPORT_SUPPORT_EXP < propName`
 ///     - ::UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION
 ///         + If `propName` is not supported by the adapter.
 ///     - ::UR_RESULT_ERROR_INVALID_SIZE