From patchwork Thu Oct 26 19:06:41 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella X-Patchwork-Id: 117265 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp1126504qgn; Thu, 26 Oct 2017 12:10:10 -0700 (PDT) X-Google-Smtp-Source: ABhQp+QTht8hdRSG7rpb+DQTrr01zal/grcXlGtHlzCHMTzIrSUhvxVm+gF/OUGwJFj/ym8+E+MA X-Received: by 10.159.244.19 with SMTP id x19mr4612799plr.373.1509045010178; Thu, 26 Oct 2017 12:10:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509045010; cv=none; d=google.com; s=arc-20160816; b=HZvtYeg1K3VGv/NBjmlRQQxRawWc9JQA5KFenDObxnCgvBSLR98YupDV/6Ji6yqDUT TVGbDl5t6BTsNRTk9tJBaihI0TnTsaQ3n4cHDmUquU3Kxqn7is2XTJeiXr1dfw4xGea2 wCcAy8Kw7EBITayNaCM3xZUNmTATRysWDUFTrapm43x/UnWJO2nRh8wpAFlPm8zoerMl Kxb/iKd4K87URzdFMrQNLAzoufh7of38xGGiEtjBled0Vh7O5ZP2M250tfKYqeZ4VEHy Z86UJF1L57Cm6DJvVf53ljmhFzOH6usEbAkZ1uf36mMoDEycjwabUdcl71AzMhOIJWzs OU/A== 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:delivered-to :sender:list-help:list-post:list-archive:list-subscribe :list-unsubscribe:list-id:precedence:mailing-list:dkim-signature :domainkey-signature:arc-authentication-results; bh=IN8DBGsO0gzL9dlfTvg8Fdv3H8GnFdIPO7g5qpxZOg4=; b=VTpE/OkROFVnv2Or46UG36mMnYLeUjmBPn1YGoRu8g5An1IykjGwdmNWHaxxxbSswr jsN022vsplMM++QtrMltcXQwvF8HeIIzFnHVOwG/8qM6ztbF/p97Q1GoLGUToIS2rN8D sxIiMsLt6XUuBuAbKmKE/J5RvjZ1mDdl0L99vVNcvqM676/mGZOczzq6mTwFeWLKS9Z0 udleLnuJrzYf3P9Ez44T2sEkUQCt0QeSVLb4pE/uZJrzsMqsPjPU738i/TmgXyEPsRrQ N4ejl6zeI1UJOwv+N4lIGgmYCBP/V3PlUK0DQay8oDGmnFcoXt2E6g/BJzxa4EtyOOCm c37A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=Sq1s4xMH; spf=pass (google.com: domain of libc-alpha-return-86415-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-86415-patch=linaro.org@sourceware.org; dmarc=fail (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 o28si3746388pgc.521.2017.10.26.12.10.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Oct 2017 12:10:10 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-86415-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=Sq1s4xMH; spf=pass (google.com: domain of libc-alpha-return-86415-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-86415-patch=linaro.org@sourceware.org; dmarc=fail (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=K7E0W4R0KzvAa6HUnuM/CVEx7g/UHfS 2VQ6gQ+RzGBnDK8VGSJLSw+v5mRdsLfcq3E5nlybvqiPLHfOCzDIdvrk3RHHYVDI 9qpaaMD1ESgZnG6XGXJh3yHnSISnudNACwcjNgqW2Sr09jt2w3SwPKRDBMsIgkoz Y5F9xvXDZWUY= 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=blSt7kEgEl7K5juNpRWG+Gob8R4=; b=Sq1s4 xMHa1md+aoFp+a6wv4VYKlDUWQZaZwtAL7ef+HKyllU7c+6KXvOYa3gSB1NcVvm3 RzM9jVacKHkCEcO102kE5D8F+fQCQhihAQGSYloiL+xp2fDcoIGBNyWCljkqvq20 siuEa+nDsDCCRHRZX1eEkQuBsHn7FSTanTZRDY= Received: (qmail 98982 invoked by alias); 26 Oct 2017 19:07:23 -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 98897 invoked by uid 89); 26 Oct 2017 19:07:22 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mail-qk0-f194.google.com X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=IN8DBGsO0gzL9dlfTvg8Fdv3H8GnFdIPO7g5qpxZOg4=; b=hI2JjO8pH2oPsdpAHkuV1UDzo9mSC+fnhBOxIMHII/Mhcg2NQP2RipkPT6RC8RDosY jwS6oEkKfIWCj6JZqUxJ8qJipqcoIujKZUeH50QalliEXmGl4kmhmGG8nyXyDByaIoTC HGPxO9I/HEQU11ufPsIqmUBteBgE1cNLaesdAAhC6TAUzg5GSzFG6ags8iqefDYD4eqn l7AyZwfAdWVrpL0BK+MDZ3/agPt5kyKN1WebFdX4++ZgreZhJV+YZkhU65HA0+CEzw0z ieAlg9VDlb+w+9Fs8Ft49ACqFnrT58JEbHeXMD2SlTJnSE1mt/7p/no8tLPtwfho+W5W lQTA== X-Gm-Message-State: AMCzsaXz6b5XnqlxjPJiGfr30TE6a7Rk16kNHK0ywhzvAt9trWtq+lTr 9rKUxP8INkuYyId3tdYqrRWWvuaByAo= X-Received: by 10.55.18.13 with SMTP id c13mr9843369qkh.81.1509044838870; Thu, 26 Oct 2017 12:07:18 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 13/25] sparc: refactor sparc64 __mpn_mul_1 selector to C Date: Thu, 26 Oct 2017 17:06:41 -0200 Message-Id: <1509044813-9951-14-git-send-email-adhemerval.zanella@linaro.org> In-Reply-To: <1509044813-9951-1-git-send-email-adhemerval.zanella@linaro.org> References: <1509044813-9951-1-git-send-email-adhemerval.zanella@linaro.org> This patch refactors the sparc64 ifunc selector to a C implementation. Also, the generic symbol is moved to its own implementation file mul_1-generic.S). Checked on sparc64-linux-gnu and sparcv9-linux-gnu. * sysdeps/sparc/sparc64/multiarch/Makefile (sysdep_routines): Add mul_1-generic. * sysdeps/sparc/sparc64/multiarch/mul_1-generic.S: New file. * sysdeps/sparc/sparc64/multiarch/mul_1.c: Likewise. * sysdeps/sparc/sparc64/multiarch/mul_1.S: Remove file. Signed-off-by: Adhemerval Zanella --- ChangeLog | 6 +++ sysdeps/sparc/sparc64/multiarch/Makefile | 3 +- sysdeps/sparc/sparc64/multiarch/mul_1-generic.S | 2 + sysdeps/sparc/sparc64/multiarch/mul_1.S | 56 ------------------------- sysdeps/sparc/sparc64/multiarch/mul_1.c | 28 +++++++++++++ 5 files changed, 38 insertions(+), 57 deletions(-) create mode 100644 sysdeps/sparc/sparc64/multiarch/mul_1-generic.S delete mode 100644 sysdeps/sparc/sparc64/multiarch/mul_1.S create mode 100644 sysdeps/sparc/sparc64/multiarch/mul_1.c -- 2.7.4 diff --git a/sysdeps/sparc/sparc64/multiarch/Makefile b/sysdeps/sparc/sparc64/multiarch/Makefile index 6e90cba..2338213 100644 --- a/sysdeps/sparc/sparc64/multiarch/Makefile +++ b/sysdeps/sparc/sparc64/multiarch/Makefile @@ -13,7 +13,8 @@ sysdep_routines += memcpy-ultra3 memcpy-niagara1 memcpy-niagara2 \ endif ifeq ($(subdir),stdlib) -sysdep_routines += mul_1-vis3 addmul_1-vis3 submul_1-vis3 add_n-vis3 sub_n-vis3 +sysdep_routines += mul_1-vis3 mul_1-generic addmul_1-vis3 submul_1-vis3 \ + add_n-vis3 sub_n-vis3 endif ifeq ($(subdir),math) diff --git a/sysdeps/sparc/sparc64/multiarch/mul_1-generic.S b/sysdeps/sparc/sparc64/multiarch/mul_1-generic.S new file mode 100644 index 0000000..f1b7e60 --- /dev/null +++ b/sysdeps/sparc/sparc64/multiarch/mul_1-generic.S @@ -0,0 +1,2 @@ +#define __mpn_mul_1 __mpn_mul_1_generic +#include diff --git a/sysdeps/sparc/sparc64/multiarch/mul_1.S b/sysdeps/sparc/sparc64/multiarch/mul_1.S deleted file mode 100644 index 75fca93..0000000 --- a/sysdeps/sparc/sparc64/multiarch/mul_1.S +++ /dev/null @@ -1,56 +0,0 @@ -/* Multiple versions of mul_1 - - Copyright (C) 2013-2017 Free Software Foundation, Inc. - Contributed by David S. Miller (davem@davemloft.net) - 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 - . */ - -#include - -ENTRY(__mpn_mul_1) - .type __mpn_mul_1, @gnu_indirect_function -# ifdef SHARED - SETUP_PIC_REG_LEAF(o3, o5) -# endif - set HWCAP_SPARC_VIS3, %o1 - andcc %o0, %o1, %g0 - be 1f - nop -# ifdef SHARED - sethi %gdop_hix22(__mpn_mul_1_vis3), %o1 - xor %o1, %gdop_lox10(__mpn_mul_1_vis3), %o1 -# else - set __mpn_mul_1_vis3, %o1 -# endif - ba 10f - nop -1: -# ifdef SHARED - sethi %gdop_hix22(__mpn_mul_1_generic), %o1 - xor %o1, %gdop_lox10(__mpn_mul_1_generic), %o1 -# else - set __mpn_mul_1_generic, %o1 -# endif -10: -# ifdef SHARED - add %o3, %o1, %o1 -# endif - retl - mov %o1, %o0 -END(__mpn_mul_1) - -#define __mpn_mul_1 __mpn_mul_1_generic -#include "../mul_1.S" diff --git a/sysdeps/sparc/sparc64/multiarch/mul_1.c b/sysdeps/sparc/sparc64/multiarch/mul_1.c new file mode 100644 index 0000000..98f0ccc --- /dev/null +++ b/sysdeps/sparc/sparc64/multiarch/mul_1.c @@ -0,0 +1,28 @@ +/* __mpn_mul_1 ifunc resolver, Linux/sparc64 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 + . */ + +#include +#include + +extern __typeof (mpn_mul_1) __mpn_mul_1_vis3 attribute_hidden; +extern __typeof (mpn_mul_1) __mpn_mul_1_generic attribute_hidden; + +sparc_libm_ifunc (__mpn_mul_1, + hwcap & HWCAP_SPARC_VIS3 + ? __mpn_mul_1_vis3 + : __mpn_mul_1_generic)