Move loop over args inside handler::extractArgsAndReqsFromLambda()

Author: Alexandr-Konovalov

sycl/include/sycl/handler.hpp

@@ -481,8 +481,8 @@ class __SYCL_EXPORT handler {
   /// from the built-ins or integration header.
   void
   extractArgsAndReqsFromLambda(char *LambdaPtr,
-                               const detail::kernel_param_desc_t &ParamDesc,
-                               bool IsESIMD, size_t Index, size_t &IndexShift);
+                               detail::kernel_param_desc_t (*ParamDescGetter)(int),
+                               size_t NumKernelParams, bool IsESIMD);
 
   /// Extracts and prepares kernel arguments set via set_arg(s).
   void extractArgsAndReqs();
@@ -751,15 +751,10 @@ class __SYCL_EXPORT handler {
       // TODO support ESIMD in no-integration-header case too.
 
       clearArgs();
-      size_t NumParams = detail::getKernelNumParams<KernelName>();
-      reserveArgs(NumParams);
-
-      for (size_t I = 0, IndexShift = 0; I < NumParams; ++I) {
-        extractArgsAndReqsFromLambda(
-            MHostKernel->getPtr(), detail::getKernelParamDesc<KernelName>(I),
-            detail::isKernelESIMD<KernelName>(), I, IndexShift);
-      }
-
+      extractArgsAndReqsFromLambda(
+          MHostKernel->getPtr(), &(detail::getKernelParamDesc<KernelName>),
+          detail::getKernelNumParams<KernelName>(),
+          detail::isKernelESIMD<KernelName>());
       MKernelName = detail::getKernelName<KernelName>();
     } else {
       // In case w/o the integration header it is necessary to process
@@ -3820,7 +3815,6 @@ class __SYCL_EXPORT handler {
   void addArg(detail::kernel_param_kind_t ArgKind, void *Req, int AccessTarget,
               int ArgIndex);
   void clearArgs();
-  void reserveArgs(int NumParams);
   void setArgsToAssociatedAccessors();
 
   bool HasAssociatedAccessor(detail::AccessorImplHost *Req,

sycl/source/handler.cpp

@@ -1066,31 +1066,37 @@ void handler::extractArgsAndReqs() {
 }
 
 void handler::extractArgsAndReqsFromLambda(
-    char *LambdaPtr, const detail::kernel_param_desc_t &ParamDesc, bool IsESIMD,
-    size_t Index, size_t &IndexShift) {
-  void *Ptr = LambdaPtr + ParamDesc.offset;
-  const detail::kernel_param_kind_t &Kind = ParamDesc.kind;
-  const int &Size = ParamDesc.info;
-  if (Kind == detail::kernel_param_kind_t::kind_accessor) {
-    // For args kind of accessor Size is information about accessor.
-    // The first 11 bits of Size encodes the accessor target.
-    const access::target AccTarget =
-        static_cast<access::target>(Size & AccessTargetMask);
-    if ((AccTarget == access::target::device ||
-         AccTarget == access::target::constant_buffer) ||
-        (AccTarget == access::target::image ||
-         AccTarget == access::target::image_array)) {
-      detail::AccessorBaseHost *AccBase =
-          static_cast<detail::AccessorBaseHost *>(Ptr);
-      Ptr = detail::getSyclObjImpl(*AccBase).get();
-    } else if (AccTarget == access::target::local) {
-      detail::LocalAccessorBaseHost *LocalAccBase =
-          static_cast<detail::LocalAccessorBaseHost *>(Ptr);
-      Ptr = detail::getSyclObjImpl(*LocalAccBase).get();
+    char *LambdaPtr, detail::kernel_param_desc_t (*ParamDescGetter)(int),
+    size_t NumKernelParams, bool IsESIMD) {
+  size_t IndexShift = 0;
+  impl->MArgs.reserve(MaxNumAdditionalArgs * NumKernelParams);
+
+  for (size_t I = 0; I < NumKernelParams; ++I) {
+    detail::kernel_param_desc_t ParamDesc = ParamDescGetter(I);
+    void *Ptr = LambdaPtr + ParamDesc.offset;
+    const detail::kernel_param_kind_t &Kind = ParamDesc.kind;
+    const int &Size = ParamDesc.info;
+    if (Kind == detail::kernel_param_kind_t::kind_accessor) {
+      // For args kind of accessor Size is information about accessor.
+      // The first 11 bits of Size encodes the accessor target.
+      const access::target AccTarget =
+          static_cast<access::target>(Size & AccessTargetMask);
+      if ((AccTarget == access::target::device ||
+           AccTarget == access::target::constant_buffer) ||
+          (AccTarget == access::target::image ||
+           AccTarget == access::target::image_array)) {
+        detail::AccessorBaseHost *AccBase =
+            static_cast<detail::AccessorBaseHost *>(Ptr);
+        Ptr = detail::getSyclObjImpl(*AccBase).get();
+      } else if (AccTarget == access::target::local) {
+        detail::LocalAccessorBaseHost *LocalAccBase =
+            static_cast<detail::LocalAccessorBaseHost *>(Ptr);
+        Ptr = detail::getSyclObjImpl(*LocalAccBase).get();
+      }
     }
+    processArg(Ptr, Kind, Size, I, IndexShift,
+               /*IsKernelCreatedFromSource=*/false, IsESIMD);
   }
-  processArg(Ptr, Kind, Size, Index, IndexShift,
-             /*IsKernelCreatedFromSource=*/false, IsESIMD);
 }
 
 #ifndef __INTEL_PREVIEW_BREAKING_CHANGES
@@ -2134,10 +2140,6 @@ void handler::addArg(detail::kernel_param_kind_t ArgKind, void *Req,
 
 void handler::clearArgs() { impl->MArgs.clear(); }
 
-void handler::reserveArgs(int NumParams) {
-  impl->MArgs.reserve(MaxNumAdditionalArgs * NumParams);
-}
-
 void handler::setArgsToAssociatedAccessors() {
   impl->MArgs = impl->MAssociatedAccesors;
 }

sycl/test/abi/sycl_symbols_linux.dump

@@ -3493,7 +3493,6 @@ _ZN4sycl3_V17handler10processArgEPvRKNS0_6detail19kernel_param_kind_tEimRmbb
 _ZN4sycl3_V17handler11SetHostTaskEOSt8functionIFvNS0_14interop_handleEEE
 _ZN4sycl3_V17handler11SetHostTaskEOSt8functionIFvvEE
 _ZN4sycl3_V17handler11copyCodeLocERKS1_
-_ZN4sycl3_V17handler11reserveArgsEi
 _ZN4sycl3_V17handler11saveCodeLocENS0_6detail13code_locationE
 _ZN4sycl3_V17handler11saveCodeLocENS0_6detail13code_locationEb
 _ZN4sycl3_V17handler11storeRawArgEPKvm
@@ -3553,9 +3552,9 @@ _ZN4sycl3_V17handler26setNDRangeDescriptorPaddedENS0_5rangeILi3EEES3_NS0_2idILi3
 _ZN4sycl3_V17handler26setNDRangeDescriptorPaddedENS0_5rangeILi3EEEbi
 _ZN4sycl3_V17handler27addLifetimeSharedPtrStorageESt10shared_ptrIKvE
 _ZN4sycl3_V17handler27computeFallbackKernelBoundsEmm
-_ZN4sycl3_V17handler28extractArgsAndReqsFromLambdaEPcRKNS0_6detail19kernel_param_desc_tEbmRm
 _ZN4sycl3_V17handler28extractArgsAndReqsFromLambdaEPcRKSt6vectorINS0_6detail19kernel_param_desc_tESaIS5_EEb
 _ZN4sycl3_V17handler28extractArgsAndReqsFromLambdaEPcmPKNS0_6detail19kernel_param_desc_tEb
+_ZN4sycl3_V17handler28extractArgsAndReqsFromLambdaEPcPFNS0_6detail19kernel_param_desc_tEiEmb
 _ZN4sycl3_V17handler28memcpyToHostOnlyDeviceGlobalEPKvS3_mbmm
 _ZN4sycl3_V17handler28setArgsToAssociatedAccessorsEv
 _ZN4sycl3_V17handler28setStateExplicitKernelBundleEv

sycl/test/abi/sycl_symbols_windows.dump

@@ -4300,7 +4300,6 @@
 ?remquo_impl@detail@_V1@sycl@@YA?AVhalf@half_impl@123@V45123@0PEAH@Z
 ?remquo_impl@detail@_V1@sycl@@YAMMMPEAH@Z
 ?remquo_impl@detail@_V1@sycl@@YANNNPEAH@Z
-?reserveArgs@handler@_V1@sycl@@AEAAXH@Z
 ?reserve_virtual_mem@experimental@oneapi@ext@_V1@sycl@@YA_K_K0AEBVcontext@45@@Z
 ?reset@filter_selector@ONEAPI@_V1@sycl@@QEBAXXZ
 ?reset@filter_selector@oneapi@ext@_V1@sycl@@QEBAXXZ