From patchwork Thu Oct 26 19:06:38 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: 117260 Delivered-To: patch@linaro.org Received: by 10.140.22.164 with SMTP id 33csp1125458qgn; Thu, 26 Oct 2017 12:09:06 -0700 (PDT) X-Google-Smtp-Source: ABhQp+TRCPsNlLWKlRtFWrk/gsvuPSomK7zCcj7lborGqF7ftkhTY0/enaPGVj+rF/dGBiwU7RAP X-Received: by 10.101.77.208 with SMTP id q16mr5845615pgt.146.1509044946448; Thu, 26 Oct 2017 12:09:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1509044946; cv=none; d=google.com; s=arc-20160816; b=kC3/r4gvUClM8DraHr0Y9wDdtTXItdwXCgd+oyQFZRwmIFepLc+TLhT4iQafadQNlW xRtWcCXuPXvBs+SbDv4JgNggOaG5BxpVLTvySgesZndOG1CJjpa/KAYOi7Otw9KC/ASs onSfiZi4wPB2k6OCTKJngdC3K5uAD/95ludBd4PUUUAQoUt3SmGsaikfF8pXYv0k2eHG Ond3N0f/kADRsIK7maxuhLd1gYI0G8twpUo4UxnDNVoQp/MKYh89uiBSmxveknn0cTM2 6rnT5GlF0Vcbrk4KlkLpSU/Guq+SQd9wM4e08WQX7r0Wq9PHjkweUiVHuljo5SPmckxT MHYg== 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=toMD+IA5qJsEStiEwy9jmS/EXA7jK+h//zxt5u6hreU=; b=UHI0XpxECsGnHY2bTRpkAmW8vxPjm0NlBW5THBJ0WJKDao+n0icUw+rfXeCQ4jyKxy iKRGiFZ6FCv1QvQU/Fm9MaAmdZgGfuwrkVqZ1Sk35CCjaIC0P8vyOz1cjGQVa47fCr06 M6ViPF4K9NWbpZbqYK2/m35L0B9D8sVCqs3LBs5oV+BP0o3qSr2n1AAsFfc1MpG0zGqf iFpEQ8tU7YifSwkCblJOiMXzPPGpatHYW5Pkyz+lw2sQYnhyTGxOWfyhd4saDKDJrUwL uJr7i3rd+0J4bCo/oNqzppT317F0Z0HfO18xD8MFf/1phy99P6bm9dRe0RO5F9RPyvUf uBrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@sourceware.org header.s=default header.b=wGq+RIYD; spf=pass (google.com: domain of libc-alpha-return-86410-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-86410-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 o1si3753448pgn.528.2017.10.26.12.09.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 26 Oct 2017 12:09:06 -0700 (PDT) Received-SPF: pass (google.com: domain of libc-alpha-return-86410-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=wGq+RIYD; spf=pass (google.com: domain of libc-alpha-return-86410-patch=linaro.org@sourceware.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=libc-alpha-return-86410-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=EoM/w8AoTQW0KwKPCSS05WV8OuXvLqa 7j4KCFB1IsTtOTCcoM4vBIbnc/dLXoXiSuvkXqaQ20xiAdHl9zqfdrhR22UlY89F Xaq0Vle2culvdNtVCQpQVILQEexFzdiI2rDp7O4r6vUxnNZob8H0BRAUp58L2N4a bW2lyAcFTXhw= 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=k1GIttpqNd53kKbTM5JO5HmCp+E=; b=wGq+R IYDuy/2hfPrVIH441qZ87lPVP5d5iqtdfMgmcBn7YYYsy5uTML7PhfpIDD38Wk0l Ebk9JD4VWwo2QDCUGchkzeuJay9iMEiqP6VpYeXwxWx4lsMnBcGwnWNHJjH1oUDI XRbAJqexI8w1j06o2xSlrFdvu2IzvMy1Chv3ks= Received: (qmail 98458 invoked by alias); 26 Oct 2017 19:07:20 -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 98380 invoked by uid 89); 26 Oct 2017 19:07:19 -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-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:from:to:subject:date:message-id:in-reply-to :references; bh=toMD+IA5qJsEStiEwy9jmS/EXA7jK+h//zxt5u6hreU=; b=F/57fxj2U/i26cyB6uGGCYmEWyFi7Bv1R5pGNs7AfJyuawg8STh7yC4ZslmtoeU/6M Dt4NYvryd2uJnUjl+exIp9LLSbBDXVJCddvoX5sFcmQH0Go1CzWw1GD301iaAGvpPs1n jiOXkiO1VloKPasLrxRweye0u47CyY8f/vtHFWJLWe43YvC8zybtdmcvyo/fgc3mRYqE hyMCG5YGrS0HHgPVv72tYCLgnLPPLwOwS+aB3evtyrYAj1UcBIqHQ9xH62EGkm2tJ0SR k3HJodr4pWi9luJrghCp9qDE5GUSAy3cGXRxF00ztb+Js4yXyAeyCl5TGMFM7i+JhG0s QIVw== X-Gm-Message-State: AMCzsaWoEzslYQX9m2IHc0OsFujdmfvaZOuVFDMcBAedPqd0FEBnUgj9 RGjpATtp2AFO9VlByDCxa4LSu+jEXJY= X-Received: by 10.55.26.90 with SMTP id a87mr9070940qka.132.1509044834736; Thu, 26 Oct 2017 12:07:14 -0700 (PDT) From: Adhemerval Zanella To: libc-alpha@sourceware.org Subject: [PATCH 10/25] sparc: refactor sparc64 nearbyint{f} selector to C Date: Thu, 26 Oct 2017 17:06:38 -0200 Message-Id: <1509044813-9951-11-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 s_nearbyint{f}-generic.S). Checked on sparc64-linux-gnu and sparcv9-linux-gnu. * sysdeps/sparc/sparc64/fpu/multiarch/Makefile (libm-sysdep_routines): Add s_nearbyint-generic and s_nearbyintf-generic objects. * sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint-generic.S: New file. * sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint.c: Likewise. * sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf-generic.S: Likewise. * sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf.c: Likewise. * sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint.S: Remove file. * sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf.S: Likewise. Signed-off-by: Adhemerval Zanella --- ChangeLog | 10 ++++++++ sysdeps/sparc/sparc64/fpu/multiarch/Makefile | 1 + .../sparc64/fpu/multiarch/s_nearbyint-generic.S | 4 +++ sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint.S | 12 --------- sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint.c | 29 ++++++++++++++++++++++ .../sparc64/fpu/multiarch/s_nearbyintf-generic.S | 4 +++ sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf.S | 12 --------- sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf.c | 29 ++++++++++++++++++++++ 8 files changed, 77 insertions(+), 24 deletions(-) create mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint-generic.S delete mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint.S create mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint.c create mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf-generic.S delete mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf.S create mode 100644 sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf.c -- 2.7.4 diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/Makefile b/sysdeps/sparc/sparc64/fpu/multiarch/Makefile index d19a446..6062af0 100644 --- a/sysdeps/sparc/sparc64/fpu/multiarch/Makefile +++ b/sysdeps/sparc/sparc64/fpu/multiarch/Makefile @@ -12,6 +12,7 @@ sysdep_routines += $(sysdep_calls) libm-sysdep_routines += s_lrintf-vis3 s_lrint-vis3 s_rintf-vis3 s_rint-vis3 \ s_fmaf-vis3 s_fma-vis3 s_fmaf-generic s_fma-generic \ s_nearbyint-vis3 s_nearbyintf-vis3 \ + s_nearbyint-generic s_nearbyintf-generic \ s_ceilf-vis3 s_ceil-vis3 s_ceilf-generic \ s_ceil-generic s_floorf-vis3 s_floor-vis3 \ s_floorf-generic s_floor-generic s_truncf-vis3 \ diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint-generic.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint-generic.S new file mode 100644 index 0000000..efe2383 --- /dev/null +++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint-generic.S @@ -0,0 +1,4 @@ +#define __nearbyint __nearbyint_generic +#undef weak_alias +#define weak_alias(a,b) +#include diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint.S deleted file mode 100644 index bb75ab3..0000000 --- a/sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint.S +++ /dev/null @@ -1,12 +0,0 @@ -#include - -SPARC_ASM_VIS3_IFUNC(nearbyint) - -weak_alias (__nearbyint, nearbyint) - -# undef weak_alias -# define weak_alias(a, b) - -#define __nearbyint __nearbyint_generic - -#include "../s_nearbyint.S" diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint.c b/sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint.c new file mode 100644 index 0000000..3ccb3be --- /dev/null +++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyint.c @@ -0,0 +1,29 @@ +/* nearbyint 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 (nearbyint) __nearbyint_vis3 attribute_hidden; +extern __typeof (nearbyint) __nearbyint_generic attribute_hidden; + +sparc_libm_ifunc (__nearbyint, + hwcap & HWCAP_SPARC_VIS3 + ? __nearbyint_vis3 + : __nearbyint_generic); +weak_alias (__nearbyint, nearbyint) diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf-generic.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf-generic.S new file mode 100644 index 0000000..a2e38e9 --- /dev/null +++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf-generic.S @@ -0,0 +1,4 @@ +#define __nearbyintf __nearbyintf_generic +#undef weak_alias +#define weak_alias(a,b) +#include diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf.S b/sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf.S deleted file mode 100644 index 95100c1..0000000 --- a/sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf.S +++ /dev/null @@ -1,12 +0,0 @@ -#include - -SPARC_ASM_VIS3_IFUNC(nearbyintf) - -weak_alias (__nearbyintf, nearbyintf) - -# undef weak_alias -# define weak_alias(a, b) - -#define __nearbyintf __nearbyintf_generic - -#include "../s_nearbyintf.S" diff --git a/sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf.c b/sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf.c new file mode 100644 index 0000000..23e3c13 --- /dev/null +++ b/sysdeps/sparc/sparc64/fpu/multiarch/s_nearbyintf.c @@ -0,0 +1,29 @@ +/* nearbyintf 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 (nearbyintf) __nearbyintf_vis3 attribute_hidden; +extern __typeof (nearbyintf) __nearbyintf_generic attribute_hidden; + +sparc_libm_ifunc (__nearbyintf, + hwcap & HWCAP_SPARC_VIS3 + ? __nearbyintf_vis3 + : __nearbyintf_generic); +weak_alias (__nearbyintf, nearbyintf)