From patchwork Fri Nov 30 15:58:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Liebler X-Patchwork-Id: 1006063 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-97790-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="BHDLnTOt"; 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 435zmW1CPBz9s8r for ; Sat, 1 Dec 2018 03:07:06 +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=r4xXVgw9C7Fu0Ti8H55uV8z4tH2o8Z6 gVsZf08aPmF+Fu42kotdRu3IXPLBtp03lh5dV4teHRpzV559zZxcPu8Sx2D3B1qb 1xTpd52GSRIBjkar8iMv0OB0ImsrD+RQCEQDDCriVCBGJoEZxBUggXXaknHF+VfQ Ybw+eu6qxDsc= 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=vkfs2nUcdylRJfY69MG4jHNYkQc=; b=BHDLn TOtqrBJfZZ30qiXVShGKmQ1UQ5gtPdcVvRKaCjURqgSPYvqiyxy/SOo7YybgOTka OQXjeUDxql+DVAJAfXgsQyL+5Gpm1vOmn5CxEda5dPuvDjYrcWLaOSPHZH+cYkjZ WNMukaFsKqDkdgMEn59apBJXwONyo/tDuxjccg= Received: (qmail 109698 invoked by alias); 30 Nov 2018 16:04:11 -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 109591 invoked by uid 89); 30 Nov 2018 16:04:10 -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 47/56] S390: Refactor wcschrnul ifunc handling. Date: Fri, 30 Nov 2018 16:58:25 +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-4275-0000-0000-000002E935DF X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18113016-4276-0000-0000-000037F67E7D Message-Id: <1543593514-10251-48-git-send-email-stli@linux.ibm.com> The ifunc handling for wcschrnul is adjusted in order to omit ifunc if the minimum architecture level already supports newer CPUs by default. Unfortunately the c ifunc variant can't be omitted at all as it is used by the z13 ifunc variant as fallback if the pointers are not 4-byte aligned. ChangeLog: * sysdeps/s390/multiarch/Makefile (sysdep_routines): Remove wcschrnul variants. * sysdeps/s390/Makefile (sysdep_routines): Add wcschrnul variants. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Refactor ifunc handling for wcschrnul. * sysdeps/s390/multiarch/wcschrnul-c.c: Move to ... * sysdeps/s390/wcschrnul-c.c: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcschrnul-vx.S: Move to ... * sysdeps/s390/wcschrnul-vx.S: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcschrnul.c: Move to ... * sysdeps/s390/wcschrnul.c: ... here and adjust ifunc handling. * sysdeps/s390/ifunc-wcschrnul.h: New file. --- sysdeps/s390/Makefile | 3 +- sysdeps/s390/ifunc-wcschrnul.h | 53 +++++++++++++++++++++ sysdeps/s390/multiarch/Makefile | 3 +- sysdeps/s390/multiarch/ifunc-impl-list.c | 15 +++++- sysdeps/s390/{multiarch => }/wcschrnul-c.c | 10 ++-- sysdeps/s390/{multiarch => }/wcschrnul-vx.S | 16 +++++-- sysdeps/s390/{multiarch => }/wcschrnul.c | 23 ++++++--- 7 files changed, 103 insertions(+), 20 deletions(-) create mode 100644 sysdeps/s390/ifunc-wcschrnul.h rename sysdeps/s390/{multiarch => }/wcschrnul-c.c (85%) rename sysdeps/s390/{multiarch => }/wcschrnul-vx.S (92%) rename sysdeps/s390/{multiarch => }/wcschrnul.c (68%) diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile index 982e5abfb2..a8cd264521 100644 --- a/sysdeps/s390/Makefile +++ b/sysdeps/s390/Makefile @@ -93,5 +93,6 @@ sysdep_routines += wcslen wcslen-vx wcslen-c \ wcsncat wcsncat-vx wcsncat-c \ wcscmp wcscmp-vx wcscmp-c \ wcsncmp wcsncmp-vx wcsncmp-c \ - wcschr wcschr-vx wcschr-c + wcschr wcschr-vx wcschr-c \ + wcschrnul wcschrnul-vx wcschrnul-c endif diff --git a/sysdeps/s390/ifunc-wcschrnul.h b/sysdeps/s390/ifunc-wcschrnul.h new file mode 100644 index 0000000000..39d4120eb3 --- /dev/null +++ b/sysdeps/s390/ifunc-wcschrnul.h @@ -0,0 +1,53 @@ +/* wcschrnul 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_WCSCHRNUL_IFUNC 1 +#else +# define HAVE_WCSCHRNUL_IFUNC 0 +#endif + +#ifdef HAVE_S390_VX_ASM_SUPPORT +# define HAVE_WCSCHRNUL_IFUNC_AND_VX_SUPPORT HAVE_WCSCHRNUL_IFUNC +#else +# define HAVE_WCSCHRNUL_IFUNC_AND_VX_SUPPORT 0 +#endif + +#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT +# define WCSCHRNUL_DEFAULT WCSCHRNUL_Z13 +/* The z13 ifunc variant is using the common code variant as fallback! */ +# define HAVE_WCSCHRNUL_C 1 +# define HAVE_WCSCHRNUL_Z13 1 +#else +# define WCSCHRNUL_DEFAULT WCSCHRNUL_C +# define HAVE_WCSCHRNUL_C 1 +# define HAVE_WCSCHRNUL_Z13 HAVE_WCSCHRNUL_IFUNC_AND_VX_SUPPORT +#endif + +#if HAVE_WCSCHRNUL_C +# define WCSCHRNUL_C __wcschrnul_c +#else +# define WCSCHRNUL_C NULL +#endif + +#if HAVE_WCSCHRNUL_Z13 +# define WCSCHRNUL_Z13 __wcschrnul_vx +#else +# define WCSCHRNUL_Z13 NULL +#endif diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile index b282613b47..0eb01d5d84 100644 --- a/sysdeps/s390/multiarch/Makefile +++ b/sysdeps/s390/multiarch/Makefile @@ -1,6 +1,5 @@ ifeq ($(subdir),wcsmbs) -sysdep_routines += wcschrnul wcschrnul-vx wcschrnul-c \ - wcsrchr wcsrchr-vx wcsrchr-c \ +sysdep_routines += wcsrchr wcsrchr-vx wcsrchr-c \ wcsspn wcsspn-vx wcsspn-c \ wcspbrk wcspbrk-vx wcspbrk-c \ wcscspn wcscspn-vx wcscspn-c \ diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c index c69165465d..553a76c39e 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -57,6 +57,7 @@ #include #include #include +#include /* Maximum number of IFUNC implementations. */ #define MAX_IFUNC 3 @@ -567,6 +568,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, ) #endif /* HAVE_WCSCHR_IFUNC */ +#if HAVE_WCSCHRNUL_IFUNC + IFUNC_IMPL (i, name, wcschrnul, +# if HAVE_WCSCHRNUL_Z13 + IFUNC_IMPL_ADD (array, i, wcschrnul, + dl_hwcap & HWCAP_S390_VX, WCSCHRNUL_Z13) +# endif +# if HAVE_WCSCHRNUL_C + IFUNC_IMPL_ADD (array, i, wcschrnul, 1, WCSCHRNUL_C) +# endif + ) +#endif /* HAVE_WCSCHRNUL_IFUNC */ + #ifdef HAVE_S390_VX_ASM_SUPPORT # define IFUNC_VX_IMPL(FUNC) \ @@ -575,8 +588,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 (wcschrnul); - IFUNC_VX_IMPL (wcsrchr); IFUNC_VX_IMPL (wcsspn); diff --git a/sysdeps/s390/multiarch/wcschrnul-c.c b/sysdeps/s390/wcschrnul-c.c similarity index 85% rename from sysdeps/s390/multiarch/wcschrnul-c.c rename to sysdeps/s390/wcschrnul-c.c index 00e776a3ad..410cee1399 100644 --- a/sysdeps/s390/multiarch/wcschrnul-c.c +++ b/sysdeps/s390/wcschrnul-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 WCSCHRNUL __wcschrnul_c +#include + +#if HAVE_WCSCHRNUL_C +# if HAVE_WCSCHRNUL_IFUNC || HAVE_WCSCHRNUL_Z13 +# define WCSCHRNUL WCSCHRNUL_C +# endif -# include -extern __typeof (__wcschrnul) __wcschrnul_c; # include #endif diff --git a/sysdeps/s390/multiarch/wcschrnul-vx.S b/sysdeps/s390/wcschrnul-vx.S similarity index 92% rename from sysdeps/s390/multiarch/wcschrnul-vx.S rename to sysdeps/s390/wcschrnul-vx.S index ebcd32b870..4ffb937c6b 100644 --- a/sysdeps/s390/multiarch/wcschrnul-vx.S +++ b/sysdeps/s390/wcschrnul-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_WCSCHRNUL_Z13 # include "sysdep.h" # include "asm-syntax.h" @@ -35,7 +36,7 @@ -v16=part of s -v18=vector with c replicated in every byte */ -ENTRY(__wcschrnul_vx) +ENTRY(WCSCHRNUL_Z13) .machine "z13" .machinemode "zarch_nohighgprs" @@ -92,6 +93,11 @@ ENTRY(__wcschrnul_vx) .Lend: br %r14 .Lfallback: - jg __wcschrnul_c -END(__wcschrnul_vx) -#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */ + jg WCSCHRNUL_C +END(WCSCHRNUL_Z13) + +# if ! HAVE_WCSCHRNUL_IFUNC +strong_alias (WCSCHRNUL_Z13, __wcschrnul) +weak_alias (__wcschrnul, wcschrnul) +# endif +#endif diff --git a/sysdeps/s390/multiarch/wcschrnul.c b/sysdeps/s390/wcschrnul.c similarity index 68% rename from sysdeps/s390/multiarch/wcschrnul.c rename to sysdeps/s390/wcschrnul.c index 807d7ee089..ab5aaf0402 100644 --- a/sysdeps/s390/multiarch/wcschrnul.c +++ b/sysdeps/s390/wcschrnul.c @@ -16,13 +16,24 @@ License along with the GNU C Library; if not, see . */ -#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) +#include + +#if HAVE_WCSCHRNUL_IFUNC # include # include -s390_vx_libc_ifunc (__wcschrnul) -weak_alias (__wcschrnul, wcschrnul) +# if HAVE_WCSCHRNUL_C +extern __typeof (__wcschrnul) WCSCHRNUL_C attribute_hidden; +# endif -#else -# include -#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */ +# if HAVE_WCSCHRNUL_Z13 +extern __typeof (__wcschrnul) WCSCHRNUL_Z13 attribute_hidden; +# endif + +s390_libc_ifunc_expr (__wcschrnul, __wcschrnul, + (HAVE_WCSCHRNUL_Z13 && (hwcap & HWCAP_S390_VX)) + ? WCSCHRNUL_Z13 + : WCSCHRNUL_DEFAULT + ) +weak_alias (__wcschrnul, wcschrnul) +#endif