Fix backward compatibility with 6.3

Author: vinser52

sycl/source/detail/handler_impl.hpp

@@ -223,6 +223,15 @@ class handler_impl {
   // Allocation ptr to be freed asynchronously.
   void *MFreePtr = nullptr;
 
+#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
+  // TODO: remove in the next ABI-breaking window
+  // Today they are used only in the handler::setKernelNameBasedCachePtr
+  int MKernelNumArgs = 0;
+  detail::kernel_param_desc_t (*MKernelParamDescGetter)(int) = nullptr;
+  bool MKernelIsESIMD = false;
+  bool MKernelHasSpecialCaptures = true;
+#endif
+
   KernelData MKernelData;
 };
 

sycl/source/handler.cpp

@@ -2326,23 +2326,27 @@ void handler::setNDRangeDescriptor(sycl::range<1> NumWorkItems,
 void handler::setKernelNameBasedCachePtr(
     sycl::detail::KernelNameBasedCacheT *KernelNameBasedCachePtr) {
   assert(!impl->MKernelData.getDeviceKernelInfoPtr() && "Already set!");
+
+  CompileTimeKernelInfoTy HandlerInfo;
+  HandlerInfo.Name = MKernelName;
+  HandlerInfo.NumParams = impl->MKernelNumArgs;
+  HandlerInfo.ParamDescGetter = impl->MKernelParamDescGetter;
+  HandlerInfo.IsESIMD = impl->MKernelIsESIMD;
+  HandlerInfo.HasSpecialCaptures = impl->MKernelHasSpecialCaptures;
   impl->MKernelData.setDeviceKernelInfoPtr(
-      reinterpret_cast<sycl::detail::DeviceKernelInfo *>(
-          KernelNameBasedCachePtr));
+      &detail::ProgramManager::getInstance().getOrCreateDeviceKernelInfo(
+          HandlerInfo));
 }
 
 void handler::setKernelInfo(
     void *KernelFuncPtr, int KernelNumArgs,
     detail::kernel_param_desc_t (*KernelParamDescGetter)(int),
     bool KernelIsESIMD, bool KernelHasSpecialCaptures) {
-  if (impl->MKernelData.getDeviceKernelInfoPtr() == nullptr) {
-    impl->MKernelData.setDeviceKernelInfoPtr(
-        &detail::ProgramManager::getInstance().getOrCreateDeviceKernelInfo(
-            toKernelNameStrT(MKernelName)));
-  }
-  impl->MKernelData.setKernelInfo(KernelFuncPtr, KernelNumArgs,
-                                  KernelParamDescGetter, KernelIsESIMD,
-                                  KernelHasSpecialCaptures);
+  impl->MKernelData.setKernelInfo(KernelFuncPtr);
+  impl->MKernelNumArgs = KernelNumArgs;
+  impl->MKernelParamDescGetter = KernelParamDescGetter;
+  impl->MKernelIsESIMD = KernelIsESIMD;
+  impl->MKernelHasSpecialCaptures = KernelHasSpecialCaptures;
 }
 #endif