Skip to content

Commit 8e2c04b

Browse files
KseniyaTikhomirovaKseniyaTikhomirova
committed
add result of make generate
Signed-off-by: Tikhomirova, Kseniya <kseniya.tikhomirova@intel.com>
1 parent 4a252b1 commit 8e2c04b

File tree

10 files changed

+97
-18
lines changed

10 files changed

+97
-18
lines changed

‎include/ur.py

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -228,6 +228,7 @@ class ur_structure_type_v(IntEnum):
228228
SAMPLER_NATIVE_PROPERTIES = 24 ## ::ur_sampler_native_properties_t
229229
QUEUE_NATIVE_DESC = 25 ## ::ur_queue_native_desc_t
230230
DEVICE_PARTITION_PROPERTIES = 26 ## ::ur_device_partition_properties_t
231+
MEM_OBJ_PROPERTIES = 27 ## ::ur_mem_obj_properties_t
231232

232233
class ur_structure_type_t(c_int):
233234
def __str__(self):
@@ -1474,6 +1475,17 @@ def __str__(self):
14741475
return str(ur_kernel_exec_info_v(self.value))
14751476

14761477

1478+
###############################################################################
1479+
## @brief Properties for for ::urKernelSetArgMemObj.
1480+
class ur_mem_obj_properties_t(Structure):
1481+
_fields_ = [
1482+
("stype", ur_structure_type_t), ## [in] type of this structure, must be
1483+
## ::UR_STRUCTURE_TYPE_MEM_OBJ_PROPERTIES
1484+
("pNext", c_void_p), ## [in,out][optional] pointer to extension-specific structure
1485+
("memoryAccess", ur_mem_flags_t) ## [in] Memory access flag. Allowed values are: ::UR_MEM_FLAG_READ_WRITE,
1486+
## ::UR_MEM_FLAG_WRITE_ONLY, ::UR_MEM_FLAG_READ_ONLY.
1487+
]
1488+
14771489
###############################################################################
14781490
## @brief Properties for for ::urKernelCreateWithNativeHandle.
14791491
class ur_kernel_native_properties_t(Structure):
@@ -2242,9 +2254,9 @@ class ur_program_dditable_t(Structure):
22422254
###############################################################################
22432255
## @brief Function-pointer for urKernelSetArgMemObj
22442256
if __use_win_types:
2245-
_urKernelSetArgMemObj_t = WINFUNCTYPE( ur_result_t, ur_kernel_handle_t, c_ulong, ur_mem_handle_t )
2257+
_urKernelSetArgMemObj_t = WINFUNCTYPE( ur_result_t, ur_kernel_handle_t, c_ulong, ur_mem_handle_t, ur_mem_obj_properties_t )
22462258
else:
2247-
_urKernelSetArgMemObj_t = CFUNCTYPE( ur_result_t, ur_kernel_handle_t, c_ulong, ur_mem_handle_t )
2259+
_urKernelSetArgMemObj_t = CFUNCTYPE( ur_result_t, ur_kernel_handle_t, c_ulong, ur_mem_handle_t, ur_mem_obj_properties_t )
22482260

22492261
###############################################################################
22502262
## @brief Function-pointer for urKernelSetSpecializationConstants

