From patchwork Fri Nov 30 15:58:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Liebler X-Patchwork-Id: 1006092 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-97804-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="GTqGa76v"; 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 436153186Dz9sD9 for ; Sat, 1 Dec 2018 04:06:30 +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=Z7ty6/wQdRBLP+6hKsDBREP5ZvBAqOQ a6/1Ps7DpbTaywcX8PDH+kv0dMeVUOltCZUoeak+OtHa9hG1kLV8GNu/FtVMuNiK uXh7asg5A3AiDZ5nsS1Yq6AFYAv6fLs13+Lbh8Tgge9jMWaqhzj3DSFLko4neMvE /AQWP8KwORk4= 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=njpB41u2HOG7JQVAdio2jFe0mAM=; b=GTqGa 76v/HC89dcVKT/xaNA5jvlUNy67mZsfLDEhn3vxNoKNfl/pZYyIu+D9MMPZk89xl GVJ+5iTcXevXhRnrin8z6xj3rbf6tJnUXJCM87/FFYgy1g54PbOhpu6yzFIPZekd reoVNKNccDK8RsugJyTH0Pe7CT15JJcNncRhUQ= Received: (qmail 64455 invoked by alias); 30 Nov 2018 17:06:25 -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 64438 invoked by uid 89); 30 Nov 2018 17:06:22 -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 42/56] S390: Refactor wcscat ifunc handling. Date: Fri, 30 Nov 2018 16:58:20 +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-0016-0000-0000-0000022F30BF X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused x-cbparentid: 18113016-0017-0000-0000-000032879BD9 Message-Id: <1543593514-10251-43-git-send-email-stli@linux.ibm.com> The ifunc handling for wcscat 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 wcscat variants. * sysdeps/s390/Makefile (sysdep_routines): Add wcscat variants. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Refactor ifunc handling for wcscat. * sysdeps/s390/multiarch/wcscat-c.c: Move to ... * sysdeps/s390/wcscat-c.c: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcscat-vx.S: Move to ... * sysdeps/s390/wcscat-vx.S: ... here and adjust ifunc handling. * sysdeps/s390/multiarch/wcscat.c: Move to ... * sysdeps/s390/wcscat.c: ... here and adjust ifunc handling. * sysdeps/s390/ifunc-wcscat.h: New file. --- sysdeps/s390/Makefile | 3 +- sysdeps/s390/ifunc-wcscat.h | 53 ++++++++++++++++++++++++ sysdeps/s390/multiarch/Makefile | 3 +- sysdeps/s390/multiarch/ifunc-impl-list.c | 15 ++++++- sysdeps/s390/{multiarch => }/wcscat-c.c | 10 +++-- sysdeps/s390/{multiarch => }/wcscat-vx.S | 16 ++++--- sysdeps/s390/{multiarch => }/wcscat.c | 23 +++++++--- 7 files changed, 103 insertions(+), 20 deletions(-) create mode 100644 sysdeps/s390/ifunc-wcscat.h rename sysdeps/s390/{multiarch => }/wcscat-c.c (86%) rename sysdeps/s390/{multiarch => }/wcscat-vx.S (96%) rename sysdeps/s390/{multiarch => }/wcscat.c (70%) diff --git a/sysdeps/s390/Makefile b/sysdeps/s390/Makefile index e49b1bd26b..f393a2b1ef 100644 --- a/sysdeps/s390/Makefile +++ b/sysdeps/s390/Makefile @@ -88,5 +88,6 @@ sysdep_routines += wcslen wcslen-vx wcslen-c \ wcscpy wcscpy-vx wcscpy-c \ wcpcpy wcpcpy-vx wcpcpy-c \ wcsncpy wcsncpy-vx wcsncpy-c \ - wcpncpy wcpncpy-vx wcpncpy-c + wcpncpy wcpncpy-vx wcpncpy-c \ + wcscat wcscat-vx wcscat-c endif diff --git a/sysdeps/s390/ifunc-wcscat.h b/sysdeps/s390/ifunc-wcscat.h new file mode 100644 index 0000000000..fecae21403 --- /dev/null +++ b/sysdeps/s390/ifunc-wcscat.h @@ -0,0 +1,53 @@ +/* wcscat 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_WCSCAT_IFUNC 1 +#else +# define HAVE_WCSCAT_IFUNC 0 +#endif + +#ifdef HAVE_S390_VX_ASM_SUPPORT +# define HAVE_WCSCAT_IFUNC_AND_VX_SUPPORT HAVE_WCSCAT_IFUNC +#else +# define HAVE_WCSCAT_IFUNC_AND_VX_SUPPORT 0 +#endif + +#if defined HAVE_S390_MIN_Z13_ZARCH_ASM_SUPPORT +# define WCSCAT_DEFAULT WCSCAT_Z13 +/* The z13 ifunc variant is using the common code variant as fallback! */ +# define HAVE_WCSCAT_C 1 +# define HAVE_WCSCAT_Z13 1 +#else +# define WCSCAT_DEFAULT WCSCAT_C +# define HAVE_WCSCAT_C 1 +# define HAVE_WCSCAT_Z13 HAVE_WCSCAT_IFUNC_AND_VX_SUPPORT +#endif + +#if HAVE_WCSCAT_C +# define WCSCAT_C __wcscat_c +#else +# define WCSCAT_C NULL +#endif + +#if HAVE_WCSCAT_Z13 +# define WCSCAT_Z13 __wcscat_vx +#else +# define WCSCAT_Z13 NULL +#endif diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile index 158fb49552..617017496c 100644 --- a/sysdeps/s390/multiarch/Makefile +++ b/sysdeps/s390/multiarch/Makefile @@ -1,6 +1,5 @@ ifeq ($(subdir),wcsmbs) -sysdep_routines += wcscat wcscat-vx wcscat-c \ - wcsncat wcsncat-vx wcsncat-c \ +sysdep_routines += wcsncat wcsncat-vx wcsncat-c \ wcscmp wcscmp-vx wcscmp-c \ wcsncmp wcsncmp-vx wcsncmp-c \ wcschr wcschr-vx wcschr-c \ diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c index e60238fcde..b05bd35fd8 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -52,6 +52,7 @@ #include #include #include +#include /* Maximum number of IFUNC implementations. */ #define MAX_IFUNC 3 @@ -502,6 +503,18 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, ) #endif /* HAVE_WCPNCPY_IFUNC */ +#if HAVE_WCSCAT_IFUNC + IFUNC_IMPL (i, name, wcscat, +# if HAVE_WCSCAT_Z13 + IFUNC_IMPL_ADD (array, i, wcscat, + dl_hwcap & HWCAP_S390_VX, WCSCAT_Z13) +# endif +# if HAVE_WCSCAT_C + IFUNC_IMPL_ADD (array, i, wcscat, 1, WCSCAT_C) +# endif + ) +#endif /* HAVE_WCSCAT_IFUNC */ + #ifdef HAVE_S390_VX_ASM_SUPPORT # define IFUNC_VX_IMPL(FUNC) \ @@ -510,8 +523,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 (wcscat); - IFUNC_VX_IMPL (wcsncat); IFUNC_VX_IMPL (wcscmp); diff --git a/sysdeps/s390/multiarch/wcscat-c.c b/sysdeps/s390/wcscat-c.c similarity index 86% rename from sysdeps/s390/multiarch/wcscat-c.c rename to sysdeps/s390/wcscat-c.c index 9a31c65a0b..bc1a50b1a5 100644 --- a/sysdeps/s390/multiarch/wcscat-c.c +++ b/sysdeps/s390/wcscat-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 WCSCAT __wcscat_c +#include + +#if HAVE_WCSCAT_C +# if HAVE_WCSCAT_IFUNC || HAVE_WCSCAT_Z13 +# define WCSCAT WCSCAT_C +# endif -# include -extern __typeof (__wcscat) __wcscat_c; # include #endif diff --git a/sysdeps/s390/multiarch/wcscat-vx.S b/sysdeps/s390/wcscat-vx.S similarity index 96% rename from sysdeps/s390/multiarch/wcscat-vx.S rename to sysdeps/s390/wcscat-vx.S index 2164a8da41..4e40d69e84 100644 --- a/sysdeps/s390/multiarch/wcscat-vx.S +++ b/sysdeps/s390/wcscat-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_WCSCAT_Z13 # include "sysdep.h" # include "asm-syntax.h" @@ -37,7 +38,7 @@ -v17=index of zero -v18=part of src */ -ENTRY(__wcscat_vx) +ENTRY(WCSCAT_Z13) .machine "z13" .machinemode "zarch_nohighgprs" @@ -170,6 +171,11 @@ ENTRY(__wcscat_vx) lgr %r2,%r0 /* Load saved dest-ptr. */ br %r14 .Lfallback: - jg __wcscat_c -END(__wcscat_vx) -#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */ + jg WCSCAT_C +END(WCSCAT_Z13) + +# if ! HAVE_WCSCAT_IFUNC +strong_alias (WCSCAT_Z13, __wcscat) +weak_alias (__wcscat, wcscat) +# endif +#endif diff --git a/sysdeps/s390/multiarch/wcscat.c b/sysdeps/s390/wcscat.c similarity index 70% rename from sysdeps/s390/multiarch/wcscat.c rename to sysdeps/s390/wcscat.c index 33e4f6da3f..3741210a17 100644 --- a/sysdeps/s390/multiarch/wcscat.c +++ b/sysdeps/s390/wcscat.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_WCSCAT_IFUNC # include # include -s390_vx_libc_ifunc (__wcscat) -weak_alias (__wcscat, wcscat) +# if HAVE_WCSCAT_C +extern __typeof (__wcscat) WCSCAT_C attribute_hidden; +# endif -#else -# include -#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */ +# if HAVE_WCSCAT_Z13 +extern __typeof (__wcscat) WCSCAT_Z13 attribute_hidden; +# endif + +s390_libc_ifunc_expr (__wcscat, __wcscat, + (HAVE_WCSCAT_Z13 && (hwcap & HWCAP_S390_VX)) + ? WCSCAT_Z13 + : WCSCAT_DEFAULT + ) +weak_alias (__wcscat, wcscat) +#endif