From patchwork Fri Mar 29 13:35:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 161450 Delivered-To: patch@linaro.org Received: by 2002:a02:c6d8:0:0:0:0:0 with SMTP id r24csp2055508jan; Fri, 29 Mar 2019 06:42:04 -0700 (PDT) X-Google-Smtp-Source: APXvYqxgqzxfeNnDyaaep963wk0BxvWuV0+KUOVIWZQ6d8NWEbbo2j3U2hNeYl/+ZKf21RTZV9N1 X-Received: by 2002:a17:902:6942:: with SMTP id k2mr49333597plt.136.1553866924540; Fri, 29 Mar 2019 06:42:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553866924; cv=none; d=google.com; s=arc-20160816; b=y27VOc2FJoJZC5RJffYrhq9bVMmOPtzqE+bx8EmvdN+3+akHXAAmg0TYORzfVKCQui 4qmhiJr/rk+xDtUYTohmj63Yjd9+dhICFfv+O+tPRQMJEGYlox34vKmKqve70v/YmbBM 81lZy92NkZOwRIK/JyJWeoGWqjpnHxjpSd12VXZM66nfg3/5e/1L7iU0uFwTajGUpdYI Ry+GzMkgPuBToMSFf9dt81iJs/8yd/bZLqaXKvi4OjR+VqF6zikkBitu5eU5gHeI1Lyq bo44pWtxQ0e7uOMM2RFi/P1Mz2HUxb8C9gaJ3XoiZ3mwmUVpHWzEbvFqcLuCbRpYYfLS rEZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:to:from :dkim-signature:delivered-to:sender:list-help:list-post:list-archive :list-subscribe:list-unsubscribe:list-id:precedence:mailing-list :dkim-signature:domainkey-signature; bh=lTMW3XGfyYZPu9k98JqFneBXmo5QMzBzwgQNH6SFJt0=; b=J0zFUTgTU2NipmhHSf+d2SBAz6ghNCzOkEEPY0rE7i/ZRXdgQ1MKFaAlu7NEvDApEe uIT/5hDRnvemTpX2E4mekG/Ow44frzWa3uYalmbSJFHH9Pkg7rM15siW8YErlBZ1ZGgs PNUGYfbAOapjaFJkAKYE/rCLulmuw7KmP7UaoNti4J3QL2bmX4v3l3g4kNyNzm2c4Tkn lDis2IyPN3rsECW5tiasshfAX6/+uQgswLiXS2Nuxvf2Fh2cVGAdrmRqAoGQXVw9MsdX Rmmv3Uu32uH4VEtec/8a13FnsgR/2Ar9GmTVYHTGKg+jpB13n45R3Be3uuyrCHSSA+Tc q9lA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=tUw6n2gB; dkim=pass header.i=@linaro.org header.s=google header.b=o+HBqyBV; spf=pass (google.com: domain of libc-alpha-return-101019-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-101019-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id h10si1845984pgs.573.2019.03.29.06.42.03 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 29 Mar 2019 06:42:04 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-101019-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=tUw6n2gB; dkim=pass header.i=@linaro.org header.s=google header.b=o+HBqyBV; spf=pass (google.com: domain of libc-alpha-return-101019-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom="libc-alpha-return-101019-patch=linaro.org@sourceware.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org 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:subject:date:message-id:in-reply-to :references; q=dns; s=default; b=FlckatwNchHNtpaxrt1uDZutLBrq2fH ++CG3+GXl0+0CskTQWDJtTGi4QK8EfFJFGEyIUNvkzNwdJ1hUAjdzNpk9ZTy2zR9 eamNQq2Ds2sDPKucfG500J5oQESS6OrEilcbxowzwV/w6/JpZFyI2JOplQH8fxhT YfqFotmlK4H8= 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:subject:date:message-id:in-reply-to :references; s=default; bh=NkMfi9cCIRzJ4TR1apw2R3DxV5w=; b=tUw6n 2gBLCoeEUD8L/S73sFBhq5VRieYNmQZsmQK1xtLtlJKDTamft8OeBYmS25DoOoa3 onbn0RoFHlsPih+jodDC/Jv9XXYI282ugcpP3symmYdjlxJn/2U7IcDQf6OV28Na Kg0tfN/ZwvGANRQt81H9jq2GqIaYW0g4Xce5Y8= Received: (qmail 123737 invoked by alias); 29 Mar 2019 13:36:39 -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 121569 invoked by uid 89); 29 Mar 2019 13:36:17 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-24.5 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=1023 X-HELO: mail-ua1-f66.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:subject:date:message-id:in-reply-to:references; bh=lTMW3XGfyYZPu9k98JqFneBXmo5QMzBzwgQNH6SFJt0=; b=o+HBqyBVbDnHWjcutYoPqvMIEZzY0DGlyTqhVN0JiqvLyvL4y3vZpYWKDDxA7qOvHo cNcr7+YzPigDmcJP00YlyGrhWUx6CqEWCqQNcE2XNghKKAbdasFpDlxWDdIzzW34rs8v eOL/Y14Fr6fI7nZq/JMfK2qjguTdm3SyDyS5Cx7LosjNQ8Ogbl+lePu61ZUPkzfiBAFq 6NojuP67HmsL8mZwOGiVazVbSU0bO/TdFcKS10t4h7/517LHkQOu3LskSWQqa5U2Km/2 2YqUQ3wpXenXuh4bWpCRWPVa12H56bUmZEWNexAz29ZHNDJdWosOsiP4/t9fVRevXxqO nvOg== Return-Path: From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 27/28] math: Use wordsize-64 version for s_logb Date: Fri, 29 Mar 2019 10:35:28 -0300 Message-Id: <20190329133529.22523-28-adhemerval.zanella@linaro.org> In-Reply-To: <20190329133529.22523-1-adhemerval.zanella@linaro.org> References: <20190329133529.22523-1-adhemerval.zanella@linaro.org> - The resulting binary difference on 32 bits architecture is minimum. On i686-linux-gnu (with architecture optimization routine removed) there is no different using logb benchtests - It helps wordsize-64 architectures that use ldbl-opt. - It add some code simplification with reduction of duplicated implementations. Checked on powerpc-linux-gnu (built without --with-cpu, with --with-cpu=power4 and with --with-cpu=power5+ and --disable-multi-arch), powerpc64-linux-gnu (built without --with-cp and with --with-cpu=power5+ and --disable-multi-arch). * sysdeps/ieee754/dbl-64/wordsize-64/s_logb.c: Move to ... * sysdeps/ieee754/dbl-64/s_logb.c: ... here. Add work around for powerpc32 integer 0 converting to -0. --- sysdeps/ieee754/dbl-64/s_logb.c | 61 ++++++++++----------- sysdeps/ieee754/dbl-64/wordsize-64/s_logb.c | 47 ---------------- 2 files changed, 29 insertions(+), 79 deletions(-) delete mode 100644 sysdeps/ieee754/dbl-64/wordsize-64/s_logb.c -- 2.17.1 Reviewed-by: Gabriel F. T. Gomes diff --git a/sysdeps/ieee754/dbl-64/s_logb.c b/sysdeps/ieee754/dbl-64/s_logb.c index a6de1f6e49..e336251fda 100644 --- a/sysdeps/ieee754/dbl-64/s_logb.c +++ b/sysdeps/ieee754/dbl-64/s_logb.c @@ -1,22 +1,24 @@ -/* @(#)s_logb.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. - * ==================================================== - */ +/* Compute radix independent exponent. + Copyright (C) 2011-2019 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper , 2011. -/* - * double logb(x) - * IEEE 754 logb. Included to pass IEEE test suite. Not recommend. - * Use ilogb instead. - */ + 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 + . */ #include + #include #include #include @@ -24,28 +26,23 @@ double __logb (double x) { - int32_t lx, ix, rix; + int64_t ix, ex; - EXTRACT_WORDS (ix, lx, x); - ix &= 0x7fffffff; /* high |x| */ - if ((ix | lx) == 0) + EXTRACT_WORDS64 (ix, x); + ix &= UINT64_C(0x7fffffffffffffff); + if (ix == 0) return -1.0 / fabs (x); - if (ix >= 0x7ff00000) + ex = ix >> 52; + if (ex == 0x7ff) return x * x; - if (__glibc_unlikely ((rix = ix >> 20) == 0)) + if (__glibc_unlikely (ex == 0)) { - /* POSIX specifies that denormal number is treated as - though it were normalized. */ - int ma; - if (ix == 0) - ma = __builtin_clz (lx) + 32; - else - ma = __builtin_clz (ix); - rix -= ma - 12; + int m = __builtin_clzll (ix); + ex -= m - 12; } - if (FIX_INT_FP_CONVERT_ZERO && rix == 1023) + if (FIX_INT_FP_CONVERT_ZERO && ex == 1023) return 0.0; - return (double) (rix - 1023); + return (double) (ex - 1023); } #ifndef __logb libm_alias_double (__logb, logb) diff --git a/sysdeps/ieee754/dbl-64/wordsize-64/s_logb.c b/sysdeps/ieee754/dbl-64/wordsize-64/s_logb.c deleted file mode 100644 index d9b40af2c7..0000000000 --- a/sysdeps/ieee754/dbl-64/wordsize-64/s_logb.c +++ /dev/null @@ -1,47 +0,0 @@ -/* Compute radix independent exponent. - 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 - . */ - -#include - -#include -#include - - -double -__logb (double x) -{ - int64_t ix, ex; - - EXTRACT_WORDS64 (ix, x); - ix &= UINT64_C(0x7fffffffffffffff); - if (ix == 0) - return -1.0 / fabs (x); - ex = ix >> 52; - if (ex == 0x7ff) - return x * x; - if (__glibc_unlikely (ex == 0)) - { - int m = __builtin_clzll (ix); - ex -= m - 12; - } - return (double) (ex - 1023); -} -#ifndef __logb -libm_alias_double (__logb, logb) -#endif