Fix backward compatibility issue

Author: vinser52

sycl/source/detail/kernel_data.cpp

@@ -103,8 +103,15 @@ static void addArgsForLocalAccessor(detail::LocalAccessorImplHost *LAcc,
 
 void KernelData::processArg(void *Ptr, const detail::kernel_param_kind_t &Kind,
                             const int Size, const size_t Index,
-                            size_t &IndexShift,
-                            bool IsKernelCreatedFromSource) {
+                            size_t &IndexShift, bool IsKernelCreatedFromSource
+#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
+                            ,
+                            bool IsESIMD
+#endif
+) {
+#ifdef __INTEL_PREVIEW_BREAKING_CHANGES
+  bool IsESIMD = isESIMD();
+#endif
   using detail::kernel_param_kind_t;
   size_t GlobalSize = MNDRDesc.GlobalSize[0];
   for (size_t I = 1; I < MNDRDesc.Dims; ++I) {
@@ -126,14 +133,14 @@ void KernelData::processArg(void *Ptr, const detail::kernel_param_kind_t &Kind,
     detail::Requirement *GBufReq = &*detail::getSyclObjImpl(*GBufBase);
     addArgsForGlobalAccessor(GBufReq, Index, IndexShift, Size,
                              IsKernelCreatedFromSource, GlobalSize, MArgs,
-                             isESIMD());
+                             IsESIMD);
     ++IndexShift;
     detail::AccessorBaseHost *GOffsetBase =
         static_cast<detail::AccessorBaseHost *>(&S->GlobalOffset);
     detail::Requirement *GOffsetReq = &*detail::getSyclObjImpl(*GOffsetBase);
     addArgsForGlobalAccessor(GOffsetReq, Index, IndexShift, Size,
                              IsKernelCreatedFromSource, GlobalSize, MArgs,
-                             isESIMD());
+                             IsESIMD);
     ++IndexShift;
     detail::AccessorBaseHost *GFlushBase =
         static_cast<detail::AccessorBaseHost *>(&S->GlobalFlushBuf);
@@ -152,7 +159,7 @@ void KernelData::processArg(void *Ptr, const detail::kernel_param_kind_t &Kind,
     }
     addArgsForGlobalAccessor(GFlushReq, Index, IndexShift, Size,
                              IsKernelCreatedFromSource, GlobalSize, MArgs,
-                             isESIMD());
+                             IsESIMD);
     ++IndexShift;
     addArg(kernel_param_kind_t::kind_std_layout, &S->FlushBufferSize,
            sizeof(S->FlushBufferSize), Index + IndexShift);
@@ -170,15 +177,15 @@ void KernelData::processArg(void *Ptr, const detail::kernel_param_kind_t &Kind,
       detail::Requirement *AccImpl = static_cast<detail::Requirement *>(Ptr);
       addArgsForGlobalAccessor(AccImpl, Index, IndexShift, Size,
                                IsKernelCreatedFromSource, GlobalSize, MArgs,
-                               isESIMD());
+                               IsESIMD);
       break;
     }
     case access::target::local: {
       detail::LocalAccessorImplHost *LAccImpl =
           static_cast<detail::LocalAccessorImplHost *>(Ptr);
 
       addArgsForLocalAccessor(LAccImpl, Index, IndexShift,
-                              IsKernelCreatedFromSource, MArgs, isESIMD());
+                              IsKernelCreatedFromSource, MArgs, IsESIMD);
       break;
     }
     case access::target::image:
@@ -221,7 +228,7 @@ void KernelData::processArg(void *Ptr, const detail::kernel_param_kind_t &Kind,
 
       addArgsForLocalAccessor(&DynLocalAccessorImpl->LAccImplHost, Index,
                               IndexShift, IsKernelCreatedFromSource, MArgs,
-                              isESIMD());
+                              IsESIMD);
       break;
     }
     default: {
@@ -289,7 +296,12 @@ void KernelData::extractArgsAndReqs(bool IsKernelCreatedFromSource) {
     const detail::kernel_param_kind_t &Kind = UnPreparedArgs[I].MType;
     const int &Size = UnPreparedArgs[I].MSize;
     const int Index = UnPreparedArgs[I].MIndex;
-    processArg(Ptr, Kind, Size, Index, IndexShift, IsKernelCreatedFromSource);
+    processArg(Ptr, Kind, Size, Index, IndexShift, IsKernelCreatedFromSource
+#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
+               ,
+               isESIMD()
+#endif
+    );
   }
 }
 
