From patchwork Wed Aug 22 12:27:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joseph Myers X-Patchwork-Id: 960940 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-95439-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="lCSRAtoe"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41wRdL0y7Qz9s78 for ; Wed, 22 Aug 2018 22:27:33 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; q=dns; s=default; b=DIEBDFA+GH5MWM7b4ln6b9MwwNjjg aV2rKHiaLBO/f/mR7nowp3BNRqxDsdusNyQmqwpWaOOt5h/fukSJweHEyMbmjHit B67bHJ/5A5d6D5iUtRSTUQICV9pfazPVrGFVSxTnrvFZVEHFS6BR0+ZYJ4LNfyN4 cd4Sd/dTUU3i3A= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:date:from:to:subject:message-id:mime-version :content-type; s=default; bh=/0oOpf/IPeylv8o3Bjd/rw3gBOA=; b=lCS RAtoe1mDqb4R0lyocdhSXvPWMiOL6O2S8WFA6+H4YpoSPGoLsKpk/VHTN1a+SUZx 39tFRqJfHWSywNz1s3w5CZmr1EQqtEfA+owKKMxXAKEojHLHWFjpbVGJQ/ksWrqc yUSPMnYLZVEmoU2Nmm/FJL6V8plMZLx2Bl8XIA1Y= Received: (qmail 78421 invoked by alias); 22 Aug 2018 12:27:27 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 78411 invoked by uid 89); 22 Aug 2018 12:27:26 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy= X-HELO: relay1.mentorg.com Date: Wed, 22 Aug 2018 12:27:17 +0000 From: Joseph Myers To: Subject: Move ROUNDING_TESTS_* out of math-tests.h [committed] Message-ID: User-Agent: Alpine 2.21 (DEB 202 2017-01-01) MIME-Version: 1.0 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. Committed. 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. 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/arm/nofpu/math-tests-rounding.h b/sysdeps/arm/nofpu/math-tests-rounding.h new file mode 100644 index 0000000000..9a3b58c080 --- /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 0000000000..ccc38bd3a1 --- /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 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/riscv/nofpu/math-tests-rounding.h b/sysdeps/riscv/nofpu/math-tests-rounding.h new file mode 100644 index 0000000000..97842ce459 --- /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. */