From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 21784 invoked by alias); 5 Dec 2019 20:40:35 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Received: (qmail 21647 invoked by uid 89); 5 Dec 2019 20:40:34 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-21.3 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_ASCII_DIVIDERS,KAM_SHORT,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mail-vs1-f67.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=to:references:from:autocrypt:subject:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=/vxQRvIKF+Jl+cO08OEW4o8hp3+pu86I6LJRpesT1IY=; b=oB7kO17gX+5yf5oe2ROFyNHYP4/39os1bN2zEmnjpFBLKvSUuyf7OgMGt68RXFORDV LOPnLKYl89lL334R0Xb5U7EbwUCO7lL9uVMNOqIU5wNSDR6RQiLe2mJim0uRtLMtXkc/ xX5kZWxCyGlMD/HvHpIh9QnAZe6VOSVZbB3zyBMfsOKLpst3uW4zSksL3xUfk4EjDLqF y8Xp2WW+PUTy+430mZSsnyWE6ChysqN3lQ/kQy6Y270OaA7Klm9bG2YppSn6zZ9M7cqa 4izmG9zH73bUkYr/cIl7ATF32n7HDf+q+xxC390PMzWzjNiujKNBCxw2Y71KgtHJHSNu jvkA== Return-Path: To: libc-alpha@sourceware.org References: <1575297977-2589-1-git-send-email-stli@linux.ibm.com> <1575297977-2589-4-git-send-email-stli@linux.ibm.com> From: Adhemerval Zanella Subject: Re: [PATCH 03/13] Always use wordsize-64 version of s_floor.c. Message-ID: <92a60199-695d-4696-464a-0bb0c9df0d66@linaro.org> Date: Thu, 05 Dec 2019 20:40:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.2.1 MIME-Version: 1.0 In-Reply-To: <1575297977-2589-4-git-send-email-stli@linux.ibm.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-SW-Source: 2019-12/txt/msg00193.txt.bz2 On 02/12/2019 11:46, Stefan Liebler wrote: > This patch replaces s_floor.c in sysdeps/dbl-64 with the one in > sysdeps/dbl-64/wordsize-64 and removes the latter one. > The code is not changed except changes in code style. > > Also adjusted the include path in x86_64 and sparc64 files. LGTM, thanks. Reviewed-by: Adhemerval Zanella > --- > sysdeps/ieee754/dbl-64/s_floor.c | 93 +++++++++---------- > sysdeps/ieee754/dbl-64/wordsize-64/s_floor.c | 72 -------------- > .../sparc64/fpu/multiarch/s_floor-generic.c | 2 +- > .../sparc64/fpu/multiarch/s_floor-vis3.c | 2 +- > sysdeps/x86_64/fpu/multiarch/s_floor-c.c | 2 +- > 5 files changed, 46 insertions(+), 125 deletions(-) > delete mode 100644 sysdeps/ieee754/dbl-64/wordsize-64/s_floor.c > > diff --git a/sysdeps/ieee754/dbl-64/s_floor.c b/sysdeps/ieee754/dbl-64/s_floor.c > index bebc018658..ce0c42bdb6 100644 > --- a/sysdeps/ieee754/dbl-64/s_floor.c > +++ b/sysdeps/ieee754/dbl-64/s_floor.c > @@ -1,4 +1,24 @@ > -/* @(#)s_floor.c 5.1 93/09/24 */ > +/* Round double to integer away from zero. > + Copyright (C) 2011-2019 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > + Contributed by Ulrich Drepper , 2011. > + > + 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 > + . */ > + > +/* Based on a version which carries the following copyright: */ > + > /* > * ==================================================== > * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. > @@ -10,6 +30,12 @@ > * ==================================================== > */ > > +#define NO_MATH_REDIRECT > +#include > +#include > +#include > +#include > + > /* > * floor(x) > * Return x rounded toward -inf to integral value > @@ -17,69 +43,36 @@ > * Bit twiddling. > */ > > -#define NO_MATH_REDIRECT > -#include > -#include > -#include > > double > __floor (double x) > { > - int32_t i0, i1, j0; > - uint32_t i, j; > - EXTRACT_WORDS (i0, i1, x); > - j0 = ((i0 >> 20) & 0x7ff) - 0x3ff; > - if (j0 < 20) > + int64_t i0; > + EXTRACT_WORDS64 (i0, x); > + int32_t j0 = ((i0 >> 52) & 0x7ff) - 0x3ff; > + if (__glibc_likely (j0 < 52)) > { > if (j0 < 0) > { > - /* return 0*sign(x) if |x|<1 */ > + /* return 0 * sign (x) if |x| < 1 */ > if (i0 >= 0) > - { > - i0 = i1 = 0; > - } > - else if (((i0 & 0x7fffffff) | i1) != 0) > - { > - i0 = 0xbff00000; i1 = 0; > - } > + i0 = 0; > + else if ((i0 & 0x7fffffffffffffffl) != 0) > + i0 = 0xbff0000000000000l; > } > else > { > - i = (0x000fffff) >> j0; > - if (((i0 & i) | i1) == 0) > - return x; /* x is integral */ > + uint64_t i = 0x000fffffffffffffl >> j0; > + if ((i0 & i) == 0) > + return x; /* x is integral */ > if (i0 < 0) > - i0 += (0x00100000) >> j0; > - i0 &= (~i); i1 = 0; > - } > - } > - else if (j0 > 51) > - { > - if (j0 == 0x400) > - return x + x; /* inf or NaN */ > - else > - return x; /* x is integral */ > - } > - else > - { > - i = ((uint32_t) (0xffffffff)) >> (j0 - 20); > - if ((i1 & i) == 0) > - return x; /* x is integral */ > - if (i0 < 0) > - { > - if (j0 == 20) > - i0 += 1; > - else > - { > - j = i1 + (1 << (52 - j0)); > - if (j < i1) > - i0 += 1; /* got a carry */ > - i1 = j; > - } > + i0 += 0x0010000000000000l >> j0; > + i0 &= ~i; > } > - i1 &= (~i); > + INSERT_WORDS64 (x, i0); > } > - INSERT_WORDS (x, i0, i1); > + else if (j0 == 0x400) > + return x + x; /* inf or NaN */ > return x; > } > #ifndef __floor Ok. > diff --git a/sysdeps/ieee754/dbl-64/wordsize-64/s_floor.c b/sysdeps/ieee754/dbl-64/wordsize-64/s_floor.c > deleted file mode 100644 > index b60f15bf00..0000000000 > --- a/sysdeps/ieee754/dbl-64/wordsize-64/s_floor.c > +++ /dev/null > @@ -1,72 +0,0 @@ > -/* Round double to integer away from zero. > - Copyright (C) 2011-2019 Free Software Foundation, Inc. > - This file is part of the GNU C Library. > - Contributed by Ulrich Drepper , 2011. > - > - 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 > - . */ > - > -/* Based on a version which carries the following copyright: */ > - > -/* > - * ==================================================== > - * Copyright (C) 1993 by Sun Microsystems, Inc. All rights reserved. > - * > - * Developed at SunPro, a Sun Microsystems, Inc. business. > - * Permission to use, copy, modify, and distribute this > - * software is freely granted, provided that this notice > - * is preserved. > - * ==================================================== > - */ > - > -#define NO_MATH_REDIRECT > -#include > -#include > -#include > -#include > - > -/* > - * floor(x) > - * Return x rounded toward -inf to integral value > - * Method: > - * Bit twiddling. > - */ > - > - > -double > -__floor (double x) > -{ > - int64_t i0; > - EXTRACT_WORDS64(i0,x); > - int32_t j0 = ((i0>>52)&0x7ff)-0x3ff; > - if(__builtin_expect(j0<52, 1)) { > - if(j0<0) { > - /* return 0*sign(x) if |x|<1 */ > - if(i0>=0) {i0=0;} > - else if((i0&0x7fffffffffffffffl)!=0) > - { i0=0xbff0000000000000l;} > - } else { > - uint64_t i = (0x000fffffffffffffl)>>j0; > - if((i0&i)==0) return x; /* x is integral */ > - if(i0<0) i0 += (0x0010000000000000l)>>j0; > - i0 &= (~i); > - } > - INSERT_WORDS64(x,i0); > - } else if (j0==0x400) > - return x+x; /* inf or NaN */ > - return x; > -} > -#ifndef __floor > -libm_alias_double (__floor, floor) > -#endif Ok. > diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_floor-generic.c b/sysdeps/sparc/sparc64/fpu/multiarch/s_floor-generic.c > index 0f3361a9fb..c92b600df1 100644 > --- a/sysdeps/sparc/sparc64/fpu/multiarch/s_floor-generic.c > +++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_floor-generic.c > @@ -1,2 +1,2 @@ > #define __floor __floor_generic > -#include > +#include Ok. > diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_floor-vis3.c b/sysdeps/sparc/sparc64/fpu/multiarch/s_floor-vis3.c > index ccac0e46af..4f3d53c0e3 100644 > --- a/sysdeps/sparc/sparc64/fpu/multiarch/s_floor-vis3.c > +++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_floor-vis3.c > @@ -20,4 +20,4 @@ > > #define __floor __floor_vis3 > > -#include > +#include Ok. > diff --git a/sysdeps/x86_64/fpu/multiarch/s_floor-c.c b/sysdeps/x86_64/fpu/multiarch/s_floor-c.c > index 68733b69ef..002d12247e 100644 > --- a/sysdeps/x86_64/fpu/multiarch/s_floor-c.c > +++ b/sysdeps/x86_64/fpu/multiarch/s_floor-c.c > @@ -1,3 +1,3 @@ > #undef __floor > #define __floor __floor_c > -#include > +#include > Ok.