From 16a25138c13c9d687a9bc2b130e1aea4d26257b7 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 22 Aug 2018 12:25:50 +0000 Subject: Move ROUNDING_TESTS_* out of math-tests.h. Continuing moving macros out of math-tests.h to smaller headers following typo-proof conventions instead of using #ifndef, this patch moves the ROUNDING_TESTS_* macros for individual types out to their own sysdeps header. In the soft-float case where FE_TONEAREST is the only rounding mode macro defined, there is no need to define ROUNDING_TESTS_*; it is only necessary when rounding modes macros are defined that may not be supported at runtime. Thus, the ROUNDING_TESTS_* definitions for some configurations are just removed, not moved to new math-tests-rounding.h headers; the only architectures needing math-tests-rounding.h are those where the macros are defined in bits/fenv.h because of the possibility of a soft-float compilation using a hard-float glibc with the same ABI (i.e., ARM and RISC-V). The test-*-vlen*.h headers, by using #undef, do not yet follow typo-proof conventions (but they no longer implicitly rely on being included before math-tests.h, and this area can always be cleaned up further in future). Tested with build-many-glibcs.py. * sysdeps/generic/math-tests-rounding.h: New file. * sysdeps/generic/math-tests.h: Include . (ROUNDING_TESTS_float): Do not define here. (ROUNDING_TESTS_double): Likewise. (ROUNDING_TESTS_long_double): Likewise. (ROUNDING_TESTS_float128): Likewise. * math/test-double-vlen2.h: Include . (ROUNDING_TESTS_double): Undefine before defining. * math/test-double-vlen4.h: Include . (ROUNDING_TESTS_double): Undefine before defining. * math/test-double-vlen8.h: Include . (ROUNDING_TESTS_double): Undefine before defining. * math/test-float-vlen16.h: Include . (ROUNDING_TESTS_float): Undefine before defining. * math/test-float-vlen4.h: Include . (ROUNDING_TESTS_float): Undefine before defining. * math/test-float-vlen8.h: Include . (ROUNDING_TESTS_float): Undefine before defining. * sysdeps/arm/nofpu/math-tests-rounding.h: New file. * sysdeps/arm/math-tests.h [__SOFTFP__] (ROUNDING_TESTS_float): Do not define here. [__SOFTFP__] (ROUNDING_TESTS_double): Likewise. [__SOFTFP__] (ROUNDING_TESTS_long_double): Likewise. * sysdeps/riscv/nofpu/math-tests-rounding.h: New file. * sysdeps/riscv/math-tests.h [!__riscv_flen] (ROUNDING_TESTS_float): Do not define here. [!__riscv_flen] (ROUNDING_TESTS_double): Likewise. [!__risv_flen] (ROUNDING_TESTS_long_double): Likewise. * sysdeps/m68k/coldfire/math-tests.h [!__mcffpu__] (ROUNDING_TESTS_float): Likewise. [!__mcffpu__] (ROUNDING_TESTS_double): Likewise. [!__mcffpu__] (ROUNDING_TESTS_long_double): Likewise. * sysdeps/mips/math-tests.h [__mips_soft_float] (ROUNDING_TESTS_float): Likewise. [__mips_soft_float] (ROUNDING_TESTS_double): Likewise. [__mips_soft_float] (ROUNDING_TESTS_long_double): Likewise. * sysdeps/nios2/math-tests.h (ROUNDING_TESTS_float): Likewise. (ROUNDING_TESTS_double): Likewise. (ROUNDING_TESTS_long_double): Likewise. --- sysdeps/arm/math-tests.h | 3 --- sysdeps/arm/nofpu/math-tests-rounding.h | 29 +++++++++++++++++++++++++++++ sysdeps/generic/math-tests-rounding.h | 30 ++++++++++++++++++++++++++++++ sysdeps/generic/math-tests.h | 17 +---------------- sysdeps/m68k/coldfire/math-tests.h | 3 --- sysdeps/mips/math-tests.h | 3 --- sysdeps/nios2/math-tests.h | 3 --- sysdeps/riscv/math-tests.h | 7 ------- sysdeps/riscv/nofpu/math-tests-rounding.h | 27 +++++++++++++++++++++++++++ 9 files changed, 87 insertions(+), 35 deletions(-) create mode 100644 sysdeps/arm/nofpu/math-tests-rounding.h create mode 100644 sysdeps/generic/math-tests-rounding.h create mode 100644 sysdeps/riscv/nofpu/math-tests-rounding.h (limited to 'sysdeps') diff --git a/sysdeps/arm/math-tests.h b/sysdeps/arm/math-tests.h index d4d68f3..9a34902 100644 --- a/sysdeps/arm/math-tests.h +++ b/sysdeps/arm/math-tests.h @@ -21,9 +21,6 @@ support rounding modes, although fesetround succeeds, and do not support exceptions. */ #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) # define EXCEPTION_TESTS_float 0 # define EXCEPTION_TESTS_double 0 # define EXCEPTION_TESTS_long_double 0 diff --git a/sysdeps/arm/nofpu/math-tests-rounding.h b/sysdeps/arm/nofpu/math-tests-rounding.h new file mode 100644 index 0000000..9a3b58c --- /dev/null +++ b/sysdeps/arm/nofpu/math-tests-rounding.h @@ -0,0 +1,29 @@ +/* Configuration for math tests: rounding mode support. ARM no-FPU version. + Copyright (C) 2013-2018 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 + . */ + +#ifndef ARM_NOFPU_MATH_TESTS_ROUNDING_H +#define ARM_NOFPU_MATH_TESTS_ROUNDING_H 1 + +/* 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. */ +#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 /* math-tests-rounding.h. */ diff --git a/sysdeps/generic/math-tests-rounding.h b/sysdeps/generic/math-tests-rounding.h new file mode 100644 index 0000000..ccc38bd --- /dev/null +++ b/sysdeps/generic/math-tests-rounding.h @@ -0,0 +1,30 @@ +/* Configuration for math tests: rounding mode support. Generic version. + Copyright (C) 2013-2018 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 + . */ + +#ifndef _MATH_TESTS_ROUNDING_H +#define _MATH_TESTS_ROUNDING_H 1 + +/* 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. */ +#define ROUNDING_TESTS_float(MODE) 1 +#define ROUNDING_TESTS_double(MODE) 1 +#define ROUNDING_TESTS_long_double(MODE) 1 +#define ROUNDING_TESTS_float128(MODE) 1 + +#endif /* math-tests-rounding.h. */ diff --git a/sysdeps/generic/math-tests.h b/sysdeps/generic/math-tests.h index f59a225..2ad83df 100644 --- a/sysdeps/generic/math-tests.h +++ b/sysdeps/generic/math-tests.h @@ -36,22 +36,6 @@ /* Return nonzero value if to run tests involving sNaN values for X. */ #define SNAN_TESTS(x) MATH_TESTS_TG (SNAN_TESTS_, , x) -/* 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 -#ifndef ROUNDING_TESTS_float128 -# define ROUNDING_TESTS_float128(MODE) 1 -#endif - #define ROUNDING_TESTS(TYPE, MODE) \ MATH_TESTS_TG (ROUNDING_TESTS_, (MODE), TYPE) @@ -93,6 +77,7 @@ # define EXCEPTION_SET_FORCES_TRAP 0 #endif +#include #include #include #include diff --git a/sysdeps/m68k/coldfire/math-tests.h b/sysdeps/m68k/coldfire/math-tests.h index b05609d..a386f6c 100644 --- a/sysdeps/m68k/coldfire/math-tests.h +++ b/sysdeps/m68k/coldfire/math-tests.h @@ -18,9 +18,6 @@ /* ColdFire soft float does not support exceptions and rounding modes. */ #ifndef __mcffpu__ -# 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) # define EXCEPTION_TESTS_float 0 # define EXCEPTION_TESTS_double 0 # define EXCEPTION_TESTS_long_double 0 diff --git a/sysdeps/mips/math-tests.h b/sysdeps/mips/math-tests.h index 8e0b98b..79d7405 100644 --- a/sysdeps/mips/math-tests.h +++ b/sysdeps/mips/math-tests.h @@ -21,9 +21,6 @@ /* MIPS soft float does not support exceptions and rounding modes. */ #ifdef __mips_soft_float -# 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) # define EXCEPTION_TESTS_float 0 # define EXCEPTION_TESTS_double 0 # define EXCEPTION_TESTS_long_double 0 diff --git a/sysdeps/nios2/math-tests.h b/sysdeps/nios2/math-tests.h index a1c2762..b246827 100644 --- a/sysdeps/nios2/math-tests.h +++ b/sysdeps/nios2/math-tests.h @@ -18,9 +18,6 @@ /* Current Nios II soft-float does not support exceptions or rounding modes. */ -#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) #define EXCEPTION_TESTS_float 0 #define EXCEPTION_TESTS_double 0 #define EXCEPTION_TESTS_long_double 0 diff --git a/sysdeps/riscv/math-tests.h b/sysdeps/riscv/math-tests.h index 3db33b0..f4a8f9f 100644 --- a/sysdeps/riscv/math-tests.h +++ b/sysdeps/riscv/math-tests.h @@ -29,11 +29,4 @@ # define EXCEPTION_TESTS_long_double 0 #endif -/* On soft-float targets we only support the "to nearest" rounding mode. */ -#ifndef __riscv_flen -# 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/riscv/nofpu/math-tests-rounding.h b/sysdeps/riscv/nofpu/math-tests-rounding.h new file mode 100644 index 0000000..97842ce --- /dev/null +++ b/sysdeps/riscv/nofpu/math-tests-rounding.h @@ -0,0 +1,27 @@ +/* Configuration for math tests: rounding mode support. RISC-V no-FPU version. + Copyright (C) 2014-2018 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 + . */ + +#ifndef RISCV_NOFPU_MATH_TESTS_ROUNDING_H +#define RISCV_NOFPU_MATH_TESTS_ROUNDING_H 1 + +/* On soft-float targets we only support the "to nearest" rounding mode. */ +#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 /* math-tests-rounding.h. */ -- cgit v1.1