Skip to content
Merged
Changes from 1 commit
Commits
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
24 changes: 14 additions & 10 deletions sycl/include/sycl/handler.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -1467,12 +1467,13 @@ class __SYCL_EXPORT handler {
setNDRangeDescriptor(std::move(params)...);
}

setDeviceKernelInfo(std::move(Kernel));
if (lambdaAndKernelHaveEqualName<NameT>()) {
StoreLambda<NameT, KernelType, Dims, ElementType>(std::move(KernelFunc));
} else {
extractArgsAndReqs();
MKernel = detail::getSyclObjImpl(Kernel);
if (!lambdaAndKernelHaveEqualName<NameT>()) {
throw sycl::exception(
make_error_code(errc::invalid),
"the kernel name must match the name of the lambda");
}
StoreLambda<NameT, KernelType, Dims, ElementType>(std::move(KernelFunc));
processProperties<Info.IsESIMD, PropertiesT>(Props);
#endif
}
Expand Down Expand Up @@ -1926,12 +1927,15 @@ class __SYCL_EXPORT handler {
// No need to check if range is out of INT_MAX limits as it's compile-time
// known constant
setNDRangeDescriptor(range<1>{1});
setDeviceKernelInfo(std::move(Kernel));
if (lambdaAndKernelHaveEqualName<NameT>()) {
StoreLambda<NameT, KernelType, /*Dims*/ 1, void>(std::move(KernelFunc));
} else {
extractArgsAndReqs();

MKernel = detail::getSyclObjImpl(std::move(Kernel));
if (!lambdaAndKernelHaveEqualName<NameT>()) {
throw sycl::exception(
make_error_code(errc::invalid),
"the kernel name must match the name of the lambda");
}
StoreLambda<NameT, KernelType, /*Dims*/ 1, void>(std::move(KernelFunc));

#else
detail::CheckDeviceCopyable<KernelType>();
#endif
Expand Down
Loading