Skip to content

[UR][CUDA][HIP] Fix Set Arg Local #10710

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 25, 2023
Merged

[UR][CUDA][HIP] Fix Set Arg Local #10710

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions sycl/plugins/unified_runtime/pi2ur.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2190,8 +2190,12 @@ inline pi_result piKernelSetArg(pi_kernel Kernel, pi_uint32 ArgIndex,

ur_kernel_handle_t UrKernel = reinterpret_cast<ur_kernel_handle_t>(Kernel);

HANDLE_ERRORS(
urKernelSetArgValue(UrKernel, ArgIndex, ArgSize, nullptr, ArgValue));
if (ArgValue) {
HANDLE_ERRORS(
urKernelSetArgValue(UrKernel, ArgIndex, ArgSize, nullptr, ArgValue));
} else {
HANDLE_ERRORS(urKernelSetArgLocal(UrKernel, ArgIndex, ArgSize, nullptr));
}
return PI_SUCCESS;
}

Expand Down
21 changes: 16 additions & 5 deletions sycl/plugins/unified_runtime/ur/adapters/cuda/kernel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,11 +186,22 @@ UR_APIEXPORT ur_result_t UR_APICALL urKernelSetArgValue(

ur_result_t Result = UR_RESULT_SUCCESS;
try {
if (pArgValue) {
hKernel->setKernelArg(argIndex, argSize, pArgValue);
} else {
hKernel->setKernelLocalArg(argIndex, argSize);
}
hKernel->setKernelArg(argIndex, argSize, pArgValue);
} catch (ur_result_t Err) {
Result = Err;
}
return Result;
}

UR_APIEXPORT ur_result_t UR_APICALL urKernelSetArgLocal(
ur_kernel_handle_t hKernel, uint32_t argIndex, size_t argSize,
const ur_kernel_arg_local_properties_t *pProperties) {
std::ignore = pProperties;
UR_ASSERT(argSize, UR_RESULT_ERROR_INVALID_KERNEL_ARGUMENT_SIZE);

ur_result_t Result = UR_RESULT_SUCCESS;
try {
hKernel->setKernelLocalArg(argIndex, argSize);
} catch (ur_result_t Err) {
Result = Err;
}
Expand Down
2 changes: 1 addition & 1 deletion sycl/plugins/unified_runtime/ur/adapters/cuda/ur_interface_loader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetKernelProcAddrTable(
pDdiTable->pfnGetSubGroupInfo = urKernelGetSubGroupInfo;
pDdiTable->pfnRelease = urKernelRelease;
pDdiTable->pfnRetain = urKernelRetain;
pDdiTable->pfnSetArgLocal = nullptr;
pDdiTable->pfnSetArgLocal = urKernelSetArgLocal;
pDdiTable->pfnSetArgMemObj = urKernelSetArgMemObj;
pDdiTable->pfnSetArgPointer = urKernelSetArgPointer;
pDdiTable->pfnSetArgSampler = urKernelSetArgSampler;
Expand Down
21 changes: 16 additions & 5 deletions sycl/plugins/unified_runtime/ur/adapters/hip/kernel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,11 +168,22 @@ UR_APIEXPORT ur_result_t UR_APICALL urKernelSetArgValue(
const ur_kernel_arg_value_properties_t *, const void *pArgValue) {
ur_result_t Result = UR_RESULT_SUCCESS;
try {
if (pArgValue) {
hKernel->setKernelArg(argIndex, argSize, pArgValue);
} else {
hKernel->setKernelLocalArg(argIndex, argSize);
}
hKernel->setKernelArg(argIndex, argSize, pArgValue);
} catch (ur_result_t Err) {
Result = Err;
}
return Result;
}

UR_APIEXPORT ur_result_t UR_APICALL urKernelSetArgLocal(
ur_kernel_handle_t hKernel, uint32_t argIndex, size_t argSize,
const ur_kernel_arg_local_properties_t *pProperties) {
std::ignore = pProperties;
UR_ASSERT(argSize, UR_RESULT_ERROR_INVALID_KERNEL_ARGUMENT_SIZE);

ur_result_t Result = UR_RESULT_SUCCESS;
try {
hKernel->setKernelLocalArg(argIndex, argSize);
} catch (ur_result_t Err) {
Result = Err;
}
Expand Down
2 changes: 1 addition & 1 deletion sycl/plugins/unified_runtime/ur/adapters/hip/ur_interface_loader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ UR_DLLEXPORT ur_result_t UR_APICALL urGetKernelProcAddrTable(
pDdiTable->pfnGetSubGroupInfo = urKernelGetSubGroupInfo;
pDdiTable->pfnRelease = urKernelRelease;
pDdiTable->pfnRetain = urKernelRetain;
pDdiTable->pfnSetArgLocal = nullptr;
pDdiTable->pfnSetArgLocal = urKernelSetArgLocal;
pDdiTable->pfnSetArgMemObj = urKernelSetArgMemObj;
pDdiTable->pfnSetArgPointer = urKernelSetArgPointer;
pDdiTable->pfnSetArgSampler = urKernelSetArgSampler;
Expand Down
9 changes: 4 additions & 5 deletions sycl/plugins/unified_runtime/ur/adapters/level_zero/kernel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,12 +419,11 @@ UR_APIEXPORT ur_result_t UR_APICALL urKernelSetArgLocal(
const ur_kernel_arg_local_properties_t
*Properties ///< [in][optional] argument properties
) {
std::ignore = Kernel;
std::ignore = ArgIndex;
std::ignore = Properties;
std::ignore = ArgSize;
urPrint("[UR][L0] %s function not implemented!\n", __FUNCTION__);
return UR_RESULT_ERROR_UNSUPPORTED_FEATURE;

UR_CALL(urKernelSetArgValue(Kernel, ArgIndex, ArgSize, nullptr, nullptr));

return UR_RESULT_SUCCESS;
}

UR_APIEXPORT ur_result_t UR_APICALL urKernelGetInfo(
Expand Down