From b658669de074fae705630470d21fa3d95fbc731f Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Tue, 27 Sep 2016 16:14:24 +0100 Subject: [PATCH] Define 3-argument overloads of std::hypot for C++17 (P0030R1) * doc/xml/manual/status_cxx2017.xml: Update status. * include/c_global/cmath (hypot): Add three-dimensional overloads. * testsuite/26_numerics/headers/cmath/hypot.cc: New. From-SVN: r240547 --- libstdc++-v3/ChangeLog | 6 + .../doc/xml/manual/status_cxx2017.xml | 3 +- libstdc++-v3/include/c_global/cmath | 40 +++++ .../26_numerics/headers/cmath/hypot.cc | 138 ++++++++++++++++++ 4 files changed, 185 insertions(+), 2 deletions(-) create mode 100644 libstdc++-v3/testsuite/26_numerics/headers/cmath/hypot.cc diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 63d83530607..417deb815d0 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2016-09-27 Jonathan Wakely + + * doc/xml/manual/status_cxx2017.xml: Update status. + * include/c_global/cmath (hypot): Add three-dimensional overloads. + * testsuite/26_numerics/headers/cmath/hypot.cc: New. + 2016-09-26 Ville Voutilainen PR libstdc++/77727 diff --git a/libstdc++-v3/doc/xml/manual/status_cxx2017.xml b/libstdc++-v3/doc/xml/manual/status_cxx2017.xml index 76eaaa0fa22..4ead6b996c4 100644 --- a/libstdc++-v3/doc/xml/manual/status_cxx2017.xml +++ b/libstdc++-v3/doc/xml/manual/status_cxx2017.xml @@ -633,14 +633,13 @@ Feature-testing recommendations for C++. - Proposal to Introduce a 3-Argument Overload to std::hypot P0030R1 - No + 7 __cpp_lib_hypot >= 201603 diff --git a/libstdc++-v3/include/c_global/cmath b/libstdc++-v3/include/c_global/cmath index 6db9deeb996..fffa0e77435 100644 --- a/libstdc++-v3/include/c_global/cmath +++ b/libstdc++-v3/include/c_global/cmath @@ -1455,6 +1455,46 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION return hypot(__type(__x), __type(__y)); } +#if __cplusplus > 201402L +#define __cpp_lib_hypot 201603 + // [c.math.hypot3], three-dimensional hypotenuse + + template + inline _Tp + __hypot3(_Tp __x, _Tp __y, _Tp __z) + { + __x = std::abs(__x); + __y = std::abs(__y); + __z = std::abs(__z); + if (_Tp __a = __x < __y ? __y < __z ? __z : __y : __x < __z ? __z : __x) + return __a * std::sqrt((__x / __a) * (__x / __a) + + (__y / __a) * (__y / __a) + + (__z / __a) * (__z / __a)); + else + return {}; + } + + inline float + hypot(float __x, float __y, float __z) + { return std::__hypot3(__x, __y, __z); } + + inline double + hypot(double __x, double __y, double __z) + { return std::__hypot3(__x, __y, __z); } + + inline long double + hypot(long double __x, long double __y, long double __z) + { return std::__hypot3(__x, __y, __z); } + + template + typename __gnu_cxx::__promote_3<_Tp, _Up, _Vp>::__type + hypot(_Tp __x, _Up __y, _Vp __z) + { + using __type = typename __gnu_cxx::__promote_3<_Tp, _Up, _Vp>::__type; + return std::__hypot3<__type>(__x, __y, __z); + } +#endif // C++17 + #ifndef __CORRECT_ISO_CPP11_MATH_H_PROTO constexpr int ilogb(float __x) diff --git a/libstdc++-v3/testsuite/26_numerics/headers/cmath/hypot.cc b/libstdc++-v3/testsuite/26_numerics/headers/cmath/hypot.cc new file mode 100644 index 00000000000..ec7429134ca --- /dev/null +++ b/libstdc++-v3/testsuite/26_numerics/headers/cmath/hypot.cc @@ -0,0 +1,138 @@ +// Copyright (C) 2016 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-options "-std=gnu++17" } +// { dg-do run { target c++1z } } + +#include +#include +#if defined(__TEST_DEBUG) +#include +#define VERIFY(A) \ +if (!(A)) \ + { \ + std::cout << "line " << __LINE__ \ + << " max_abs_frac = " << max_abs_frac \ + << " tolerance = " << toler \ + << std::endl; \ + } +#else +#include +#endif + +using std::is_same_v; +static_assert(is_same_v); +static_assert(is_same_v); +static_assert(is_same_v); +static_assert(is_same_v); +static_assert(is_same_v); +static_assert(is_same_v); +static_assert(is_same_v); +static_assert(is_same_v); + +template struct testcase_hypot { T x, y, z, f0; }; + +template + void + test(const testcase_hypot (&data)[Num], Tp toler) + { + bool test __attribute__((unused)) = true; + const Tp eps = std::numeric_limits::epsilon(); + Tp max_abs_diff = -Tp(1); + Tp max_abs_frac = -Tp(1); + unsigned int num_datum = Num; + for (unsigned int i = 0; i < num_datum; ++i) + { + const Tp f = std::hypot(data[i].x, data[i].y, data[i].z); + const Tp f0 = data[i].f0; + const Tp diff = f - f0; + if (std::abs(diff) > max_abs_diff) + max_abs_diff = std::abs(diff); + if (std::abs(f0) > Tp(10) * eps && std::abs(f) > Tp(10) * eps) + { + const Tp frac = diff / f0; + if (std::abs(frac) > max_abs_frac) + max_abs_frac = std::abs(frac); + } + } + VERIFY(max_abs_frac < toler); + } + +const testcase_hypot data1[] = { + { 0.0, 0.0, 0.0, 0.0 }, + { 0.0, 1.0, 1.0, std::sqrt(2.0) }, + { 1.0, 1.0, 1.0, std::sqrt(3.0) }, + { 1.0, 2.0, 2.0, 3.0 }, + { 2.0, 3.0, 6.0, 7.0 }, + { 1.0, 4.0, 8.0, 9.0 }, + { 4.0, 4.0, 7.0, 9.0 }, + { 12.0, 16.0, 21.0, 29.0 }, + { 1e8, 1., 1e-8, 1e8 }, + { 1., 1e8, 1e-8, 1e8 }, + { 1e-8, 1., 1e8, 1e8 }, + { 1e-2, 1e-4, 1e-4, 0.01000099995 }, + { 214748364., 214748364., 214748364., 371955077.2902952 } +}; +const double toler1 = 1e-12; + +const testcase_hypot data2[] = { + { 0.0f, 0.0f, 0.0f, 0.0f }, + { 0.0f, 1.0f, 1.0f, std::sqrt(2.0f) }, + { 1.0f, 1.0f, 1.0f, std::sqrt(3.0f) }, + { 1.0f, 2.0f, 2.0f, 3.0f }, + { 2.0f, 3.0f, 6.0f, 7.0f }, + { 1.0f, 4.0f, 8.0f, 9.0f }, + { 4.0f, 4.0f, 7.0f, 9.0f }, + { 12.0f, 16.0f, 21.0f, 29.0f }, + { 1e8f, 1.f, 1e-8f, 1e8f }, + { 1.f, 1e8f, 1e-8f, 1e8f }, + { 1e-8f, 1.f, 1e8f, 1e8f }, + { 1e-2f, 1e-4f, 1e-4f, 0.010001f }, + { 214748364.f, 214748364.f, 214748364.f, 371955072.f } +}; +const float toler2 = 1e-7f; + +const testcase_hypot data3[] = { + { 0.0l, 0.0l, 0.0l, 0.0l }, + { 0.0l, 1.0l, 1.0l, std::sqrt(2.0l) }, + { 1.0l, 1.0l, 1.0l, std::sqrt(3.0l) }, + { 1.0l, 2.0l, 2.0l, 3.0l }, + { 2.0l, 3.0l, 6.0l, 7.0l }, + { 1.0l, 4.0l, 8.0l, 9.0l }, + { 4.0l, 4.0l, 7.0l, 9.0l }, + { 12.0l, 16.0l, 21.0l, 29.0l }, + { 1e8l, 1.l, 1e-8l, 1e8l }, + { 1.l, 1e8l, 1e-8l, 1e8l }, + { 1e-8l, 1.l, 1e8l, 1e8l }, + { 1e-2l, 1e-4l, 1e-4l, 0.010000999950004999375l }, + { 2147483647.l, 2147483647.l, 2147483647.l, 3719550785.027307813987l } +}; +const long double toler3 = 1e-16l; + +void +test01() +{ + test(data1, toler1); + test(data2, toler2); + test(data3, toler3); +} + +int +main() +{ + test01(); +}