Adding action specializations for noexcept functions

STEllAR-GROUP · Dec 3, 2019 · f3e7aab · f3e7aab
1 parent 8558bc9
commit f3e7aab
Show file tree

Hide file tree

Showing 6 changed files with 165 additions and 1 deletion.
diff --git a/cmake/HPX_AddConfigTest.cmake b/cmake/HPX_AddConfigTest.cmake
@@ -759,6 +759,14 @@ function(hpx_check_for_cxx17_if_constexpr)
     FILE ${ARGN})
 endfunction()
 
+###############################################################################
+function(hpx_check_for_cxx17_noexcept_functions_as_nontype_template_arguments)
+  add_hpx_config_test(
+    HPX_WITH_CXX17_NOEXCEPT_FUNCTIONS_AS_NONTYPE_TEMPLATE_ARGUMENTS
+    SOURCE cmake/tests/cxx17_noexcept_function.cpp
+    FILE ${ARGN})
+endfunction()
+
 ###############################################################################
 function(hpx_check_for_mm_prefetch)
   add_hpx_config_test(HPX_WITH_MM_PREFETCH

diff --git a/cmake/HPX_PerformCxxFeatureTests.cmake b/cmake/HPX_PerformCxxFeatureTests.cmake
@@ -227,5 +227,9 @@ function(hpx_perform_cxx_feature_tests)
 
     hpx_check_for_cxx17_std_in_place_type_t(
       DEFINITIONS HPX_HAVE_CXX17_STD_IN_PLACE_TYPE_T)
+
+    hpx_check_for_cxx17_noexcept_functions_as_nontype_template_arguments(
+      DEFINITIONS HPX_HAVE_CXX17_NOEXCEPT_FUNCTIONS_AS_NONTYPE_TEMPLATE_ARGUMENTS)
+
   endif()
 endfunction()
diff --git a/cmake/tests/cxx17_noexcept_function.cpp b/cmake/tests/cxx17_noexcept_function.cpp
@@ -0,0 +1,29 @@
+//  Copyright (c) 2019 Hartmut Kaiser
+//
+//  SPDX-License-Identifier: BSL-1.0
+//  Distributed under the Boost Software License, Version 1.0. (See accompanying
+//  file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
+
+// This tests whether noexcept function used a non-type template arguments are
+// properly supported by the compiler.
+
+template <typename F, F f>
+struct action;
+
+template <typename R, typename... Args, R (*F)(Args...)>
+struct action<R (*)(Args...), F>
+{
+};
+
+template <typename R, typename... Args, R (*F)(Args...) noexcept>
+struct action<R (*)(Args...) noexcept, F>
+{
+};
+
+void foo() noexcept {}
+
+int main()
+{
+    action<decltype(&foo), &foo> t;
+    return 0;
+}
diff --git a/hpx/runtime/actions/component_action.hpp b/hpx/runtime/actions/component_action.hpp
@@ -169,6 +169,94 @@ namespace hpx { namespace actions
         }
     };
 
