From patchwork Fri Jun 26 11:51:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Liebler X-Patchwork-Id: 7365 Received: (qmail 20963 invoked by alias); 26 Jun 2015 11:52:08 -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 20755 invoked by uid 89); 26 Jun 2015 11:52:07 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.0 required=5.0 tests=AWL, BAYES_50, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD autolearn=ham version=3.3.2 X-HELO: e06smtp13.uk.ibm.com X-MailFrom: stli@linux.vnet.ibm.com X-RcptTo: libc-alpha@sourceware.org From: Stefan Liebler To: libc-alpha@sourceware.org Cc: Stefan Liebler Subject: [PATCH 10/27] S390: Optimize stpcpy and wcpcpy. Date: Fri, 26 Jun 2015 13:51:35 +0200 Message-Id: <1435319512-22245-11-git-send-email-stli@linux.vnet.ibm.com> In-Reply-To: <1435319512-22245-1-git-send-email-stli@linux.vnet.ibm.com> References: <1435319512-22245-1-git-send-email-stli@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15062611-0013-0000-0000-0000047EF5EA This patch provides optimized versions of stpcpy and wcpcpy with the z13 vector instructions. ChangeLog: * sysdeps/s390/multiarch/stpcpy-c.c: New File. * sysdeps/s390/multiarch/stpcpy-vx.S: Likewise. * sysdeps/s390/multiarch/stpcpy.c: Likewise. * sysdeps/s390/multiarch/wcpcpy-c.c: Likewise. * sysdeps/s390/multiarch/wcpcpy-vx.S: Likewise. * sysdeps/s390/multiarch/wcpcpy.c: Likewise. * sysdeps/s390/multiarch/Makefile (sysdep_routines): Add stpcpy and wcpcpy functions. * string/stpcpy.c: Use STPCPY if defined. * wcsmbs/wcpcpy.c: Use WCPCPY if defined. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Add ifunc test for stpcpy, wcpcpy. * string/test-stpcpy.c: Add wcpcpy support. * wcsmbs/test-wcpcpy.c: New File. * wcsmbs/Makefile (strop-tests): Add wcpcpy. * benchtests/bench-stpcpy.c: Add wcpcpy support. * benchtests/bench-wcpcpy.c: New File. * benchtests/Makefile (wcsmbs-bench): Add wcpcpy. --- benchtests/Makefile | 2 +- benchtests/bench-stpcpy.c | 33 ++++++-- benchtests/bench-wcpcpy.c | 20 +++++ string/stpcpy.c | 6 ++ string/test-stpcpy.c | 35 +++++--- sysdeps/s390/multiarch/Makefile | 6 +- sysdeps/s390/multiarch/ifunc-impl-list.c | 3 + sysdeps/s390/multiarch/stpcpy-c.c | 34 ++++++++ sysdeps/s390/multiarch/stpcpy-vx.S | 102 +++++++++++++++++++++++ sysdeps/s390/multiarch/stpcpy.c | 30 +++++++ sysdeps/s390/multiarch/wcpcpy-c.c | 25 ++++++ sysdeps/s390/multiarch/wcpcpy-vx.S | 136 +++++++++++++++++++++++++++++++ sysdeps/s390/multiarch/wcpcpy.c | 28 +++++++ wcsmbs/Makefile | 3 +- wcsmbs/test-wcpcpy.c | 20 +++++ wcsmbs/wcpcpy.c | 6 +- 16 files changed, 465 insertions(+), 24 deletions(-) create mode 100644 benchtests/bench-wcpcpy.c create mode 100644 sysdeps/s390/multiarch/stpcpy-c.c create mode 100644 sysdeps/s390/multiarch/stpcpy-vx.S create mode 100644 sysdeps/s390/multiarch/stpcpy.c create mode 100644 sysdeps/s390/multiarch/wcpcpy-c.c create mode 100644 sysdeps/s390/multiarch/wcpcpy-vx.S create mode 100644 sysdeps/s390/multiarch/wcpcpy.c create mode 100644 wcsmbs/test-wcpcpy.c diff --git a/benchtests/Makefile b/benchtests/Makefile index 28892c8..bf1f6dc 100644 --- a/benchtests/Makefile +++ b/benchtests/Makefile @@ -36,7 +36,7 @@ string-bench := bcopy bzero memccpy memchr memcmp memcpy memmem memmove \ strncasecmp strncat strncmp strncpy strnlen strpbrk strrchr \ strspn strstr strcpy_chk stpcpy_chk memrchr strsep strtok \ strcoll -wcsmbs-bench := wcslen wcsnlen wcscpy +wcsmbs-bench := wcslen wcsnlen wcscpy wcpcpy string-bench-all := $(string-bench) ${wcsmbs-bench} # We have to generate locales diff --git a/benchtests/bench-stpcpy.c b/benchtests/bench-stpcpy.c index 3d79432..843e6a9 100644 --- a/benchtests/bench-stpcpy.c +++ b/benchtests/bench-stpcpy.c @@ -18,19 +18,34 @@ #define STRCPY_RESULT(dst, len) ((dst) + (len)) #define TEST_MAIN -#define TEST_NAME "stpcpy" +#ifndef WIDE +# define TEST_NAME "stpcpy" +#else +# define TEST_NAME "wcpcpy" +#endif /* WIDE */ #include "bench-string.h" - -char *simple_stpcpy (char *, const char *); - -IMPL (simple_stpcpy, 0) -IMPL (stpcpy, 1) - -char * -simple_stpcpy (char *dst, const char *src) +#ifndef WIDE +# define CHAR char +# define SIMPLE_STPCPY simple_stpcpy +# define STPCPY stpcpy +#else +# include +# define CHAR wchar_t +# define SIMPLE_STPCPY simple_wcpcpy +# define STPCPY wcpcpy +#endif /* WIDE */ + +CHAR *SIMPLE_STPCPY (CHAR *, const CHAR *); + +IMPL (SIMPLE_STPCPY, 0) +IMPL (STPCPY, 1) + +CHAR * +SIMPLE_STPCPY (CHAR *dst, const CHAR *src) { while ((*dst++ = *src++) != '\0'); return dst - 1; } +#undef CHAR #include "bench-strcpy.c" diff --git a/benchtests/bench-wcpcpy.c b/benchtests/bench-wcpcpy.c new file mode 100644 index 0000000..cfbfccf --- /dev/null +++ b/benchtests/bench-wcpcpy.c @@ -0,0 +1,20 @@ +/* Measure wcpcpy functions. + Copyright (C) 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; if not, see + . */ + +#define WIDE 1 +#include "bench-stpcpy.c" diff --git a/string/stpcpy.c b/string/stpcpy.c index ecfb8d9..8d7b3fe 100644 --- a/string/stpcpy.c +++ b/string/stpcpy.c @@ -29,6 +29,12 @@ # define __stpcpy stpcpy #endif +#ifdef STPCPY +extern __typeof (__stpcpy) STPCPY; +# undef __stpcpy +# define __stpcpy STPCPY +#endif + /* Copy SRC to DEST, returning the address of the terminating '\0' in DEST. */ char * __stpcpy (dest, src) diff --git a/string/test-stpcpy.c b/string/test-stpcpy.c index 3d138d9..7336834 100644 --- a/string/test-stpcpy.c +++ b/string/test-stpcpy.c @@ -1,4 +1,4 @@ -/* Test and measure stpcpy functions. +/* Test stpcpy functions. Copyright (C) 1999-2015 Free Software Foundation, Inc. This file is part of the GNU C Library. Written by Jakub Jelinek , 1999. @@ -19,19 +19,34 @@ #define STRCPY_RESULT(dst, len) ((dst) + (len)) #define TEST_MAIN -#define TEST_NAME "stpcpy" +#ifndef WIDE +# define TEST_NAME "stpcpy" +#else +# define TEST_NAME "wcpcpy" +#endif /* !WIDE */ #include "test-string.h" - -char *simple_stpcpy (char *, const char *); - -IMPL (simple_stpcpy, 0) -IMPL (stpcpy, 1) - -char * -simple_stpcpy (char *dst, const char *src) +#ifndef WIDE +# define CHAR char +# define SIMPLE_STPCPY simple_stpcpy +# define STPCPY stpcpy +#else +# include +# define CHAR wchar_t +# define SIMPLE_STPCPY simple_wcpcpy +# define STPCPY wcpcpy +#endif /* !WIDE */ + +CHAR *SIMPLE_STPCPY (CHAR *, const CHAR *); + +IMPL (SIMPLE_STPCPY, 0) +IMPL (STPCPY, 1) + +CHAR * +SIMPLE_STPCPY (CHAR *dst, const CHAR *src) { while ((*dst++ = *src++) != '\0'); return dst - 1; } +#undef CHAR #include "test-strcpy.c" diff --git a/sysdeps/s390/multiarch/Makefile b/sysdeps/s390/multiarch/Makefile index e2202b7..5b57342 100644 --- a/sysdeps/s390/multiarch/Makefile +++ b/sysdeps/s390/multiarch/Makefile @@ -1,11 +1,13 @@ ifeq ($(subdir),string) sysdep_routines += strlen strlen-vx strlen-c \ strnlen strnlen-vx strnlen-c \ - strcpy strcpy-vx + strcpy strcpy-vx \ + stpcpy stpcpy-vx stpcpy-c endif ifeq ($(subdir),wcsmbs) sysdep_routines += wcslen wcslen-vx wcslen-c \ wcsnlen wcsnlen-vx wcsnlen-c \ - wcscpy wcscpy-vx wcscpy-c + wcscpy wcscpy-vx wcscpy-c \ + wcpcpy wcpcpy-vx wcpcpy-c endif diff --git a/sysdeps/s390/multiarch/ifunc-impl-list.c b/sysdeps/s390/multiarch/ifunc-impl-list.c index c9228d6..a402301 100644 --- a/sysdeps/s390/multiarch/ifunc-impl-list.c +++ b/sysdeps/s390/multiarch/ifunc-impl-list.c @@ -88,6 +88,9 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, IFUNC_VX_IMPL (strcpy); IFUNC_VX_IMPL (wcscpy); + IFUNC_VX_IMPL (stpcpy); + IFUNC_VX_IMPL (wcpcpy); + #endif /* HAVE_S390_VX_ASM_SUPPORT */ return i; diff --git a/sysdeps/s390/multiarch/stpcpy-c.c b/sysdeps/s390/multiarch/stpcpy-c.c new file mode 100644 index 0000000..7d40751 --- /dev/null +++ b/sysdeps/s390/multiarch/stpcpy-c.c @@ -0,0 +1,34 @@ +/* Default stpcpy implementation for S/390. + Copyright (C) 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; if not, see + . */ + +#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) +# define STPCPY __stpcpy_c +# undef libc_hidden_def +# undef weak_alias +# undef libc_hidden_builtin_def +# ifdef SHARED +# define libc_hidden_def(name) \ + __hidden_ver1 (__stpcpy_c, __GI___stpcpy, __stpcpy_c); +# define libc_hidden_builtin_def(name) \ + strong_alias (__stpcpy_c, __stpcpy_c_1); \ + __hidden_ver1 (__stpcpy_c_1, __GI_stpcpy, __stpcpy_c_1); +# endif /* SHARED */ + + +# include +#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */ diff --git a/sysdeps/s390/multiarch/stpcpy-vx.S b/sysdeps/s390/multiarch/stpcpy-vx.S new file mode 100644 index 0000000..5fe511d --- /dev/null +++ b/sysdeps/s390/multiarch/stpcpy-vx.S @@ -0,0 +1,102 @@ +/* Vector optimized 32/64 bit S/390 version of stpcpy. + Copyright (C) 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; if not, see + . */ + +#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) + +# include "sysdep.h" +# include "asm-syntax.h" + + .text + +/* char * stpcpy (const char *dest, const char *src) + Copy string src to dest returning a pointer to its end. + + Register usage: + -r1=tmp + -r2=dest and return value + -r3=src + -r4=tmp + -r5=current_len + -v16=part of src + -v17=index of zero + -v18=part of src +*/ +ENTRY(__stpcpy_vx) + .machine "z13" + .machinemode "zarch_nohighgprs" + + lghi %r5,0 /* current_len = 0. */ + + /* Align s to 16 byte */ + risbg %r1,%r3,60,128+63,0 /* Test if s is aligned and + %r1 = bits 60-63 'and' 15. */ + je .Lloop1 /* If s is aligned, loop aligned. */ + lghi %r4,15 + slr %r4,%r1 /* Compute highest index to load (15-x). */ + vll %v16,%r4,0(%r3) /* Load up to 16byte boundary. (vll needs + highest index, left bytes are 0.) */ + vfenezb %v17,%v16,%v16 /* Find element not equal with zero search. */ + vlgvb %r5,%v17,7 /* Load zero index or 16 if not found. */ + clrjle %r5,%r4,.Lfound_align /* If found zero within loaded bytes, + copy bytes before and return. */ + vstl %v16,%r4,0(%r2) /* Copy loaded characters - no zero. */ + ahi %r4,1 /* Start loop at next character. */ + lgr %r5,%r4 /* No zero within loaded bytes, + process further bytes aligned. */ + j .Lloop1 + +.Lfound_align: + vstl %v16,%r5,0(%r2) /* Copy characters including zero. */ + la %r2,0(%r5,%r2) /* Return pointer to zero. */ + br %r14 + + /* Find zero in 16byte aligned loop. */ +.Lloop2: + vst %v18,0(%r5,%r2) /* Store previous part without zero to dst. */ + aghi %r5,16 +.Lloop1: + vl %v16,0(%r5,%r3) /* Load s. */ + vfenezbs %v17,%v16,%v16 /* Find element not equal with zero search. */ + je .Lfound_v16 /* Jump away if zero was found. */ + vl %v18,16(%r5,%r3) /* Load next part of s. */ + vst %v16,0(%r5,%r2) /* Store previous part without zero to dst. */ + aghi %r5,16 + vfenezbs %v17,%v18,%v18 + je .Lfound_v18 + vl %v16,16(%r5,%r3) + vst %v18,0(%r5,%r2) + aghi %r5,16 + vfenezbs %v17,%v16,%v16 + je .Lfound_v16 + vl %v18,16(%r5,%r3) + vst %v16,0(%r5,%r2) + aghi %r5,16 + vfenezbs %v17,%v18,%v18 + jo .Lloop2 /* No zero found -> loop. */ + +.Lfound_v18: + vlr %v16,%v18 +.Lfound_v16: + la %r3,0(%r5,%r2) + vlgvb %r1,%v17,7 /* Load byte index of zero. */ + vstl %v16,%r1,0(%r3) /* Copy characters including zero. */ + algr %r5,%r1 + la %r2,0(%r5,%r2) /* Return pointer to zero. */ + br %r14 +END(__stpcpy_vx) +#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */ diff --git a/sysdeps/s390/multiarch/stpcpy.c b/sysdeps/s390/multiarch/stpcpy.c new file mode 100644 index 0000000..7c65c02 --- /dev/null +++ b/sysdeps/s390/multiarch/stpcpy.c @@ -0,0 +1,30 @@ +/* Multiple versions of stpcpy. + Copyright (C) 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; if not, see + . */ + +#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) +# define NO_MEMPCPY_STPCPY_REDIRECT +# include +# include + +s390_vx_libc_ifunc (__stpcpy) +weak_alias (__stpcpy, stpcpy) +libc_hidden_builtin_def (stpcpy) + +#else +# include +#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */ diff --git a/sysdeps/s390/multiarch/wcpcpy-c.c b/sysdeps/s390/multiarch/wcpcpy-c.c new file mode 100644 index 0000000..e5a58e4 --- /dev/null +++ b/sysdeps/s390/multiarch/wcpcpy-c.c @@ -0,0 +1,25 @@ +/* Default wcslen implementation for S/390. + Copyright (C) 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; if not, see + . */ + +#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) +# define WCPCPY __wcpcpy_c + +# include +extern __typeof (__wcpcpy) __wcpcpy_c; +# include +#endif diff --git a/sysdeps/s390/multiarch/wcpcpy-vx.S b/sysdeps/s390/multiarch/wcpcpy-vx.S new file mode 100644 index 0000000..868f4c5 --- /dev/null +++ b/sysdeps/s390/multiarch/wcpcpy-vx.S @@ -0,0 +1,136 @@ +/* Vector optimized 32/64 bit S/390 version of wcpcpy. + Copyright (C) 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; if not, see + . */ + +#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) + +# include "sysdep.h" +# include "asm-syntax.h" + + .text + +/* wchar_t * wcpcpy (const wchar_t *dest, const wchar_t *src) + Copy string src to dest returning a pointer to its end. + + Register usage: + -r0=border-len for switching to vector-instructions + -r1=tmp + -r2=dest and return value + -r3=src + -r4=tmp + -r5=current_len + -v16=part of src + -v17=index of zero + -v18=part of src +*/ +ENTRY(__wcpcpy_vx) + .machine "z13" + .machinemode "zarch_nohighgprs" + + lghi %r5,0 /* current_len = 0. */ + lghi %r0,16 /* Jump to vector-algorithmus after + at least 16 processed bytes. */ + + /* Align s to 16 byte */ + risbg %r1,%r3,60,128+63,0 /* Test if s is aligned and + %r1 = bits 60-63 'and' 15. */ + je .Lpreloop /* If s is aligned, loop aligned. */ + tmll %r3,3 /* Test if s is 4-byte aligned? */ + jne .Lfallback /* And use common-code variant if not. */ + lghi %r4,16 + slr %r4,%r1 /* Compute byte count (16-x). */ + agr %r0,%r4 /* And add it to border-byte-len. */ + +.Lpreloop: + /* Copy first 4 characters without vector algorithmus. */ + lt %r1,0(%r5,%r3) + je .Lstore_r1_0_end + st %r1,0(%r5,%r2) + lt %r4,4(%r5,%r3) + je .Lstore_r1_4_end + st %r4,4(%r5,%r2) + lt %r1,8(%r5,%r3) + je .Lstore_r1_8_end + st %r1,8(%r5,%r2) + lt %r4,12(%r5,%r3) + je .Lstore_r1_12_end + st %r4,12(%r5,%r2) + aghi %r5,16 /* Processed first 4 characters. */ + clije %r0,16,.Lloop1 /* Continue with vector algorithm. */ +.Lpreloop_loop: + lt %r1,0(%r5,%r3) + je .Lstore_r1_0_end + st %r1,0(%r5,%r2) + aghi %r5,4 + clrjh %r0,%r5,.Lpreloop_loop + j .Lloop1 /* Proceed with vector algorithmus. */ + +.Lstore_r1_8_end: + aghi %r5,8 +.Lstore_r1_0_end: + st %r1,0(%r5,%r2) + la %r2,0(%r5,%r2) + br %r14 +.Lstore_r1_12_end: + aghi %r5,8 +.Lstore_r1_4_end: + st %r4,4(%r5,%r2) + la %r2,4(%r5,%r2) + br %r14 + + /* Find zero in 16byte aligned loop. */ +.Lloop2: + vst %v18,0(%r5,%r2) /* Store previous part without zero to dst. */ + aghi %r5,16 +.Lloop1: + vl %v16,0(%r5,%r3) /* Load s. */ + vfenezfs %v17,%v16,%v16 /* Find element not equal with zero search. */ + je .Lfound_v16 /* Jump away if zero was found. */ + vl %v18,16(%r5,%r3) /* Load next part of s. */ + vst %v16,0(%r5,%r2) /* Store previous part without zero to dst. */ + aghi %r5,16 + vfenezfs %v17,%v18,%v18 + je .Lfound_v18 + vl %v16,16(%r5,%r3) + vst %v18,0(%r5,%r2) + aghi %r5,16 + vfenezfs %v17,%v16,%v16 + je .Lfound_v16 + vl %v18,16(%r5,%r3) + vst %v16,0(%r5,%r2) + aghi %r5,16 + vfenezfs %v17,%v18,%v18 + jo .Lloop2 /* No zero found -> loop. */ + +.Lfound_v18: + vlr %v16,%v18 +.Lfound_v16: + la %r3,0(%r5,%r2) + vlgvb %r1,%v17,7 /* Load byte index of zero. */ + aghi %r1,3 /* Also copy remaining bytes of zero. */ + vstl %v16,%r1,0(%r3) /* Copy characters including zero. */ + algr %r5,%r1 + lay %r2,-3(%r5,%r2) /* Return pointer to zero. */ + br %r14 +.Lfallback: + /* Common-code cannot handle non 4-byte aligned wchar_t-pointers, too. + Write a terminating null to dest and return! */ + lhi %r1,0 + st %r1,0(%r2) + br %r14 +END(__wcpcpy_vx) +#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */ diff --git a/sysdeps/s390/multiarch/wcpcpy.c b/sysdeps/s390/multiarch/wcpcpy.c new file mode 100644 index 0000000..53c4444 --- /dev/null +++ b/sysdeps/s390/multiarch/wcpcpy.c @@ -0,0 +1,28 @@ +/* Multiple versions of wcpcpy. + Copyright (C) 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; if not, see + . */ + +#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) +# include +# include + +s390_vx_libc_ifunc (__wcpcpy) +weak_alias (__wcpcpy, wcpcpy) + +#else +# include +#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */ diff --git a/wcsmbs/Makefile b/wcsmbs/Makefile index 3858d74..1112e05 100644 --- a/wcsmbs/Makefile +++ b/wcsmbs/Makefile @@ -42,7 +42,8 @@ routines := wcscat wcschr wcscmp wcscpy wcscspn wcsdup wcslen wcsncat \ isoc99_swscanf isoc99_vswscanf \ mbrtoc16 c16rtomb -strop-tests := wcscmp wcsncmp wmemcmp wcslen wcschr wcsrchr wcscpy wcsnlen +strop-tests := wcscmp wcsncmp wmemcmp wcslen wcschr wcsrchr wcscpy wcsnlen \ + wcpcpy tests := tst-wcstof wcsmbs-tst1 tst-wcsnlen tst-btowc tst-mbrtowc \ tst-wcrtomb tst-wcpncpy tst-mbsrtowcs tst-wchar-h tst-mbrtowc2 \ tst-c16c32-1 wcsatcliff $(addprefix test-,$(strop-tests)) diff --git a/wcsmbs/test-wcpcpy.c b/wcsmbs/test-wcpcpy.c new file mode 100644 index 0000000..2cf91a1 --- /dev/null +++ b/wcsmbs/test-wcpcpy.c @@ -0,0 +1,20 @@ +/* Test wcspcpy functions. + Copyright (C) 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; if not, see + . */ + +#define WIDE 1 +#include "../string/test-stpcpy.c" diff --git a/wcsmbs/wcpcpy.c b/wcsmbs/wcpcpy.c index 1c05bca..0c8ded3 100644 --- a/wcsmbs/wcpcpy.c +++ b/wcsmbs/wcpcpy.c @@ -21,7 +21,9 @@ #define __need_ptrdiff_t #include - +#ifdef WCPCPY +# define __wcpcpy WCPCPY +#endif /* Copy SRC to DEST, returning the address of the terminating L'\0' in DEST. */ wchar_t * @@ -43,4 +45,6 @@ __wcpcpy (dest, src) return wcp; } +#ifndef WCPCPY weak_alias (__wcpcpy, wcpcpy) +#endif