@@ -2192,21 +2192,21 @@ typedef enum ur_usm_alloc_info_t {
21922192
21932193///////////////////////////////////////////////////////////////////////////////
21942194/// @brief USM memory advice
2195- typedef enum ur_mem_advice_t {
2196- UR_MEM_ADVICE_DEFAULT = 0 , ///< The USM memory advice is default
2197- UR_MEM_ADVICE_SET_READ_MOSTLY = 1 , ///< Hint that memory will be read from frequently and written to rarely
2198- UR_MEM_ADVICE_CLEAR_READ_MOSTLY = 2 , ///< Removes the affect of ::::UR_MEM_ADVICE_SET_READ_MOSTLY
2199- UR_MEM_ADVICE_SET_PREFERRED_LOCATION = 3 , ///< Hint that the preferred memory location is the specified device
2200- UR_MEM_ADVICE_CLEAR_PREFERRED_LOCATION = 4 , ///< Removes the affect of ::::UR_MEM_ADVICE_SET_PREFERRED_LOCATION
2201- UR_MEM_ADVICE_SET_NON_ATOMIC_MOSTLY = 5 , ///< Hints that memory will mostly be accessed non-atomically
2202- UR_MEM_ADVICE_CLEAR_NON_ATOMIC_MOSTLY = 6 , ///< Removes the affect of ::::UR_MEM_ADVICE_SET_NON_ATOMIC_MOSTLY
2203- UR_MEM_ADVICE_BIAS_CACHED = 7 , ///< Hints that memory should be cached
2204- UR_MEM_ADVICE_BIAS_UNCACHED = 8 , ///< Hints that memory should be not be cached
2195+ typedef enum ur_usm_advice_t {
2196+ UR_USM_ADVICE_DEFAULT = 0 , ///< The USM memory advice is default
2197+ UR_USM_ADVICE_SET_READ_MOSTLY = 1 , ///< Hint that memory will be read from frequently and written to rarely
2198+ UR_USM_ADVICE_CLEAR_READ_MOSTLY = 2 , ///< Removes the affect of ::::UR_USM_ADVICE_SET_READ_MOSTLY
2199+ UR_USM_ADVICE_SET_PREFERRED_LOCATION = 3 , ///< Hint that the preferred memory location is the specified device
2200+ UR_USM_ADVICE_CLEAR_PREFERRED_LOCATION = 4 , ///< Removes the affect of ::::UR_USM_ADVICE_SET_PREFERRED_LOCATION
2201+ UR_USM_ADVICE_SET_NON_ATOMIC_MOSTLY = 5 , ///< Hints that memory will mostly be accessed non-atomically
2202+ UR_USM_ADVICE_CLEAR_NON_ATOMIC_MOSTLY = 6 , ///< Removes the affect of ::::UR_USM_ADVICE_SET_NON_ATOMIC_MOSTLY
2203+ UR_USM_ADVICE_BIAS_CACHED = 7 , ///< Hints that memory should be cached
2204+ UR_USM_ADVICE_BIAS_UNCACHED = 8 , ///< Hints that memory should be not be cached
22052205 /// @cond
2206- UR_MEM_ADVICE_FORCE_UINT32 = 0x7fffffff
2206+ UR_USM_ADVICE_FORCE_UINT32 = 0x7fffffff
22072207 /// @endcond
22082208
2209- } ur_mem_advice_t ;
2209+ } ur_usm_advice_t ;
22102210
22112211///////////////////////////////////////////////////////////////////////////////
22122212/// @brief Handle of USM pool
@@ -2218,7 +2218,7 @@ typedef struct ur_usm_desc_t {
22182218 ur_structure_type_t stype ; ///< [in] type of this structure, must be ::UR_STRUCTURE_TYPE_USM_DESC
22192219 const void * pNext ; ///< [in][optional] pointer to extension-specific structure
22202220 ur_usm_flags_t flags ; ///< [in] memory allocation flags.
2221- ur_mem_advice_t hints ; ///< [in] Memory advice hints
2221+ ur_usm_advice_t hints ; ///< [in] Memory advice hints
22222222 uint32_t align ; ///< [in] memory advice hints.
22232223
22242224} ur_usm_desc_t ;
@@ -3783,7 +3783,7 @@ typedef enum ur_command_t {
37833783 UR_COMMAND_USM_FILL = 17 , ///< Event created by ::urEnqueueUSMFill
37843784 UR_COMMAND_USM_MEMCPY = 18 , ///< Event created by ::urEnqueueUSMMemcpy
37853785 UR_COMMAND_USM_PREFETCH = 19 , ///< Event created by ::urEnqueueUSMPrefetch
3786- UR_COMMAND_USM_MEM_ADVISE = 20 , ///< Event created by ::urEnqueueUSMMemAdvise
3786+ UR_COMMAND_USM_ADVISE = 20 , ///< Event created by ::urEnqueueUSMAdvise
37873787 UR_COMMAND_USM_FILL_2D = 21 , ///< Event created by ::urEnqueueUSMFill2D
37883788 UR_COMMAND_USM_MEMCPY_2D = 22 , ///< Event created by ::urEnqueueUSMMemcpy2D
37893789 UR_COMMAND_DEVICE_GLOBAL_VARIABLE_WRITE = 23 , ///< Event created by ::urEnqueueDeviceGlobalVariableWrite
@@ -4115,7 +4115,7 @@ typedef enum ur_function_t {
41154115 UR_FUNCTION_ENQUEUE_USM_FILL = 32 , ///< Enumerator for ::urEnqueueUSMFill
41164116 UR_FUNCTION_ENQUEUE_USM_MEMCPY = 33 , ///< Enumerator for ::urEnqueueUSMMemcpy
41174117 UR_FUNCTION_ENQUEUE_USM_PREFETCH = 34 , ///< Enumerator for ::urEnqueueUSMPrefetch
4118- UR_FUNCTION_ENQUEUE_USM_MEM_ADVISE = 35 , ///< Enumerator for ::urEnqueueUSMMemAdvise
4118+ UR_FUNCTION_ENQUEUE_USM_ADVISE = 35 , ///< Enumerator for ::urEnqueueUSMAdvise
41194119 UR_FUNCTION_ENQUEUE_USM_FILL2_D = 36 , ///< Enumerator for ::urEnqueueUSMFill2D
41204120 UR_FUNCTION_ENQUEUE_USM_MEMCPY2_D = 37 , ///< Enumerator for ::urEnqueueUSMMemcpy2D
41214121 UR_FUNCTION_ENQUEUE_DEVICE_GLOBAL_VARIABLE_WRITE = 38 , ///< Enumerator for ::urEnqueueDeviceGlobalVariableWrite
@@ -5117,7 +5117,7 @@ urEnqueueUSMPrefetch(
51175117/// - ::UR_RESULT_ERROR_INVALID_NULL_POINTER
51185118/// + `NULL == pMem`
51195119/// - ::UR_RESULT_ERROR_INVALID_ENUMERATION
5120- /// + `::UR_MEM_ADVICE_BIAS_UNCACHED < advice`
5120+ /// + `::UR_USM_ADVICE_BIAS_UNCACHED < advice`
51215121/// - ::UR_RESULT_ERROR_INVALID_QUEUE
51225122/// - ::UR_RESULT_ERROR_INVALID_EVENT
51235123/// - ::UR_RESULT_ERROR_INVALID_SIZE
@@ -5127,11 +5127,11 @@ urEnqueueUSMPrefetch(
51275127/// - ::UR_RESULT_ERROR_OUT_OF_HOST_MEMORY
51285128/// - ::UR_RESULT_ERROR_OUT_OF_RESOURCES
51295129UR_APIEXPORT ur_result_t UR_APICALL
5130- urEnqueueUSMMemAdvise (
5130+ urEnqueueUSMAdvise (
51315131 ur_queue_handle_t hQueue , ///< [in] handle of the queue object
51325132 const void * pMem , ///< [in] pointer to the USM memory object
51335133 size_t size , ///< [in] size in bytes to be advised
5134- ur_mem_advice_t advice , ///< [in] USM memory advice
5134+ ur_usm_advice_t advice , ///< [in] USM memory advice
51355135 ur_event_handle_t * phEvent ///< [out][optional] return an event object that identifies this particular
51365136 ///< command instance.
51375137);
@@ -7314,25 +7314,25 @@ typedef void(UR_APICALL *ur_pfnEnqueueUSMPrefetchCb_t)(
73147314 void * * ppTracerInstanceUserData );
73157315
73167316///////////////////////////////////////////////////////////////////////////////
7317- /// @brief Callback function parameters for urEnqueueUSMMemAdvise
7317+ /// @brief Callback function parameters for urEnqueueUSMAdvise
73187318/// @details Each entry is a pointer to the parameter passed to the function;
73197319/// allowing the callback the ability to modify the parameter's value
7320- typedef struct ur_enqueue_usm_mem_advise_params_t {
7320+ typedef struct ur_enqueue_usm_advise_params_t {
73217321 ur_queue_handle_t * phQueue ;
73227322 const void * * ppMem ;
73237323 size_t * psize ;
7324- ur_mem_advice_t * padvice ;
7324+ ur_usm_advice_t * padvice ;
73257325 ur_event_handle_t * * pphEvent ;
7326- } ur_enqueue_usm_mem_advise_params_t ;
7326+ } ur_enqueue_usm_advise_params_t ;
73277327
73287328///////////////////////////////////////////////////////////////////////////////
7329- /// @brief Callback function-pointer for urEnqueueUSMMemAdvise
7329+ /// @brief Callback function-pointer for urEnqueueUSMAdvise
73307330/// @param[in] params Parameters passed to this instance
73317331/// @param[in] result Return value
73327332/// @param[in] pTracerUserData Per-Tracer user data
73337333/// @param[in,out] ppTracerInstanceUserData Per-Tracer, Per-Instance user data
7334- typedef void (UR_APICALL * ur_pfnEnqueueUSMMemAdviseCb_t )(
7335- ur_enqueue_usm_mem_advise_params_t * params ,
7334+ typedef void (UR_APICALL * ur_pfnEnqueueUSMAdviseCb_t )(
7335+ ur_enqueue_usm_advise_params_t * params ,
73367336 ur_result_t result ,
73377337 void * pTracerUserData ,
73387338 void * * ppTracerInstanceUserData );
@@ -7475,7 +7475,7 @@ typedef struct ur_enqueue_callbacks_t {
74757475 ur_pfnEnqueueUSMFillCb_t pfnUSMFillCb ;
74767476 ur_pfnEnqueueUSMMemcpyCb_t pfnUSMMemcpyCb ;
74777477 ur_pfnEnqueueUSMPrefetchCb_t pfnUSMPrefetchCb ;
7478- ur_pfnEnqueueUSMMemAdviseCb_t pfnUSMMemAdviseCb ;
7478+ ur_pfnEnqueueUSMAdviseCb_t pfnUSMAdviseCb ;
74797479 ur_pfnEnqueueUSMFill2DCb_t pfnUSMFill2DCb ;
74807480 ur_pfnEnqueueUSMMemcpy2DCb_t pfnUSMMemcpy2DCb ;
74817481 ur_pfnEnqueueDeviceGlobalVariableWriteCb_t pfnDeviceGlobalVariableWriteCb ;
0 commit comments