Fix Jenkins issue

Author: vinser52

sycl/source/detail/kernel_impl.cpp

@@ -27,8 +27,7 @@ kernel_impl::kernel_impl(Managed<ur_kernel_handle_t> &&Kernel,
       MKernelBundleImpl(KernelBundleImpl ? KernelBundleImpl->shared_from_this()
                                          : nullptr),
       MIsInterop(true), MKernelArgMaskPtr{ArgMask},
-      MInteropDeviceKernelInfoHolder(CompileTimeKernelInfoTy{getName()}),
-      MDeviceKernelInfo(MInteropDeviceKernelInfoHolder) {
+      MInteropDeviceKernelInfo(CompileTimeKernelInfoTy{getName()}) {
   ur_context_handle_t UrContext = nullptr;
   // Using the adapter from the passed ContextImpl
   getAdapter().call<UrApiKind::urKernelGetInfo>(
@@ -55,14 +54,8 @@ kernel_impl::kernel_impl(Managed<ur_kernel_handle_t> &&Kernel,
       MKernelBundleImpl(KernelBundleImpl.shared_from_this()),
       MIsInterop(MDeviceImageImpl->getOriginMask() & ImageOriginInterop),
       MKernelArgMaskPtr{ArgMask}, MCacheMutex{CacheMutex},
-      MInteropDeviceKernelInfoHolder(MIsInterop
-                                         ? CompileTimeKernelInfoTy{getName()}
-                                         : CompileTimeKernelInfoTy{}),
-      MDeviceKernelInfo(
-          MIsInterop
-              ? MInteropDeviceKernelInfoHolder
-              : ProgramManager::getInstance().getOrCreateDeviceKernelInfo(
-                    KernelNameStrT(getName()))) {
+      MInteropDeviceKernelInfo(MIsInterop ? CompileTimeKernelInfoTy{getName()}
+                                          : CompileTimeKernelInfoTy{}) {
   // 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.

sycl/source/detail/kernel_impl.hpp

@@ -238,7 +238,12 @@ class kernel_impl {
   std::mutex *getCacheMutex() const { return MCacheMutex; }
   std::string_view getName() const;
 
-  DeviceKernelInfo &getDeviceKernelInfo() const { return MDeviceKernelInfo; }
+  DeviceKernelInfo &getDeviceKernelInfo() {
+    return MIsInterop
+               ? MInteropDeviceKernelInfo
+               : ProgramManager::getInstance().getOrCreateDeviceKernelInfo(
+                     KernelNameStrT(getName()));
+  }
 
 private:
   Managed<ur_kernel_handle_t> MKernel;
@@ -253,11 +258,9 @@ class kernel_impl {
   std::mutex *MCacheMutex = nullptr;
   mutable std::string MName;
 
-  // For the interop kernel we create the DeviceKernelInfo
-  // as part of the kernel_impl.
+  // It is used for the interop kernels only.
   // For regular kernel we get DeviceKernelInfo from the ProgramManager.
-  DeviceKernelInfo MInteropDeviceKernelInfoHolder;
-  DeviceKernelInfo &MDeviceKernelInfo;
+  DeviceKernelInfo MInteropDeviceKernelInfo;
 
   bool isBuiltInKernel(device_impl &Device) const;
   void checkIfValidForNumArgsInfoQuery() const;