Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
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
12 changes: 7 additions & 5 deletions sycl/source/detail/kernel_impl.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ kernel_impl::kernel_impl(Managed<ur_kernel_handle_t> &&Kernel,
MCreatedFromSource(true),
MKernelBundleImpl(KernelBundleImpl ? KernelBundleImpl->shared_from_this()
: nullptr),
MIsInterop(true), MKernelArgMaskPtr{ArgMask},
MInteropDeviceKernelInfo(createCompileTimeKernelInfo(getName())) {
MIsInterop(true), MKernelArgMaskPtr{ArgMask}, MOwnsDeviceKernelInfo(true),
MDeviceKernelInfo(createCompileTimeKernelInfo(getName())) {
ur_context_handle_t UrContext = nullptr;
// Using the adapter from the passed ContextImpl
getAdapter().call<UrApiKind::urKernelGetInfo>(
Expand All @@ -59,9 +59,11 @@ kernel_impl::kernel_impl(Managed<ur_kernel_handle_t> &&Kernel,
MKernelBundleImpl(KernelBundleImpl.shared_from_this()),
MIsInterop(MDeviceImageImpl->getOriginMask() & ImageOriginInterop),
MKernelArgMaskPtr{ArgMask}, MCacheMutex{CacheMutex},
MInteropDeviceKernelInfo(MIsInterop
? createCompileTimeKernelInfo(getName())
: createCompileTimeKernelInfo()) {
MOwnsDeviceKernelInfo(MDeviceImageImpl->getOriginMask() &
~ImageOriginSYCLOffline),
MDeviceKernelInfo(MOwnsDeviceKernelInfo
? createCompileTimeKernelInfo(getName())
: createCompileTimeKernelInfo()) {
// Enable USM indirect access for interop and non-sycl-jit source kernels.
// sycl-jit kernels will enable this if needed through the regular kernel
// path.
Expand Down
10 changes: 6 additions & 4 deletions sycl/source/detail/kernel_impl.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,8 @@ class kernel_impl {
std::string_view getName() const;

DeviceKernelInfo &getDeviceKernelInfo() {
return MIsInterop
? MInteropDeviceKernelInfo
return MOwnsDeviceKernelInfo
? MDeviceKernelInfo
: ProgramManager::getInstance().getOrCreateDeviceKernelInfo(
KernelNameStrT(getName()));
}
Expand All @@ -259,9 +259,11 @@ class kernel_impl {
std::mutex *MCacheMutex = nullptr;
mutable std::string MName;

// It is used for the interop kernels only.
// Used for images that aren't obtained with standard SYCL offline
// compilation.
// For regular kernel we get DeviceKernelInfo from the ProgramManager.
DeviceKernelInfo MInteropDeviceKernelInfo;
bool MOwnsDeviceKernelInfo = false;
DeviceKernelInfo MDeviceKernelInfo;

bool isBuiltInKernel(device_impl &Device) const;
void checkIfValidForNumArgsInfoQuery() const;
Expand Down
Loading