From 0efa6f8b9906cddf2da36722449c8e30fb698b37 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Mon, 10 Jun 2013 12:34:49 +0000 Subject: [PATCH] Add rounding mode information to math-tests.h and use it in libm-test.inc. --- ChangeLog | 12 ++++++++++++ math/libm-test.inc | 13 +++++++++---- ports/ChangeLog.arm | 4 ++++ ports/sysdeps/arm/math-tests.h | 28 ++++++++++++++++++++++++++++ sysdeps/generic/math-tests.h | 18 ++++++++++++++++++ 5 files changed, 71 insertions(+), 4 deletions(-) create mode 100644 ports/sysdeps/arm/math-tests.h diff --git a/ChangeLog b/ChangeLog index e8de668..7cc1378 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2013-06-10 Joseph Myers + + * sysdeps/generic/math-tests.h (ROUNDING_TESTS_float): New macro. + (ROUNDING_TESTS_double): Likewise. + (ROUNDING_TESTS_long_double): Likewise. + (ROUNDING_TESTS): Likewise. + * math/libm-test.inc: Include . + (IF_ROUND_INIT_FE_DOWNWARD): Use ROUNDING_TESTS. + (IF_ROUND_INIT_FE_TONEAREST): Likewise. + (IF_ROUND_INIT_FE_TOWARDZERO): Likewise. + (IF_ROUND_INIT_FE_UPWARD): Likewise. + 2013-06-10 Siddhesh Poyarekar * benchtests/Makefile (CPPFLAGS-nonlib): Append values instead diff --git a/math/libm-test.inc b/math/libm-test.inc index 6870d96..ed050cb 100644 --- a/math/libm-test.inc +++ b/math/libm-test.inc @@ -125,6 +125,7 @@ #include #include #include +#include /* Structure for ulp data for a test, a function, or the real or imaginary part of a function. */ @@ -1085,16 +1086,20 @@ struct test_fFF_11_data #define IF_ROUND_INIT_ /* Empty. */ #define IF_ROUND_INIT_FE_DOWNWARD \ int save_round_mode = fegetround (); \ - if (fesetround (FE_DOWNWARD) == 0) + if (ROUNDING_TESTS (FLOAT, FE_DOWNWARD) \ + && fesetround (FE_DOWNWARD) == 0) #define IF_ROUND_INIT_FE_TONEAREST \ int save_round_mode = fegetround (); \ - if (fesetround (FE_TONEAREST) == 0) + if (ROUNDING_TESTS (FLOAT, FE_TONEAREST) \ + && fesetround (FE_TONEAREST) == 0) #define IF_ROUND_INIT_FE_TOWARDZERO \ int save_round_mode = fegetround (); \ - if (fesetround (FE_TOWARDZERO) == 0) + if (ROUNDING_TESTS (FLOAT, FE_TOWARDZERO) \ + && fesetround (FE_TOWARDZERO) == 0) #define IF_ROUND_INIT_FE_UPWARD \ int save_round_mode = fegetround (); \ - if (fesetround (FE_UPWARD) == 0) + if (ROUNDING_TESTS (FLOAT, FE_UPWARD) \ + && fesetround (FE_UPWARD) == 0) #define ROUND_RESTORE_ /* Empty. */ #define ROUND_RESTORE_FE_DOWNWARD \ fesetround (save_round_mode) diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm index 37eac21..6b0310b 100644 --- a/ports/ChangeLog.arm +++ b/ports/ChangeLog.arm @@ -1,3 +1,7 @@ +2013-06-10 Joseph Myers + + * sysdeps/arm/math-tests.h: New file. + 2013-06-05 Richard Henderson [BZ #15583] diff --git a/ports/sysdeps/arm/math-tests.h b/ports/sysdeps/arm/math-tests.h new file mode 100644 index 0000000..6b8e089 --- /dev/null +++ b/ports/sysdeps/arm/math-tests.h @@ -0,0 +1,28 @@ +/* Configuration for math tests. ARM version. + Copyright (C) 2013 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C 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 + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + . */ + +/* On systems with VFP support, but where glibc is built for + soft-float, the libgcc functions used in libc and libm do not + support rounding modes, although fesetround succeeds. */ +#ifdef __SOFTFP__ +# define ROUNDING_TESTS_float(MODE) ((MODE) == FE_TONEAREST) +# define ROUNDING_TESTS_double(MODE) ((MODE) == FE_TONEAREST) +# define ROUNDING_TESTS_long_double(MODE) ((MODE) == FE_TONEAREST) +#endif + +#include_next diff --git a/sysdeps/generic/math-tests.h b/sysdeps/generic/math-tests.h index da8747a..b1e9fd7 100644 --- a/sysdeps/generic/math-tests.h +++ b/sysdeps/generic/math-tests.h @@ -40,3 +40,21 @@ #ifndef SNAN_TESTS_TYPE_CAST # define SNAN_TESTS_TYPE_CAST 1 #endif + +/* Indicate whether to run tests involving a given rounding mode for a + given floating-point type, given that fesetround succeeds for that + mode. All are run if fesetround succeeds unless overridden. */ +#ifndef ROUNDING_TESTS_float +# define ROUNDING_TESTS_float(MODE) 1 +#endif +#ifndef ROUNDING_TESTS_double +# define ROUNDING_TESTS_double(MODE) 1 +#endif +#ifndef ROUNDING_TESTS_long_double +# define ROUNDING_TESTS_long_double(MODE) 1 +#endif + +#define ROUNDING_TESTS(TYPE, MODE) \ + (sizeof (TYPE) == sizeof (float) ? ROUNDING_TESTS_float (MODE) \ + : sizeof (TYPE) == sizeof (double) ? ROUNDING_TESTS_double (MODE) \ + : ROUNDING_TESTS_long_double (MODE)) -- 2.7.4