class DeviceKernelInfo : public CompileTimeKernelInfoTy

Author: aelovikov-intel

sycl/include/sycl/detail/kernel_desc.hpp

@@ -283,16 +283,16 @@ inline namespace compile_time_kernel_info_v1 {
 // at least for as long as we support user apps built with GNU libstdc++'s
 // pre-C++11 ABI.
 struct CompileTimeKernelInfoTy {
-  const char *Name = nullptr;
-  unsigned NumParams = 0;
-  bool IsESIMD = false;
-  const char *FileName = "";
-  const char *FunctionName = "";
-  unsigned LineNumber = 0;
-  unsigned ColumnNumber = 0;
-  int64_t KernelSize;
-  kernel_param_desc_t (*ParamDescGetter)(int) = nullptr;
-  bool HasSpecialCaptures = false;
+  const char * const Name = nullptr;
+  const unsigned NumParams = 0;
+  const bool IsESIMD = false;
+  const char * const FileName = "";
+  const char *const FunctionName = "";
+  const unsigned LineNumber = 0;
+  const unsigned ColumnNumber = 0;
+  const int64_t KernelSize = 0;
+  kernel_param_desc_t (*const ParamDescGetter)(int) = nullptr;
+  const bool HasSpecialCaptures = false;
 };
 
 template <class Kernel>

sycl/source/detail/get_kernel_name_based_data.cpp

@@ -22,7 +22,7 @@ KernelNameBasedCacheT *createKernelNameBasedCache() {
 #endif
 
 DeviceKernelInfo &getDeviceKernelInfo(const CompileTimeKernelInfoTy &Info) {
-  return ProgramManager::getInstance().getOrCreateDeviceKernelInfo(Info.Name);
+  return ProgramManager::getInstance().getOrCreateDeviceKernelInfo(Info);
 }
 
 } // namespace detail

sycl/source/detail/kernel_name_based_data.cpp

@@ -12,8 +12,9 @@ namespace sycl {
 inline namespace _V1 {
 namespace detail {
 
-DeviceKernelInfo::DeviceKernelInfo(KernelNameStrRefT KernelName) {
-  init(KernelName);
+DeviceKernelInfo::DeviceKernelInfo(const CompileTimeKernelInfoTy &Info)
+    : CompileTimeKernelInfoTy(Info) {
+  init(Name);
 }
 
 void DeviceKernelInfo::init(KernelNameStrRefT KernelName) {
@@ -53,4 +54,4 @@ void DeviceKernelInfo::assertInitialized() {
 
 } // namespace detail
 } // namespace _V1
-} // namespace sycl
+} // namespace sycl

sycl/source/detail/kernel_name_based_data.hpp

@@ -10,6 +10,7 @@
 #include <detail/hashers.hpp>
 #include <detail/kernel_arg_mask.hpp>
 #include <emhash/hash_table8.hpp>
+#include <sycl/detail/kernel_desc.hpp>
 #include <sycl/detail/kernel_name_str_t.hpp>
 #include <sycl/detail/spinlock.hpp>
 #include <sycl/detail/ur.hpp>
@@ -85,12 +86,12 @@ struct FastKernelSubcacheT {
 // TODO Currently this class duplicates information fetched from the program
 // manager. Instead, we should merge all of the kernel name based information
 // into this structure and get rid of the other KernelName -> * maps.
-class DeviceKernelInfo {
+class DeviceKernelInfo : public CompileTimeKernelInfoTy {
 public:
 #ifndef __INTEL_PREVIEW_BREAKING_CHANGES
   DeviceKernelInfo() = default;
 #endif
-  DeviceKernelInfo(KernelNameStrRefT KernelName);
+  DeviceKernelInfo(const CompileTimeKernelInfoTy &Info);
 
   void init(KernelNameStrRefT KernelName);
 #ifndef __INTEL_PREVIEW_BREAKING_CHANGES

sycl/source/detail/program_manager/program_manager.cpp

@@ -1821,8 +1821,9 @@ ProgramManager::kernelImplicitLocalArgPos(KernelNameStrRefT KernelName) const {
 }
 
 DeviceKernelInfo &
-ProgramManager::getOrCreateDeviceKernelInfo(KernelNameStrRefT KernelName) {
-  auto Result = m_KernelNameBasedDataMap.try_emplace(KernelName, KernelName);
+ProgramManager::getOrCreateDeviceKernelInfo(const CompileTimeKernelInfoTy &Info) {
+  auto Result =
+      m_KernelNameBasedDataMap.try_emplace(KernelNameStrT{Info.Name}, Info);
   return Result.first->second;
 }
 

sycl/source/detail/program_manager/program_manager.hpp

@@ -376,10 +376,11 @@ class ProgramManager {
   std::optional<int>
   kernelImplicitLocalArgPos(KernelNameStrRefT KernelName) const;
 
-  DeviceKernelInfo &getOrCreateDeviceKernelInfo(KernelNameStrRefT KernelName);
   DeviceKernelInfo &
-  getOrCreateDeviceKernelInfo(const CompileTimeKernelInfoTy &Info) {
-    return getOrCreateDeviceKernelInfo(Info.Name);
+  getOrCreateDeviceKernelInfo(const CompileTimeKernelInfoTy &Info);
+  DeviceKernelInfo &getOrCreateDeviceKernelInfo(KernelNameStrRefT KernelName) {
+    return getOrCreateDeviceKernelInfo(
+        CompileTimeKernelInfoTy{KernelName.data()});
   }
 
   std::set<const RTDeviceBinaryImage *>