From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org
Subject: Re: [PATCH 04/13] Always use wordsize-64 version of s_ceil.c.
Date: Thu, 05 Dec 2019 20:40:00 -0000 [thread overview]
Message-ID: <3d46ad58-2869-f2a6-3187-062c045c7e0f@linaro.org> (raw)
In-Reply-To: <1575297977-2589-5-git-send-email-stli@linux.ibm.com>
On 02/12/2019 11:46, Stefan Liebler wrote:
> This patch replaces s_ceil.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 <adhemerval.zanella@linaro.org>
> ---
> sysdeps/ieee754/dbl-64/s_ceil.c | 61 ++++++-------------
> sysdeps/ieee754/dbl-64/wordsize-64/s_ceil.c | 52 ----------------
> .../sparc64/fpu/multiarch/s_ceil-generic.c | 2 +-
> .../sparc/sparc64/fpu/multiarch/s_ceil-vis3.c | 2 +-
> sysdeps/x86_64/fpu/multiarch/s_ceil-c.c | 2 +-
> 5 files changed, 22 insertions(+), 97 deletions(-)
> delete mode 100644 sysdeps/ieee754/dbl-64/wordsize-64/s_ceil.c
>
> diff --git a/sysdeps/ieee754/dbl-64/s_ceil.c b/sysdeps/ieee754/dbl-64/s_ceil.c
> index 4c96286c69..9d214eac81 100644
> --- a/sysdeps/ieee754/dbl-64/s_ceil.c
> +++ b/sysdeps/ieee754/dbl-64/s_ceil.c
> @@ -23,63 +23,40 @@
> #include <libm-alias-double.h>
>
> double
> -__ceil (double x)
> +__ceil(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, i;
> + int32_t j0;
> + EXTRACT_WORDS64 (i0, x);
> + j0 = ((i0 >> 52) & 0x7ff) - 0x3ff;
> + if (j0 <= 51)
> {
> if (j0 < 0)
> {
> - /* return 0*sign(x) if |x|<1 */
> + /* return 0 * sign(x) if |x| < 1 */
> if (i0 < 0)
> - {
> - i0 = 0x80000000; i1 = 0;
> - }
> - else if ((i0 | i1) != 0)
> - {
> - i0 = 0x3ff00000; i1 = 0;
> - }
> + i0 = INT64_C (0x8000000000000000);
> + else if (i0 != 0)
> + i0 = INT64_C (0x3ff0000000000000);
> }
> else
> {
> - i = (0x000fffff) >> j0;
> - if (((i0 & i) | i1) == 0)
> - return x; /* x is integral */
> + i = INT64_C (0x000fffffffffffff) >> j0;
> + if ((i0 & i) == 0)
> + return x; /* x is integral */
> if (i0 > 0)
> - i0 += (0x00100000) >> j0;
> - i0 &= (~i); i1 = 0;
> + i0 += UINT64_C (0x0010000000000000) >> j0;
> + i0 &= ~i;
> }
> }
> - else if (j0 > 51)
> + else
> {
> if (j0 == 0x400)
> - return x + x; /* inf or NaN */
> + 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;
> - }
> - }
> - i1 &= (~i);
> + return x; /* x is integral */
> }
> - INSERT_WORDS (x, i0, i1);
> + INSERT_WORDS64 (x, i0);
> return x;
> }
> #ifndef __ceil
Ok.
> diff --git a/sysdeps/ieee754/dbl-64/wordsize-64/s_ceil.c b/sysdeps/ieee754/dbl-64/wordsize-64/s_ceil.c
> deleted file mode 100644
> index 4bb93d0633..0000000000
> --- a/sysdeps/ieee754/dbl-64/wordsize-64/s_ceil.c
> +++ /dev/null
> @@ -1,52 +0,0 @@
> -/* @(#)s_ceil.c 5.1 93/09/24 */
> -/*
> - * ====================================================
> - * 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.
> - * ====================================================
> - */
> -
> -/*
> - * ceil(x)
> - * Return x rounded toward -inf to integral value
> - * Method:
> - * Bit twiddling.
> - */
> -
> -#define NO_MATH_REDIRECT
> -#include <math.h>
> -#include <math_private.h>
> -#include <libm-alias-double.h>
> -
> -double
> -__ceil(double x)
> -{
> - int64_t i0,i;
> - int32_t j0;
> - EXTRACT_WORDS64(i0,x);
> - j0 = ((i0>>52)&0x7ff)-0x3ff;
> - if(j0<=51) {
> - if(j0<0) {
> - /* return 0*sign(x) if |x|<1 */
> - if(i0<0) {i0=INT64_C(0x8000000000000000);}
> - else if(i0!=0) { i0=INT64_C(0x3ff0000000000000);}
> - } else {
> - i = INT64_C(0x000fffffffffffff)>>j0;
> - if((i0&i)==0) return x; /* x is integral */
> - if(i0>0) i0 += UINT64_C(0x0010000000000000)>>j0;
> - i0 &= (~i);
> - }
> - } else {
> - if(j0==0x400) return x+x; /* inf or NaN */
> - else return x; /* x is integral */
> - }
> - INSERT_WORDS64(x,i0);
> - return x;
> -}
> -#ifndef __ceil
> -libm_alias_double (__ceil, ceil)
> -#endif
Ok.
> diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_ceil-generic.c b/sysdeps/sparc/sparc64/fpu/multiarch/s_ceil-generic.c
> index febea745e1..80f68b6766 100644
> --- a/sysdeps/sparc/sparc64/fpu/multiarch/s_ceil-generic.c
> +++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_ceil-generic.c
> @@ -1,2 +1,2 @@
> #define __ceil __ceil_generic
> -#include <sysdeps/ieee754/dbl-64/wordsize-64/s_ceil.c>
> +#include <sysdeps/ieee754/dbl-64/s_ceil.c>
> diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_ceil-vis3.c b/sysdeps/sparc/sparc64/fpu/multiarch/s_ceil-vis3.c
> index 9c17809da4..2b89199c62 100644
> --- a/sysdeps/sparc/sparc64/fpu/multiarch/s_ceil-vis3.c
> +++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_ceil-vis3.c
> @@ -20,4 +20,4 @@
>
> #define __ceil __ceil_vis3
>
> -#include <sysdeps/ieee754/dbl-64/wordsize-64/s_ceil.c>
> +#include <sysdeps/ieee754/dbl-64/s_ceil.c>
Ok.
> diff --git a/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c b/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c
> index 6a5ea3ff27..ada28baa1a 100644
> --- a/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c
> +++ b/sysdeps/x86_64/fpu/multiarch/s_ceil-c.c
> @@ -1,2 +1,2 @@
> #define __ceil __ceil_c
> -#include <sysdeps/ieee754/dbl-64/wordsize-64/s_ceil.c>
> +#include <sysdeps/ieee754/dbl-64/s_ceil.c>
>
Ok.
next prev parent reply other threads:[~2019-12-05 20:40 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-02 14:46 [PATCH 00/13] Use GCC builtins for some math functions if desired Stefan Liebler
2019-12-02 14:46 ` [PATCH 05/13] Always use wordsize-64 version of s_trunc.c Stefan Liebler
2019-12-05 20:40 ` Adhemerval Zanella
2019-12-02 14:46 ` [PATCH 07/13] Use GCC builtins for nearbyint functions if desired Stefan Liebler
2019-12-05 20:40 ` Adhemerval Zanella
2019-12-02 14:46 ` [PATCH 01/13] Always use wordsize-64 version of s_nearbyint.c Stefan Liebler
2019-12-05 20:40 ` Adhemerval Zanella
2019-12-02 14:46 ` [PATCH 02/13] Always use wordsize-64 version of s_rint.c Stefan Liebler
2019-12-05 20:40 ` Adhemerval Zanella
2019-12-02 14:46 ` [PATCH 03/13] Always use wordsize-64 version of s_floor.c Stefan Liebler
2019-12-05 20:40 ` Adhemerval Zanella
2019-12-02 14:46 ` [PATCH 09/13] Use GCC builtins for floor functions if desired Stefan Liebler
2019-12-05 20:40 ` Adhemerval Zanella
2019-12-02 14:46 ` [PATCH 08/13] Use GCC builtins for rint " Stefan Liebler
2019-12-05 20:40 ` Adhemerval Zanella
2019-12-02 15:10 ` [PATCH 11/13] Use GCC builtins for trunc " Stefan Liebler
2019-12-05 20:40 ` Adhemerval Zanella
2019-12-02 15:15 ` [PATCH 04/13] Always use wordsize-64 version of s_ceil.c Stefan Liebler
2019-12-05 20:40 ` Adhemerval Zanella [this message]
2019-12-02 15:18 ` [PATCH 10/13] Use GCC builtins for ceil functions if desired Stefan Liebler
2019-12-05 20:40 ` Adhemerval Zanella
2019-12-02 15:46 ` [PATCH 06/13] Always use wordsize-64 version of s_round.c Stefan Liebler
2019-12-05 20:40 ` Adhemerval Zanella
2019-12-02 15:50 ` [PATCH 12/13] Use GCC builtins for round functions if desired Stefan Liebler
2019-12-05 20:41 ` Adhemerval Zanella
2019-12-02 15:52 ` [PATCH 13/13] Use GCC builtins for copysign " Stefan Liebler
2019-12-02 21:00 ` Joseph Myers
2019-12-03 8:27 ` Stefan Liebler
2019-12-03 16:51 ` Joseph Myers
2019-12-04 13:15 ` Stefan Liebler
2019-12-04 13:20 ` Joseph Myers
2019-12-04 16:34 ` Stefan Liebler
2019-12-04 20:43 ` Joseph Myers
2019-12-05 15:40 ` Stefan Liebler
2019-12-09 12:58 ` [PATCH 00/13] Use GCC builtins for some math " Stefan Liebler
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=3d46ad58-2869-f2a6-3187-062c045c7e0f@linaro.org \
--to=adhemerval.zanella@linaro.org \
--cc=libc-alpha@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).