fix properties type and update generated files

KseniyaTikhomirova · KseniyaTikhomirova · commit 3186b5398c3a · 2023-06-06T07:59:39.000-07:00
Signed-off-by: Tikhomirova, Kseniya &lt;kseniya.tikhomirova@intel.com&gt;
diff --git a/include/ur.py b/include/ur.py
@@ -2254,9 +2254,9 @@ class ur_program_dditable_t(Structure):
 ###############################################################################
 ## @brief Function-pointer for urKernelSetArgMemObj
 if __use_win_types:
-    _urKernelSetArgMemObj_t = WINFUNCTYPE( ur_result_t, ur_kernel_handle_t, c_ulong, ur_mem_handle_t, ur_mem_obj_properties_t )
+    _urKernelSetArgMemObj_t = WINFUNCTYPE( ur_result_t, ur_kernel_handle_t, c_ulong, ur_mem_handle_t, POINTER(ur_mem_obj_properties_t) )
 else:
-    _urKernelSetArgMemObj_t = CFUNCTYPE( ur_result_t, ur_kernel_handle_t, c_ulong, ur_mem_handle_t, ur_mem_obj_properties_t )
+    _urKernelSetArgMemObj_t = CFUNCTYPE( ur_result_t, ur_kernel_handle_t, c_ulong, ur_mem_handle_t, POINTER(ur_mem_obj_properties_t) )
 
 ###############################################################################
 ## @brief Function-pointer for urKernelSetSpecializationConstants
diff --git a/include/ur_api.h b/include/ur_api.h
@@ -3866,10 +3866,10 @@ typedef struct ur_mem_obj_properties_t {
 ///     - ::UR_RESULT_ERROR_INVALID_KERNEL_ARGUMENT_INDEX
 UR_APIEXPORT ur_result_t UR_APICALL
 urKernelSetArgMemObj(
-    ur_kernel_handle_t hKernel,         ///< [in] handle of the kernel object
-    uint32_t argIndex,                  ///< [in] argument index in range [0, num args - 1]
-    ur_mem_handle_t hArgValue,          ///< [in][optional] handle of Memory object.
-    ur_mem_obj_properties_t pProperties ///< [in][optional] pointer to Memory object properties.
+    ur_kernel_handle_t hKernel,                ///< [in] handle of the kernel object
+    uint32_t argIndex,                         ///< [in] argument index in range [0, num args - 1]
+    ur_mem_handle_t hArgValue,                 ///< [in][optional] handle of Memory object.
+    const ur_mem_obj_properties_t *pProperties ///< [in][optional] pointer to Memory object properties.
 );
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -6474,7 +6474,7 @@ typedef struct ur_kernel_set_arg_mem_obj_params_t {
     ur_kernel_handle_t *phKernel;
     uint32_t *pargIndex;
     ur_mem_handle_t *phArgValue;
-    ur_mem_obj_properties_t *ppProperties;
+    const ur_mem_obj_properties_t **ppProperties;
 } ur_kernel_set_arg_mem_obj_params_t;
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/include/ur_ddi.h b/include/ur_ddi.h
@@ -510,7 +510,7 @@ typedef ur_result_t(UR_APICALL *ur_pfnKernelSetArgMemObj_t)(
     ur_kernel_handle_t,
     uint32_t,
     ur_mem_handle_t,
-    ur_mem_obj_properties_t);
+    const ur_mem_obj_properties_t *);
 
 ///////////////////////////////////////////////////////////////////////////////
 /// @brief Function-pointer for urKernelSetSpecializationConstants
diff --git a/scripts/core/kernel.yml b/scripts/core/kernel.yml
@@ -385,7 +385,7 @@ params:
     - type: "$x_mem_handle_t"
       name: hArgValue
       desc: "[in][optional] handle of Memory object."
-    - type: "$x_mem_obj_properties_t"
+    - type: "const $x_mem_obj_properties_t*"
       name: pProperties
       desc: "[in][optional] pointer to Memory object properties."
 returns:
diff --git a/source/adapters/null/ur_nullddi.cpp b/source/adapters/null/ur_nullddi.cpp
@@ -1952,8 +1952,8 @@ __urdlllocal ur_result_t UR_APICALL urKernelSetArgMemObj(
     ur_kernel_handle_t hKernel, ///< [in] handle of the kernel object
     uint32_t argIndex, ///< [in] argument index in range [0, num args - 1]
     ur_mem_handle_t hArgValue, ///< [in][optional] handle of Memory object.
-    ur_mem_obj_properties_t
-        pProperties ///< [in][optional] pointer to Memory object properties.
+    const ur_mem_obj_properties_t
+        *pProperties ///< [in][optional] pointer to Memory object properties.
     ) try {
     ur_result_t result = UR_RESULT_SUCCESS;
 
diff --git a/source/common/ur_params.hpp b/source/common/ur_params.hpp
@@ -10484,7 +10484,7 @@ operator<<(std::ostream &os,
     os << ", ";
     os << ".pProperties = ";
 
-    os << *(params->ppProperties);
+    ur_params::serializePtr(os, *(params->ppProperties));
 
     return os;
 }
diff --git a/source/loader/layers/tracing/ur_trcddi.cpp b/source/loader/layers/tracing/ur_trcddi.cpp
@@ -2224,8 +2224,8 @@ __urdlllocal ur_result_t UR_APICALL urKernelSetArgMemObj(
     ur_kernel_handle_t hKernel, ///< [in] handle of the kernel object
     uint32_t argIndex, ///< [in] argument index in range [0, num args - 1]
     ur_mem_handle_t hArgValue, ///< [in][optional] handle of Memory object.
-    ur_mem_obj_properties_t
-        pProperties ///< [in][optional] pointer to Memory object properties.
+    const ur_mem_obj_properties_t
+        *pProperties ///< [in][optional] pointer to Memory object properties.
 ) {
     auto pfnSetArgMemObj = context.urDdiTable.Kernel.pfnSetArgMemObj;
 
diff --git a/source/loader/layers/validation/ur_valddi.cpp b/source/loader/layers/validation/ur_valddi.cpp
@@ -2730,8 +2730,8 @@ __urdlllocal ur_result_t UR_APICALL urKernelSetArgMemObj(
     ur_kernel_handle_t hKernel, ///< [in] handle of the kernel object
     uint32_t argIndex, ///< [in] argument index in range [0, num args - 1]
     ur_mem_handle_t hArgValue, ///< [in][optional] handle of Memory object.
-    ur_mem_obj_properties_t
-        pProperties ///< [in][optional] pointer to Memory object properties.
+    const ur_mem_obj_properties_t
+        *pProperties ///< [in][optional] pointer to Memory object properties.
 ) {
     auto pfnSetArgMemObj = context.urDdiTable.Kernel.pfnSetArgMemObj;
 
diff --git a/source/loader/ur_ldrddi.cpp b/source/loader/ur_ldrddi.cpp
@@ -2561,8 +2561,8 @@ __urdlllocal ur_result_t UR_APICALL urKernelSetArgMemObj(
     ur_kernel_handle_t hKernel, ///< [in] handle of the kernel object
     uint32_t argIndex, ///< [in] argument index in range [0, num args - 1]
     ur_mem_handle_t hArgValue, ///< [in][optional] handle of Memory object.
-    ur_mem_obj_properties_t
-        pProperties ///< [in][optional] pointer to Memory object properties.
+    const ur_mem_obj_properties_t
+        *pProperties ///< [in][optional] pointer to Memory object properties.
 ) {
     ur_result_t result = UR_RESULT_SUCCESS;
 
diff --git a/source/loader/ur_libapi.cpp b/source/loader/ur_libapi.cpp
@@ -3022,8 +3022,8 @@ ur_result_t UR_APICALL urKernelSetArgMemObj(
     ur_kernel_handle_t hKernel, ///< [in] handle of the kernel object
     uint32_t argIndex, ///< [in] argument index in range [0, num args - 1]
     ur_mem_handle_t hArgValue, ///< [in][optional] handle of Memory object.
-    ur_mem_obj_properties_t
-        pProperties ///< [in][optional] pointer to Memory object properties.
+    const ur_mem_obj_properties_t
+        *pProperties ///< [in][optional] pointer to Memory object properties.
     ) try {
     auto pfnSetArgMemObj = ur_lib::context->urDdiTable.Kernel.pfnSetArgMemObj;
     if (nullptr == pfnSetArgMemObj) {
diff --git a/source/ur_api.cpp b/source/ur_api.cpp
@@ -2528,8 +2528,8 @@ ur_result_t UR_APICALL urKernelSetArgMemObj(
     ur_kernel_handle_t hKernel, ///< [in] handle of the kernel object
     uint32_t argIndex, ///< [in] argument index in range [0, num args - 1]
     ur_mem_handle_t hArgValue, ///< [in][optional] handle of Memory object.
-    ur_mem_obj_properties_t
-        pProperties ///< [in][optional] pointer to Memory object properties.
+    const ur_mem_obj_properties_t
+        *pProperties ///< [in][optional] pointer to Memory object properties.
 ) {
     ur_result_t result = UR_RESULT_SUCCESS;
     return result;
diff --git a/test/conformance/testing/include/uur/fixtures.h b/test/conformance/testing/include/uur/fixtures.h
@@ -696,8 +696,8 @@ struct urKernelExecutionTest : urKernelTest {
                                               sizeof(zero), 0, size, 0, nullptr,
                                               nullptr));
         ASSERT_SUCCESS(urQueueFinish(queue));
-        ASSERT_SUCCESS(
-            urKernelSetArgMemObj(kernel, current_arg_index, mem_handle));
+        ASSERT_SUCCESS(urKernelSetArgMemObj(kernel, current_arg_index,
+                                            mem_handle, nullptr));
 
         // This emulates the offset struct sycl adds for a 1D buffer accessor.
         struct {

Original file line number	Diff line number	Diff line change
`@@ -10484,7 +10484,7 @@ operator<<(std::ostream &os,`
`10484`	`10484`	`os << ", ";`
`10485`	`10485`	`os << ".pProperties = ";`
`10486`	`10486`
`10487`		`- os << *(params->ppProperties);`
	`10487`	`+ ur_params::serializePtr(os, *(params->ppProperties));`
`10488`	`10488`
`10489`	`10489`	`return os;`
`10490`	`10490`	`}`