+#if defined(HPX_HAVE_CXX17_NOEXCEPT_FUNCTIONS_AS_NONTYPE_TEMPLATE_ARGUMENTS)
+    ///////////////////////////////////////////////////////////////////////////
+    //  Specialized generic non-const noexcept component action types allowing
+    //  to hold a different number of arguments
+    ///////////////////////////////////////////////////////////////////////////
+    template <
+        typename Component, typename R, typename ...Ps,
+        R (Component::*F)(Ps...) noexcept, typename Derived>
+    struct action<R (Component::*)(Ps...) noexcept, F, Derived>
+      : public basic_action<Component, R(Ps...),
+            typename detail::action_type<
+                action<R (Component::*)(Ps...) noexcept, F, Derived>,
+                Derived
+            >::type
+        >
+    {
+    public:
+        typedef typename detail::action_type<
+            action, Derived
+        >::type derived_type;
+
+        static std::string get_action_name(naming::address::address_type lva)
+        {
+            return detail::make_component_action_name(
+                detail::get_action_name<derived_type>(),
+                get_lva<Component>::call(lva));
+        }
+
+        template <typename ...Ts>
+        static R invoke(
+            naming::address::address_type lva,
+            naming::address::component_type comptype, Ts&&... vs)
+        {
+            basic_action<Component, R(Ps...), derived_type>::
+                increment_invocation_count();
+
+            using is_future = typename traits::is_future<R>::type;
+            return detail::component_invoke<Component, R>(is_future{},
+                lva, comptype, F, std::forward<Ts>(vs)...);
+        }
+    };
+
+    ///////////////////////////////////////////////////////////////////////////
+    //  Specialized generic const noexcept component action types allowing to
+    //  hold a different number of arguments
+    ///////////////////////////////////////////////////////////////////////////
+    template <
+        typename Component, typename R, typename ...Ps,
+        R (Component::*F)(Ps...) const noexcept, typename Derived>
+    struct action<R (Component::*)(Ps...) const noexcept, F, Derived>
+      : public basic_action<Component const, R(Ps...),
+            typename detail::action_type<
+                action<R (Component::*)(Ps...) const noexcept, F, Derived>,
+                Derived
+            >::type
+        >
+    {
+    public:
+        typedef typename detail::action_type<
+            action, Derived
+        >::type derived_type;
+
+        static std::string get_action_name(naming::address::address_type lva)
+        {
+            return detail::make_component_action_name(
+                detail::get_action_name<derived_type>(),
+                get_lva<Component>::call(lva));
+        }
+
+        template <typename ...Ts>
+        static R invoke(
+            naming::address::address_type lva,
+            naming::address::component_type comptype, Ts&&... vs)
+        {
+            basic_action<Component const, R(Ps...), derived_type>::
+                increment_invocation_count();
+
+            using is_future_or_client = typename std::integral_constant<bool,
+                traits::is_future<R>::value ||
+                    traits::is_client<R>::value>::type;
+
+            return detail::component_invoke<Component const, R>(
+                is_future_or_client{}, lva, comptype, F,
+                std::forward<Ts>(vs)...);
+        }
+    };
+#endif
+
     /// \endcond
 }}
 

diff --git a/hpx/runtime/actions/plain_action.hpp b/hpx/runtime/actions/plain_action.hpp
@@ -96,6 +96,41 @@ namespace hpx { namespace actions
         }
     };
 
+#if defined(HPX_HAVE_CXX17_NOEXCEPT_FUNCTIONS_AS_NONTYPE_TEMPLATE_ARGUMENTS)
+    template <
+        typename R, typename ...Ps,
+        R (*F)(Ps...) noexcept, typename Derived>
+    struct action<R (*)(Ps...) noexcept, F, Derived>
+      : public basic_action<detail::plain_function, R(Ps...),
+            typename detail::action_type<
+                action<R (*)(Ps...) noexcept, F, Derived>,
+                Derived
+            >::type
+        >
+    {
+    public:
+        typedef typename detail::action_type<
+            action, Derived
+        >::type derived_type;
+
+        static std::string get_action_name(naming::address::address_type /*lva*/)
+        {
+            return detail::make_plain_action_name(
+                detail::get_action_name<derived_type>());
+        }
+
+        template <typename ...Ts>
+        static R invoke(
+            naming::address::address_type /*lva*/,
+            naming::address::component_type comptype, Ts&&... vs)
+        {
+            basic_action<detail::plain_function, R(Ps...),
+                derived_type>::increment_invocation_count();
+            return F(std::forward<Ts>(vs)...);
+        }
+    };
+#endif
+
     /// \endcond
 }}
 

diff --git a/tests/performance/local/future_overhead.cpp b/tests/performance/local/future_overhead.cpp
@@ -102,7 +102,7 @@ double global_scratch = 0;
 std::uint64_t num_iterations = 0;
 
 ///////////////////////////////////////////////////////////////////////////////
-double null_function()
+double null_function() noexcept
 {
     if (num_iterations > 0)
     {