From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
To: libc-alpha@sourceware.org
Subject: Re: [PATCH 06/13] Always use wordsize-64 version of s_round.c.
Date: Thu, 05 Dec 2019 20:40:00 -0000 [thread overview]
Message-ID: <9241ad99-c3ea-43e4-744c-995301be5fd6@linaro.org> (raw)
In-Reply-To: <1575297977-2589-7-git-send-email-stli@linux.ibm.com>
On 02/12/2019 11:46, Stefan Liebler wrote:
> This patch replaces s_round.c in sysdeps/dbl-64 with the one in
> sysdeps/dbl-64/wordsize-64 and removes the latter one.
LGTM, thanks.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
> ---
> sysdeps/ieee754/dbl-64/s_round.c | 39 ++++--------
> sysdeps/ieee754/dbl-64/wordsize-64/s_round.c | 66 --------------------
> 2 files changed, 12 insertions(+), 93 deletions(-)
> delete mode 100644 sysdeps/ieee754/dbl-64/wordsize-64/s_round.c
>
> diff --git a/sysdeps/ieee754/dbl-64/s_round.c b/sysdeps/ieee754/dbl-64/s_round.c
> index 1793e575e9..8f4b7cff86 100644
> --- a/sysdeps/ieee754/dbl-64/s_round.c
> +++ b/sysdeps/ieee754/dbl-64/s_round.c
> @@ -22,38 +22,36 @@
>
> #include <math_private.h>
> #include <libm-alias-double.h>
> +#include <stdint.h>
>
>
> double
> __round (double x)
> {
> - int32_t i0, j0;
> - uint32_t i1;
> + int64_t i0, j0;
>
> - EXTRACT_WORDS (i0, i1, x);
> - j0 = ((i0 >> 20) & 0x7ff) - 0x3ff;
> - if (j0 < 20)
> + EXTRACT_WORDS64 (i0, x);
> + j0 = ((i0 >> 52) & 0x7ff) - 0x3ff;
> + if (__glibc_likely (j0 < 52))
> {
> if (j0 < 0)
> {
> - i0 &= 0x80000000;
> + i0 &= UINT64_C (0x8000000000000000);
> if (j0 == -1)
> - i0 |= 0x3ff00000;
> - i1 = 0;
> + i0 |= UINT64_C (0x3ff0000000000000);
> }
> else
> {
> - uint32_t i = 0x000fffff >> j0;
> - if (((i0 & i) | i1) == 0)
> + uint64_t i = UINT64_C (0x000fffffffffffff) >> j0;
> + if ((i0 & i) == 0)
> /* X is integral. */
> return x;
>
> - i0 += 0x00080000 >> j0;
> + i0 += UINT64_C (0x0008000000000000) >> j0;
> i0 &= ~i;
> - i1 = 0;
> }
> }
> - else if (j0 > 51)
> + else
> {
> if (j0 == 0x400)
> /* Inf or NaN. */
> @@ -61,21 +59,8 @@ __round (double x)
> else
> return x;
> }
> - else
> - {
> - uint32_t i = 0xffffffff >> (j0 - 20);
> - if ((i1 & i) == 0)
> - /* X is integral. */
> - return x;
> -
> - uint32_t j = i1 + (1 << (51 - j0));
> - if (j < i1)
> - i0 += 1;
> - i1 = j;
> - i1 &= ~i;
> - }
>
> - INSERT_WORDS (x, i0, i1);
> + INSERT_WORDS64 (x, i0);
> return x;
> }
> libm_alias_double (__round, round)
Ok.
> diff --git a/sysdeps/ieee754/dbl-64/wordsize-64/s_round.c b/sysdeps/ieee754/dbl-64/wordsize-64/s_round.c
> deleted file mode 100644
> index 1c3fc7f50e..0000000000
> --- a/sysdeps/ieee754/dbl-64/wordsize-64/s_round.c
> +++ /dev/null
> @@ -1,66 +0,0 @@
> -/* Round double to integer away from zero.
> - Copyright (C) 1997-2019 Free Software Foundation, Inc.
> - This file is part of the GNU C Library.
> - Contributed by Ulrich Drepper <drepper@cygnus.com>, 1997.
> -
> - 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
> - <https://www.gnu.org/licenses/>. */
> -
> -#define NO_MATH_REDIRECT
> -#include <math.h>
> -
> -#include <math_private.h>
> -#include <libm-alias-double.h>
> -#include <stdint.h>
> -
> -
> -double
> -__round (double x)
> -{
> - int64_t i0, j0;
> -
> - EXTRACT_WORDS64 (i0, x);
> - j0 = ((i0 >> 52) & 0x7ff) - 0x3ff;
> - if (__glibc_likely (j0 < 52))
> - {
> - if (j0 < 0)
> - {
> - i0 &= UINT64_C(0x8000000000000000);
> - if (j0 == -1)
> - i0 |= UINT64_C(0x3ff0000000000000);
> - }
> - else
> - {
> - uint64_t i = UINT64_C(0x000fffffffffffff) >> j0;
> - if ((i0 & i) == 0)
> - /* X is integral. */
> - return x;
> -
> - i0 += UINT64_C(0x0008000000000000) >> j0;
> - i0 &= ~i;
> - }
> - }
> - else
> - {
> - if (j0 == 0x400)
> - /* Inf or NaN. */
> - return x + x;
> - else
> - return x;
> - }
> -
> - INSERT_WORDS64 (x, i0);
> - return x;
> -}
> -libm_alias_double (__round, round)
>
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 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 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 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 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 08/13] Use GCC builtins for rint " Stefan Liebler
2019-12-05 20:40 ` Adhemerval Zanella
2019-12-02 14:46 ` [PATCH 09/13] Use GCC builtins for floor " 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
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 [this message]
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=9241ad99-c3ea-43e4-744c-995301be5fd6@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).