From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18257 invoked by alias); 5 Dec 2019 20:40:14 -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 18249 invoked by uid 89); 5 Dec 2019 20:40:13 -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,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.1 spammy= X-HELO: mail-ua1-f65.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=2hTp6xUdTU3zjOAh8LpCd39wPTOSnZjpydZHNhqUzkM=; b=VWxI8TU4dGH/oOvE1KMD8jdolhJV2olKh1iE2u8K6w78I/to5iYnoE3v2WemT9opSf pNZ3lvMU2w5akc8dDBewoIoGFHL+1NRl/25yDMFVtvxmQqsxZn+ewy52YFlhxe5lIzjP mLcUnP5Ozc36YbJo3EfKZdIUNS/icFigv/H/CH2CALAa2R+INmrr2DJ8OGhafQFMP73z t8yexsVnsEyWSBU/ZMXfdX7FsZSv4zmzsovaJcFatH2BkZ5+M7yoDNe5rMLs+gMJh8AH nab4fQ7Z6dsQ08PXnRliiy6hI6g5hS0XXxuxY3GMuU1mzpY2z32UN/NazNdE1tnL3iN+ 1i4g== Return-Path: To: libc-alpha@sourceware.org References: <1575297977-2589-1-git-send-email-stli@linux.ibm.com> <1575297977-2589-2-git-send-email-stli@linux.ibm.com> From: Adhemerval Zanella Subject: Re: [PATCH 01/13] Always use wordsize-64 version of s_nearbyint.c. Message-ID: <47dd9c42-a3ec-b00e-05eb-d81a8e8e9a2e@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-2-git-send-email-stli@linux.ibm.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-SW-Source: 2019-12/txt/msg00191.txt.bz2 On 02/12/2019 11:46, Stefan Liebler wrote: > This patch replaces s_nearbyint.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 file. LGTM, thanks. Reviewed-by: Adhemerval Zanella > --- > sysdeps/ieee754/dbl-64/s_nearbyint.c | 38 +++++------ > .../ieee754/dbl-64/wordsize-64/s_nearbyint.c | 65 ------------------- > sysdeps/x86_64/fpu/multiarch/s_nearbyint-c.c | 2 +- > 3 files changed, 17 insertions(+), 88 deletions(-) > delete mode 100644 sysdeps/ieee754/dbl-64/wordsize-64/s_nearbyint.c > > diff --git a/sysdeps/ieee754/dbl-64/s_nearbyint.c b/sysdeps/ieee754/dbl-64/s_nearbyint.c > index 4ce570ac7f..c261885c5a 100644 > --- a/sysdeps/ieee754/dbl-64/s_nearbyint.c > +++ b/sysdeps/ieee754/dbl-64/s_nearbyint.c > @@ -10,10 +10,6 @@ > * ==================================================== > */ > > -#if defined(LIBM_SCCS) && !defined(lint) > -static char rcsid[] = "$NetBSD: s_rint.c,v 1.8 1995/05/10 20:48:04 jtc Exp $"; > -#endif > - > /* > * rint(x) > * Return x rounded to integral value according to the prevailing > @@ -32,44 +28,42 @@ static char rcsid[] = "$NetBSD: s_rint.c,v 1.8 1995/05/10 20:48:04 jtc Exp $"; > #include > > static const double > - TWO52[2] = { > - 4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */ > - -4.50359962737049600000e+15, /* 0xC3300000, 0x00000000 */ > +TWO52[2] = { > + 4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */ > + -4.50359962737049600000e+15, /* 0xC3300000, 0x00000000 */ > }; > > double > __nearbyint (double x) > { > fenv_t env; > - int32_t i0, j0, sx; > - double w, t; > - GET_HIGH_WORD (i0, x); > - sx = (i0 >> 31) & 1; > - j0 = ((i0 >> 20) & 0x7ff) - 0x3ff; > - if (j0 < 52) > + int64_t i0, sx; > + int32_t j0; > + EXTRACT_WORDS64 (i0, x); > + sx = (i0 >> 63) & 1; > + j0 = ((i0 >> 52) & 0x7ff) - 0x3ff; > + if (__glibc_likely (j0 < 52)) > { > if (j0 < 0) > { > libc_feholdexcept (&env); > - w = TWO52[sx] + math_opt_barrier (x); > - t = w - TWO52[sx]; > + double w = TWO52[sx] + math_opt_barrier (x); > + double t = w - TWO52[sx]; > math_force_eval (t); > libc_fesetenv (&env); > - GET_HIGH_WORD (i0, t); > - SET_HIGH_WORD (t, (i0 & 0x7fffffff) | (sx << 31)); > - return t; > + return copysign (t, x); > } > } > else > { > if (j0 == 0x400) > - return x + x; /* inf or NaN */ > + return x + x; /* inf or NaN */ > else > - return x; /* x is integral */ > + return x; /* x is integral */ > } > libc_feholdexcept (&env); > - w = TWO52[sx] + math_opt_barrier (x); > - t = w - TWO52[sx]; > + double w = TWO52[sx] + math_opt_barrier (x); > + double t = w - TWO52[sx]; > math_force_eval (t); > libc_fesetenv (&env); > return t; Ok. > diff --git a/sysdeps/ieee754/dbl-64/wordsize-64/s_nearbyint.c b/sysdeps/ieee754/dbl-64/wordsize-64/s_nearbyint.c > deleted file mode 100644 > index 92fa72af59..0000000000 > --- a/sysdeps/ieee754/dbl-64/wordsize-64/s_nearbyint.c > +++ /dev/null > @@ -1,65 +0,0 @@ > -/* Adapted for use as nearbyint by Ulrich Drepper . */ > -/* > - * ==================================================== > - * 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. > - * ==================================================== > - */ > - > -/* > - * rint(x) > - * Return x rounded to integral value according to the prevailing > - * rounding mode. > - * Method: > - * Using floating addition. > - * Exception: > - * Inexact flag raised if x not equal to rint(x). > - */ > - > -#include > -#include > -#include > -#include > -#include > -#include > - > -static const double > -TWO52[2]={ > - 4.50359962737049600000e+15, /* 0x43300000, 0x00000000 */ > - -4.50359962737049600000e+15, /* 0xC3300000, 0x00000000 */ > -}; > - > -double > -__nearbyint(double x) > -{ > - fenv_t env; > - int64_t i0,sx; > - int32_t j0; > - EXTRACT_WORDS64(i0,x); > - sx = (i0>>63)&1; > - j0 = ((i0>>52)&0x7ff)-0x3ff; > - if(__builtin_expect(j0<52, 1)) { > - if(j0<0) { > - libc_feholdexcept (&env); > - double w = TWO52[sx] + math_opt_barrier (x); > - double t = w-TWO52[sx]; > - math_force_eval (t); > - libc_fesetenv (&env); > - return copysign (t, x); > - } > - } else { > - if(j0==0x400) return x+x; /* inf or NaN */ > - else return x; /* x is integral */ > - } > - libc_feholdexcept (&env); > - double w = TWO52[sx] + math_opt_barrier (x); > - double t = w-TWO52[sx]; > - math_force_eval (t); > - libc_fesetenv (&env); > - return t; > -} > -libm_alias_double (__nearbyint, nearbyint) Ok. > diff --git a/sysdeps/x86_64/fpu/multiarch/s_nearbyint-c.c b/sysdeps/x86_64/fpu/multiarch/s_nearbyint-c.c > index f897a2a6a6..4fdeb11291 100644 > --- a/sysdeps/x86_64/fpu/multiarch/s_nearbyint-c.c > +++ b/sysdeps/x86_64/fpu/multiarch/s_nearbyint-c.c > @@ -1,3 +1,3 @@ > #undef __nearbyint > #define __nearbyint __nearbyint_c > -#include > +#include > Ok.