From 16a25138c13c9d687a9bc2b130e1aea4d26257b7 Mon Sep 17 00:00:00 2001 From: Joseph Myers Date: Wed, 22 Aug 2018 12:25:50 +0000 Subject: [PATCH] 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. --- ChangeLog | 42 ++++++++++++++++++++++ math/test-double-vlen2.h | 2 ++ math/test-double-vlen4.h | 2 ++ math/test-double-vlen8.h | 2 ++ math/test-float-vlen16.h | 2 ++ math/test-float-vlen4.h | 2 ++ math/test-float-vlen8.h | 2 ++ sysdeps/arm/math-tests.h | 3 -- .../nofpu/math-tests-rounding.h} | 17 ++++----- .../math-tests.h => generic/math-tests-rounding.h} | 24 ++++++------- 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 ---- .../nofpu/math-tests-rounding.h} | 19 +++++----- 16 files changed, 84 insertions(+), 66 deletions(-) copy sysdeps/{nios2/math-tests.h => arm/nofpu/math-tests-rounding.h} (67%) copy sysdeps/{mips/math-tests.h => generic/math-tests-rounding.h} (59%) copy sysdeps/{nios2/math-tests.h => riscv/nofpu/math-tests-rounding.h} (63%) diff --git a/ChangeLog b/ChangeLog index 2d713d0115..0f435dcae4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,45 @@ +2018-08-22 Joseph Myers + + * 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. + 2018-08-21 Tobias Klauser * sysdeps/unix/sysv/linux/bits/socket.h (PF_MAX): Set to 45. diff --git a/math/test-double-vlen2.h b/math/test-double-vlen2.h index 5c2bfe036c..12f37bab85 100644 --- a/math/test-double-vlen2.h +++ b/math/test-double-vlen2.h @@ -19,7 +19,9 @@ #include "test-double.h" #include "test-math-no-inline.h" #include "test-math-vector.h" +#include +#undef ROUNDING_TESTS_double #define ROUNDING_TESTS_double(MODE) ((MODE) == FE_TONEAREST) #define VEC_SUFF _vlen2 diff --git a/math/test-double-vlen4.h b/math/test-double-vlen4.h index 8d9d326080..a28fef367c 100644 --- a/math/test-double-vlen4.h +++ b/math/test-double-vlen4.h @@ -19,7 +19,9 @@ #include "test-double.h" #include "test-math-no-inline.h" #include "test-math-vector.h" +#include +#undef ROUNDING_TESTS_double #define ROUNDING_TESTS_double(MODE) ((MODE) == FE_TONEAREST) #define VEC_SUFF _vlen4 diff --git a/math/test-double-vlen8.h b/math/test-double-vlen8.h index 602fd6eb59..93e4daba2a 100644 --- a/math/test-double-vlen8.h +++ b/math/test-double-vlen8.h @@ -19,7 +19,9 @@ #include "test-double.h" #include "test-math-no-inline.h" #include "test-math-vector.h" +#include +#undef ROUNDING_TESTS_double #define ROUNDING_TESTS_double(MODE) ((MODE) == FE_TONEAREST) #define VEC_SUFF _vlen8 diff --git a/math/test-float-vlen16.h b/math/test-float-vlen16.h index 268c8e67c0..3cdd97dabf 100644 --- a/math/test-float-vlen16.h +++ b/math/test-float-vlen16.h @@ -19,7 +19,9 @@ #include "test-float.h" #include "test-math-no-inline.h" #include "test-math-vector.h" +#include +#undef ROUNDING_TESTS_float #define ROUNDING_TESTS_float(MODE) ((MODE) == FE_TONEAREST) #define VEC_SUFF _vlen16 diff --git a/math/test-float-vlen4.h b/math/test-float-vlen4.h index 1da9f66c4d..76374b98fe 100644 --- a/math/test-float-vlen4.h +++ b/math/test-float-vlen4.h @@ -19,7 +19,9 @@ #include "test-float.h" #include "test-math-no-inline.h" #include "test-math-vector.h" +#include +#undef ROUNDING_TESTS_float #define ROUNDING_TESTS_float(MODE) ((MODE) == FE_TONEAREST) #define VEC_SUFF _vlen4 diff --git a/math/test-float-vlen8.h b/math/test-float-vlen8.h index b44ed1c5b3..b44d00e0ac 100644 --- a/math/test-float-vlen8.h +++ b/math/test-float-vlen8.h @@ -19,7 +19,9 @@ #include "test-float.h" #include "test-math-no-inline.h" #include "test-math-vector.h" +#include +#undef ROUNDING_TESTS_float #define ROUNDING_TESTS_float(MODE) ((MODE) == FE_TONEAREST) #define VEC_SUFF _vlen8 diff --git a/sysdeps/arm/math-tests.h b/sysdeps/arm/math-tests.h index d4d68f39c9..9a34902b6a 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/nios2/math-tests.h b/sysdeps/arm/nofpu/math-tests-rounding.h similarity index 67% copy from sysdeps/nios2/math-tests.h copy to sysdeps/arm/nofpu/math-tests-rounding.h index a1c2762786..9a3b58c080 100644 --- a/sysdeps/nios2/math-tests.h +++ b/sysdeps/arm/nofpu/math-tests-rounding.h @@ -1,5 +1,5 @@ -/* Configuration for math tests. Nios II version. - Copyright (C) 2015-2018 Free Software Foundation, Inc. +/* 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 @@ -16,13 +16,14 @@ License along with the GNU C Library; if not, see . */ -/* Current Nios II soft-float does not support exceptions or rounding - modes. */ +#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) -#define EXCEPTION_TESTS_float 0 -#define EXCEPTION_TESTS_double 0 -#define EXCEPTION_TESTS_long_double 0 -#include_next +#endif /* math-tests-rounding.h. */ diff --git a/sysdeps/mips/math-tests.h b/sysdeps/generic/math-tests-rounding.h similarity index 59% copy from sysdeps/mips/math-tests.h copy to sysdeps/generic/math-tests-rounding.h index 8e0b98bfef..ccc38bd3a1 100644 --- a/sysdeps/mips/math-tests.h +++ b/sysdeps/generic/math-tests-rounding.h @@ -1,4 +1,4 @@ -/* Configuration for math tests. MIPS version. +/* 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. @@ -16,17 +16,15 @@ License along with the GNU C Library; if not, see . */ -#include -#include +#ifndef _MATH_TESTS_ROUNDING_H +#define _MATH_TESTS_ROUNDING_H 1 -/* 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 -#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. */ +#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 -#include_next +#endif /* math-tests-rounding.h. */ diff --git a/sysdeps/generic/math-tests.h b/sysdeps/generic/math-tests.h index f59a2251ed..2ad83dfc43 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 b05609d45d..a386f6cb06 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 8e0b98bfef..79d7405be9 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 a1c2762786..b246827581 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 3db33b0e9a..f4a8f9f5bc 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/nios2/math-tests.h b/sysdeps/riscv/nofpu/math-tests-rounding.h similarity index 63% copy from sysdeps/nios2/math-tests.h copy to sysdeps/riscv/nofpu/math-tests-rounding.h index a1c2762786..97842ce459 100644 --- a/sysdeps/nios2/math-tests.h +++ b/sysdeps/riscv/nofpu/math-tests-rounding.h @@ -1,5 +1,5 @@ -/* Configuration for math tests. Nios II version. - Copyright (C) 2015-2018 Free Software Foundation, Inc. +/* 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 @@ -16,13 +16,12 @@ License along with the GNU C Library; if not, see . */ -/* 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) +#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) -#define EXCEPTION_TESTS_float 0 -#define EXCEPTION_TESTS_double 0 -#define EXCEPTION_TESTS_long_double 0 -#include_next +#endif /* math-tests-rounding.h. */ -- 2.11.4.GIT