Address review comment

Author: vinser52

sycl/source/detail/kernel_impl.cpp

@@ -27,16 +27,12 @@ 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(
           MIsInterop
-              ? DeviceKernelInfoUniquePtr(
-                    new DeviceKernelInfo(
-                        CompileTimeKernelInfoTy{std::string_view(getName())}),
-                    DeviceKernelInfoDeleter)
-              : DeviceKernelInfoUniquePtr(
-                    &ProgramManager::getInstance().getOrCreateDeviceKernelInfo(
-                        KernelNameStrT(getName())),
-                    noopDeviceKernelInfoDeleter)) {
+              ? MInteropDeviceKernelInfoHolder
+              : ProgramManager::getInstance().getOrCreateDeviceKernelInfo(
+                    KernelNameStrT(getName()))) {
   ur_context_handle_t UrContext = nullptr;
   // Using the adapter from the passed ContextImpl
   getAdapter().call<UrApiKind::urKernelGetInfo>(
@@ -63,16 +59,12 @@ kernel_impl::kernel_impl(Managed<ur_kernel_handle_t> &&Kernel,
       MKernelBundleImpl(KernelBundleImpl.shared_from_this()),
       MIsInterop(MDeviceImageImpl->getOriginMask() & ImageOriginInterop),
       MKernelArgMaskPtr{ArgMask}, MCacheMutex{CacheMutex},
+      MInteropDeviceKernelInfoHolder(CompileTimeKernelInfoTy{getName()}),
       MDeviceKernelInfo(
           MIsInterop
-              ? DeviceKernelInfoUniquePtr(
-                    new DeviceKernelInfo(
-                        CompileTimeKernelInfoTy{std::string_view(getName())}),
-                    DeviceKernelInfoDeleter)
-              : DeviceKernelInfoUniquePtr(
-                    &ProgramManager::getInstance().getOrCreateDeviceKernelInfo(
-                        KernelNameStrT(getName())),
-                    noopDeviceKernelInfoDeleter)) {
+              ? MInteropDeviceKernelInfoHolder
+              : ProgramManager::getInstance().getOrCreateDeviceKernelInfo(
+                    KernelNameStrT(getName()))) {
   // 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,9 +238,7 @@ class kernel_impl {
   std::mutex *getCacheMutex() const { return MCacheMutex; }
   std::string_view getName() const;
 
-  DeviceKernelInfo *getDeviceKernelInfoPtr() const {
-    return MDeviceKernelInfo.get();
-  }
+  DeviceKernelInfo &getDeviceKernelInfo() const { return MDeviceKernelInfo; }
 
 private:
   Managed<ur_kernel_handle_t> MKernel;
@@ -255,16 +253,11 @@ class kernel_impl {
   std::mutex *MCacheMutex = nullptr;
   mutable std::string MName;
 
-  using DeviceKernelInfoDeleterTy = void (*)(DeviceKernelInfo *);
-  using DeviceKernelInfoUniquePtr =
-      std::unique_ptr<DeviceKernelInfo, DeviceKernelInfoDeleterTy>;
-  DeviceKernelInfoUniquePtr MDeviceKernelInfo;
-
-  static void DeviceKernelInfoDeleter(DeviceKernelInfo *Ptr) { delete Ptr; }
-
-  static void noopDeviceKernelInfoDeleter(DeviceKernelInfo *) {
-    // do nothing
-  }
+  // For the interop kernel we create the DeviceKernelInfo
+  // as part of the kernel_impl
+  // For regular kernel we get DeviceKernelInfo from the ProgramManager
+  DeviceKernelInfo MInteropDeviceKernelInfoHolder;
+  DeviceKernelInfo &MDeviceKernelInfo;
 
   bool isBuiltInKernel(device_impl &Device) const;
   void checkIfValidForNumArgsInfoQuery() const;

sycl/source/handler.cpp

@@ -2542,7 +2542,7 @@ sycl::detail::CGType handler::getType() const { return impl->MCGType; }
 void handler::setDeviceKernelInfo(kernel &&Kernel) {
   MKernel = detail::getSyclObjImpl(std::move(Kernel));
   MKernelName = getKernelName();
-  setDeviceKernelInfoPtr(MKernel->getDeviceKernelInfoPtr());
+  setDeviceKernelInfoPtr(&MKernel->getDeviceKernelInfo());
   setType(detail::CGType::Kernel);
 
   // If any extra actions are added here make sure that logic around