Skip to content

Commit e6f5e81

Browse files
KseniyaTikhomirovaKseniyaTikhomirova
committed
fix code-review comments
Signed-off-by: Tikhomirova, Kseniya <kseniya.tikhomirova@intel.com>
1 parent 590ce6e commit e6f5e81

File tree

12 files changed

+37
-37
lines changed

12 files changed

+37
-37
lines changed

‎include/ur.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2254,9 +2254,9 @@ class ur_program_dditable_t(Structure):
22542254
###############################################################################
22552255
## @brief Function-pointer for urKernelSetArgMemObj
22562256
if __use_win_types:
2257-
_urKernelSetArgMemObj_t = WINFUNCTYPE( ur_result_t, ur_kernel_handle_t, c_ulong, ur_mem_handle_t, POINTER(ur_mem_obj_properties_t) )
2257+
_urKernelSetArgMemObj_t = WINFUNCTYPE( ur_result_t, ur_kernel_handle_t, c_ulong, POINTER(ur_mem_obj_properties_t), ur_mem_handle_t )
22582258
else:
2259-
_urKernelSetArgMemObj_t = CFUNCTYPE( ur_result_t, ur_kernel_handle_t, c_ulong, ur_mem_handle_t, POINTER(ur_mem_obj_properties_t) )
2259+
_urKernelSetArgMemObj_t = CFUNCTYPE( ur_result_t, ur_kernel_handle_t, c_ulong, POINTER(ur_mem_obj_properties_t), ur_mem_handle_t )
22602260

22612261
###############################################################################
22622262
## @brief Function-pointer for urKernelSetSpecializationConstants

‎include/ur_api.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3866,10 +3866,10 @@ typedef struct ur_mem_obj_properties_t {
38663866
/// - ::UR_RESULT_ERROR_INVALID_KERNEL_ARGUMENT_INDEX
38673867
UR_APIEXPORT ur_result_t UR_APICALL
38683868
urKernelSetArgMemObj(
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-
const ur_mem_obj_properties_t *pProperties ///< [in][optional] pointer to Memory object properties.
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+
const ur_mem_obj_properties_t *pProperties, ///< [in][optional] pointer to Memory object properties.
3872+
ur_mem_handle_t hArgValue ///< [in][optional] handle of Memory object.
38733873
);
38743874

38753875
///////////////////////////////////////////////////////////////////////////////
@@ -6473,8 +6473,8 @@ typedef struct ur_kernel_set_arg_sampler_params_t {
64736473
typedef struct ur_kernel_set_arg_mem_obj_params_t {
64746474
ur_kernel_handle_t *phKernel;
64756475
uint32_t *pargIndex;
6476-
ur_mem_handle_t *phArgValue;
64776476
const ur_mem_obj_properties_t **ppProperties;
6477+
ur_mem_handle_t *phArgValue;
64786478
} ur_kernel_set_arg_mem_obj_params_t;
64796479

64806480
///////////////////////////////////////////////////////////////////////////////

‎include/ur_ddi.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -509,8 +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,
513-
const ur_mem_obj_properties_t *);
512+
const ur_mem_obj_properties_t *,
513+
ur_mem_handle_t);
514514

515515
///////////////////////////////////////////////////////////////////////////////
516516
/// @brief Function-pointer for urKernelSetSpecializationConstants

‎scripts/core/PROG.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -216,9 +216,9 @@ explicit and implicit kernel arguments along with data needed for launch.
216216
// Create kernel object from program
217217
${x}_kernel_handle_t hKernel;
218218
${x}KernelCreate(hProgram, "addVectors", &hKernel);
219-
${x}KernelSetArgMemObj(hKernel, 0, A);
220-
${x}KernelSetArgMemObj(hKernel, 1, B);
221-
${x}KernelSetArgMemObj(hKernel, 2, C);
219+
${x}KernelSetArgMemObj(hKernel, 0, nullptr, A);
220+
${x}KernelSetArgMemObj(hKernel, 1, nullptr, B);
221+
${x}KernelSetArgMemObj(hKernel, 2, nullptr, C);
222222
223223
Queue and Enqueue
224224
=================

‎scripts/core/kernel.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -382,12 +382,12 @@ params:
382382
- type: "uint32_t"
383383
name: argIndex
384384
desc: "[in] argument index in range [0, num args - 1]"
385-
- type: "$x_mem_handle_t"
386-
name: hArgValue
387-
desc: "[in][optional] handle of Memory object."
388385
- type: "const $x_mem_obj_properties_t*"
389386
name: pProperties
390387
desc: "[in][optional] pointer to Memory object properties."
388+
- type: "$x_mem_handle_t"
389+
name: hArgValue
390+
desc: "[in][optional] handle of Memory object."
391391
returns:
392392
- $X_RESULT_ERROR_INVALID_KERNEL_ARGUMENT_INDEX
393393
--- #--------------------------------------------------------------------------

