From patchwork Mon Sep 25 23:34:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 23140 Received: (qmail 88369 invoked by alias); 25 Sep 2017 23:34:27 -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 88359 invoked by uid 89); 25 Sep 2017 23:34:26 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.3 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_STOCKGEN, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-oi0-f51.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition:user-agent; bh=qc7N18ZK4DYFGDh1YEA7Yg2fF7eyEWvbjttyJtcEBUo=; b=YLzAFummc9LzkdpnvvirZoNB+4auuA7YP52vSzKucfRk00Lph4rMxVDGYVt9DW5JIj HjAX9zPm09yONyw6dqb36inyQdISj5IcqyHKSeT4oe+MIu4/if41jnFCoxcvshtcitD3 8P6rEa7i+HkL+mfLph/yixTUy6eLkUfk83lhGFI23WDvIPvbmLljBAxnEB/9kGL+7VZd SInzcAfYvURSzEhiHlhDwkO6WR1xWo/0SYw5YN1Y1Kc2s1Qz0DsxTWFVhjsmyp4MLmOp PSeIFL5Oxk1Mk7VisChME73seqT7DOyzIDaIqtmoM46DnGabq8YW4ldX6BMDKoYSJNnS FyTw== X-Gm-Message-State: AHPjjUgPnRI3qykVtQU9hVQWL2FIhYeRB8d1GKy44ccGNO/swPurdbtz o8jyF2Nb9sgISXJ6is2Sgpg= X-Google-Smtp-Source: AOwi7QAgakcOFc29uk4g26HIybx/QAjUCdOn/ohC1TefAaN0LUtJrupjwjH6Zomu5yON8jt66AMNXQ== X-Received: by 10.202.102.165 with SMTP id m37mr11381704oik.89.1506382463087; Mon, 25 Sep 2017 16:34:23 -0700 (PDT) Date: Mon, 25 Sep 2017 16:34:16 -0700 From: "H.J. Lu" To: GNU C Library Cc: Arjan van de Ven , Andrew Senkevich Subject: [PATCH 4/4] i386: Replace assembly versions of e_exp2f with generic e_exp2f.c Message-ID: <20170925233416.GD31745@gmail.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.8.3 (2017-05-23) This patch replaces i386 assembly versions of e_exp2f with generic e_exp2f.c. * sysdeps/i386/fpu/e_exp2f.S: Removed. * sysdeps/i386/fpu/libm-test-ulps: Updated for generic e_exp2f.c. * sysdeps/i386/i686/fpu/multiarch/libm-test-ulps: Likewise. * sysdeps/i386/i686/fpu/multiarch/Makefile (libm-sysdep_routines): Add e_exp2f-sse2. (CFLAGS-e_exp2f-sse2.c): New. * sysdeps/i386/i686/fpu/multiarch/e_exp2f-sse2.c: New file. * sysdeps/i386/i686/fpu/multiarch/e_exp2f.c: Likewise. --- sysdeps/i386/fpu/e_exp2f.S | 52 -------------------------- sysdeps/i386/fpu/libm-test-ulps | 2 + sysdeps/i386/i686/fpu/multiarch/Makefile | 3 +- sysdeps/i386/i686/fpu/multiarch/e_exp2f-sse2.c | 6 +++ sysdeps/i386/i686/fpu/multiarch/e_exp2f.c | 33 ++++++++++++++++ sysdeps/i386/i686/fpu/multiarch/libm-test-ulps | 2 + 6 files changed, 45 insertions(+), 53 deletions(-) delete mode 100644 sysdeps/i386/fpu/e_exp2f.S create mode 100644 sysdeps/i386/i686/fpu/multiarch/e_exp2f-sse2.c create mode 100644 sysdeps/i386/i686/fpu/multiarch/e_exp2f.c diff --git a/sysdeps/i386/fpu/e_exp2f.S b/sysdeps/i386/fpu/e_exp2f.S deleted file mode 100644 index 30623cd850..0000000000 --- a/sysdeps/i386/fpu/e_exp2f.S +++ /dev/null @@ -1,52 +0,0 @@ -/* - * Written by J.T. Conklin . - * Adapted for exp2 by Ulrich Drepper . - * Public domain. - */ - -#include -#include - -DEFINE_FLT_MIN - -#ifdef PIC -# define MO(op) op##@GOTOFF(%ecx) -#else -# define MO(op) op -#endif - - .text -ENTRY(__ieee754_exp2f) -#ifdef PIC - LOAD_PIC_REG (cx) -#endif - flds 4(%esp) -/* I added the following ugly construct because exp(+-Inf) resulted - in NaN. The ugliness results from the bright minds at Intel. - For the i686 the code can be written better. - -- drepper@cygnus.com. */ - fxam /* Is NaN or +-Inf? */ - fstsw %ax - movb $0x45, %dh - andb %ah, %dh - cmpb $0x05, %dh - je 1f /* Is +-Inf, jump. */ - fld %st - frndint /* int(x) */ - fsubr %st,%st(1) /* fract(x) */ - fxch - f2xm1 /* 2^(fract(x)) - 1 */ - fld1 - faddp /* 2^(fract(x)) */ - fscale /* e^x */ - fstp %st(1) - FLT_NARROW_EVAL_UFLOW_NONNEG_NAN - ret - -1: testl $0x200, %eax /* Test sign. */ - jz 2f /* If positive, jump. */ - fstp %st - fldz /* Set result to 0. */ -2: ret -END (__ieee754_exp2f) -strong_alias (__ieee754_exp2f, __exp2f_finite) diff --git a/sysdeps/i386/fpu/libm-test-ulps b/sysdeps/i386/fpu/libm-test-ulps index 60a721c000..5a319f147b 100644 --- a/sysdeps/i386/fpu/libm-test-ulps +++ b/sysdeps/i386/fpu/libm-test-ulps @@ -1921,7 +1921,9 @@ ildouble: 1 ldouble: 1 Function: "exp2_upward": +float: 1 float128: 2 +ifloat: 1 ifloat128: 2 ildouble: 1 ldouble: 1 diff --git a/sysdeps/i386/i686/fpu/multiarch/Makefile b/sysdeps/i386/i686/fpu/multiarch/Makefile index c5e8cfd689..2723f570af 100644 --- a/sysdeps/i386/i686/fpu/multiarch/Makefile +++ b/sysdeps/i386/i686/fpu/multiarch/Makefile @@ -1,6 +1,7 @@ ifeq ($(subdir),math) -libm-sysdep_routines += e_expf-sse2 s_sinf-sse2 s_cosf-sse2 \ +libm-sysdep_routines += e_exp2f-sse2 e_expf-sse2 s_sinf-sse2 s_cosf-sse2 \ s_sincosf-sse2 +CFLAGS-e_exp2f-sse2.c = -msse2 -mfpmath=sse CFLAGS-e_expf-sse2.c = -msse2 -mfpmath=sse endif diff --git a/sysdeps/i386/i686/fpu/multiarch/e_exp2f-sse2.c b/sysdeps/i386/i686/fpu/multiarch/e_exp2f-sse2.c new file mode 100644 index 0000000000..481336de7d --- /dev/null +++ b/sysdeps/i386/i686/fpu/multiarch/e_exp2f-sse2.c @@ -0,0 +1,6 @@ +#undef strong_alias +#define strong_alias(ignored1, ignored2) + +#define __ieee754_exp2f __ieee754_exp2f_sse2 + +#include diff --git a/sysdeps/i386/i686/fpu/multiarch/e_exp2f.c b/sysdeps/i386/i686/fpu/multiarch/e_exp2f.c new file mode 100644 index 0000000000..8ec3c01206 --- /dev/null +++ b/sysdeps/i386/i686/fpu/multiarch/e_exp2f.c @@ -0,0 +1,33 @@ +/* Multiple versions of IEEE 754 exp2f. + Copyright (C) 2012-2017 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + 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 + . */ + +extern float __redirect_ieee754_exp2f (float); + +#define SYMBOL_NAME ieee754_exp2f +#include "ifunc-sse2.h" + +libc_ifunc_redirected (__redirect_ieee754_exp2f, __ieee754_exp2f, + IFUNC_SELECTOR ()); +strong_alias (__ieee754_exp2f, __exp2f_finite) + +#undef strong_alias +#define strong_alias(ignored1, ignored2) + +#define __ieee754_exp2f __ieee754_exp2f_ia32 + +#include diff --git a/sysdeps/i386/i686/fpu/multiarch/libm-test-ulps b/sysdeps/i386/i686/fpu/multiarch/libm-test-ulps index 5ff641f848..2d056a9260 100644 --- a/sysdeps/i386/i686/fpu/multiarch/libm-test-ulps +++ b/sysdeps/i386/i686/fpu/multiarch/libm-test-ulps @@ -1921,7 +1921,9 @@ ildouble: 1 ldouble: 1 Function: "exp2_upward": +float: 1 float128: 2 +ifloat: 1 ifloat128: 2 ildouble: 1 ldouble: 1