Skip to content

Commit 98ebdf5

Browse files
sarnexsarnex
committed
Rework change to not use experimental infrastructure
Signed-off-by: Sarnie, Nick <nick.sarnie@intel.com>
1 parent 76a5b09 commit 98ebdf5

File tree

9 files changed

+27
-95
lines changed

9 files changed

+27
-95
lines changed

‎include/ur.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -827,6 +827,8 @@ class ur_device_info_v(IntEnum):
827827
## is implementation-defined, but newer devices should have a higher
828828
## version than older devices.
829829
VIRTUAL_MEMORY_SUPPORT = 114 ## [::ur_bool_t] return true if the device supports virtual memory.
830+
ESIMD_SUPPORT = 115 ## [::ur_bool_t] returns true if the device supports ESIMD.
831+
830832
BINDLESS_IMAGES_SUPPORT_EXP = 0x2000 ## [::ur_bool_t] returns true if the device supports the creation of
831833
## bindless images
832834
BINDLESS_IMAGES_SHARED_USM_SUPPORT_EXP = 0x2001 ## [::ur_bool_t] returns true if the device supports the creation of

‎include/ur_api.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1454,6 +1454,7 @@ typedef enum ur_device_info_t {
14541454
///< is implementation-defined, but newer devices should have a higher
14551455
///< version than older devices.
14561456
UR_DEVICE_INFO_VIRTUAL_MEMORY_SUPPORT = 114, ///< [::ur_bool_t] return true if the device supports virtual memory.
1457+
UR_DEVICE_INFO_ESIMD_SUPPORT = 115, ///< [::ur_bool_t] returns true if the device supports ESIMD.
14571458
UR_DEVICE_INFO_BINDLESS_IMAGES_SUPPORT_EXP = 0x2000, ///< [::ur_bool_t] returns true if the device supports the creation of
14581459
///< bindless images
14591460
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 {
14861487
///< semaphore resources
14871488
UR_DEVICE_INFO_INTEROP_SEMAPHORE_EXPORT_SUPPORT_EXP = 0x200F, ///< [::ur_bool_t] returns true if the device supports exporting internal
14881489
///< event resources
1489-
UR_DEVICE_INFO_ESIMD_SUPPORT_EXP = 0x2010, ///< [::ur_bool_t] returns true if the device supports ESIMD
14901490
/// @cond
14911491
UR_DEVICE_INFO_FORCE_UINT32 = 0x7fffffff
14921492
/// @endcond
@@ -1512,7 +1512,7 @@ typedef enum ur_device_info_t {
15121512
/// - ::UR_RESULT_ERROR_INVALID_NULL_HANDLE
15131513
/// + `NULL == hDevice`
15141514
/// - ::UR_RESULT_ERROR_INVALID_ENUMERATION
1515-
/// + `::UR_DEVICE_INFO_ESIMD_SUPPORT_EXP < propName`
1515+
/// + `::UR_DEVICE_INFO_INTEROP_SEMAPHORE_EXPORT_SUPPORT_EXP < propName`
15161516
/// - ::UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION
15171517
/// + If `propName` is not supported by the adapter.
15181518
/// - ::UR_RESULT_ERROR_INVALID_SIZE

‎scripts/core/EXP-ESIMD.rst

Lines changed: 0 additions & 50 deletions
This file was deleted.

‎scripts/core/device.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -385,6 +385,8 @@ etors:
385385
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."
386386
- name: VIRTUAL_MEMORY_SUPPORT
387387
desc: "[$x_bool_t] return true if the device supports virtual memory."
388+
- name: ESIMD_SUPPORT
389+
desc: "[$x_bool_t] return true if the device supports ESIMD."
388390
--- #--------------------------------------------------------------------------
389391
type: function
390392
desc: "Retrieves various information about device"

‎scripts/core/exp-esimd.yml

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎source/common/ur_params.hpp

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2772,6 +2772,10 @@ inline std::ostream &operator<<(std::ostream &os, enum ur_device_info_t value) {
27722772
os << "UR_DEVICE_INFO_VIRTUAL_MEMORY_SUPPORT";
27732773
break;
27742774

2775+
case UR_DEVICE_INFO_ESIMD_SUPPORT:
2776+
os << "UR_DEVICE_INFO_ESIMD_SUPPORT";
2777+
break;
2778+
27752779
case UR_DEVICE_INFO_BINDLESS_IMAGES_SUPPORT_EXP:
27762780
os << "UR_DEVICE_INFO_BINDLESS_IMAGES_SUPPORT_EXP";
27772781
break;
@@ -2836,9 +2840,6 @@ inline std::ostream &operator<<(std::ostream &os, enum ur_device_info_t value) {
28362840
os << "UR_DEVICE_INFO_INTEROP_SEMAPHORE_EXPORT_SUPPORT_EXP";
28372841
break;
28382842

2839-
case UR_DEVICE_INFO_ESIMD_SUPPORT_EXP:
2840-
os << "UR_DEVICE_INFO_ESIMD_SUPPORT_EXP";
2841-
break;
28422843
default:
28432844
os << "unknown enumerator";
28442845
break;
@@ -4414,6 +4415,20 @@ inline void serializeTagged(std::ostream &os, const void *ptr,
44144415
os << ")";
44154416
} break;
44164417

4418+
case UR_DEVICE_INFO_ESIMD_SUPPORT: {
4419+
const ur_bool_t *tptr = (const ur_bool_t *)ptr;
4420+
if (sizeof(ur_bool_t) > size) {
4421+
os << "invalid size (is: " << size
4422+
<< ", expected: >=" << sizeof(ur_bool_t) << ")";
4423+
return;
4424+
}
4425+
os << (void *)(tptr) << " (";
4426+
4427+
os << *tptr;
4428+
4429+
os << ")";
4430+
} break;
4431+
44174432
case UR_DEVICE_INFO_BINDLESS_IMAGES_SUPPORT_EXP: {
44184433
const ur_bool_t *tptr = (const ur_bool_t *)ptr;
44194434
if (sizeof(ur_bool_t) > size) {
@@ -4637,20 +4652,6 @@ inline void serializeTagged(std::ostream &os, const void *ptr,
46374652

46384653
os << ")";
46394654
} break;
4640-
4641-
case UR_DEVICE_INFO_ESIMD_SUPPORT_EXP: {
4642-
const ur_bool_t *tptr = (const ur_bool_t *)ptr;
4643-
if (sizeof(ur_bool_t) > size) {
4644-
os << "invalid size (is: " << size
4645-
<< ", expected: >=" << sizeof(ur_bool_t) << ")";
4646-
return;
4647-
}
4648-
os << (void *)(tptr) << " (";
4649-
4650-
os << *tptr;
4651-
4652-
os << ")";
4653-
} break;
46544655
default:
46554656
os << "unknown enumerator";
46564657
break;

‎source/loader/layers/validation/ur_valddi.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -512,7 +512,7 @@ __urdlllocal ur_result_t UR_APICALL urDeviceGetInfo(
512512
return UR_RESULT_ERROR_INVALID_NULL_POINTER;
513513
}
514514

515-
if (UR_DEVICE_INFO_ESIMD_SUPPORT_EXP < propName) {
515+
if (UR_DEVICE_INFO_INTEROP_SEMAPHORE_EXPORT_SUPPORT_EXP < propName) {
516516
return UR_RESULT_ERROR_INVALID_ENUMERATION;
517517
}
518518

‎source/loader/ur_libapi.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -768,7 +768,7 @@ ur_result_t UR_APICALL urDeviceGet(
768768
/// - ::UR_RESULT_ERROR_INVALID_NULL_HANDLE
769769
/// + `NULL == hDevice`
770770
/// - ::UR_RESULT_ERROR_INVALID_ENUMERATION
771-
/// + `::UR_DEVICE_INFO_ESIMD_SUPPORT_EXP < propName`
771+
/// + `::UR_DEVICE_INFO_INTEROP_SEMAPHORE_EXPORT_SUPPORT_EXP < propName`
772772
/// - ::UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION
773773
/// + If `propName` is not supported by the adapter.
774774
/// - ::UR_RESULT_ERROR_INVALID_SIZE

‎source/ur_api.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ ur_result_t UR_APICALL urDeviceGet(
657657
/// - ::UR_RESULT_ERROR_INVALID_NULL_HANDLE
658658
/// + `NULL == hDevice`
659659
/// - ::UR_RESULT_ERROR_INVALID_ENUMERATION
660-
/// + `::UR_DEVICE_INFO_ESIMD_SUPPORT_EXP < propName`
660+
/// + `::UR_DEVICE_INFO_INTEROP_SEMAPHORE_EXPORT_SUPPORT_EXP < propName`
661661
/// - ::UR_RESULT_ERROR_UNSUPPORTED_ENUMERATION
662662
/// + If `propName` is not supported by the adapter.
663663
/// - ::UR_RESULT_ERROR_INVALID_SIZE

0 commit comments

Comments
 (0)