initIfEmpty

Author: aelovikov-intel

sycl/source/detail/device_kernel_info.cpp

@@ -32,9 +32,13 @@ void DeviceKernelInfo::init(KernelNameStrRefT KernelName) {
 }
 
 #ifndef __INTEL_PREVIEW_BREAKING_CHANGES
-void DeviceKernelInfo::initIfNeeded(KernelNameStrRefT KernelName) {
-  if (!MInitialized.load())
-    init(KernelName);
+void DeviceKernelInfo::initIfEmpty(const CompileTimeKernelInfoTy &Info) {
+  if (MInitialized.load())
+    return;
+
+  CompileTimeKernelInfoTy::operator=(Info);
+  Name = Info.Name.data();
+  init(Name.data());
 }
 #endif
 

sycl/source/detail/device_kernel_info.hpp

@@ -102,7 +102,8 @@ class DeviceKernelInfo : public CompileTimeKernelInfoTy {
 
   void init(KernelNameStrRefT KernelName);
 #ifndef __INTEL_PREVIEW_BREAKING_CHANGES
-  void initIfNeeded(KernelNameStrRefT KernelName);
+  // Initialize default-created entry that has no data recorded:
+  void initIfEmpty(const CompileTimeKernelInfoTy &Info);
 #endif
   void setCompileTimeInfoIfNeeded(const CompileTimeKernelInfoTy &Info);
 

sycl/source/handler.cpp

@@ -544,7 +544,14 @@ event handler::finalize() {
   if (type == detail::CGType::Kernel) {
     if (impl->MDeviceKernelInfoPtr) {
 #ifndef __INTEL_PREVIEW_BREAKING_CHANGES
-      impl->MDeviceKernelInfoPtr->initIfNeeded(toKernelNameStrT(MKernelName));
+      detail::CompileTimeKernelInfoTy HandlerInfo;
+      HandlerInfo.Name = MKernelName;
+      HandlerInfo.NumParams = impl->MKernelNumArgs;
+      HandlerInfo.ParamDescGetter = impl->MKernelParamDescGetter;
+      HandlerInfo.IsESIMD = impl->MKernelIsESIMD;
+      HandlerInfo.HasSpecialCaptures = impl->MKernelHasSpecialCaptures;
+
+      impl->MDeviceKernelInfoPtr->initIfEmpty(HandlerInfo);
 #endif
     } else {
       // Fetch the device kernel info pointer if it hasn't been set (e.g.