From 0c183c17428707bd6182451e6da6dbb62626e078 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 5 Mar 2012 13:21:47 +0100 Subject: [PATCH] hypot* tests: More tests. * tests/test-hypot.h: New file, partially extracted from tests/test-hypotl.c. * tests/test-hypot.c: Include test-hypot.h. (main): Invoke test_function. * tests/test-hypotf.c: Include test-hypot.h. (main): Invoke test_function. * tests/test-hypotl.c: Include fpucw.h and test-hypot.h. (main): Invoke BEGIN_LONG_DOUBLE_ROUNDING and test_function. * modules/hypot-tests (Files): Add tests/test-hypot.h, tests/randomd.c. (Makefile.am): Add randomd.c to test_hypot_SOURCES. * modules/hypotf-tests (Files): Add tests/test-hypot.h, tests/randomf.c. (Makefile.am): Add randomf.c to test_hypotf_SOURCES. * modules/hypotl-tests (Files): Add tests/test-hypot.h, tests/randoml.c. (Depends-on): Add 'fpucw', 'float'. (Makefile.am): Add randoml.c to test_hypotl_SOURCES. --- ChangeLog | 21 +++++++++++++ modules/hypot-tests | 3 ++ modules/hypotf-tests | 3 ++ modules/hypotl-tests | 5 +++ tests/test-hypot.c | 33 ++++++++------------ tests/test-hypot.h | 72 ++++++++++++++++++++++++++++++++++++++++++++ tests/test-hypotf.c | 33 ++++++++------------ tests/test-hypotl.c | 38 +++++++++++------------ 8 files changed, 148 insertions(+), 60 deletions(-) create mode 100644 tests/test-hypot.h diff --git a/ChangeLog b/ChangeLog index 2ad8c24876..09b6051e0b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,24 @@ +2012-03-05 Bruno Haible + + hypot* tests: More tests. + * tests/test-hypot.h: New file, partially extracted from + tests/test-hypotl.c. + * tests/test-hypot.c: Include test-hypot.h. + (main): Invoke test_function. + * tests/test-hypotf.c: Include test-hypot.h. + (main): Invoke test_function. + * tests/test-hypotl.c: Include fpucw.h and test-hypot.h. + (main): Invoke BEGIN_LONG_DOUBLE_ROUNDING and test_function. + * modules/hypot-tests (Files): Add tests/test-hypot.h, tests/randomd.c. + (Makefile.am): Add randomd.c to test_hypot_SOURCES. + * modules/hypotf-tests (Files): Add tests/test-hypot.h, + tests/randomf.c. + (Makefile.am): Add randomf.c to test_hypotf_SOURCES. + * modules/hypotl-tests (Files): Add tests/test-hypot.h, + tests/randoml.c. + (Depends-on): Add 'fpucw', 'float'. + (Makefile.am): Add randoml.c to test_hypotl_SOURCES. + 2012-03-05 Bruno Haible fpucw: Doc about FreeBSD. diff --git a/modules/hypot-tests b/modules/hypot-tests index f4b65d05d3..b8df992516 100644 --- a/modules/hypot-tests +++ b/modules/hypot-tests @@ -1,7 +1,9 @@ Files: tests/test-hypot.c +tests/test-hypot.h tests/signature.h tests/macros.h +tests/randomd.c Depends-on: @@ -10,4 +12,5 @@ configure.ac: Makefile.am: TESTS += test-hypot check_PROGRAMS += test-hypot +test_hypot_SOURCES = test-hypot.c randomd.c test_hypot_LDADD = $(LDADD) @HYPOT_LIBM@ diff --git a/modules/hypotf-tests b/modules/hypotf-tests index e84a62469a..92c37edae0 100644 --- a/modules/hypotf-tests +++ b/modules/hypotf-tests @@ -1,7 +1,9 @@ Files: tests/test-hypotf.c +tests/test-hypot.h tests/signature.h tests/macros.h +tests/randomf.c Depends-on: @@ -10,4 +12,5 @@ configure.ac: Makefile.am: TESTS += test-hypotf check_PROGRAMS += test-hypotf +test_hypotf_SOURCES = test-hypotf.c randomf.c test_hypotf_LDADD = $(LDADD) @HYPOTF_LIBM@ diff --git a/modules/hypotl-tests b/modules/hypotl-tests index 76a995ef68..27b0b38556 100644 --- a/modules/hypotl-tests +++ b/modules/hypotl-tests @@ -1,13 +1,18 @@ Files: tests/test-hypotl.c +tests/test-hypot.h tests/signature.h tests/macros.h +tests/randoml.c Depends-on: +fpucw +float configure.ac: Makefile.am: TESTS += test-hypotl check_PROGRAMS += test-hypotl +test_hypotl_SOURCES = test-hypotl.c randoml.c test_hypotl_LDADD = $(LDADD) @HYPOTL_LIBM@ diff --git a/tests/test-hypot.c b/tests/test-hypot.c index d8cf7faaff..4dc1b2c2d9 100644 --- a/tests/test-hypot.c +++ b/tests/test-hypot.c @@ -27,9 +27,18 @@ SIGNATURE_CHECK (hypot, double, (double, double)); #include "macros.h" -volatile double x; -volatile double y; -double z; +#undef MIN +#undef MAX + +#define DOUBLE double +#define HUGEVAL HUGE_VAL +#define L_(literal) literal +#define MANT_DIG DBL_MANT_DIG +#define MIN DBL_MIN +#define MAX DBL_MAX +#define HYPOT hypot +#define RANDOM randomd +#include "test-hypot.h" int main () @@ -40,23 +49,7 @@ main () z = hypot (x, y); ASSERT (z >= 0.7211102550 && z <= 0.7211102551); - /* Overflow. */ - x = DBL_MAX; - y = DBL_MAX * 0.5; - z = hypot (x, y); - ASSERT (z == HUGE_VAL); - - /* No underflow. */ - x = DBL_MIN; - y = 0.0; - z = hypot (x, y); - ASSERT (z == DBL_MIN); - - /* No underflow. */ - x = DBL_MIN * 2.0; - y = DBL_MIN * 3.0; - z = hypot (x, y); - ASSERT (z >= DBL_MIN * 2.0 && z <= DBL_MIN * 4.0); + test_function (); return 0; } diff --git a/tests/test-hypot.h b/tests/test-hypot.h new file mode 100644 index 0000000000..cdc555ba00 --- /dev/null +++ b/tests/test-hypot.h @@ -0,0 +1,72 @@ +/* Test of hypot*() function family. + Copyright (C) 2012 Free Software Foundation, Inc. + + This program 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 of the License, or + (at your option) any later version. + + This program 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 program. If not, see . */ + +static void +test_function (void) +{ + int i; + int j; + const DOUBLE TWO_MANT_DIG = + /* Assume MANT_DIG <= 5 * 31. + Use the identity + n = floor(n/5) + floor((n+1)/5) + ... + floor((n+4)/5). */ + (DOUBLE) (1U << ((MANT_DIG - 1) / 5)) + * (DOUBLE) (1U << ((MANT_DIG - 1 + 1) / 5)) + * (DOUBLE) (1U << ((MANT_DIG - 1 + 2) / 5)) + * (DOUBLE) (1U << ((MANT_DIG - 1 + 3) / 5)) + * (DOUBLE) (1U << ((MANT_DIG - 1 + 4) / 5)); + + { + volatile DOUBLE x; + volatile DOUBLE y; + DOUBLE z; + + /* Overflow. */ + x = MAX; + y = MAX * L_(0.5); + z = HYPOT (x, y); + ASSERT (z == HUGEVAL); + + /* No underflow. */ + x = MIN; + y = L_(0.0); + z = HYPOT (x, y); + ASSERT (z == MIN); + + /* No underflow. */ + x = MIN * L_(2.0); + y = MIN * L_(3.0); + z = HYPOT (x, y); + ASSERT (z >= MIN * L_(2.0) && z <= MIN * L_(4.0)); + } + + /* Randomized tests. */ + for (i = 0; i < SIZEOF (RANDOM) / 5; i++) + for (j = 0; j < SIZEOF (RANDOM) / 5;j++) + { + DOUBLE x = L_(16.0) * RANDOM[i]; /* 0.0 <= x <= 16.0 */ + DOUBLE y = L_(16.0) * RANDOM[j]; /* 0.0 <= y <= 16.0 */ + DOUBLE z = HYPOT (x, y); + DOUBLE err = z * z - (x * x + y * y); + ASSERT (z >= L_(0.0)); + ASSERT (err >= - L_(4.0) * L_(16.0) * L_(16.0) / TWO_MANT_DIG + && err <= L_(4.0) * L_(16.0) * L_(16.0) / TWO_MANT_DIG); + } +} + +volatile DOUBLE x; +volatile DOUBLE y; +DOUBLE z; diff --git a/tests/test-hypotf.c b/tests/test-hypotf.c index f1b0c17a36..cbc3964364 100644 --- a/tests/test-hypotf.c +++ b/tests/test-hypotf.c @@ -27,9 +27,18 @@ SIGNATURE_CHECK (hypotf, float, (float, float)); #include "macros.h" -volatile float x; -volatile float y; -float z; +#undef MIN +#undef MAX + +#define DOUBLE float +#define HUGEVAL HUGE_VALF +#define L_(literal) literal##f +#define MANT_DIG FLT_MANT_DIG +#define MIN FLT_MIN +#define MAX FLT_MAX +#define HYPOT hypotf +#define RANDOM randomf +#include "test-hypot.h" int main () @@ -40,23 +49,7 @@ main () z = hypot (x, y); ASSERT (z >= 0.7211102f && z <= 0.7211103f); - /* Overflow. */ - x = FLT_MAX; - y = FLT_MAX * 0.5f; - z = hypotf (x, y); - ASSERT (z == HUGE_VALF); - - /* No underflow. */ - x = FLT_MIN; - y = 0.0f; - z = hypotf (x, y); - ASSERT (z == FLT_MIN); - - /* No underflow. */ - x = FLT_MIN * 2.0f; - y = FLT_MIN * 3.0f; - z = hypotf (x, y); - ASSERT (z >= FLT_MIN * 2.0f && z <= FLT_MIN * 4.0f); + test_function (); return 0; } diff --git a/tests/test-hypotl.c b/tests/test-hypotl.c index 52bd72d826..dbaed3a297 100644 --- a/tests/test-hypotl.c +++ b/tests/test-hypotl.c @@ -25,38 +25,36 @@ SIGNATURE_CHECK (hypotl, long double, (long double, long double)); #include +#include "fpucw.h" #include "macros.h" -volatile long double x; -volatile long double y; -long double z; +#undef MIN +#undef MAX + +#define DOUBLE long double +#define HUGEVAL HUGE_VALL +#define L_(literal) literal##L +#define MANT_DIG LDBL_MANT_DIG +#define MIN LDBL_MIN +#define MAX LDBL_MAX +#define HYPOT hypotl +#define RANDOM randoml +#include "test-hypot.h" int main () { + DECL_LONG_DOUBLE_ROUNDING + + BEGIN_LONG_DOUBLE_ROUNDING (); + /* A particular value. */ x = 0.4L; y = 0.6L; z = hypotl (x, y); ASSERT (z >= 0.7211102550L && z <= 0.7211102551L); - /* Overflow. */ - x = LDBL_MAX; - y = LDBL_MAX * 0.5L; - z = hypotl (x, y); - ASSERT (z == HUGE_VALL); - - /* No underflow. */ - x = LDBL_MIN; - y = 0.0L; - z = hypotl (x, y); - ASSERT (z == LDBL_MIN); - - /* No underflow. */ - x = LDBL_MIN * 2.0L; - y = LDBL_MIN * 3.0L; - z = hypotl (x, y); - ASSERT (z >= LDBL_MIN * 2.0L && z <= LDBL_MIN * 4.0L); + test_function (); return 0; } -- 2.39.5