[SYCL] Removes any knowledge of specific memory advices from PI API.

Signed-off-by: Sergey V Maslov <[email protected]>

Author: smaslov-intel

sycl/include/CL/sycl/detail/pi.h

@@ -388,27 +388,6 @@ typedef enum {
   PI_MEM_TYPE_IMAGE1D_BUFFER = CL_MEM_OBJECT_IMAGE1D_BUFFER
 } _pi_mem_type;
 
-typedef enum {
-  PI_MEM_ADVICE_SET_READ_MOSTLY = 0,    ///< hints that memory will be read from
-                                        ///< frequently and written to rarely
-  PI_MEM_ADVICE_CLEAR_READ_MOSTLY,      ///< removes the affect of
-                                        ///< PI_MEM_ADVICE_SET_READ_MOSTLY
-  PI_MEM_ADVICE_SET_PREFERRED_LOCATION, ///< hints that the preferred memory
-                                        ///< location is the specified device
-  PI_MEM_ADVICE_CLEAR_PREFERRED_LOCATION, ///< removes the affect of
-                                          ///< PI_MEM_ADVICE_SET_PREFERRED_LOCATION
-  PI_MEM_ADVICE_SET_ACCESSED_BY, ///< hints that memory will be accessed by the
-                                 ///< specified device
-  PI_MEM_ADVICE_CLEAR_ACCESSED_BY,       ///< removes the affect of
-                                         ///< PI_MEM_ADVICE_SET_ACCESSED_BY
-  PI_MEM_ADVICE_SET_NON_ATOMIC_MOSTLY,   ///< hints that memory will mostly be
-                                         ///< accessed non-atomically
-  PI_MEM_ADVICE_CLEAR_NON_ATOMIC_MOSTLY, ///< removes the affect of
-                                         ///< PI_MEM_ADVICE_SET_NON_ATOMIC_MOSTLY
-  PI_MEM_ADVICE_BIAS_CACHED,  ///< hints that memory should be cached
-  PI_MEM_ADVICE_BIAS_UNCACHED ///< hints that memory should not be cached
-} _pi_mem_advice;
-
 typedef enum {
   PI_IMAGE_CHANNEL_ORDER_A = CL_A,
   PI_IMAGE_CHANNEL_ORDER_R = CL_R,
@@ -538,7 +517,7 @@ using pi_fp_capabilities = _pi_fp_capabilities;
 using pi_event_info = _pi_event_info;
 using pi_command_type = _pi_command_type;
 using pi_mem_type = _pi_mem_type;
-using pi_mem_advice = _pi_mem_advice;
+using pi_mem_advice = pi_int32;
 using pi_image_channel_order = _pi_image_channel_order;
 using pi_image_channel_type = _pi_image_channel_type;
 using pi_buffer_create_type = _pi_buffer_create_type;

sycl/plugins/level_zero/pi_level_zero.cpp

@@ -4686,36 +4686,7 @@ pi_result piextUSMEnqueueMemAdvise(pi_queue Queue, const void *Ptr,
   // Lock automatically releases when this goes out of scope.
   std::lock_guard<std::mutex> lock(Queue->PiQueueMutex);
 
-  ze_memory_advice_t ZeAdvice = {};
-  switch (Advice) {
-  case PI_MEM_ADVICE_SET_READ_MOSTLY:
-    ZeAdvice = ZE_MEMORY_ADVICE_SET_READ_MOSTLY;
-    break;
-  case PI_MEM_ADVICE_CLEAR_READ_MOSTLY:
-    ZeAdvice = ZE_MEMORY_ADVICE_CLEAR_READ_MOSTLY;
-    break;
-  case PI_MEM_ADVICE_SET_PREFERRED_LOCATION:
-    ZeAdvice = ZE_MEMORY_ADVICE_SET_PREFERRED_LOCATION;
-    break;
-  case PI_MEM_ADVICE_CLEAR_PREFERRED_LOCATION:
-    ZeAdvice = ZE_MEMORY_ADVICE_CLEAR_PREFERRED_LOCATION;
-    break;
-  case PI_MEM_ADVICE_SET_NON_ATOMIC_MOSTLY:
-    ZeAdvice = ZE_MEMORY_ADVICE_SET_NON_ATOMIC_MOSTLY;
-    break;
-  case PI_MEM_ADVICE_CLEAR_NON_ATOMIC_MOSTLY:
-    ZeAdvice = ZE_MEMORY_ADVICE_CLEAR_NON_ATOMIC_MOSTLY;
-    break;
-  case PI_MEM_ADVICE_BIAS_CACHED:
-    ZeAdvice = ZE_MEMORY_ADVICE_BIAS_CACHED;
-    break;
-  case PI_MEM_ADVICE_BIAS_UNCACHED:
-    ZeAdvice = ZE_MEMORY_ADVICE_BIAS_UNCACHED;
-    break;
-  default:
-    zePrint("piextUSMEnqueueMemAdvise: unexpected memory advise\n");
-    return PI_INVALID_VALUE;
-  }
+  auto ZeAdvice = pi_cast<ze_memory_advice_t>(Advice);
 
   // Get a new command list to be used on this call
   ze_command_list_handle_t ZeCommandList = nullptr;