From patchwork Fri Nov 30 15:58:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Liebler X-Patchwork-Id: 1006044 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-97774-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=linux.ibm.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="KGG/GDoH"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 435zhT3tSTz9sBZ for ; Sat, 1 Dec 2018 03:03:37 +1100 (AEDT) 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:cc:subject:date:in-reply-to:references :message-id; q=dns; s=default; b=akkDjYzEcr3v/LP7BYD8QsjAqylJ6vc cnA9i2DemM3k28VD6MhnZJdDnEZVtJhIxJn0tadVoablGs2aEpylqvaILeCnRKkA jxWF5KOr3iB0wquBBnlwXU9zUXORDBjo2pvPnX6zCDAPuxg6Jc8Q0JtP6ABaM66h SAr9OcFozo58= 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:cc:subject:date:in-reply-to:references :message-id; s=default; bh=q3LBKEQApfCpzvY39ihx/c4q9qs=; b=KGG/G DoHRPp3fplIfhJwHPIeIRLG0E6euHHMTFoadIdbLFxzLuibGhPinr++Q4euQLirY 4Ph8Fndxo+NTuWhPyg1UNLjuw6/GWMv0NAFUSWQB9Ja4J0TKIuvFLS35WB+v7OOP PqP/Hj0hCe11wRWPabIRqigtzN6I+QrB5vGSS0= Received: (qmail 81979 invoked by alias); 30 Nov 2018 16:01:16 -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 38280 invoked by uid 89); 30 Nov 2018 16:00:32 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-27.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 spammy= X-HELO: mx0a-001b2d01.pphosted.com From: Stefan Liebler To: libc-alpha@sourceware.org Cc: Stefan Liebler Subject: [PATCH 45/56] S390: Refactor wcsncmp ifunc handling. Date: Fri, 30 Nov 2018 16:58:23 +0100 In-Reply-To: <1543593514-10251-1-git-send-email-stli@linux.ibm.com> References: <1543593514-10251-1-git-send-email-stli@linux.ibm.com> x-cbid: 18113016-0012-0000-0000-000002D2B61E X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18113016-0013-0000-0000-000021080474 Message-Id: <1543593514-10251-46-git-send-email-stli@linux.ibm.com> The ifunc handling for wcsncmp is adjusted in order to omit ifunc variants if those will never be used as the minimum architecture level already supports newer CPUs by default. ChangeLog: * sysdeps/s390/multiarch/Makefile (sysdep_routines): Remove wcsncmp variants. * sysdeps/s390/Makefile (sysdep_routines): Add wcsncmp variants. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Refactor ifunc handling for wcsncmp. * sysdeps/s390/multiarch/wcsncmp-c.c: Move to ... * sysdeps/s390/wcsncmp-c.c: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcsncmp-vx.S: Move to ... * sysdeps/s390/wcsncmp-vx.S: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcsncmp.c: Move to ... * sysdeps/s390/wcsncmp.c: ... here and adjust ifunc handling. * sysdeps/s390/ifunc-wcsncmp.h: New file. --- sysdeps/s390/Makefile | 3 +- sysdeps/s390/ifunc-wcsncmp.h | 52 +++++++++++++++++++++++ sysdeps/s390/multiarch/Makefile | 3 +- sysdeps/s390/multiarch/ifunc-impl-list.c | 15 ++++++- sysdeps/s390/{multiarch => }/wcsncmp-c.c | 10 +++-- sysdeps/s390/{multiarch => }/wcsncmp-vx.S | 13 ++++-- sysdeps/s390/{multiarch => }/wcsncmp.c | 21 ++++++--- 7 files changed, 99 insertions(+), 18 deletions(-) create mode 100644 sysdeps/s390/ifunc-wcsncmp.h rename sysdeps/s390/{multiarch => }/wcsncmp-c.c (85%) rename sysdeps/s390/{multiarch => }/wcsncmp-vx.S (97%) rename sysdeps/s390/{multiarch => }/wcsncmp.c (69%) diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile index 00398ba6c2..e1253c04be 100644 --- a/sysdeps/s390/Makefile +++ b/sysdeps/s390/Makefile @@ -91,5 +91,6 @@ sysdep_routines += wcslen wcslen-vx wcslen-c \ wcpncpy wcpncpy-vx wcpncpy-c \ wcscat wcscat-vx wcscat-c \ wcsncat wcsncat-vx wcsncat-c \ - wcscmp wcscmp-vx wcscmp-c + wcscmp wcscmp-vx wcscmp-c \ + wcsncmp wcsncmp-vx wcsncmp-c endif diff --git a/sysdeps/s390/ifunc-wcsncmp.h b/sysdeps/s390/ifunc-wcsncmp.h new file mode 100644 index 0000000000..3a22bc9c12 --- /dev/null +++ b/sysdeps/s390/ifunc-wcsncmp.h @@ -0,0 +1,52 @@ +/* wcsncmp variant information on S/390 version. + Copyright (C) 2018 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 + . */ + +#if defined USE_MULTIARCH && IS_IN (libc) \ + && ! defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT +# define HAVE_WCSNCMP_IFUNC 1 +#else +# define HAVE_WCSNCMP_IFUNC 0 +#endif + +#ifdef HAVE_S390_VX_ASM_SUPPORT +# define HAVE_WCSNCMP_IFUNC_AND_VX_SUPPORT HAVE_WCSNCMP_IFUNC +#else +# define HAVE_WCSNCMP_IFUNC_AND_VX_SUPPORT 0 +#endif + +#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT +# define WCSNCMP_DEFAULT WCSNCMP_Z13 +# define HAVE_WCSNCMP_C 0 +# define HAVE_WCSNCMP_Z13 1 +#else +# define WCSNCMP_DEFAULT WCSNCMP_C +# define HAVE_WCSNCMP_C 1 +# define HAVE_WCSNCMP_Z13 HAVE_WCSNCMP_IFUNC_AND_VX_SUPPORT +#endif + +#if HAVE_WCSNCMP_C +# define WCSNCMP_C __wcsncmp_c +#else +# define WCSNCMP_C NULL +#endif + +#if HAVE_WCSNCMP_Z13 +# define WCSNCMP_Z13 __wcsncmp_vx +#else +# define WCSNCMP_Z13 NULL +#endif diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile index 70162d0eaa..d1740fa8e4 100644 --- a/sysdeps/s390/multiarch/Makefile +++ b/sysdeps/s390/multiarch/Makefile @@ -1,6 +1,5 @@ ifeq ($(subdir),wcsmbs) -sysdep_routines += wcsncmp wcsncmp-vx wcsncmp-c \ - wcschr wcschr-vx wcschr-c \ +sysdep_routines += wcschr wcschr-vx wcschr-c \ wcschrnul wcschrnul-vx wcschrnul-c \ wcsrchr wcsrchr-vx wcsrchr-c \ wcsspn wcsspn-vx wcsspn-c \ diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c index f461063c80..8c9e788ae5 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -55,6 +55,7 @@ #include #include #include +#include /* Maximum number of IFUNC implementations. */ #define MAX_IFUNC 3 @@ -541,6 +542,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, ) #endif /* HAVE_WCSCMP_IFUNC */ +#if HAVE_WCSNCMP_IFUNC + IFUNC_IMPL (i, name, wcsncmp, +# if HAVE_WCSNCMP_Z13 + IFUNC_IMPL_ADD (array, i, wcsncmp, + dl_hwcap & HWCAP_S390_VX, WCSNCMP_Z13) +# endif +# if HAVE_WCSNCMP_C + IFUNC_IMPL_ADD (array, i, wcsncmp, 1, WCSNCMP_C) +# endif + ) +#endif /* HAVE_WCSNCMP_IFUNC */ + #ifdef HAVE_S390_VX_ASM_SUPPORT # define IFUNC_VX_IMPL(FUNC) \ @@ -549,8 +562,6 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, __##FUNC##_vx) \ IFUNC_IMPL_ADD (array, i, FUNC, 1, __##FUNC##_c)) - IFUNC_VX_IMPL (wcsncmp); - IFUNC_VX_IMPL (wcschr); IFUNC_VX_IMPL (wcschrnul); diff --git a/sysdeps/s390/multiarch/wcsncmp-c.c b/sysdeps/s390/wcsncmp-c.c similarity index 85% rename from sysdeps/s390/multiarch/wcsncmp-c.c rename to sysdeps/s390/wcsncmp-c.c index 92ab5e8b50..a9ccb8de82 100644 --- a/sysdeps/s390/multiarch/wcsncmp-c.c +++ b/sysdeps/s390/wcsncmp-c.c @@ -16,10 +16,12 @@ License along with the GNU C Library; if not, see . */ -#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) -# define WCSNCMP __wcsncmp_c +#include + +#if HAVE_WCSNCMP_C +# if HAVE_WCSNCMP_IFUNC +# define WCSNCMP WCSNCMP_C +# endif -# include -extern __typeof (wcsncmp) __wcsncmp_c; # include #endif diff --git a/sysdeps/s390/multiarch/wcsncmp-vx.S b/sysdeps/s390/wcsncmp-vx.S similarity index 97% rename from sysdeps/s390/multiarch/wcsncmp-vx.S rename to sysdeps/s390/wcsncmp-vx.S index 34c203bc90..9bdd21acef 100644 --- a/sysdeps/s390/multiarch/wcsncmp-vx.S +++ b/sysdeps/s390/wcsncmp-vx.S @@ -16,7 +16,8 @@ License along with the GNU C Library; if not, see . */ -#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) +#include +#if HAVE_WCSNCMP_Z13 # include "sysdep.h" # include "asm-syntax.h" @@ -37,7 +38,7 @@ -v17=part of s2 -v18=index of unequal */ -ENTRY(__wcsncmp_vx) +ENTRY(WCSNCMP_Z13) .machine "z13" .machinemode "zarch_nohighgprs" @@ -173,5 +174,9 @@ ENTRY(__wcsncmp_vx) lghi %r1,-1 locgrl %r2,%r1 br %r14 -END(__wcsncmp_vx) -#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */ +END(WCSNCMP_Z13) + +# if ! HAVE_WCSNCMP_IFUNC +strong_alias (WCSNCMP_Z13, wcsncmp) +# endif +#endif diff --git a/sysdeps/s390/multiarch/wcsncmp.c b/sysdeps/s390/wcsncmp.c similarity index 69% rename from sysdeps/s390/multiarch/wcsncmp.c rename to sysdeps/s390/wcsncmp.c index ee5f08c1e4..101db44591 100644 --- a/sysdeps/s390/multiarch/wcsncmp.c +++ b/sysdeps/s390/wcsncmp.c @@ -16,12 +16,23 @@ License along with the GNU C Library; if not, see . */ -#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) +#include + +#if HAVE_WCSNCMP_IFUNC # include # include -s390_vx_libc_ifunc2 (__wcsncmp, wcsncmp) +# if HAVE_WCSNCMP_C +extern __typeof (wcsncmp) WCSNCMP_C attribute_hidden; +# endif + +# if HAVE_WCSNCMP_Z13 +extern __typeof (wcsncmp) WCSNCMP_Z13 attribute_hidden; +# endif -#else -# include -#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */ +s390_libc_ifunc_expr (wcsncmp, wcsncmp, + (HAVE_WCSNCMP_Z13 && (hwcap & HWCAP_S390_VX)) + ? WCSNCMP_Z13 + : WCSNCMP_DEFAULT + ) +#endif