From patchwork Wed Jan 21 16:14:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 4751 X-Patchwork-Delegate: azanella@linux.vnet.ibm.com Received: (qmail 23382 invoked by alias); 21 Jan 2015 16:15:12 -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 23095 invoked by uid 89); 21 Jan 2015 16:15:08 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, TVD_SUBJ_WIPE_DEBT, T_RP_MATCHES_RCVD autolearn=no version=3.3.2 X-HELO: e24smtp02.br.ibm.com Message-ID: <54BFD07D.9040309@linux.vnet.ibm.com> Date: Wed, 21 Jan 2015 14:14:53 -0200 From: Adhemerval Zanella User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.5.0 MIME-Version: 1.0 To: "GNU C. Library" Subject: [PATCH 3/6] powerpc: Remove POWER7 wordcopy ifunc References: <54BFCE9B.3030602@linux.vnet.ibm.com> In-Reply-To: <54BFCE9B.3030602@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15012116-0021-0000-0000-000001AC42F6 This patch remove the POWER7 ifunc wordcopy function (_wordcopy_*_power7), since now GLIBC provides a optimized memmove/bcopy for POWER7. Tested on powerpc64 and powerpc64le. --- * sysdeps/powerpc/powerpc64/multiarch/Makefile [sysdep_routines]: Remove wordcopy-power7 object. * sysdeps/powerpc/powerpc64/multiarch/wordcopy-power7.c: Remove file. * sysdeps/powerpc/powerpc64/multiarch/wordcopy.c (_wordcopy_fwd_aligned): Remove POWER7 specialization. (_wordcopy_fwd_dest_aligned): Likewise. (_wordcopy_bwd_aligned): Likewise. (_wordcopy_bwd_dest_aligned): Likewise. -- diff --git a/sysdeps/powerpc/powerpc64/multiarch/Makefile b/sysdeps/powerpc/powerpc64/multiarch/Makefile index fe4f255..0111ad6 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/Makefile +++ b/sysdeps/powerpc/powerpc64/multiarch/Makefile @@ -11,7 +11,7 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \ strncmp-power8 strncmp-power7 strncmp-power4 strncmp-ppc64 \ strchr-power7 strchr-ppc64 \ strchrnul-power7 strchrnul-ppc64 \ - wordcopy-power7 wordcopy-power6 wordcopy-ppc64 \ + wordcopy-power6 wordcopy-ppc64 \ strcpy-power8 strcpy-power7 strcpy-ppc64 stpcpy-power8 \ stpcpy-power7 stpcpy-ppc64 \ strrchr-power7 strrchr-ppc64 strncat-power7 strncat-ppc64 \ @@ -23,7 +23,6 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \ CFLAGS-strncase-power7.c += -mcpu=power7 -funroll-loops CFLAGS-strncase_l-power7.c += -mcpu=power7 -funroll-loops -CFLAGS-wordcopy-power7.c += -mcpu=power7 CFLAGS-wordcopy-power6.c += -mcpu=power6 endif diff --git a/sysdeps/powerpc/powerpc64/multiarch/wordcopy-power7.c b/sysdeps/powerpc/powerpc64/multiarch/wordcopy-power7.c deleted file mode 100644 index 3c54623..0000000 --- a/sysdeps/powerpc/powerpc64/multiarch/wordcopy-power7.c +++ /dev/null @@ -1,19 +0,0 @@ -/* wordcopy routines for powerpc64/power7. - Copyright (C) 2013-2015 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; see the file COPYING.LIB. If - not, see . */ - -#include diff --git a/sysdeps/powerpc/powerpc64/multiarch/wordcopy.c b/sysdeps/powerpc/powerpc64/multiarch/wordcopy.c index cc27540..ec39732 100644 --- a/sysdeps/powerpc/powerpc64/multiarch/wordcopy.c +++ b/sysdeps/powerpc/powerpc64/multiarch/wordcopy.c @@ -26,14 +26,10 @@ extern __typeof (_wordcopy_fwd_aligned) _wordcopy_fwd_aligned_ppc attribute_hidden; extern __typeof (_wordcopy_fwd_aligned) _wordcopy_fwd_aligned_power6 attribute_hidden; -extern __typeof (_wordcopy_fwd_aligned) _wordcopy_fwd_aligned_power7 -attribute_hidden; libc_ifunc (_wordcopy_fwd_aligned, - (hwcap & PPC_FEATURE_HAS_VSX) - ? _wordcopy_fwd_aligned_power7 : - (hwcap & PPC_FEATURE_ARCH_2_05) - ? _wordcopy_fwd_aligned_power6 + (hwcap & PPC_FEATURE_ARCH_2_05) + ? _wordcopy_fwd_aligned_power6 : _wordcopy_fwd_aligned_ppc); @@ -41,14 +37,10 @@ extern __typeof (_wordcopy_fwd_dest_aligned) _wordcopy_fwd_dest_aligned_ppc attribute_hidden; extern __typeof (_wordcopy_fwd_dest_aligned) _wordcopy_fwd_dest_aligned_power6 attribute_hidden; -extern __typeof (_wordcopy_fwd_dest_aligned) _wordcopy_fwd_dest_aligned_power7 -attribute_hidden; libc_ifunc (_wordcopy_fwd_dest_aligned, - (hwcap & PPC_FEATURE_HAS_VSX) - ? _wordcopy_fwd_dest_aligned_power7 : - (hwcap & PPC_FEATURE_ARCH_2_05) - ? _wordcopy_fwd_dest_aligned_power6 + (hwcap & PPC_FEATURE_ARCH_2_05) + ? _wordcopy_fwd_dest_aligned_power6 : _wordcopy_fwd_dest_aligned_ppc); @@ -56,14 +48,10 @@ extern __typeof (_wordcopy_bwd_aligned) _wordcopy_bwd_aligned_ppc attribute_hidden; extern __typeof (_wordcopy_bwd_aligned) _wordcopy_bwd_aligned_power6 attribute_hidden; -extern __typeof (_wordcopy_bwd_aligned) _wordcopy_bwd_aligned_power7 -attribute_hidden; libc_ifunc (_wordcopy_bwd_aligned, - (hwcap & PPC_FEATURE_HAS_VSX) - ? _wordcopy_bwd_aligned_power7 : - (hwcap & PPC_FEATURE_ARCH_2_05) - ? _wordcopy_bwd_aligned_power6 + (hwcap & PPC_FEATURE_ARCH_2_05) + ? _wordcopy_bwd_aligned_power6 : _wordcopy_bwd_aligned_ppc); @@ -71,14 +59,10 @@ extern __typeof (_wordcopy_bwd_dest_aligned) _wordcopy_bwd_dest_aligned_ppc attribute_hidden; extern __typeof (_wordcopy_bwd_dest_aligned) _wordcopy_bwd_dest_aligned_power6 attribute_hidden; -extern __typeof (_wordcopy_bwd_dest_aligned) _wordcopy_bwd_dest_aligned_power7 -attribute_hidden; libc_ifunc (_wordcopy_bwd_dest_aligned, - (hwcap & PPC_FEATURE_HAS_VSX) - ? _wordcopy_bwd_dest_aligned_power7 : - (hwcap & PPC_FEATURE_ARCH_2_05) - ? _wordcopy_bwd_dest_aligned_power6 + (hwcap & PPC_FEATURE_ARCH_2_05) + ? _wordcopy_bwd_dest_aligned_power6 : _wordcopy_bwd_dest_aligned_ppc); #else