From patchwork Thu Oct 26 19:06:43 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 117267 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp1126829qgn; Thu, 26 Oct 2017 12:10:30 -0700 (PDT) X-Google-Smtp-Source: ABhQp+RxplWfV9I+6KiEecmCPeH+23wYnZMfbIq6CCmZYkpqhG2eyJVrhvNQqDvKX4rWll9xUFsQ X-Received: by 10.98.211.203 with SMTP id z72mr6460701pfk.328.1509045030749; Thu, 26 Oct 2017 12:10:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509045030; cv=none; d=google.com; s=arc-20160816; b=CA/RMmi4BCoiz5CWU54iKrEOEs0Va7cTFFuBtoPl8/M2K9zhcnJEH0gD500oEMHxso vrXx50pMP9m1YEsBiPY6rjzoTMXDMra134SGYRrcnJilOknMpoZpUndAqp/QRavUBPea WBxF5RyZAh4QhBn38BBjGj54Vp5+lSTfeSeoM2XRMPFlKwJoYWpdXxoknKkUlbruyZ5S 6hmw8qlnf6dQWAjT7ocZMhKeoLD3giYCRnGB687AC0TZh4SHYYvuTCzkRXqCz8ydr8/D t4oDTpTqA8TyruBztKHJ1q0D6vhaRMBFDof1X1sickaYdweJGXJe0Eme3PPDKicOtIxL Ugkg== 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=E1+APT5hLgPRBiutT2kJ1zfLKO6RxVSBQT31q1DIMqM=; b=lfcXghS6sywLGRcG1Ag4vqj+o4wTBiS0jwmP883rF07r1NMaRLJiL1KUpzTkPCo3FJ iR1Sz+jbhgrgy/w0nStDVhG8GfKlcvJK1Fh/1Kx8l2G2rXJho7Qu0nGUbTzCsxkjDloJ MTQnGyEBbZsPZMjgFoPe+tjIeXLBPa1ReFhn5pWjF5t05KWPWjCzaMGG4sQtRIil8dHN xMke3qWdjvERJzZZaUR7WlqqAwCAgZI1UmeGXqDFaHOVVvjsaQb880RB2zFL79Mv0Jdd +Tz8dxScau+xqcowBORJi9tOven2RkoULRqcqebfCqba3+lHkjjEP3ZpqxEq7LeoGfPc Y0UQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=Y0FVUQ3w; spf=pass (google.com: domain of libc-alpha-return-86417-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-86417-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 n11si3353024plg.315.2017.10.26.12.10.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Oct 2017 12:10:30 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-86417-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=Y0FVUQ3w; spf=pass (google.com: domain of libc-alpha-return-86417-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-86417-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=GhdLBZPKhAgjktoyb1/OBXbYs3rynLx hy28VJ51MEAtVW9Ke/PNzPmP66DS47F2BdfJB3NBwNSPdLZNoER+fhcEhhDiRaAN y5JXiWC2YefTb6kYdJt/vujbVl/1foHU7cgxUMLlmSNLq9IbPwb0zH7AqoDg+dmu fEu4AOCyvqac= 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=vlaz4KV38aOAA02Jqcvuyxced4U=; b=Y0FVU Q3wbU80+4xtYnrFhsVq96sDEufvkqn2/4EHay/rp+ZgfaiOfl7Se6VeUkja0Vln0 uebmfKnh8NNVtDBjs4QS3C03SvEaiAyXJgd4SvIXW96HOEjUEfsS1EEXe51qqMZr W+y4rYf5lo8bry+rwTrzYlvjuD4FrU6F/0e35M= Received: (qmail 99383 invoked by alias); 26 Oct 2017 19:07: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 99339 invoked by uid 89); 26 Oct 2017 19:07:26 -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-qt0-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=E1+APT5hLgPRBiutT2kJ1zfLKO6RxVSBQT31q1DIMqM=; b=RaTS19iD2NOadQPgePfgcjf6UxWOTyxbY2bm7FNBwVmE2xSrDAd5IRpGsZimWRk5DY +oj7/WasWvVlA0DrQBOXZXv5prfHYsDMxeTPibGLBSEMhIwVlJerknBgxc8/eJPP3ugc jvRluJ3SbkxUAVCIUazhFexFV2ZVrb2Neqx4+X7cmvcUU/9UGLjRV+eLNJTbqvNk+cPV rq8zGhlD0czlszOwBOB9lzPeO+PqkuVWq/EsJsayaFW/XlvILQOs/dVy5KCTpVNaS+gE wlRsBKfr9YbbWocsw6jeHCBwSzWf6BjHRTGpJMLcf5BRR2R23C6am3nqTwqoZ7prF/8+ HtRg== X-Gm-Message-State: AMCzsaWgoWdF7lKo6gQodvz6fjIrOWMoMPIZdxujfSAu0KKIHAJTiTiq QmEqDdwDzV6jxyoruqll+WFQDuU1Ij0= X-Received: by 10.237.47.195 with SMTP id m61mr36155818qtd.143.1509044841892; Thu, 26 Oct 2017 12:07:21 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 15/25] sparc: refactor sparc64 __mpn_addmul_1 selector to C Date: Thu, 26 Oct 2017 17:06:43 -0200 Message-Id: <1509044813-9951-16-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 addmul_1-generic.S). Checked on sparc64-linux-gnu and sparcv9-linux-gnu. * sysdeps/sparc/sparc64/multiarch/Makefile (sysdep_routines): Add addmul_1-generic. * sysdeps/sparc/sparc64/multiarch/addmul_1-generic.S: New file. * sysdeps/sparc/sparc64/multiarch/addmul_1.c: Likewise. * sysdeps/sparc/sparc64/multiarch/addmul_1.S: Remove file. Signed-off-by: Adhemerval Zanella --- ChangeLog | 6 +++ sysdeps/sparc/sparc64/multiarch/Makefile | 4 +- sysdeps/sparc/sparc64/multiarch/addmul_1-generic.S | 2 + sysdeps/sparc/sparc64/multiarch/addmul_1.S | 56 ---------------------- sysdeps/sparc/sparc64/multiarch/addmul_1.c | 28 +++++++++++ 5 files changed, 38 insertions(+), 58 deletions(-) create mode 100644 sysdeps/sparc/sparc64/multiarch/addmul_1-generic.S delete mode 100644 sysdeps/sparc/sparc64/multiarch/addmul_1.S create mode 100644 sysdeps/sparc/sparc64/multiarch/addmul_1.c -- 2.7.4 diff --git a/sysdeps/sparc/sparc64/multiarch/Makefile b/sysdeps/sparc/sparc64/multiarch/Makefile index 10fe54f..fbd7e22 100644 --- a/sysdeps/sparc/sparc64/multiarch/Makefile +++ b/sysdeps/sparc/sparc64/multiarch/Makefile @@ -13,8 +13,8 @@ sysdep_routines += memcpy-ultra3 memcpy-niagara1 memcpy-niagara2 \ endif ifeq ($(subdir),stdlib) -sysdep_routines += mul_1-vis3 mul_1-generic addmul_1-vis3 submul_1-vis3 \ - add_n-vis3 sub_n-vis3 sub_n-generic +sysdep_routines += mul_1-vis3 mul_1-generic addmul_1-vis3 addmul_1-generic \ + submul_1-vis3 add_n-vis3 sub_n-vis3 sub_n-generic endif ifeq ($(subdir),math) diff --git a/sysdeps/sparc/sparc64/multiarch/addmul_1-generic.S b/sysdeps/sparc/sparc64/multiarch/addmul_1-generic.S new file mode 100644 index 0000000..5bf1da7 --- /dev/null +++ b/sysdeps/sparc/sparc64/multiarch/addmul_1-generic.S @@ -0,0 +1,2 @@ +#define __mpn_addmul_1 __mpn_addmul_1_generic +#include diff --git a/sysdeps/sparc/sparc64/multiarch/addmul_1.S b/sysdeps/sparc/sparc64/multiarch/addmul_1.S deleted file mode 100644 index dcb1da1..0000000 --- a/sysdeps/sparc/sparc64/multiarch/addmul_1.S +++ /dev/null @@ -1,56 +0,0 @@ -/* Multiple versions of addmul_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_addmul_1) - .type __mpn_addmul_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_addmul_1_vis3), %o1 - xor %o1, %gdop_lox10(__mpn_addmul_1_vis3), %o1 -# else - set __mpn_addmul_1_vis3, %o1 -# endif - ba 10f - nop -1: -# ifdef SHARED - sethi %gdop_hix22(__mpn_addmul_1_generic), %o1 - xor %o1, %gdop_lox10(__mpn_addmul_1_generic), %o1 -# else - set __mpn_addmul_1_generic, %o1 -# endif -10: -# ifdef SHARED - add %o3, %o1, %o1 -# endif - retl - mov %o1, %o0 -END(__mpn_addmul_1) - -#define __mpn_addmul_1 __mpn_addmul_1_generic -#include "../addmul_1.S" diff --git a/sysdeps/sparc/sparc64/multiarch/addmul_1.c b/sysdeps/sparc/sparc64/multiarch/addmul_1.c new file mode 100644 index 0000000..78bc34d --- /dev/null +++ b/sysdeps/sparc/sparc64/multiarch/addmul_1.c @@ -0,0 +1,28 @@ +/* __mpn_addmul_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_addmul_1) __mpn_addmul_1_vis3 attribute_hidden; +extern __typeof (mpn_addmul_1) __mpn_addmul_1_generic attribute_hidden; + +sparc_libm_ifunc (__mpn_addmul_1, + hwcap & HWCAP_SPARC_VIS3 + ? __mpn_addmul_1_vis3 + : __mpn_addmul_1_generic)