From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 32540 invoked by alias); 30 Nov 2017 20:33:31 -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 32471 invoked by uid 89); 30 Nov 2017 20:33:30 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.7 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_SHORT,KB_WAM_FROM_NAME_SINGLEWORD,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-qt0-f196.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:from:to:references:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=h4O0E6uTddZH4dGED6lOgaDTQHR2Jh16sIh1JMlGfEw=; b=ZtC4sDKJlUiIXo0rTh/bR+1FB7Pj9WXhkGZRxEWdx2OSOqnwkt49NiQjBKwo/cxst9 3NyI+Jn3uek9yi4J7eBkvA8YgRejJ5pfZHdhrhFHKYBO7N5xK8ry4MvnSFZZecztNPSW BFl0liRtML77VXqkRHt6Mt32fJXSfvmnMe5WxW8gB88geoR9aEdo19yUS3tlTgo0IdgF neXOBkXz+WuMnhZ2vzvffha0jENH5ApzWCgM0DGJDY/ne6t0vt58B+leyzvcp+rXXwro nVov6qneRFixgWX7y3/g5JkPuOY69L++J9SnjjeO8uJYXHCJjqjGxpXyV94nAjDGa/Al 5nnw== X-Gm-Message-State: AKGB3mLStFFWKYl46sSGha+7Gqie/9Y0+6Y3cYzsVVpNW8R46xCDXdBK 4irKCAeqm9i4dff0vRldYp3l35QVgms= X-Google-Smtp-Source: AGs4zMbJRlTKHLnx96owsF1ITtCBMyuQMD77RguTXIw8064DGl5PSOTiUkNOg1rPAWanGRwuEfr7vQ== X-Received: by 10.237.57.233 with SMTP id m96mr5580322qte.192.1512074002821; Thu, 30 Nov 2017 12:33:22 -0800 (PST) Subject: Re: [PATCH 18/25] sparc: refactor sparc32 copysign selector to C From: Adhemerval Zanella To: libc-alpha@sourceware.org References: <1509044813-9951-1-git-send-email-adhemerval.zanella@linaro.org> <1509044813-9951-19-git-send-email-adhemerval.zanella@linaro.org> Message-ID: Date: Thu, 30 Nov 2017 20:33:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 MIME-Version: 1.0 In-Reply-To: <1509044813-9951-19-git-send-email-adhemerval.zanella@linaro.org> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-SW-Source: 2017-11/txt/msg01061.txt.bz2 If no one opposes it, I will commit it shortly. I had to adjust to use Joseph recent changes to use libc_alias_{float,double}. On 26/10/2017 17:06, Adhemerval Zanella wrote: > This patch refactors the sparc32 ifunc selector to a C implementation. > Also, the generic symbol is moved to its own implementation file > s_copysign{f}-generic.S). > > Checked on sparc64-linux-gnu and sparcv9-linux-gnu. > > * sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile > (sysdep_calls): New rule. > (sysdep_routines): Use sysdep_calls as base. > (libm-sysdep_routines): Add generic rule for symbols shared with > libc. Add s_copysign-generic and s_copysign-generic objects. > * sysdeps/sparc/sparcv9/fpu/multiarch/s_copysign-generic.S: New > file. > * sysdeps/sparc32/sparcv9/fpu/multiarch/s_copysign.c: Likewise. > * sysdeps/sparc/sparcv9/fpu/multiarch/s_copysignf-generic.S: > Likewise. > * sysdeps/sparc32/sparcv9/fpu/multiarch/s_copysignf.c: Likewise. > * sysdeps/sparc32/sparcv9/fpu/multiarch/s_copysign.S: Remove file. > * sysdeps/sparc32/sparcv9/fpu/multiarch/s_copysignf.S: Likewise. > > Signed-off-by: Adhemerval Zanella > --- > ChangeLog | 14 ++++++++ > .../sparc/sparc32/sparcv9/fpu/multiarch/Makefile | 15 ++++++--- > .../sparcv9/fpu/multiarch/s_copysign-generic.S | 8 +++++ > .../sparc32/sparcv9/fpu/multiarch/s_copysign.S | 21 ------------ > .../sparc32/sparcv9/fpu/multiarch/s_copysign.c | 38 ++++++++++++++++++++++ > .../sparcv9/fpu/multiarch/s_copysignf-generic.S | 4 +++ > .../sparc32/sparcv9/fpu/multiarch/s_copysignf.S | 12 ------- > .../sparc32/sparcv9/fpu/multiarch/s_copysignf.c | 11 +++++++ > 8 files changed, 86 insertions(+), 37 deletions(-) > create mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysign-generic.S > delete mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysign.S > create mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysign.c > create mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysignf-generic.S > delete mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysignf.S > create mode 100644 sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysignf.c > > diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile > index 62bf6f1..b8d1126 100644 > --- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile > +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/Makefile > @@ -1,12 +1,19 @@ > ifeq ($(subdir),math) > -libm-sysdep_routines += m_copysignf-vis3 m_copysign-vis3 s_fabs-vis3 \ > - s_fabsf-vis3 s_llrintf-vis3 s_llrint-vis3 \ > + > +# These functions are built both for libc and libm because they're required > +# by printf. While the libc objects have the prefix s_, the libm ones are > +# prefixed with m_. > +sysdep_calls := s_copysignf-vis3 s_copysign-vis3 s_copysignf-generic \ > + s_copysign-generic > + > +sysdep_routines += $(sysdep_calls) > +libm-sysdep_routines += s_fabs-vis3 s_fabsf-vis3 s_llrintf-vis3 s_llrint-vis3 \ > s_rintf-vis3 s_rint-vis3 \ > s_fmaf-vis3 s_fma-vis3 s_fma-generic s_fmaf-generic \ > s_nearbyint-vis3 s_nearbyintf-vis3 \ > s_fdimf-vis3 s_fdim-vis3 s_fdim-generic \ > - s_fdimf-generic > -sysdep_routines += s_copysignf-vis3 s_copysign-vis3 > + s_fdimf-generic \ > + $(sysdep_calls:s_%=m_%) > > CFLAGS-s_fdimf-vis3.c += -Wa,-Av9d -mvis3 > CFLAGS-s_fdim-vis3.c += -Wa,-Av9d -mvis3 > diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysign-generic.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysign-generic.S > new file mode 100644 > index 0000000..55fb0ed > --- /dev/null > +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysign-generic.S > @@ -0,0 +1,8 @@ > +#include > + > +#define __copysign __copysign_generic > +#undef weak_alias > +#define weak_alias(a, b) > +#undef compat_symbol > +#define compat_symbol(a, b, c, d) > +#include > diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysign.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysign.S > deleted file mode 100644 > index 5d26430..0000000 > --- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysign.S > +++ /dev/null > @@ -1,21 +0,0 @@ > -#include > -#include > - > -SPARC_ASM_VIS3_IFUNC(copysign) > - > -weak_alias (__copysign, copysign) > -#if LONG_DOUBLE_COMPAT (libm, GLIBC_2_0) > -compat_symbol (libm, __copysign, copysignl, GLIBC_2_0); > -#endif > -#if LONG_DOUBLE_COMPAT (libc, GLIBC_2_0) > -compat_symbol (libc, __copysign, copysignl, GLIBC_2_0); > -#endif > - > -# undef weak_alias > -# define weak_alias(a, b) > -# undef compat_symbol > -# define compat_symbol(a, b, c, d) > - > -#define __copysign __copysign_generic > - > -#include "../../../fpu/s_copysign.S" > diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysign.c b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysign.c > new file mode 100644 > index 0000000..f11181b > --- /dev/null > +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysign.c > @@ -0,0 +1,38 @@ > +/* copysign ifunc resolver, Linux/sparc32 version. > + Copyright (C) 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 > + . */ > + > +#define __copysign __redirect_copysign > +#include > +#include > +#undef __copysign > +#include > + > +extern __typeof (__redirect_copysign) __copysign_vis3 attribute_hidden; > +extern __typeof (__redirect_copysign) __copysign_generic attribute_hidden; > + > +sparc_libm_ifunc_redirected (__redirect_copysign, __copysign, > + hwcap & HWCAP_SPARC_VIS3 > + ? __copysign_vis3 > + : __copysign_generic); > +weak_alias (__copysign, copysign) > +#if LONG_DOUBLE_COMPAT (libm, GLIBC_2_0) > +compat_symbol (libm, __copysign, copysignl, GLIBC_2_0); > +#endif > +#if LONG_DOUBLE_COMPAT (libc, GLIBC_2_0) > +compat_symbol (libc, __copysign, copysignl, GLIBC_2_0); > +#endif > diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysignf-generic.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysignf-generic.S > new file mode 100644 > index 0000000..ebe0759 > --- /dev/null > +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysignf-generic.S > @@ -0,0 +1,4 @@ > +#define __copysignf __copysignf_generic > +#undef weak_alias > +#define weak_alias(a, b) > +#include > diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysignf.S b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysignf.S > deleted file mode 100644 > index cd40955..0000000 > --- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysignf.S > +++ /dev/null > @@ -1,12 +0,0 @@ > -#include > - > -SPARC_ASM_VIS3_IFUNC(copysignf) > - > -weak_alias (__copysignf, copysignf) > - > -# undef weak_alias > -# define weak_alias(a, b) > - > -#define __copysignf __copysignf_generic > - > -#include "../../../fpu/s_copysignf.S" > diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysignf.c b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysignf.c > new file mode 100644 > index 0000000..573c14d > --- /dev/null > +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_copysignf.c > @@ -0,0 +1,11 @@ > +#include > +#include > + > +extern __typeof (copysignf) __copysignf_vis3 attribute_hidden; > +extern __typeof (copysignf) __copysignf_generic attribute_hidden; > + > +sparc_libm_ifunc (__copysignf, > + hwcap & HWCAP_SPARC_VIS3 > + ? __copysignf_vis3 > + : __copysignf_generic); > +weak_alias (__copysignf, copysignf) >