Skip to content

Commit 98193fe

Browse files
committed
[UR] Fix warnings in appendKernelLaunchWithArgsExpNew()
Fix following warnings in appendKernelLaunchWithArgsExpNew(): warning: cast from type ‘X’ to type ‘void*’ casts away qualifiers [-Wcast-qual] Signed-off-by: Lukasz Dorau <[email protected]>
1 parent 43eedd1 commit 98193fe

File tree

4 files changed

+13
-9
lines changed

4 files changed

+13
-9
lines changed

sycl/source/detail/scheduler/commands.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2438,7 +2438,7 @@ static ur_result_t SetKernelParamsAndLaunch(
24382438
case kernel_param_kind_t::kind_std_layout: {
24392439
int Size = ParamDesc.info;
24402440
ur_exp_kernel_arg_value_t Value = {};
2441-
Value.value = ArgPtr;
2441+
Value.value = const_cast<void *>(ArgPtr);
24422442
UrArgs.push_back({UR_STRUCTURE_TYPE_EXP_KERNEL_ARG_PROPERTIES, nullptr,
24432443
UR_EXP_KERNEL_ARG_TYPE_VALUE,
24442444
static_cast<uint32_t>(NextTrueIndex),
@@ -2447,7 +2447,7 @@ static ur_result_t SetKernelParamsAndLaunch(
24472447
}
24482448
case kernel_param_kind_t::kind_pointer: {
24492449
ur_exp_kernel_arg_value_t Value = {};
2450-
Value.pointer = *static_cast<const void *const *>(ArgPtr);
2450+
Value.pointer = *static_cast<void **>(const_cast<void *>(ArgPtr));
24512451
UrArgs.push_back({UR_STRUCTURE_TYPE_EXP_KERNEL_ARG_PROPERTIES, nullptr,
24522452
UR_EXP_KERNEL_ARG_TYPE_POINTER,
24532453
static_cast<uint32_t>(NextTrueIndex),

unified-runtime/include/ur_api.h

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

unified-runtime/scripts/core/exp-enqueue-kernel-launch-with-args.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ desc: "Typesafe container for a kernel argument value"
4646
name: $x_exp_kernel_arg_value_t
4747
tag: $x_exp_kernel_arg_type_t
4848
members:
49-
- type: "const void*"
49+
- type: "void*"
5050
name: value
5151
desc: |
5252
[in] argument value represented as matching arg type.
5353
The data pointed to will be copied and therefore can be reused on return.
5454
tag: $X_EXP_KERNEL_ARG_TYPE_VALUE
55-
- type: "const void*"
55+
- type: "void*"
5656
name: pointer
5757
desc: "[in] Allocation obtained by USM allocation or virtual memory mapping operation, or pointer to a literal value."
5858
tag: $X_EXP_KERNEL_ARG_TYPE_POINTER

unified-runtime/source/adapters/level_zero/v2/command_list_manager.cpp

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1167,13 +1167,17 @@ ur_result_t ur_command_list_manager::appendKernelLaunchWithArgsExpNew(
11671167
for (uint32_t argIndex = 0; argIndex < numArgs; argIndex++) {
11681168
switch (pArgs[argIndex].type) {
11691169
case UR_EXP_KERNEL_ARG_TYPE_LOCAL:
1170-
hKernel->kernelArgs[argIndex] = (void *)&pArgs[argIndex].size;
1170+
hKernel->kernelArgs[argIndex] =
1171+
reinterpret_cast<void *>(const_cast<size_t *>(&pArgs[argIndex].size));
11711172
break;
11721173
case UR_EXP_KERNEL_ARG_TYPE_VALUE:
1173-
hKernel->kernelArgs[argIndex] = (void *)pArgs[argIndex].value.value;
1174+
hKernel->kernelArgs[argIndex] = pArgs[argIndex].value.value;
11741175
break;
11751176
case UR_EXP_KERNEL_ARG_TYPE_POINTER:
1176-
hKernel->kernelArgs[argIndex] = (void *)&pArgs[argIndex].value.pointer;
1177+
// Casting is necessary here, since the argument
1178+
// is of the 'void * const *' type.
1179+
hKernel->kernelArgs[argIndex] = reinterpret_cast<void *>(
1180+
const_cast<void **>(&pArgs[argIndex].value.pointer));
11771181
break;
11781182
case UR_EXP_KERNEL_ARG_TYPE_MEM_OBJ:
11791183
// prepareForSubmission() will save zePtr in kernelMemObj[argIndex]

0 commit comments

Comments
 (0)