From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 412673858025; Mon, 4 Apr 2022 13:00:13 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 412673858025 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/clang] math: Add math-use-builtins-fabs X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/azanella/clang X-Git-Oldrev: 5c7514b22fb84962ddbe7404ce74519aae878af4 X-Git-Newrev: 6c5f586e5811d8b8d55c993ddee8c375e32ee924 Message-Id: <20220404130013.412673858025@sourceware.org> Date: Mon, 4 Apr 2022 13:00:13 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Apr 2022 13:00:13 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=6c5f586e5811d8b8d55c993ddee8c375e32ee924 commit 6c5f586e5811d8b8d55c993ddee8c375e32ee924 Author: Adhemerval Zanella Date: Fri Apr 1 10:19:57 2022 -0300 math: Add math-use-builtins-fabs Both float and double are assumed to be supported (since generic implementation uses it without a fallback), only long double and float128 are defined. It allows to remove i686, ia64, x86_64, powerpc, and sparc arch specific implementation. On ia64 it also fixes: math/test-float64x-fabs math/test-ldouble-fabs Checked on x86_64-linux-gnu, i686-linux-gnu, powerpc-linux-gnu, powerpc64-linux-gnu, sparc64-linux-gnu, and ia64-linux-gnu. Diff: --- sysdeps/generic/math-use-builtins-fabs.h | 4 ++ sysdeps/generic/math-use-builtins.h | 1 + sysdeps/i386/fpu/s_fabsl.S | 10 --- sysdeps/ia64/fpu/s_fabsl.S | 82 ---------------------- sysdeps/ia64/math-use-builtins-fabs.h | 4 ++ sysdeps/ieee754/ldbl-128/s_fabsl.c | 5 ++ sysdeps/ieee754/ldbl-128ibm/s_fabsl.c | 5 ++ .../fpu/s_fabsl.S => ieee754/ldbl-96/s_fabsl.c} | 22 +++--- sysdeps/powerpc/fpu/math-use-builtins-fabs.h | 9 +++ sysdeps/powerpc/powerpc32/fpu/s_fabsl.S | 52 -------------- sysdeps/powerpc/powerpc64/fpu/s_fabsl.S | 34 --------- sysdeps/sparc/fpu/math-use-builtins-fabs.h | 4 ++ sysdeps/sparc/sparc32/fpu/s_fabsl.c | 9 --- sysdeps/sparc/sparc64/fpu/s_fabsl.c | 7 -- sysdeps/x86/math-use-builtins-fabs.h | 4 ++ 15 files changed, 49 insertions(+), 203 deletions(-) diff --git a/sysdeps/generic/math-use-builtins-fabs.h b/sysdeps/generic/math-use-builtins-fabs.h new file mode 100644 index 0000000000..8f3da3cf21 --- /dev/null +++ b/sysdeps/generic/math-use-builtins-fabs.h @@ -0,0 +1,4 @@ +/* Generic implementation already assume builtin support for + float and double. */ +#define USE_FABSL_BUILTIN 0 +#define USE_FABSF128_BUILTIN 0 diff --git a/sysdeps/generic/math-use-builtins.h b/sysdeps/generic/math-use-builtins.h index 3ec15e59d4..6bd424d900 100644 --- a/sysdeps/generic/math-use-builtins.h +++ b/sysdeps/generic/math-use-builtins.h @@ -36,5 +36,6 @@ #include #include #include +#include #endif /* MATH_USE_BUILTINS_H */ diff --git a/sysdeps/i386/fpu/s_fabsl.S b/sysdeps/i386/fpu/s_fabsl.S deleted file mode 100644 index 6642ed4151..0000000000 --- a/sysdeps/i386/fpu/s_fabsl.S +++ /dev/null @@ -1,10 +0,0 @@ -#include -#include - - .text -ENTRY(__fabsl) - fldt 4(%esp) - fabs - ret -END(__fabsl) -libm_alias_ldouble (__fabs, fabs) diff --git a/sysdeps/ia64/fpu/s_fabsl.S b/sysdeps/ia64/fpu/s_fabsl.S deleted file mode 100644 index 07838b1057..0000000000 --- a/sysdeps/ia64/fpu/s_fabsl.S +++ /dev/null @@ -1,82 +0,0 @@ -.file "fabsl.s" - - -// Copyright (c) 2000 - 2003, Intel Corporation -// All rights reserved. -// -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// -// * Redistributions in binary form must reproduce the above copyright -// notice, this list of conditions and the following disclaimer in the -// documentation and/or other materials provided with the distribution. -// -// * The name of Intel Corporation may not be used to endorse or promote -// products derived from this software without specific prior written -// permission. - -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL INTEL OR ITS -// CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -// EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR -// PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY -// OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY OR TORT (INCLUDING -// NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -// SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Intel Corporation is the author of this code, and requests that all -// problem reports or change requests be submitted to it directly at -// http://www.intel.com/software/products/opensource/libraries/num.htm. -// -// History -//============================================================== -// 02/02/00 Initial version -// 02/07/02 Added __libm_fabsl entry point to test in case compiler inlines -// 05/20/02 Cleaned up namespace and sf0 syntax -// 02/10/03 Reordered header: .section, .global, .proc, .align -// -// API -//============================================================== -// long double fabsl (long double x) -// -// Overview of operation -//============================================================== -// returns absolute value of x - -// floating-point registers used: 1 -// f8, input - -.section .text -.global __libm_fabsl# - -.proc __libm_fabsl# -__libm_fabsl: -.endp __libm_fabsl# - -GLOBAL_IEEE754_ENTRY(fabsl) - -// set invalid or denormal flags and take fault if -// necessary - -{ .mfi - nop.m 999 - fcmp.eq.unc.s0 p6,p7 = f8,f1 - nop.i 999 ;; -} - -{ .mfb - nop.m 999 - fmerge.s f8 = f0,f8 - br.ret.sptk b0 ;; -} - -GLOBAL_IEEE754_END(fabsl) -libm_alias_ldouble_other (__fabs, fabs) diff --git a/sysdeps/ia64/math-use-builtins-fabs.h b/sysdeps/ia64/math-use-builtins-fabs.h new file mode 100644 index 0000000000..facf3a6425 --- /dev/null +++ b/sysdeps/ia64/math-use-builtins-fabs.h @@ -0,0 +1,4 @@ +/* Generic implementation already assume builtin support for + float and double. */ +#define USE_FABSL_BUILTIN 1 +#define USE_FABSF128_BUILTIN 1 diff --git a/sysdeps/ieee754/ldbl-128/s_fabsl.c b/sysdeps/ieee754/ldbl-128/s_fabsl.c index 7e08980252..464d62fa1b 100644 --- a/sysdeps/ieee754/ldbl-128/s_fabsl.c +++ b/sysdeps/ieee754/ldbl-128/s_fabsl.c @@ -23,12 +23,17 @@ static char rcsid[] = "$NetBSD: $"; #include #include #include +#include _Float128 __fabsl(_Float128 x) { +#if USE_FABSF128_BUILTIN + return __builtin_fabsf128 (x); +#else uint64_t hx; GET_LDOUBLE_MSW64(hx,x); SET_LDOUBLE_MSW64(x,hx&0x7fffffffffffffffLL); return x; +#endif } libm_alias_ldouble (__fabs, fabs) diff --git a/sysdeps/ieee754/ldbl-128ibm/s_fabsl.c b/sysdeps/ieee754/ldbl-128ibm/s_fabsl.c index cba7de6660..7f26315e84 100644 --- a/sysdeps/ieee754/ldbl-128ibm/s_fabsl.c +++ b/sysdeps/ieee754/ldbl-128ibm/s_fabsl.c @@ -24,9 +24,13 @@ static char rcsid[] = "$NetBSD: $"; #include #include #include +#include long double __fabsl(long double x) { +#if USE_FABSL_BUILTIN + return __builtin_fabsl (x); +#else uint64_t hx, lx; double xhi, xlo; @@ -39,5 +43,6 @@ long double __fabsl(long double x) INSERT_WORDS64 (xlo, lx); x = ldbl_pack (xhi, xlo); return x; +#endif } long_double_symbol (libm, __fabsl, fabsl); diff --git a/sysdeps/x86_64/fpu/s_fabsl.S b/sysdeps/ieee754/ldbl-96/s_fabsl.c similarity index 72% rename from sysdeps/x86_64/fpu/s_fabsl.S rename to sysdeps/ieee754/ldbl-96/s_fabsl.c index cfcf01e027..c8a6a50918 100644 --- a/sysdeps/x86_64/fpu/s_fabsl.S +++ b/sysdeps/ieee754/ldbl-96/s_fabsl.c @@ -1,5 +1,5 @@ -/* Absolute value of floating point number. - Copyright (C) 2002-2022 Free Software Foundation, Inc. +/* Absolute value of floating-point number. + Copyright (C) 2022 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,17 @@ License along with the GNU C Library; if not, see . */ -#include +#include #include +#include - .text -ENTRY(__fabsl) - fldt 8(%rsp) - fabs - ret -END(__fabsl) +long double +__fabsl (long double x) +{ +#if USE_FABSL_BUILTIN + return __builtin_fabsl (x); +#else +# error "missing fabsl implementation for lbdl-96" +#endif +} libm_alias_ldouble (__fabs, fabs) diff --git a/sysdeps/powerpc/fpu/math-use-builtins-fabs.h b/sysdeps/powerpc/fpu/math-use-builtins-fabs.h new file mode 100644 index 0000000000..3100a004fe --- /dev/null +++ b/sysdeps/powerpc/fpu/math-use-builtins-fabs.h @@ -0,0 +1,9 @@ +/* Generic implementation already assume builtin support for + float and double. */ +#define USE_FABSL_BUILTIN 1 +/* This is not available for P8 or BE targets. */ +#ifdef __FLOAT128__ +# define USE_FABSF128_BUILTIN 1 +#else +# define USE_FABSF128_BUILTIN 0 +#endif diff --git a/sysdeps/powerpc/powerpc32/fpu/s_fabsl.S b/sysdeps/powerpc/powerpc32/fpu/s_fabsl.S deleted file mode 100644 index 8bdcdc8cfb..0000000000 --- a/sysdeps/powerpc/powerpc32/fpu/s_fabsl.S +++ /dev/null @@ -1,52 +0,0 @@ -/* Copy a sign bit between floating-point values. - IBM extended format long double version. - Copyright (C) 2004-2022 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 - . */ - -#include -#include - -ENTRY(__fabsl) -/* long double [f1,f2] fabs (long double [f1,f2] x); - fabs(x,y) returns a value with the magnitude of x and - with the sign bit of y. */ -#ifdef _ARCH_PPCGR - /* fsel available. */ - fmr fp0,fp1 -#else - /* Use integer operations to test sign of high part to avoid - exceptions on sNaNs. */ - stwu r1,-16(r1) - cfi_adjust_cfa_offset (16) - stfd fp1,8(r1) -#endif - fabs fp1,fp1 -#ifdef _ARCH_PPCGR - fneg fp3,fp2 - fsel fp2,fp0,fp2,fp3 -#else - lwz r3,8+HIWORD(r1) - cmpwi cr6,r3,0 - addi r1,r1,16 - cfi_adjust_cfa_offset (-16) - bgelr cr6 - fneg fp2,fp2 -#endif - blr -END (__fabsl) - -long_double_symbol (libm, __fabsl, fabsl) diff --git a/sysdeps/powerpc/powerpc64/fpu/s_fabsl.S b/sysdeps/powerpc/powerpc64/fpu/s_fabsl.S deleted file mode 100644 index ec796a1cd3..0000000000 --- a/sysdeps/powerpc/powerpc64/fpu/s_fabsl.S +++ /dev/null @@ -1,34 +0,0 @@ -/* Copy a sign bit between floating-point values. - IBM extended format long double version. - Copyright (C) 2004-2022 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 - . */ - -#include -#include - -ENTRY_TOCLESS (__fabsl) -/* long double [f1,f2] fabs (long double [f1,f2] x); - fabs(x,y) returns a value with the magnitude of x and - with the sign bit of y. */ - fmr fp0,fp1 - fabs fp1,fp1 - fneg fp3,fp2 - fsel fp2,fp0,fp2,fp3 - blr -END (__fabsl) - -long_double_symbol (libm, __fabsl, fabsl) diff --git a/sysdeps/sparc/fpu/math-use-builtins-fabs.h b/sysdeps/sparc/fpu/math-use-builtins-fabs.h new file mode 100644 index 0000000000..702229ddd4 --- /dev/null +++ b/sysdeps/sparc/fpu/math-use-builtins-fabs.h @@ -0,0 +1,4 @@ +/* Generic implementation already assume builtin support for + float and double. */ +#define USE_FABSL_BUILTIN 1 +#define USE_FABSF128_BUILTIN 0 diff --git a/sysdeps/sparc/sparc32/fpu/s_fabsl.c b/sysdeps/sparc/sparc32/fpu/s_fabsl.c deleted file mode 100644 index 411a2e1511..0000000000 --- a/sysdeps/sparc/sparc32/fpu/s_fabsl.c +++ /dev/null @@ -1,9 +0,0 @@ -#include -#include -#include - -long double __fabsl (long double x) -{ - return __builtin_fabsl (x); -} -libm_alias_ldouble (__fabs, fabs) diff --git a/sysdeps/sparc/sparc64/fpu/s_fabsl.c b/sysdeps/sparc/sparc64/fpu/s_fabsl.c deleted file mode 100644 index 72e1c51340..0000000000 --- a/sysdeps/sparc/sparc64/fpu/s_fabsl.c +++ /dev/null @@ -1,7 +0,0 @@ -#include - -long double __fabsl (long double x) -{ - return __builtin_fabsl (x); -} -libm_alias_ldouble (__fabs, fabs) diff --git a/sysdeps/x86/math-use-builtins-fabs.h b/sysdeps/x86/math-use-builtins-fabs.h new file mode 100644 index 0000000000..facf3a6425 --- /dev/null +++ b/sysdeps/x86/math-use-builtins-fabs.h @@ -0,0 +1,4 @@ +/* Generic implementation already assume builtin support for + float and double. */ +#define USE_FABSL_BUILTIN 1 +#define USE_FABSF128_BUILTIN 1