[SYCL] Use 'kernel's info instance for more image origins

Author: sergey-semenov

sycl/source/detail/kernel_impl.cpp

@@ -32,7 +32,8 @@ kernel_impl::kernel_impl(Managed<ur_kernel_handle_t> &&Kernel,
       MKernelBundleImpl(KernelBundleImpl ? KernelBundleImpl->shared_from_this()
                                          : nullptr),
       MIsInterop(true), MKernelArgMaskPtr{ArgMask},
-      MInteropDeviceKernelInfo(createCompileTimeKernelInfo(getName())) {
+      MOwnsDeviceKernelInfo(true),
+      MDeviceKernelInfo(createCompileTimeKernelInfo(getName())) {
   ur_context_handle_t UrContext = nullptr;
   // Using the adapter from the passed ContextImpl
   getAdapter().call<UrApiKind::urKernelGetInfo>(
@@ -59,7 +60,8 @@ 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
+      MOwnsDeviceKernelInfo(MDeviceImageImpl->getOriginMask() & ~ImageOriginSYCLOffline),
+      MDeviceKernelInfo(MOwnsDeviceKernelInfo
                                    ? createCompileTimeKernelInfo(getName())
                                    : createCompileTimeKernelInfo()) {
   // Enable USM indirect access for interop and non-sycl-jit source kernels.

sycl/source/detail/kernel_impl.hpp

@@ -240,10 +240,9 @@ class kernel_impl {
   std::string_view getName() const;
 
   DeviceKernelInfo &getDeviceKernelInfo() {
-    return MIsInterop
-               ? MInteropDeviceKernelInfo
-               : ProgramManager::getInstance().getOrCreateDeviceKernelInfo(
-                     KernelNameStrT(getName()));
+    return MOwnsDeviceKernelInfo ? MDeviceKernelInfo
+                      : ProgramManager::getInstance().getOrCreateDeviceKernelInfo(
+                            KernelNameStrT(getName()));
   }
 
 private:
@@ -259,9 +258,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;