From patchwork Mon Dec 9 12:45:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Liebler X-Patchwork-Id: 1206178 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-107833-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="ahrgMoF6"; 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 47WjhR23XPz9sNH for ; Mon, 9 Dec 2019 23:49:59 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:in-reply-to:references :message-id; q=dns; s=default; b=USRJ5MYaSOVtikKQKGd0Kvk+rHTO0+r YYgGfTHjEGwSiLZRqkOXrNRv4qrNIRmNEvnd+P7uhbHZr76gJjmPDPUz3s/nD+D9 M7VUlmqGOpaDebiisSuClQQ5jmh/fGzH4PfoodcnCCqXj/pYRkJtwGZDdZb7leEy gQ79JRKIg7FU= 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:from:to:cc:subject:date:in-reply-to:references :message-id; s=default; bh=TEev8oYH04456FyYPeA9+3sRXZc=; b=ahrgM oF6Jg3v8uEU5Acj3AyJ7MrDzvbqL7QvB8b6U/aAVFa9GGrFmKeUTm+Qs/Kl7ESxT Dmnpgzb8RPwXhePq3H7dbWkBDOO9qjbe79Y9zf/9F8McrabKW7AZK2LAudNos0y1 +L0fOM6UX1aX2Txpkk4yg8J56rA5CKCa+wBBkE= Received: (qmail 92781 invoked by alias); 9 Dec 2019 12:49:53 -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 92771 invoked by uid 89); 9 Dec 2019 12:49:52 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-22.8 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.1 spammy=wt X-HELO: mx0a-001b2d01.pphosted.com From: Stefan Liebler To: libc-alpha@sourceware.org Cc: Stefan Liebler Subject: [PATCH v2 07/18] Use GCC builtins for nearbyint functions if desired. Date: Mon, 9 Dec 2019 13:45:57 +0100 In-Reply-To: <1575895568-26473-1-git-send-email-stli@linux.ibm.com> References: <1575895568-26473-1-git-send-email-stli@linux.ibm.com> x-cbid: 19120912-4275-0000-0000-0000038D408E X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 19120912-4276-0000-0000-000038A0EDA1 Message-Id: <1575895568-26473-8-git-send-email-stli@linux.ibm.com> This patch is using the corresponding GCC builtin for nearbyintf, nearbyint, nearbintl and nearbyintf128 if the USE_FUNCTION_BUILTIN macros are defined to one in math-use-builtins.h. This is the case for s390 if build with at least --march=z196 --mzarch. Otherwise the generic implementation is used. The code of the generic implementation is not changed. Reviewed-by: Adhemerval Zanella --- sysdeps/generic/math-use-builtins.h | 29 ++++++++++++ sysdeps/ieee754/dbl-64/s_nearbyint.c | 17 ++++--- sysdeps/ieee754/float128/float128_private.h | 4 ++ sysdeps/ieee754/flt-32/s_nearbyintf.c | 17 ++++--- sysdeps/ieee754/ldbl-128/s_nearbyintl.c | 17 ++++--- sysdeps/s390/fpu/math-use-builtins.h | 49 +++++++++++++++++++++ 6 files changed, 115 insertions(+), 18 deletions(-) create mode 100644 sysdeps/generic/math-use-builtins.h create mode 100644 sysdeps/s390/fpu/math-use-builtins.h diff --git a/sysdeps/generic/math-use-builtins.h b/sysdeps/generic/math-use-builtins.h new file mode 100644 index 0000000000..e12490ed41 --- /dev/null +++ b/sysdeps/generic/math-use-builtins.h @@ -0,0 +1,29 @@ +/* Using math gcc builtins instead of generic implementation. Generic version. + Copyright (C) 2019 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_USE_BUILTINS_H +#define MATH_USE_BUILTINS_H 1 + +/* Define these macros to 1 to use __builtin_xyz instead of the + generic implementation. */ +#define USE_NEARBYINT_BUILTIN 0 +#define USE_NEARBYINTF_BUILTIN 0 +#define USE_NEARBYINTL_BUILTIN 0 +#define USE_NEARBYINTF128_BUILTIN 0 + +#endif /* math-use-builtins.h */ diff --git a/sysdeps/ieee754/dbl-64/s_nearbyint.c b/sysdeps/ieee754/dbl-64/s_nearbyint.c index c261885c5a..2deaeb2568 100644 --- a/sysdeps/ieee754/dbl-64/s_nearbyint.c +++ b/sysdeps/ieee754/dbl-64/s_nearbyint.c @@ -26,16 +26,20 @@ #include #include #include - -static const double -TWO52[2] = { - 4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */ - -4.50359962737049600000e+15, /* 0xC3300000, 0x00000000 */ -}; +#include double __nearbyint (double x) { +#if USE_NEARBYINT_BUILTIN + return __builtin_nearbyint (x); +#else + /* Use generic implementation. */ + static const double + TWO52[2] = { + 4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */ + -4.50359962737049600000e+15, /* 0xC3300000, 0x00000000 */ + }; fenv_t env; int64_t i0, sx; int32_t j0; @@ -67,5 +71,6 @@ __nearbyint (double x) math_force_eval (t); libc_fesetenv (&env); return t; +#endif /* ! USE_NEARBYINT_BUILTIN */ } libm_alias_double (__nearbyint, nearbyint) diff --git a/sysdeps/ieee754/float128/float128_private.h b/sysdeps/ieee754/float128/float128_private.h index 4e31ef365b..e96986a968 100644 --- a/sysdeps/ieee754/float128/float128_private.h +++ b/sysdeps/ieee754/float128/float128_private.h @@ -139,6 +139,9 @@ #undef libm_alias_double_ldouble #define libm_alias_double_ldouble(func) libm_alias_float64_float128 (func) +#include +#undef USE_NEARBYINTL_BUILTIN +#define USE_NEARBYINTL_BUILTIN USE_NEARBYINTF128_BUILTIN /* IEEE function renames. */ #define __ieee754_acoshl __ieee754_acoshf128 @@ -342,6 +345,7 @@ /* Builtin renames. */ #define __builtin_copysignl __builtin_copysignf128 #define __builtin_signbitl __builtin_signbit +#define __builtin_nearbyintl __builtin_nearbyintf128 /* Get the constant suffix from bits/floatn-compat.h. */ #define L(x) __f128 (x) diff --git a/sysdeps/ieee754/flt-32/s_nearbyintf.c b/sysdeps/ieee754/flt-32/s_nearbyintf.c index acedf34c90..b37e003e12 100644 --- a/sysdeps/ieee754/flt-32/s_nearbyintf.c +++ b/sysdeps/ieee754/flt-32/s_nearbyintf.c @@ -21,16 +21,20 @@ #include #include #include - -static const float -TWO23[2]={ - 8.3886080000e+06, /* 0x4b000000 */ - -8.3886080000e+06, /* 0xcb000000 */ -}; +#include float __nearbyintf(float x) { +#if USE_NEARBYINTF_BUILTIN + return __builtin_nearbyintf (x); +#else + /* Use generic implementation. */ + static const float + TWO23[2] = { + 8.3886080000e+06, /* 0x4b000000 */ + -8.3886080000e+06, /* 0xcb000000 */ + }; fenv_t env; int32_t i0,j0,sx; float w,t; @@ -58,5 +62,6 @@ __nearbyintf(float x) math_force_eval (t); libc_fesetenvf (&env); return t; +#endif /* ! USE_NEARBYINT_BUILTIN */ } libm_alias_float (__nearbyint, nearbyint) diff --git a/sysdeps/ieee754/ldbl-128/s_nearbyintl.c b/sysdeps/ieee754/ldbl-128/s_nearbyintl.c index f044cb4334..a4ad8e82e5 100644 --- a/sysdeps/ieee754/ldbl-128/s_nearbyintl.c +++ b/sysdeps/ieee754/ldbl-128/s_nearbyintl.c @@ -28,15 +28,19 @@ #include #include #include - -static const _Float128 -TWO112[2]={ - L(5.19229685853482762853049632922009600E+33), /* 0x406F000000000000, 0 */ - L(-5.19229685853482762853049632922009600E+33) /* 0xC06F000000000000, 0 */ -}; +#include _Float128 __nearbyintl(_Float128 x) { +#if USE_NEARBYINTL_BUILTIN + return __builtin_nearbyintl (x); +#else + /* Use generic implementation. */ + static const _Float128 + TWO112[2] = { + L(5.19229685853482762853049632922009600E+33), /* 0x406F000000000000, 0 */ + L(-5.19229685853482762853049632922009600E+33) /* 0xC06F000000000000, 0 */ + }; fenv_t env; int64_t i0,j0,sx; uint64_t i1 __attribute__ ((unused)); @@ -65,5 +69,6 @@ _Float128 __nearbyintl(_Float128 x) math_force_eval (t); fesetenv (&env); return t; +#endif /* ! USE_NEARBYINTL_BUILTIN */ } libm_alias_ldouble (__nearbyint, nearbyint) diff --git a/sysdeps/s390/fpu/math-use-builtins.h b/sysdeps/s390/fpu/math-use-builtins.h new file mode 100644 index 0000000000..7abbfb3b50 --- /dev/null +++ b/sysdeps/s390/fpu/math-use-builtins.h @@ -0,0 +1,49 @@ +/* Using math gcc builtins instead of generic implementation. s390/s390x version. + Copyright (C) 2019 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_USE_BUILTINS_S390_H +#define MATH_USE_BUILTINS_S390_H 1 + +#ifdef HAVE_S390_MIN_Z196_ZARCH_ASM_SUPPORT + +# include /* For __GNUC_PREREQ. */ + +/* GCC emits the z196 zarch "load fp integer" instructions for these + builtins if build with at least --march=z196 -mzarch. Otherwise a + function call to libc is emitted. */ +# define USE_NEARBYINT_BUILTIN 1 +# define USE_NEARBYINTF_BUILTIN 1 +# define USE_NEARBYINTL_BUILTIN 1 + +# if __GNUC_PREREQ (8, 0) +# define USE_NEARBYINTF128_BUILTIN 1 +# else +# define USE_NEARBYINTF128_BUILTIN 0 +# endif + +#else + +/* Disable the builtins if we do not have the z196 zarch instructions. */ +# define USE_NEARBYINT_BUILTIN 0 +# define USE_NEARBYINTF_BUILTIN 0 +# define USE_NEARBYINTL_BUILTIN 0 +# define USE_NEARBYINTF128_BUILTIN 0 + +#endif /* ! HAVE_S390_MIN_Z196_ZARCH_ASM_SUPPORT */ + +#endif /* math-use-builtins.h */