[SYCL][NFC] Decouple property parsing from KernelWrapper (#19566)

Motivation behind this PR is to club together all data members and
functions required for parsing kernel launch properties, so that this
code can be reused for the no-handler submission path.

Author: uditagarwal97

sycl/include/sycl/detail/kernel_launch_helper.hpp

@@ -195,33 +195,21 @@ struct KernelWrapperHelperFuncs {
 // embedding them into the kernel's type).
 
 template <WrapAs WrapAsVal, typename KernelName, typename KernelType,
-          typename ElementType, typename PropertyProcessor,
+          typename ElementType,
           typename PropertiesT = ext::oneapi::experimental::empty_properties_t,
           typename MergedPropertiesT = typename detail::
               GetMergedKernelProperties<KernelType, PropertiesT>::type>
 struct KernelWrapper;
 template <WrapAs WrapAsVal, typename KernelName, typename KernelType,
-          typename ElementType, typename PropertyProcessor,
-          typename PropertiesT, typename... MergedProps>
+          typename ElementType, typename PropertiesT, typename... MergedProps>
 struct KernelWrapper<
-    WrapAsVal, KernelName, KernelType, ElementType, PropertyProcessor,
-    PropertiesT,
+    WrapAsVal, KernelName, KernelType, ElementType, PropertiesT,
     ext::oneapi::experimental::detail::properties_t<MergedProps...>>
     : public KernelWrapperHelperFuncs {
 
-  static void wrap([[maybe_unused]] PropertyProcessor h,
-                   [[maybe_unused]] const KernelType &KernelFunc) {
+  static void wrap([[maybe_unused]] const KernelType &KernelFunc) {
 #ifdef __SYCL_DEVICE_ONLY__
     detail::CheckDeviceCopyable<KernelType>();
-#else
-    // If there are properties provided by get method then process them.
-    if constexpr (ext::oneapi::experimental::detail::
-                      HasKernelPropertiesGetMethod<const KernelType &>::value) {
-
-      // TODO: decouple property processing from KernelWrapper.
-      h->template processProperties<detail::isKernelESIMD<KernelName>()>(
-          KernelFunc.get(ext::oneapi::experimental::properties_tag{}));
-    }
 #endif
     // Note: the static_assert below need to be run on both the host and the
     // device ends to avoid test issues, so don't put it into the #ifdef
@@ -263,6 +251,23 @@ struct KernelWrapper<
   }
 }; // KernelWrapper struct
 
+struct KernelLaunchPropertyWrapper {
+  template <typename KernelName, typename PropertyProcessor,
+            typename KernelType>
+  static void parseProperties([[maybe_unused]] PropertyProcessor h,
+                              [[maybe_unused]] const KernelType &KernelFunc) {
+#ifndef __SYCL_DEVICE_ONLY__
+    // If there are properties provided by get method then process them.
+    if constexpr (ext::oneapi::experimental::detail::
+                      HasKernelPropertiesGetMethod<const KernelType &>::value) {
+
+      h->template processProperties<detail::isKernelESIMD<KernelName>()>(
+          KernelFunc.get(ext::oneapi::experimental::properties_tag{}));
+    }
+#endif
+  }
+}; // KernelLaunchPropertyWrapper struct
+
 } // namespace detail
 } // namespace _V1
 } // namespace sycl

sycl/include/sycl/handler.hpp

@@ -1294,7 +1294,10 @@ class __SYCL_EXPORT handler {
 
       detail::KernelWrapper<detail::WrapAs::parallel_for, KName,
                             decltype(Wrapper), TransformedArgType,
-                            decltype(this), PropertiesT>::wrap(this, Wrapper);
+                            PropertiesT>::wrap(Wrapper);
+
+      detail::KernelLaunchPropertyWrapper::parseProperties<KName>(this,
+                                                                  Wrapper);
 #ifndef __SYCL_DEVICE_ONLY__
       constexpr detail::string_view Name{detail::getKernelName<NameT>()};
       verifyUsedKernelBundleInternal(Name);
@@ -1319,8 +1322,9 @@ class __SYCL_EXPORT handler {
       // If parallel_for range rounding is forced then only range rounded
       // kernel is generated
       detail::KernelWrapper<detail::WrapAs::parallel_for, NameT, KernelType,
-                            TransformedArgType, decltype(this),
-                            PropertiesT>::wrap(this, KernelFunc);
+                            TransformedArgType, PropertiesT>::wrap(KernelFunc);
+      detail::KernelLaunchPropertyWrapper::parseProperties<NameT>(this,
+                                                                  KernelFunc);
 #ifndef __SYCL_DEVICE_ONLY__
       constexpr detail::string_view Name{detail::getKernelName<NameT>()};
 
@@ -1400,7 +1404,9 @@ class __SYCL_EXPORT handler {
         typename detail::get_kernel_name_t<KernelName, KernelType>::name;
     (void)Props;
     detail::KernelWrapper<WrapAsVal, NameT, KernelType, ElementType,
-                          decltype(this), PropertiesT>::wrap(this, KernelFunc);
+                          PropertiesT>::wrap(KernelFunc);
+    detail::KernelLaunchPropertyWrapper::parseProperties<NameT>(this,
+                                                                KernelFunc);
 #ifndef __SYCL_DEVICE_ONLY__
     if constexpr (WrapAsVal == detail::WrapAs::single_task) {
       throwOnKernelParameterMisuse<KernelName, KernelType>();
@@ -1441,7 +1447,9 @@ class __SYCL_EXPORT handler {
     (void)Props;
     (void)Kernel;
     detail::KernelWrapper<WrapAsVal, NameT, KernelType, ElementType,
-                          decltype(this), PropertiesT>::wrap(this, KernelFunc);
+                          PropertiesT>::wrap(KernelFunc);
+    detail::KernelLaunchPropertyWrapper::parseProperties<NameT>(this,
+                                                                KernelFunc);
 #ifndef __SYCL_DEVICE_ONLY__
     if constexpr (WrapAsVal == detail::WrapAs::single_task) {
       throwOnKernelParameterMisuse<KernelName, KernelType>();
@@ -3643,9 +3651,7 @@ class __SYCL_EXPORT handler {
   void instantiateKernelOnHost(void *InstantiateKernelOnHostPtr);
 
   friend class detail::HandlerAccess;
-  template <detail::WrapAs, typename, typename, typename, typename, typename,
-            typename>
-  friend struct detail::KernelWrapper;
+  friend struct detail::KernelLaunchPropertyWrapper;
 
 #ifdef __INTEL_PREVIEW_BREAKING_CHANGES
   __SYCL_DLL_LOCAL detail::handler_impl *get_impl() { return impl; }