Move SFINAE check to the return type

Author: aelovikov-intel

sycl/include/sycl/ext/oneapi/experimental/reduction_properties.hpp

@@ -103,72 +103,82 @@ inline constexpr bool is_valid_reduction_prop_list =
         ext::oneapi::experimental::detail::reduction_property_check_anchor,
         PropertyList>;
 
+template <typename BinaryOperation, typename PropertyList, typename... Args>
+auto convert_reduction_properties(BinaryOperation combiner,
+                                  PropertyList properties, Args &&...args) {
+  if constexpr (is_valid_reduction_prop_list<PropertyList>) {
+    auto WrappedOp = WrapOp(combiner, properties);
+    auto RuntimeProps = GetReductionPropertyList(properties);
+    return sycl::reduction(std::forward<Args>(args)..., WrappedOp,
+                           RuntimeProps);
+  } else {
+    // Invalid, will be disabled by SFINAE at the caller side. Make sure no hard
+    // error is emitted from here.
+  }
+}
 } // namespace detail
 
-template <typename BufferT, typename BinaryOperation, typename PropertyList,
-          typename = std::enable_if_t<
-              detail::is_valid_reduction_prop_list<PropertyList>>>
+template <typename BufferT, typename BinaryOperation, typename PropertyList>
 auto reduction(BufferT vars, handler &cgh, BinaryOperation combiner,
-               PropertyList properties) {
+               PropertyList properties)
+    -> std::enable_if_t<detail::is_valid_reduction_prop_list<PropertyList>,
+                        decltype(detail::convert_reduction_properties(
+                            combiner, properties, vars, cgh))> {
   detail::CheckReductionIdentity<typename BufferT::value_type, BinaryOperation>(
       properties);
-  auto WrappedOp = detail::WrapOp(combiner, properties);
-  auto RuntimeProps = detail::GetReductionPropertyList(properties);
-  return reduction(vars, cgh, WrappedOp, RuntimeProps);
+  return detail::convert_reduction_properties(combiner, properties, vars, cgh);
 }
 
-template <typename T, typename BinaryOperation, typename PropertyList,
-          typename = std::enable_if_t<
-              detail::is_valid_reduction_prop_list<PropertyList>>>
-auto reduction(T *var, BinaryOperation combiner, PropertyList properties) {
+template <typename T, typename BinaryOperation, typename PropertyList>
+auto reduction(T *var, BinaryOperation combiner, PropertyList properties)
+    -> std::enable_if_t<detail::is_valid_reduction_prop_list<PropertyList>,
+                        decltype(detail::convert_reduction_properties(
+                            combiner, properties, var))> {
   detail::CheckReductionIdentity<T, BinaryOperation>(properties);
-  auto WrappedOp = detail::WrapOp(combiner, properties);
-  auto RuntimeProps = detail::GetReductionPropertyList(properties);
-  return reduction(var, WrappedOp, RuntimeProps);
+  return detail::convert_reduction_properties(combiner, properties, var);
 }
 
-template <
-    typename T, size_t Extent, typename BinaryOperation, typename PropertyList,
-    typename =
-        std::enable_if_t<detail::is_valid_reduction_prop_list<PropertyList>>>
+template <typename T, size_t Extent, typename BinaryOperation,
+          typename PropertyList>
 auto reduction(span<T, Extent> vars, BinaryOperation combiner,
-               PropertyList properties) {
+               PropertyList properties)
+    -> std::enable_if_t<detail::is_valid_reduction_prop_list<PropertyList>,
+                        decltype(detail::convert_reduction_properties(
+                            combiner, properties, vars))> {
   detail::CheckReductionIdentity<T, BinaryOperation>(properties);
-  auto WrappedOp = detail::WrapOp(combiner, properties);
-  auto RuntimeProps = detail::GetReductionPropertyList(properties);
-  return reduction(vars, WrappedOp, RuntimeProps);
+  return detail::convert_reduction_properties(combiner, properties, vars);
 }
 
-template <typename BufferT, typename BinaryOperation, typename PropertyList,
-          typename = std::enable_if_t<
-              detail::is_valid_reduction_prop_list<PropertyList>>>
+template <typename BufferT, typename BinaryOperation, typename PropertyList>
 auto reduction(BufferT vars, handler &cgh,
                const typename BufferT::value_type &identity,
-               BinaryOperation combiner, PropertyList properties) {
-  auto WrappedOp = detail::WrapOp(combiner, properties);
-  auto RuntimeProps = detail::GetReductionPropertyList(properties);
-  return reduction(vars, cgh, identity, WrappedOp, RuntimeProps);
+               BinaryOperation combiner, PropertyList properties)
+    -> std::enable_if_t<detail::is_valid_reduction_prop_list<PropertyList>,
+                        decltype(detail::convert_reduction_properties(
+                            combiner, properties, vars, cgh, identity))> {
+  return detail::convert_reduction_properties(combiner, properties, vars, cgh,
+                                              identity);
 }
 
-template <typename T, typename BinaryOperation, typename PropertyList,
-          typename = std::enable_if_t<
-              detail::is_valid_reduction_prop_list<PropertyList>>>
+template <typename T, typename BinaryOperation, typename PropertyList>
 auto reduction(T *var, const T &identity, BinaryOperation combiner,
-               PropertyList properties) {
-  auto WrappedOp = detail::WrapOp(combiner, properties);
-  auto RuntimeProps = detail::GetReductionPropertyList(properties);
-  return reduction(var, identity, WrappedOp, RuntimeProps);
+               PropertyList properties)
+    -> std::enable_if_t<detail::is_valid_reduction_prop_list<PropertyList>,
+                        decltype(detail::convert_reduction_properties(
+                            combiner, properties, var, identity))> {
+  return detail::convert_reduction_properties(combiner, properties, var,
+                                              identity);
 }
 
-template <
-    typename T, size_t Extent, typename BinaryOperation, typename PropertyList,
-    typename =
-        std::enable_if_t<detail::is_valid_reduction_prop_list<PropertyList>>>
+template <typename T, size_t Extent, typename BinaryOperation,
+          typename PropertyList>
 auto reduction(span<T, Extent> vars, const T &identity,
-               BinaryOperation combiner, PropertyList properties) {
-  auto WrappedOp = detail::WrapOp(combiner, properties);
-  auto RuntimeProps = detail::GetReductionPropertyList(properties);
-  return reduction(vars, identity, WrappedOp, RuntimeProps);
+               BinaryOperation combiner, PropertyList properties)
+    -> std::enable_if_t<detail::is_valid_reduction_prop_list<PropertyList>,
+                        decltype(detail::convert_reduction_properties(
+                            combiner, properties, vars, identity))> {
+  return detail::convert_reduction_properties(combiner, properties, vars,
+                                              identity);
 }
 
 } // namespace _V1