Skip to content

[SYCL] Handle nullptr arguments in level_zero #6464

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 3 commits into from
Jul 25, 2022
Merged

[SYCL] Handle nullptr arguments in level_zero #6464

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ba0df83
[SYCL] Handle nullptr arguments in level_zero
v-klochkov Jul 21, 2022
f8bca29
Add a comment per reviewer's request
v-klochkov Jul 22, 2022
fdd68a3
Merge remote-tracking branch 'intel_llvm/sycl' into esimd_spec_const_…
v-klochkov Jul 22, 2022
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
15 changes: 11 additions & 4 deletions sycl/plugins/level_zero/pi_level_zero.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4976,8 +4976,11 @@ pi_result piextKernelSetArgMemObj(pi_kernel Kernel, pi_uint32 ArgIndex,
// piextKernelSetArgMemObj.
//
std::scoped_lock Guard(Kernel->Mutex);
// The ArgValue may be a NULL pointer in which case a NULL value is used for
// the kernel argument declared as a pointer to global or constant memory.
auto Arg = ArgValue ? *ArgValue : nullptr;
Kernel->PendingArguments.push_back(
{ArgIndex, sizeof(void *), *ArgValue, _pi_mem::read_write});
{ArgIndex, sizeof(void *), Arg, _pi_mem::read_write});

return PI_SUCCESS;
}
Expand Down Expand Up @@ -5201,9 +5204,13 @@ piEnqueueKernelLaunch(pi_queue Queue, pi_kernel Kernel, pi_uint32 WorkDim,

// If there are any pending arguments set them now.
for (auto &Arg : Kernel->PendingArguments) {
char **ZeHandlePtr;
PI_CALL(
Arg.Value->getZeHandlePtr(ZeHandlePtr, Arg.AccessMode, Queue->Device));
// The ArgValue may be a NULL pointer in which case a NULL value is used for
// the kernel argument declared as a pointer to global or constant memory.
char **ZeHandlePtr = nullptr;
if (Arg.Value) {
PI_CALL(Arg.Value->getZeHandlePtr(ZeHandlePtr, Arg.AccessMode,
Queue->Device));
}
ZE_CALL(zeKernelSetArgumentValue,
(Kernel->ZeKernel, Arg.Index, Arg.Size, ZeHandlePtr));
}
Expand Down