@@ -341,7 +353,12 @@ void KernelData::extractArgsAndReqsFromLambda() {
     }
 
     processArg(Ptr, Kind, Size, I, IndexShift,
-               /*IsKernelCreatedFromSource=*/false);
+               /*IsKernelCreatedFromSource=*/false
+#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
+               ,
+               isESIMD()
+#endif
+    );
   }
 }
 

sycl/source/detail/kernel_data.hpp

@@ -169,7 +169,12 @@ class KernelData {
 
   void processArg(void *Ptr, const detail::kernel_param_kind_t &Kind,
                   const int Size, const size_t Index, size_t &IndexShift,
-                  bool IsKernelCreatedFromSource);
+                  bool IsKernelCreatedFromSource
+#ifndef __INTEL_PREVIEW_BREAKING_CHANGES
+                  ,
+                  bool IsESIMD
+#endif
+  );
 
   void extractArgsAndReqs(bool IsKernelCreatedFromSource);
 

sycl/source/handler.cpp

@@ -539,8 +539,14 @@ event handler::finalize() {
   }
 
   if (type == detail::CGType::Kernel) {
-    assert(impl->MKernelData.getDeviceKernelInfoPtr() != nullptr &&
-           "DeviceKernelInfo pointer must be set in handler_impl");
+    if (impl->MKernelData.getDeviceKernelInfoPtr() == nullptr) {
+      // Fetch the device kernel info pointer if it hasn't been set (e.g.
+      // in kernel bundle or free function cases).
+      impl->MKernelData.setDeviceKernelInfoPtr(
+          &detail::ProgramManager::getInstance().getOrCreateDeviceKernelInfo(
+              toKernelNameStrT(MKernelName)));
+    }
+    assert(impl->MKernelData.getKernelName() == MKernelName);
 
     // If there were uses of set_specialization_constant build the kernel_bundle
     detail::kernel_bundle_impl *KernelBundleImpPtr =
@@ -1049,9 +1055,8 @@ void handler::associateWithHandler(
 void handler::processArg(void *Ptr, const detail::kernel_param_kind_t &Kind,
                          const int Size, const size_t Index, size_t &IndexShift,
                          bool IsKernelCreatedFromSource, bool IsESIMD) {
-  (void)IsESIMD;
   impl->MKernelData.processArg(Ptr, Kind, Size, Index, IndexShift,
-                               IsKernelCreatedFromSource);
+                               IsKernelCreatedFromSource, IsESIMD);
 }
 #endif
 
@@ -1103,13 +1108,6 @@ void handler::extractArgsAndReqsFromLambda(
   const bool IsKernelCreatedFromSource = false;
   size_t IndexShift = 0;
 
-  if (impl->MKernelData.getDeviceKernelInfoPtr() == nullptr) {
-    impl->MKernelData.setDeviceKernelInfoPtr(
-        &detail::ProgramManager::getInstance().getOrCreateDeviceKernelInfo(
-            toKernelNameStrT(getKernelName())));
-  }
-  impl->MKernelData.setESIMD(IsESIMD);
-
   for (size_t I = 0; I < ParamDescs.size(); ++I) {
     void *Ptr = LambdaPtr + ParamDescs[I].offset;
     const detail::kernel_param_kind_t &Kind = ParamDescs[I].kind;
@@ -1133,7 +1131,7 @@ void handler::extractArgsAndReqsFromLambda(
       }
     }
     impl->MKernelData.processArg(Ptr, Kind, Size, I, IndexShift,
-                                 IsKernelCreatedFromSource);
+                                 IsKernelCreatedFromSource, IsESIMD);
   }
 }