‎include/ur_api.h

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,7 @@ typedef enum ur_structure_type_t {
252252
UR_STRUCTURE_TYPE_SAMPLER_NATIVE_PROPERTIES = 24, ///< ::ur_sampler_native_properties_t
253253
UR_STRUCTURE_TYPE_QUEUE_NATIVE_DESC = 25, ///< ::ur_queue_native_desc_t
254254
UR_STRUCTURE_TYPE_DEVICE_PARTITION_PROPERTIES = 26, ///< ::ur_device_partition_properties_t
255+
UR_STRUCTURE_TYPE_MEM_OBJ_PROPERTIES = 27, ///< ::ur_mem_obj_properties_t
255256
/// @cond
256257
UR_STRUCTURE_TYPE_FORCE_UINT32 = 0x7fffffff
257258
/// @endcond
@@ -3837,6 +3838,17 @@ urKernelSetArgSampler(
38373838
ur_sampler_handle_t hArgValue ///< [in] handle of Sampler object.
38383839
);
38393840

3841+
///////////////////////////////////////////////////////////////////////////////
3842+
/// @brief Properties for for ::urKernelSetArgMemObj.
3843+
typedef struct ur_mem_obj_properties_t {
3844+
ur_structure_type_t stype; ///< [in] type of this structure, must be
3845+
///< ::UR_STRUCTURE_TYPE_MEM_OBJ_PROPERTIES
3846+
void *pNext; ///< [in,out][optional] pointer to extension-specific structure
3847+
ur_mem_flags_t memoryAccess; ///< [in] Memory access flag. Allowed values are: ::UR_MEM_FLAG_READ_WRITE,
3848+
///< ::UR_MEM_FLAG_WRITE_ONLY, ::UR_MEM_FLAG_READ_ONLY.
3849+
3850+
} ur_mem_obj_properties_t;
3851+
38403852
///////////////////////////////////////////////////////////////////////////////
38413853
/// @brief Set a Memory object as the argument value of a Kernel.
38423854
///
@@ -3854,9 +3866,10 @@ urKernelSetArgSampler(
38543866
/// - ::UR_RESULT_ERROR_INVALID_KERNEL_ARGUMENT_INDEX
38553867
UR_APIEXPORT ur_result_t UR_APICALL
38563868
urKernelSetArgMemObj(
3857-
ur_kernel_handle_t hKernel, ///< [in] handle of the kernel object
3858-
uint32_t argIndex, ///< [in] argument index in range [0, num args - 1]
3859-
ur_mem_handle_t hArgValue ///< [in][optional] handle of Memory object.
3869+
ur_kernel_handle_t hKernel, ///< [in] handle of the kernel object
3870+
uint32_t argIndex, ///< [in] argument index in range [0, num args - 1]
3871+
ur_mem_handle_t hArgValue, ///< [in][optional] handle of Memory object.
3872+
ur_mem_obj_properties_t pProperties ///< [in][optional] pointer to Memory object properties.
38603873
);
38613874

38623875
///////////////////////////////////////////////////////////////////////////////
@@ -6461,6 +6474,7 @@ typedef struct ur_kernel_set_arg_mem_obj_params_t {
64616474
ur_kernel_handle_t *phKernel;
64626475
uint32_t *pargIndex;
64636476
ur_mem_handle_t *phArgValue;
6477+
ur_mem_obj_properties_t *ppProperties;
64646478
} ur_kernel_set_arg_mem_obj_params_t;
64656479

64666480
///////////////////////////////////////////////////////////////////////////////

‎include/ur_ddi.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -509,7 +509,8 @@ typedef ur_result_t(UR_APICALL *ur_pfnKernelSetArgSampler_t)(
509509
typedef ur_result_t(UR_APICALL *ur_pfnKernelSetArgMemObj_t)(
510510
ur_kernel_handle_t,
511511
uint32_t,
512-
ur_mem_handle_t);
512+
ur_mem_handle_t,
513+
ur_mem_obj_properties_t);
513514

514515
///////////////////////////////////////////////////////////////////////////////
515516
/// @brief Function-pointer for urKernelSetSpecializationConstants

‎source/adapters/null/ur_nullddi.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1951,14 +1951,16 @@ __urdlllocal ur_result_t UR_APICALL urKernelSetArgSampler(
19511951
__urdlllocal ur_result_t UR_APICALL urKernelSetArgMemObj(
19521952
ur_kernel_handle_t hKernel, ///< [in] handle of the kernel object
19531953
uint32_t argIndex, ///< [in] argument index in range [0, num args - 1]
1954-
ur_mem_handle_t hArgValue ///< [in][optional] handle of Memory object.
1954+
ur_mem_handle_t hArgValue, ///< [in][optional] handle of Memory object.
1955+
ur_mem_obj_properties_t
1956+
pProperties ///< [in][optional] pointer to Memory object properties.
19551957
) try {
19561958
ur_result_t result = UR_RESULT_SUCCESS;
19571959

19581960
// if the driver has created a custom function, then call it instead of using the generic path
19591961
auto pfnSetArgMemObj = d_context.urDdiTable.Kernel.pfnSetArgMemObj;
19601962
if (nullptr != pfnSetArgMemObj) {
1961-
result = pfnSetArgMemObj(hKernel, argIndex, hArgValue);
1963+
result = pfnSetArgMemObj(hKernel, argIndex, hArgValue, pProperties);
19621964
} else {
19631965
// generic implementation
19641966
}

‎source/common/ur_params.hpp

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,8 @@ inline std::ostream &operator<<(std::ostream &os,
305305
enum ur_kernel_cache_config_t value);
306306
inline std::ostream &operator<<(std::ostream &os,
307307
enum ur_kernel_exec_info_t value);
308+
inline std::ostream &operator<<(std::ostream &os,
309+
const struct ur_mem_obj_properties_t params);
308310
inline std::ostream &
309311
operator<<(std::ostream &os, const struct ur_kernel_native_properties_t params);
310312
inline std::ostream &operator<<(std::ostream &os, enum ur_queue_info_t value);
@@ -726,6 +728,10 @@ inline std::ostream &operator<<(std::ostream &os,
726728
case UR_STRUCTURE_TYPE_DEVICE_PARTITION_PROPERTIES:
727729
os << "UR_STRUCTURE_TYPE_DEVICE_PARTITION_PROPERTIES";
728730
break;
731+
732+
case UR_STRUCTURE_TYPE_MEM_OBJ_PROPERTIES:
733+
os << "UR_STRUCTURE_TYPE_MEM_OBJ_PROPERTIES";
734+
break;
729735
default:
730736
os << "unknown enumerator";
731737
break;
@@ -895,6 +901,12 @@ inline void serializeStruct(std::ostream &os, const void *ptr) {
895901
(const ur_device_partition_properties_t *)ptr;
896902
ur_params::serializePtr(os, pstruct);
897903
} break;
904+
905+
case UR_STRUCTURE_TYPE_MEM_OBJ_PROPERTIES: {
906+
const ur_mem_obj_properties_t *pstruct =
907+
(const ur_mem_obj_properties_t *)ptr;
908+
ur_params::serializePtr(os, pstruct);
909+
} break;
898910
default:
899911
os << "unknown enumerator";
900912
break;
@@ -6891,6 +6903,27 @@ inline void serializeTagged(std::ostream &os, const void *ptr,
68916903
}
68926904
}
68936905
} // namespace ur_params
6906+
inline std::ostream &operator<<(std::ostream &os,
6907+
const struct ur_mem_obj_properties_t params) {
6908+
os << "(struct ur_mem_obj_properties_t){";
6909+
6910+
os << ".stype = ";
6911+
6912+
os << (params.stype);
6913+
6914+
os << ", ";
6915+
os << ".pNext = ";
6916+
6917+
ur_params::serializeStruct(os, (params.pNext));
6918+
6919+
os << ", ";
6920+
os << ".memoryAccess = ";
6921+
6922+
ur_params::serializeFlag<ur_mem_flag_t>(os, (params.memoryAccess));
6923+
6924+
os << "}";
6925+
return os;
6926+
}
68946927
inline std::ostream &
68956928
operator<<(std::ostream &os,
68966929
const struct ur_kernel_native_properties_t params) {
@@ -10448,6 +10481,11 @@ operator<<(std::ostream &os,
1044810481

1044910482
ur_params::serializePtr(os, *(params->phArgValue));
1045010483

10484+
os << ", ";
10485+
os << ".pProperties = ";
10486+
10487+
os << *(params->ppProperties);
10488+
1045110489
return os;
1045210490
}
1045310491

‎source/loader/layers/tracing/ur_trcddi.cpp

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2223,7 +2223,9 @@ __urdlllocal ur_result_t UR_APICALL urKernelSetArgSampler(
22232223
__urdlllocal ur_result_t UR_APICALL urKernelSetArgMemObj(
22242224
ur_kernel_handle_t hKernel, ///< [in] handle of the kernel object
22252225
uint32_t argIndex, ///< [in] argument index in range [0, num args - 1]
2226-
ur_mem_handle_t hArgValue ///< [in][optional] handle of Memory object.
2226+
ur_mem_handle_t hArgValue, ///< [in][optional] handle of Memory object.
2227+
ur_mem_obj_properties_t
2228+
pProperties ///< [in][optional] pointer to Memory object properties.
22272229
) {
22282230
auto pfnSetArgMemObj = context.urDdiTable.Kernel.pfnSetArgMemObj;
22292231

@@ -2232,11 +2234,12 @@ __urdlllocal ur_result_t UR_APICALL urKernelSetArgMemObj(
22322234
}
22332235

22342236
ur_kernel_set_arg_mem_obj_params_t params = {&hKernel, &argIndex,
2235-
&hArgValue};
2237+
&hArgValue, &pProperties};
22362238
uint64_t instance = context.notify_begin(UR_FUNCTION_KERNEL_SET_ARG_MEM_OBJ,
22372239
"urKernelSetArgMemObj", &params);
22382240

2239-
ur_result_t result = pfnSetArgMemObj(hKernel, argIndex, hArgValue);
2241+
ur_result_t result =
2242+
pfnSetArgMemObj(hKernel, argIndex, hArgValue, pProperties);
22402243

22412244
context.notify_end(UR_FUNCTION_KERNEL_SET_ARG_MEM_OBJ,
22422245
"urKernelSetArgMemObj", &params, &result, instance);

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

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2729,7 +2729,9 @@ __urdlllocal ur_result_t UR_APICALL urKernelSetArgSampler(
27292729
__urdlllocal ur_result_t UR_APICALL urKernelSetArgMemObj(
27302730
ur_kernel_handle_t hKernel, ///< [in] handle of the kernel object
27312731
uint32_t argIndex, ///< [in] argument index in range [0, num args - 1]
2732-
ur_mem_handle_t hArgValue ///< [in][optional] handle of Memory object.
2732+
ur_mem_handle_t hArgValue, ///< [in][optional] handle of Memory object.
2733+
ur_mem_obj_properties_t
2734+
pProperties ///< [in][optional] pointer to Memory object properties.
27332735
) {
27342736
auto pfnSetArgMemObj = context.urDdiTable.Kernel.pfnSetArgMemObj;
27352737

@@ -2743,7 +2745,8 @@ __urdlllocal ur_result_t UR_APICALL urKernelSetArgMemObj(
27432745
}
27442746
}
27452747

2746-
ur_result_t result = pfnSetArgMemObj(hKernel, argIndex, hArgValue);
2748+
ur_result_t result =
2749+
pfnSetArgMemObj(hKernel, argIndex, hArgValue, pProperties);
27472750

27482751
return result;
27492752
}

‎source/loader/ur_ldrddi.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2560,7 +2560,9 @@ __urdlllocal ur_result_t UR_APICALL urKernelSetArgSampler(
25602560
__urdlllocal ur_result_t UR_APICALL urKernelSetArgMemObj(
25612561
ur_kernel_handle_t hKernel, ///< [in] handle of the kernel object
25622562
uint32_t argIndex, ///< [in] argument index in range [0, num args - 1]
2563-
ur_mem_handle_t hArgValue ///< [in][optional] handle of Memory object.
2563+
ur_mem_handle_t hArgValue, ///< [in][optional] handle of Memory object.
2564+
ur_mem_obj_properties_t
2565+
pProperties ///< [in][optional] pointer to Memory object properties.
25642566
) {
25652567
ur_result_t result = UR_RESULT_SUCCESS;
25662568

@@ -2580,7 +2582,7 @@ __urdlllocal ur_result_t UR_APICALL urKernelSetArgMemObj(
25802582
: nullptr;
25812583

25822584
// forward to device-platform
2583-
result = pfnSetArgMemObj(hKernel, argIndex, hArgValue);
2585+
result = pfnSetArgMemObj(hKernel, argIndex, hArgValue, pProperties);
25842586

25852587
return result;
25862588
}

‎source/loader/ur_libapi.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3021,14 +3021,16 @@ ur_result_t UR_APICALL urKernelSetArgSampler(
30213021
ur_result_t UR_APICALL urKernelSetArgMemObj(
30223022
ur_kernel_handle_t hKernel, ///< [in] handle of the kernel object
30233023
uint32_t argIndex, ///< [in] argument index in range [0, num args - 1]
3024-
ur_mem_handle_t hArgValue ///< [in][optional] handle of Memory object.
3024+
ur_mem_handle_t hArgValue, ///< [in][optional] handle of Memory object.
3025+
ur_mem_obj_properties_t
3026+
pProperties ///< [in][optional] pointer to Memory object properties.
30253027
) try {
30263028
auto pfnSetArgMemObj = ur_lib::context->urDdiTable.Kernel.pfnSetArgMemObj;
30273029
if (nullptr == pfnSetArgMemObj) {
30283030
return UR_RESULT_ERROR_UNINITIALIZED;
30293031
}
30303032

3031-
return pfnSetArgMemObj(hKernel, argIndex, hArgValue);
3033+
return pfnSetArgMemObj(hKernel, argIndex, hArgValue, pProperties);
30323034
} catch (...) {
30333035
return exceptionToResult(std::current_exception());
30343036
}

‎source/ur_api.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2527,7 +2527,9 @@ ur_result_t UR_APICALL urKernelSetArgSampler(
25272527
ur_result_t UR_APICALL urKernelSetArgMemObj(
25282528
ur_kernel_handle_t hKernel, ///< [in] handle of the kernel object
25292529
uint32_t argIndex, ///< [in] argument index in range [0, num args - 1]
2530-
ur_mem_handle_t hArgValue ///< [in][optional] handle of Memory object.
2530+
ur_mem_handle_t hArgValue, ///< [in][optional] handle of Memory object.
2531+
ur_mem_obj_properties_t
2532+
pProperties ///< [in][optional] pointer to Memory object properties.
25312533
) {
25322534
ur_result_t result = UR_RESULT_SUCCESS;
25332535
return result;

0 commit comments

Comments
 (0)