‎source/adapters/null/ur_nullddi.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1951,16 +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.
19551954
const ur_mem_obj_properties_t
1956-
*pProperties ///< [in][optional] pointer to Memory object properties.
1955+
*pProperties, ///< [in][optional] pointer to Memory object properties.
1956+
ur_mem_handle_t hArgValue ///< [in][optional] handle of Memory object.
19571957
) try {
19581958
ur_result_t result = UR_RESULT_SUCCESS;
19591959

19601960
// if the driver has created a custom function, then call it instead of using the generic path
19611961
auto pfnSetArgMemObj = d_context.urDdiTable.Kernel.pfnSetArgMemObj;
19621962
if (nullptr != pfnSetArgMemObj) {
1963-
result = pfnSetArgMemObj(hKernel, argIndex, hArgValue, pProperties);
1963+
result = pfnSetArgMemObj(hKernel, argIndex, pProperties, hArgValue);
19641964
} else {
19651965
// generic implementation
19661966
}

‎source/common/ur_params.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10477,14 +10477,14 @@ operator<<(std::ostream &os,
1047710477
os << *(params->pargIndex);
1047810478

1047910479
os << ", ";
10480-
os << ".hArgValue = ";
10480+
os << ".pProperties = ";
1048110481

10482-
ur_params::serializePtr(os, *(params->phArgValue));
10482+
ur_params::serializePtr(os, *(params->ppProperties));
1048310483

1048410484
os << ", ";
10485-
os << ".pProperties = ";
10485+
os << ".hArgValue = ";
1048610486

10487-
ur_params::serializePtr(os, *(params->ppProperties));
10487+
ur_params::serializePtr(os, *(params->phArgValue));
1048810488

1048910489
return os;
1049010490
}

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2223,9 +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.
22272226
const ur_mem_obj_properties_t
2228-
*pProperties ///< [in][optional] pointer to Memory object properties.
2227+
*pProperties, ///< [in][optional] pointer to Memory object properties.
2228+
ur_mem_handle_t hArgValue ///< [in][optional] handle of Memory object.
22292229
) {
22302230
auto pfnSetArgMemObj = context.urDdiTable.Kernel.pfnSetArgMemObj;
22312231

@@ -2234,12 +2234,12 @@ __urdlllocal ur_result_t UR_APICALL urKernelSetArgMemObj(
22342234
}
22352235

22362236
ur_kernel_set_arg_mem_obj_params_t params = {&hKernel, &argIndex,
2237-
&hArgValue, &pProperties};
2237+
&pProperties, &hArgValue};
22382238
uint64_t instance = context.notify_begin(UR_FUNCTION_KERNEL_SET_ARG_MEM_OBJ,
22392239
"urKernelSetArgMemObj", &params);
22402240

22412241
ur_result_t result =
2242-
pfnSetArgMemObj(hKernel, argIndex, hArgValue, pProperties);
2242+
pfnSetArgMemObj(hKernel, argIndex, pProperties, hArgValue);
22432243

22442244
context.notify_end(UR_FUNCTION_KERNEL_SET_ARG_MEM_OBJ,
22452245
"urKernelSetArgMemObj", &params, &result, instance);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2729,9 +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.
27332732
const ur_mem_obj_properties_t
2734-
*pProperties ///< [in][optional] pointer to Memory object properties.
2733+
*pProperties, ///< [in][optional] pointer to Memory object properties.
2734+
ur_mem_handle_t hArgValue ///< [in][optional] handle of Memory object.
27352735
) {
27362736
auto pfnSetArgMemObj = context.urDdiTable.Kernel.pfnSetArgMemObj;
27372737

@@ -2746,7 +2746,7 @@ __urdlllocal ur_result_t UR_APICALL urKernelSetArgMemObj(
27462746
}
27472747

27482748
ur_result_t result =
2749-
pfnSetArgMemObj(hKernel, argIndex, hArgValue, pProperties);
2749+
pfnSetArgMemObj(hKernel, argIndex, pProperties, hArgValue);
27502750

27512751
return result;
27522752
}

‎source/loader/ur_ldrddi.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2560,9 +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.
25642563
const ur_mem_obj_properties_t
2565-
*pProperties ///< [in][optional] pointer to Memory object properties.
2564+
*pProperties, ///< [in][optional] pointer to Memory object properties.
2565+
ur_mem_handle_t hArgValue ///< [in][optional] handle of Memory object.
25662566
) {
25672567
ur_result_t result = UR_RESULT_SUCCESS;
25682568

@@ -2582,7 +2582,7 @@ __urdlllocal ur_result_t UR_APICALL urKernelSetArgMemObj(
25822582
: nullptr;
25832583

25842584
// forward to device-platform
2585-
result = pfnSetArgMemObj(hKernel, argIndex, hArgValue, pProperties);
2585+
result = pfnSetArgMemObj(hKernel, argIndex, pProperties, hArgValue);
25862586

25872587
return result;
25882588
}

0 commit comments

Comments
 (0)