[SYCL] Address comment and warning

Signed-off-by: Hu, Peisen <[email protected]>

Author: HPS-1

sycl/include/sycl/handler.hpp

@@ -2196,58 +2196,42 @@ class __SYCL_EXPORT handler {
                                                std::forward<RestT>(Rest)...);
   }
 
-  template <typename KernelName = detail::auto_name, typename... RestT>
-  std::enable_if_t<detail::AreAllButLastReductions<RestT...>::value &&
-                   (sizeof...(RestT) > 1)>
-  parallel_for(range<1> Range, RestT &&...Rest) {
-    const auto &KernelObj = (Rest, ...);
+  template <typename... RestT> auto property_deduction_helper(RestT &&...Rest) {
+    const auto &KernelObj = (std::forward<RestT>(Rest), ...);
     if constexpr (ext::oneapi::experimental::detail::
                       HasKernelPropertiesGetMethod<
                           decltype(KernelObj)>::value) {
-      parallel_for<KernelName>(
-          Range, KernelObj.get(ext::oneapi::experimental::properties_tag{}),
-          std::forward<RestT>(Rest)...);
+      return KernelObj.get(ext::oneapi::experimental::properties_tag{});
     } else {
-      parallel_for<KernelName>(Range,
-                               ext::oneapi::experimental::empty_properties_t{},
-                               std::forward<RestT>(Rest)...);
+      return ext::oneapi::experimental::empty_properties_t{};
     }
   }
 
+  template <typename KernelName = detail::auto_name, typename... RestT>
+  std::enable_if_t<detail::AreAllButLastReductions<RestT...>::value &&
+                   (sizeof...(RestT) > 1)>
+  parallel_for(range<1> Range, RestT &&...Rest) {
+    parallel_for<KernelName>(
+        Range, property_deduction_helper(std::forward<RestT>(Rest)...),
+        std::forward<RestT>(Rest)...);
+  }
+
   template <typename KernelName = detail::auto_name, typename... RestT>
   std::enable_if_t<detail::AreAllButLastReductions<RestT...>::value &&
                    (sizeof...(RestT) > 1)>
   parallel_for(range<2> Range, RestT &&...Rest) {
-    const auto &KernelObj = (Rest, ...);
-    if constexpr (ext::oneapi::experimental::detail::
-                      HasKernelPropertiesGetMethod<
-                          decltype(KernelObj)>::value) {
-      parallel_for<KernelName>(
-          Range, KernelObj.get(ext::oneapi::experimental::properties_tag{}),
-          std::forward<RestT>(Rest)...);
-    } else {
-      parallel_for<KernelName>(Range,
-                               ext::oneapi::experimental::empty_properties_t{},
-                               std::forward<RestT>(Rest)...);
-    }
+    parallel_for<KernelName>(
+        Range, property_deduction_helper(std::forward<RestT>(Rest)...),
+        std::forward<RestT>(Rest)...);
   }
 
   template <typename KernelName = detail::auto_name, typename... RestT>
   std::enable_if_t<detail::AreAllButLastReductions<RestT...>::value &&
                    (sizeof...(RestT) > 1)>
   parallel_for(range<3> Range, RestT &&...Rest) {
-    const auto &KernelObj = (Rest, ...);
-    if constexpr (ext::oneapi::experimental::detail::
-                      HasKernelPropertiesGetMethod<
-                          decltype(KernelObj)>::value) {
-      parallel_for<KernelName>(
-          Range, KernelObj.get(ext::oneapi::experimental::properties_tag{}),
-          std::forward<RestT>(Rest)...);
-    } else {
-      parallel_for<KernelName>(Range,
-                               ext::oneapi::experimental::empty_properties_t{},
-                               std::forward<RestT>(Rest)...);
-    }
+    parallel_for<KernelName>(
+        Range, property_deduction_helper(std::forward<RestT>(Rest)...),
+        std::forward<RestT>(Rest)...);
   }
 
   template <typename KernelName = detail::auto_name, int Dims,
@@ -2275,18 +2259,9 @@ class __SYCL_EXPORT handler {
   std::enable_if_t<detail::AreAllButLastReductions<RestT...>::value &&
                    (sizeof...(RestT) > 1)> // variant with reductions
   parallel_for(nd_range<Dims> Range, RestT &&...Rest) {
-    const auto &KernelObj = (Rest, ...);
-    if constexpr (ext::oneapi::experimental::detail::
-                      HasKernelPropertiesGetMethod<
-                          decltype(KernelObj)>::value) {
-      parallel_for<KernelName>(
-          Range, KernelObj.get(ext::oneapi::experimental::properties_tag{}),
-          std::forward<RestT>(Rest)...);
-    } else {
-      parallel_for<KernelName>(Range,
-                               ext::oneapi::experimental::empty_properties_t{},
-                               std::forward<RestT>(Rest)...);
-    }
+    parallel_for<KernelName>(
+        Range, property_deduction_helper(std::forward<RestT>(Rest)...),
+        std::forward<RestT>(Rest)...);
   }
 
   template <typename KernelName = detail::auto_name, int Dims,