align pi and ur api to use cast

Signed-off-by: Tikhomirova, Kseniya <[email protected]>

Author: KseniyaTikhomirova

sycl/include/sycl/detail/pi.h

@@ -1709,20 +1709,28 @@ __SYCL_EXPORT pi_result piEnqueueMemUnmap(pi_queue command_queue, pi_mem memobj,
                                           const pi_event *event_wait_list,
                                           pi_event *event);
 
+#ifndef PI_BIT
+#define PI_BIT(_i) (1 << _i)
+#endif // PI_BIT
+
 typedef enum {
-  PI_ACCESS_READ_WRITE,
-  PI_ACCESS_READ_ONLY,
-  PI_ACCESS_WRITE_ONLY
+  PI_ACCESS_READ_WRITE = PI_BIT(0),
+  PI_ACCESS_WRITE_ONLY = PI_BIT(1),
+  PI_ACCESS_READ_ONLY = PI_BIT(2)
 } _pi_mem_obj_access;
 using pi_mem_obj_access = _pi_mem_obj_access;
+typedef uint32_t pi_mem_access_flag;
 
-typedef enum { PI_KERNEL_ARG_MEM_OBJ_ACCESS } _pi_mem_obj_property_type;
+typedef enum {
+  PI_KERNEL_ARG_MEM_OBJ_ACCESS = 29,
+  PI_ENUM_FORCE_UINT32 = 0x7fffffff
+} _pi_mem_obj_property_type;
 using pi_mem_obj_property_type = _pi_mem_obj_property_type;
 
 typedef struct {
   pi_mem_obj_property_type type;
   void *pNext;
-  _pi_mem_obj_access mem_access;
+  pi_mem_access_flag mem_access;
 } _pi_mem_obj_property;
 using pi_mem_obj_property = _pi_mem_obj_property;
 

sycl/plugins/unified_runtime/pi2ur.hpp

@@ -1926,23 +1926,33 @@ piextKernelSetArgMemObj(pi_kernel Kernel, pi_uint32 ArgIndex,
   // to process it later when the device is known (at the kernel enqueue).
   //
   ur_kernel_handle_t UrKernel = reinterpret_cast<ur_kernel_handle_t>(Kernel);
-  if (ArgProperties) {
-    assert(ArgProperties->type == PI_KERNEL_ARG_MEM_OBJ_ACCESS);
-    ur_kernel_arg_mem_obj_properties_t UrMemProperties{};
-    UrMemProperties.stype = UR_STRUCTURE_TYPE_KERNEL_ARG_MEM_OBJ_PROPERTIES;
-    switch (ArgProperties->mem_access) {
-    case PI_ACCESS_READ_ONLY:
-      UrMemProperties.memoryAccess = UR_MEM_FLAG_READ_ONLY;
-      break;
-    case PI_ACCESS_WRITE_ONLY:
-      UrMemProperties.memoryAccess = UR_MEM_FLAG_WRITE_ONLY;
-      break;
-    case PI_ACCESS_READ_WRITE:
-      UrMemProperties.memoryAccess = UR_MEM_FLAG_READ_WRITE;
-      break;
-    }
+  // the only applicable type, just ignore anything else
+  if (ArgProperties && ArgProperties->type == PI_KERNEL_ARG_MEM_OBJ_ACCESS) {
+    // following structure layout checks to be replaced with
+    // std::is_layout_compatible after move to C++20
+    static_assert(sizeof(pi_mem_obj_property) ==
+                  sizeof(ur_kernel_arg_mem_obj_properties_t));
+    static_assert(sizeof(pi_mem_obj_property::type) ==
+                  sizeof(ur_kernel_arg_mem_obj_properties_t::stype));
+    static_assert(sizeof(pi_mem_obj_property::pNext) ==
+                  sizeof(ur_kernel_arg_mem_obj_properties_t::pNext));
+    static_assert(sizeof(pi_mem_obj_property::mem_access) ==
+                  sizeof(ur_kernel_arg_mem_obj_properties_t::memoryAccess));
+
+    static_assert(uint32_t(PI_ACCESS_READ_WRITE) ==
+                  uint32_t(UR_MEM_FLAG_READ_WRITE));
+    static_assert(uint32_t(PI_ACCESS_READ_ONLY) ==
+                  uint32_t(UR_MEM_FLAG_READ_ONLY));
+    static_assert(uint32_t(PI_ACCESS_WRITE_ONLY) ==
+                  uint32_t(UR_MEM_FLAG_WRITE_ONLY));
+    static_assert(uint32_t(PI_KERNEL_ARG_MEM_OBJ_ACCESS) ==
+                  uint32_t(UR_STRUCTURE_TYPE_KERNEL_ARG_MEM_OBJ_PROPERTIES));
+
+    const ur_kernel_arg_mem_obj_properties_t *UrMemProperties =
+        reinterpret_cast<const ur_kernel_arg_mem_obj_properties_t *>(
+            ArgProperties);
     HANDLE_ERRORS(
-        urKernelSetArgMemObj(UrKernel, ArgIndex, &UrMemProperties, UrMemory));
+        urKernelSetArgMemObj(UrKernel, ArgIndex, UrMemProperties, UrMemory));
   } else {
     HANDLE_ERRORS(urKernelSetArgMemObj(UrKernel, ArgIndex, nullptr, UrMemory));
   }