@@ -2199,21 +2199,21 @@ typedef enum ur_usm_alloc_info_t {
21992199
22002200///////////////////////////////////////////////////////////////////////////////
22012201/// @brief USM memory advice
2202- typedef enum ur_mem_advice_t {
2203- UR_MEM_ADVICE_DEFAULT = 0 , ///< The USM memory advice is default
2204- UR_MEM_ADVICE_SET_READ_MOSTLY = 1 , ///< Hint that memory will be read from frequently and written to rarely
2205- UR_MEM_ADVICE_CLEAR_READ_MOSTLY = 2 , ///< Removes the affect of ::::UR_MEM_ADVICE_SET_READ_MOSTLY
2206- UR_MEM_ADVICE_SET_PREFERRED_LOCATION = 3 , ///< Hint that the preferred memory location is the specified device
2207- UR_MEM_ADVICE_CLEAR_PREFERRED_LOCATION = 4 , ///< Removes the affect of ::::UR_MEM_ADVICE_SET_PREFERRED_LOCATION
2208- UR_MEM_ADVICE_SET_NON_ATOMIC_MOSTLY = 5 , ///< Hints that memory will mostly be accessed non-atomically
2209- UR_MEM_ADVICE_CLEAR_NON_ATOMIC_MOSTLY = 6 , ///< Removes the affect of ::::UR_MEM_ADVICE_SET_NON_ATOMIC_MOSTLY
2210- UR_MEM_ADVICE_BIAS_CACHED = 7 , ///< Hints that memory should be cached
2211- UR_MEM_ADVICE_BIAS_UNCACHED = 8 , ///< Hints that memory should be not be cached
2202+ typedef enum ur_usm_advice_t {
2203+ UR_USM_ADVICE_DEFAULT = 0 , ///< The USM memory advice is default
2204+ UR_USM_ADVICE_SET_READ_MOSTLY = 1 , ///< Hint that memory will be read from frequently and written to rarely
2205+ UR_USM_ADVICE_CLEAR_READ_MOSTLY = 2 , ///< Removes the affect of ::::UR_USM_ADVICE_SET_READ_MOSTLY
2206+ UR_USM_ADVICE_SET_PREFERRED_LOCATION = 3 , ///< Hint that the preferred memory location is the specified device
2207+ UR_USM_ADVICE_CLEAR_PREFERRED_LOCATION = 4 , ///< Removes the affect of ::::UR_USM_ADVICE_SET_PREFERRED_LOCATION
2208+ UR_USM_ADVICE_SET_NON_ATOMIC_MOSTLY = 5 , ///< Hints that memory will mostly be accessed non-atomically
2209+ UR_USM_ADVICE_CLEAR_NON_ATOMIC_MOSTLY = 6 , ///< Removes the affect of ::::UR_USM_ADVICE_SET_NON_ATOMIC_MOSTLY
2210+ UR_USM_ADVICE_BIAS_CACHED = 7 , ///< Hints that memory should be cached
2211+ UR_USM_ADVICE_BIAS_UNCACHED = 8 , ///< Hints that memory should be not be cached
22122212 /// @cond
2213- UR_MEM_ADVICE_FORCE_UINT32 = 0x7fffffff
2213+ UR_USM_ADVICE_FORCE_UINT32 = 0x7fffffff
22142214 /// @endcond
22152215
2216- } ur_mem_advice_t ;
2216+ } ur_usm_advice_t ;
22172217
22182218///////////////////////////////////////////////////////////////////////////////
22192219/// @brief Handle of USM pool
@@ -2225,7 +2225,7 @@ typedef struct ur_usm_desc_t {
22252225 ur_structure_type_t stype ; ///< [in] type of this structure, must be ::UR_STRUCTURE_TYPE_USM_DESC
22262226 const void * pNext ; ///< [in][optional] pointer to extension-specific structure
22272227 ur_usm_flags_t flags ; ///< [in] memory allocation flags.
2228- ur_mem_advice_t hints ; ///< [in] Memory advice hints
2228+ ur_usm_advice_t hints ; ///< [in] Memory advice hints
22292229 uint32_t align ; ///< [in] memory advice hints.
22302230
22312231} ur_usm_desc_t ;
@@ -3788,7 +3788,7 @@ typedef enum ur_command_t {
37883788 UR_COMMAND_USM_FILL = 17 , ///< Event created by ::urEnqueueUSMFill
37893789 UR_COMMAND_USM_MEMCPY = 18 , ///< Event created by ::urEnqueueUSMMemcpy
37903790 UR_COMMAND_USM_PREFETCH = 19 , ///< Event created by ::urEnqueueUSMPrefetch
3791- UR_COMMAND_USM_MEM_ADVISE = 20 , ///< Event created by ::urEnqueueUSMMemAdvise
3791+ UR_COMMAND_USM_ADVISE = 20 , ///< Event created by ::urEnqueueUSMAdvise
37923792 UR_COMMAND_USM_FILL_2D = 21 , ///< Event created by ::urEnqueueUSMFill2D
37933793 UR_COMMAND_USM_MEMCPY_2D = 22 , ///< Event created by ::urEnqueueUSMMemcpy2D
37943794 UR_COMMAND_DEVICE_GLOBAL_VARIABLE_WRITE = 23 , ///< Event created by ::urEnqueueDeviceGlobalVariableWrite
@@ -4123,7 +4123,7 @@ typedef enum ur_function_t {
41234123 UR_FUNCTION_ENQUEUE_USM_FILL = 32 , ///< Enumerator for ::urEnqueueUSMFill
41244124 UR_FUNCTION_ENQUEUE_USM_MEMCPY = 33 , ///< Enumerator for ::urEnqueueUSMMemcpy
41254125 UR_FUNCTION_ENQUEUE_USM_PREFETCH = 34 , ///< Enumerator for ::urEnqueueUSMPrefetch
4126- UR_FUNCTION_ENQUEUE_USM_MEM_ADVISE = 35 , ///< Enumerator for ::urEnqueueUSMMemAdvise
4126+ UR_FUNCTION_ENQUEUE_USM_ADVISE = 35 , ///< Enumerator for ::urEnqueueUSMAdvise
41274127 UR_FUNCTION_ENQUEUE_USM_FILL2_D = 36 , ///< Enumerator for ::urEnqueueUSMFill2D
41284128 UR_FUNCTION_ENQUEUE_USM_MEMCPY2_D = 37 , ///< Enumerator for ::urEnqueueUSMMemcpy2D
41294129 UR_FUNCTION_ENQUEUE_DEVICE_GLOBAL_VARIABLE_WRITE = 38 , ///< Enumerator for ::urEnqueueDeviceGlobalVariableWrite
@@ -5125,7 +5125,7 @@ urEnqueueUSMPrefetch(
51255125/// - ::UR_RESULT_ERROR_INVALID_NULL_POINTER
51265126/// + `NULL == pMem`
51275127/// - ::UR_RESULT_ERROR_INVALID_ENUMERATION
5128- /// + `::UR_MEM_ADVICE_BIAS_UNCACHED < advice`
5128+ /// + `::UR_USM_ADVICE_BIAS_UNCACHED < advice`
51295129/// - ::UR_RESULT_ERROR_INVALID_QUEUE
51305130/// - ::UR_RESULT_ERROR_INVALID_EVENT
51315131/// - ::UR_RESULT_ERROR_INVALID_SIZE
@@ -5135,11 +5135,11 @@ urEnqueueUSMPrefetch(
51355135/// - ::UR_RESULT_ERROR_OUT_OF_HOST_MEMORY
51365136/// - ::UR_RESULT_ERROR_OUT_OF_RESOURCES
51375137UR_APIEXPORT ur_result_t UR_APICALL
5138- urEnqueueUSMMemAdvise (
5138+ urEnqueueUSMAdvise (
51395139 ur_queue_handle_t hQueue , ///< [in] handle of the queue object
51405140 const void * pMem , ///< [in] pointer to the USM memory object
51415141 size_t size , ///< [in] size in bytes to be advised
5142- ur_mem_advice_t advice , ///< [in] USM memory advice
5142+ ur_usm_advice_t advice , ///< [in] USM memory advice
51435143 ur_event_handle_t * phEvent ///< [out][optional] return an event object that identifies this particular
51445144 ///< command instance.
51455145);
@@ -7322,25 +7322,25 @@ typedef void(UR_APICALL *ur_pfnEnqueueUSMPrefetchCb_t)(
73227322 void * * ppTracerInstanceUserData );
73237323
73247324///////////////////////////////////////////////////////////////////////////////
7325- /// @brief Callback function parameters for urEnqueueUSMMemAdvise
7325+ /// @brief Callback function parameters for urEnqueueUSMAdvise
73267326/// @details Each entry is a pointer to the parameter passed to the function;
73277327/// allowing the callback the ability to modify the parameter's value
7328- typedef struct ur_enqueue_usm_mem_advise_params_t {
7328+ typedef struct ur_enqueue_usm_advise_params_t {
73297329 ur_queue_handle_t * phQueue ;
73307330 const void * * ppMem ;
73317331 size_t * psize ;
7332- ur_mem_advice_t * padvice ;
7332+ ur_usm_advice_t * padvice ;
73337333 ur_event_handle_t * * pphEvent ;
7334- } ur_enqueue_usm_mem_advise_params_t ;
7334+ } ur_enqueue_usm_advise_params_t ;
73357335
73367336///////////////////////////////////////////////////////////////////////////////
7337- /// @brief Callback function-pointer for urEnqueueUSMMemAdvise
7337+ /// @brief Callback function-pointer for urEnqueueUSMAdvise
73387338/// @param[in] params Parameters passed to this instance
73397339/// @param[in] result Return value
73407340/// @param[in] pTracerUserData Per-Tracer user data
73417341/// @param[in,out] ppTracerInstanceUserData Per-Tracer, Per-Instance user data
7342- typedef void (UR_APICALL * ur_pfnEnqueueUSMMemAdviseCb_t )(
7343- ur_enqueue_usm_mem_advise_params_t * params ,
7342+ typedef void (UR_APICALL * ur_pfnEnqueueUSMAdviseCb_t )(
7343+ ur_enqueue_usm_advise_params_t * params ,
73447344 ur_result_t result ,
73457345 void * pTracerUserData ,
73467346 void * * ppTracerInstanceUserData );
@@ -7483,7 +7483,7 @@ typedef struct ur_enqueue_callbacks_t {
74837483 ur_pfnEnqueueUSMFillCb_t pfnUSMFillCb ;
74847484 ur_pfnEnqueueUSMMemcpyCb_t pfnUSMMemcpyCb ;
74857485 ur_pfnEnqueueUSMPrefetchCb_t pfnUSMPrefetchCb ;
7486- ur_pfnEnqueueUSMMemAdviseCb_t pfnUSMMemAdviseCb ;
7486+ ur_pfnEnqueueUSMAdviseCb_t pfnUSMAdviseCb ;
74877487 ur_pfnEnqueueUSMFill2DCb_t pfnUSMFill2DCb ;
74887488 ur_pfnEnqueueUSMMemcpy2DCb_t pfnUSMMemcpy2DCb ;
74897489 ur_pfnEnqueueDeviceGlobalVariableWriteCb_t pfnDeviceGlobalVariableWriteCb ;
0 commit comments