S390: Optimize stpncpy and wcpncpy.
This patch provides optimized versions of stpncpy and wcpncpy with the z13 vector instructions. ChangeLog: * sysdeps/s390/multiarch/stpncpy-c.c: New File. * sysdeps/s390/multiarch/stpncpy-vx.S: Likewise. * sysdeps/s390/multiarch/stpncpy.c: Likewise. * sysdeps/s390/multiarch/wcpncpy-c.c: Likewise. * sysdeps/s390/multiarch/wcpncpy-vx.S: Likewise. * sysdeps/s390/multiarch/wcpncpy.c: Likewise. * sysdeps/s390/multiarch/Makefile (sysdep_routines): Add stpncpy and wcpncpy functions. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Add ifunc test for stpncpy, wcpncpy. * wcsmbs/wcpncpy.c: Use WCPNCPY if defined. * string/test-stpncpy.c: Add wcpncpy support. * wcsmbs/test-wcpncpy.c: New File. * wcsmbs/Makefile (strop-tests): Add wcpncpy. * benchtests/bench-stpncpy.c: Add wcpncpy support. * benchtests/bench-wcpncpy.c: New File. * benchtests/Makefile (wcsmbs-bench): Add wcpncpy.
This commit is contained in:
Stefan Liebler
Andreas Krebbel
parent
d183b96ee6
commit
b3a0c176d1
20
ChangeLog
20
ChangeLog
|
|
@ -1,3 +1,23 @@
|
|||
2015-08-26 Stefan Liebler <stli@linux.vnet.ibm.com>
|
||||
|
||||
* sysdeps/s390/multiarch/stpncpy-c.c: New File.
|
||||
* sysdeps/s390/multiarch/stpncpy-vx.S: Likewise.
|
||||
* sysdeps/s390/multiarch/stpncpy.c: Likewise.
|
||||
* sysdeps/s390/multiarch/wcpncpy-c.c: Likewise.
|
||||
* sysdeps/s390/multiarch/wcpncpy-vx.S: Likewise.
|
||||
* sysdeps/s390/multiarch/wcpncpy.c: Likewise.
|
||||
* sysdeps/s390/multiarch/Makefile (sysdep_routines): Add stpncpy and
|
||||
wcpncpy functions.
|
||||
* sysdeps/s390/multiarch/ifunc-impl-list.c
|
||||
(__libc_ifunc_impl_list): Add ifunc test for stpncpy, wcpncpy.
|
||||
* wcsmbs/wcpncpy.c: Use WCPNCPY if defined.
|
||||
* string/test-stpncpy.c: Add wcpncpy support.
|
||||
* wcsmbs/test-wcpncpy.c: New File.
|
||||
* wcsmbs/Makefile (strop-tests): Add wcpncpy.
|
||||
* benchtests/bench-stpncpy.c: Add wcpncpy support.
|
||||
* benchtests/bench-wcpncpy.c: New File.
|
||||
* benchtests/Makefile (wcsmbs-bench): Add wcpncpy.
|
||||
|
||||
2015-08-26 Stefan Liebler <stli@linux.vnet.ibm.com>
|
||||
|
||||
* sysdeps/s390/multiarch/strncpy-vx.S: New File.
|
||||
|
|
|
|||
|
|
@ -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 wcpcpy wcsncpy
|
||||
wcsmbs-bench := wcslen wcsnlen wcscpy wcpcpy wcsncpy wcpncpy
|
||||
string-bench-all := $(string-bench) ${wcsmbs-bench}
|
||||
|
||||
# We have to generate locales
|
||||
|
|
|
|||
|
|
@ -18,18 +18,36 @@
|
|||
|
||||
#define STRNCPY_RESULT(dst, len, n) ((dst) + ((len) > (n) ? (n) : (len)))
|
||||
#define TEST_MAIN
|
||||
#define TEST_NAME "stpncpy"
|
||||
#ifndef WIDE
|
||||
# define TEST_NAME "stpncpy"
|
||||
#else
|
||||
# define TEST_NAME "wcpncpy"
|
||||
#endif /* WIDE */
|
||||
#include "bench-string.h"
|
||||
#ifndef WIDE
|
||||
# define CHAR char
|
||||
# define SIMPLE_STPNCPY simple_stpncpy
|
||||
# define STUPID_STPNCPY stupid_stpncpy
|
||||
# define STPNCPY stpncpy
|
||||
# define STRNLEN strnlen
|
||||
#else
|
||||
# include <wchar.h>
|
||||
# define CHAR wchar_t
|
||||
# define SIMPLE_STPNCPY simple_wcpncpy
|
||||
# define STUPID_STPNCPY stupid_wcpncpy
|
||||
# define STPNCPY wcpncpy
|
||||
# define STRNLEN wcsnlen
|
||||
#endif /* WIDE */
|
||||
|
||||
char *simple_stpncpy (char *, const char *, size_t);
|
||||
char *stupid_stpncpy (char *, const char *, size_t);
|
||||
CHAR *SIMPLE_STPNCPY (CHAR *, const CHAR *, size_t);
|
||||
CHAR *STUPID_STPNCPY (CHAR *, const CHAR *, size_t);
|
||||
|
||||
IMPL (stupid_stpncpy, 0)
|
||||
IMPL (simple_stpncpy, 0)
|
||||
IMPL (stpncpy, 1)
|
||||
IMPL (STUPID_STPNCPY, 0)
|
||||
IMPL (SIMPLE_STPNCPY, 0)
|
||||
IMPL (STPNCPY, 1)
|
||||
|
||||
char *
|
||||
simple_stpncpy (char *dst, const char *src, size_t n)
|
||||
CHAR *
|
||||
SIMPLE_STPNCPY (CHAR *dst, const CHAR *src, size_t n)
|
||||
{
|
||||
while (n--)
|
||||
if ((*dst++ = *src++) == '\0')
|
||||
|
|
@ -43,10 +61,10 @@ simple_stpncpy (char *dst, const char *src, size_t n)
|
|||
return dst;
|
||||
}
|
||||
|
||||
char *
|
||||
stupid_stpncpy (char *dst, const char *src, size_t n)
|
||||
CHAR *
|
||||
STUPID_STPNCPY (CHAR *dst, const CHAR *src, size_t n)
|
||||
{
|
||||
size_t nc = strnlen (src, n);
|
||||
size_t nc = STRNLEN (src, n);
|
||||
size_t i;
|
||||
|
||||
for (i = 0; i < nc; ++i)
|
||||
|
|
@ -56,4 +74,5 @@ stupid_stpncpy (char *dst, const char *src, size_t n)
|
|||
return dst + nc;
|
||||
}
|
||||
|
||||
#undef CHAR
|
||||
#include "bench-strncpy.c"
|
||||
|
|
|
|||
|
|
@ -0,0 +1,20 @@
|
|||
/* Measure wcpncpy 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
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#define WIDE 1
|
||||
#include "bench-stpncpy.c"
|
||||
|
|
@ -19,18 +19,36 @@
|
|||
|
||||
#define STRNCPY_RESULT(dst, len, n) ((dst) + ((len) > (n) ? (n) : (len)))
|
||||
#define TEST_MAIN
|
||||
#define TEST_NAME "stpncpy"
|
||||
#ifndef WIDE
|
||||
# define TEST_NAME "stpncpy"
|
||||
#else
|
||||
# define TEST_NAME "wcpncpy"
|
||||
#endif /* WIDE */
|
||||
#include "test-string.h"
|
||||
#ifndef WIDE
|
||||
# define CHAR char
|
||||
# define SIMPLE_STPNCPY simple_stpncpy
|
||||
# define STUPID_STPNCPY stupid_stpncpy
|
||||
# define STPNCPY stpncpy
|
||||
# define STRNLEN strnlen
|
||||
#else
|
||||
# include <wchar.h>
|
||||
# define CHAR wchar_t
|
||||
# define SIMPLE_STPNCPY simple_wcpncpy
|
||||
# define STUPID_STPNCPY stupid_wcpncpy
|
||||
# define STPNCPY wcpncpy
|
||||
# define STRNLEN wcsnlen
|
||||
#endif /* WIDE */
|
||||
|
||||
char *simple_stpncpy (char *, const char *, size_t);
|
||||
char *stupid_stpncpy (char *, const char *, size_t);
|
||||
CHAR *SIMPLE_STPNCPY (CHAR *, const CHAR *, size_t);
|
||||
CHAR *STUPID_STPNCPY (CHAR *, const CHAR *, size_t);
|
||||
|
||||
IMPL (stupid_stpncpy, 0)
|
||||
IMPL (simple_stpncpy, 0)
|
||||
IMPL (stpncpy, 1)
|
||||
IMPL (STUPID_STPNCPY, 0)
|
||||
IMPL (SIMPLE_STPNCPY, 0)
|
||||
IMPL (STPNCPY, 1)
|
||||
|
||||
char *
|
||||
simple_stpncpy (char *dst, const char *src, size_t n)
|
||||
CHAR *
|
||||
SIMPLE_STPNCPY (CHAR *dst, const CHAR *src, size_t n)
|
||||
{
|
||||
while (n--)
|
||||
if ((*dst++ = *src++) == '\0')
|
||||
|
|
@ -44,10 +62,10 @@ simple_stpncpy (char *dst, const char *src, size_t n)
|
|||
return dst;
|
||||
}
|
||||
|
||||
char *
|
||||
stupid_stpncpy (char *dst, const char *src, size_t n)
|
||||
CHAR *
|
||||
STUPID_STPNCPY (CHAR *dst, const CHAR *src, size_t n)
|
||||
{
|
||||
size_t nc = strnlen (src, n);
|
||||
size_t nc = STRNLEN (src, n);
|
||||
size_t i;
|
||||
|
||||
for (i = 0; i < nc; ++i)
|
||||
|
|
@ -57,4 +75,5 @@ stupid_stpncpy (char *dst, const char *src, size_t n)
|
|||
return dst + nc;
|
||||
}
|
||||
|
||||
#undef CHAR
|
||||
#include "test-strncpy.c"
|
||||
|
|
|
|||
|
|
@ -3,7 +3,8 @@ sysdep_routines += strlen strlen-vx strlen-c \
|
|||
strnlen strnlen-vx strnlen-c \
|
||||
strcpy strcpy-vx \
|
||||
stpcpy stpcpy-vx stpcpy-c \
|
||||
strncpy strncpy-vx
|
||||
strncpy strncpy-vx \
|
||||
stpncpy stpncpy-vx stpncpy-c
|
||||
endif
|
||||
|
||||
ifeq ($(subdir),wcsmbs)
|
||||
|
|
@ -11,5 +12,6 @@ sysdep_routines += wcslen wcslen-vx wcslen-c \
|
|||
wcsnlen wcsnlen-vx wcsnlen-c \
|
||||
wcscpy wcscpy-vx wcscpy-c \
|
||||
wcpcpy wcpcpy-vx wcpcpy-c \
|
||||
wcsncpy wcsncpy-vx wcsncpy-c
|
||||
wcsncpy wcsncpy-vx wcsncpy-c \
|
||||
wcpncpy wcpncpy-vx wcpncpy-c
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -94,6 +94,9 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
|
|||
IFUNC_VX_IMPL (strncpy);
|
||||
IFUNC_VX_IMPL (wcsncpy);
|
||||
|
||||
IFUNC_VX_IMPL (stpncpy);
|
||||
IFUNC_VX_IMPL (wcpncpy);
|
||||
|
||||
#endif /* HAVE_S390_VX_ASM_SUPPORT */
|
||||
|
||||
return i;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,28 @@
|
|||
/* Default stpncpy 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
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
|
||||
# define STPNCPY __stpncpy_c
|
||||
# ifdef SHARED
|
||||
# undef libc_hidden_def
|
||||
# define libc_hidden_def(name) \
|
||||
__hidden_ver1 (__stpncpy_c, __GI___stpncpy, __stpncpy_c);
|
||||
# endif /* SHARED */
|
||||
|
||||
# include <string/stpncpy.c>
|
||||
#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
|
||||
|
|
@ -0,0 +1,200 @@
|
|||
/* Vector optimized 32/64 bit S/390 version of stpncpy.
|
||||
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
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
|
||||
|
||||
# include "sysdep.h"
|
||||
# include "asm-syntax.h"
|
||||
|
||||
.text
|
||||
|
||||
/* char * stpncpy (char *dest, const char *src, size_t n)
|
||||
Copies at most n characters of string src to dest
|
||||
returning a pointer to its end or dest+n
|
||||
if src is smaller than n.
|
||||
|
||||
Register usage:
|
||||
-%r0 = return value
|
||||
-%r1 = zero byte index
|
||||
-%r2 = curr dst pointer
|
||||
-%r3 = curr src pointer
|
||||
-%r4 = n
|
||||
-%r5 = current_len
|
||||
-%r6 = loaded bytes
|
||||
-%r7 = border, tmp
|
||||
*/
|
||||
ENTRY(__stpncpy_vx)
|
||||
.machine "z13"
|
||||
.machinemode "zarch_nohighgprs"
|
||||
|
||||
# if !defined __s390x__
|
||||
llgfr %r4,%r4
|
||||
# endif /* !defined __s390x__ */
|
||||
|
||||
clgfi %r4,0
|
||||
ber %r14 /* Nothing to do, if n == 0. */
|
||||
|
||||
la %r0,0(%r4,%r2) /* Save destination pointer + n for return. */
|
||||
vlvgp %v31,%r6,%r7 /* Save registers. */
|
||||
|
||||
vlbb %v16,0(%r3),6 /* Load s until next 4k-byte boundary. */
|
||||
lcbb %r6,0(%r3),6 /* Get bytes to 4k-byte boundary or 16. */
|
||||
llgfr %r6,%r6 /* Convert 32bit to 64bit. */
|
||||
|
||||
lghi %r5,0 /* current_len = 0. */
|
||||
|
||||
clgrjle %r4,%r6,.Lremaining_v16 /* If n <= loaded-bytes
|
||||
-> process remaining. */
|
||||
|
||||
/* n > loaded-byte-count */
|
||||
vfenezb %v17,%v16,%v16 /* Find element not equal with zero search. */
|
||||
vlgvb %r1,%v17,7 /* Load zero index or 16 if not found. */
|
||||
clrjl %r1,%r6,.Lfound_v16_store /* Found zero within loaded bytes,
|
||||
copy and return. */
|
||||
|
||||
/* Align s to 16 byte. */
|
||||
risbgn %r7,%r3,60,128+63,0 /* %r3 = bits 60-63 of %r2 'and' 15. */
|
||||
lghi %r5,15 /* current_len = 15. */
|
||||
slr %r5,%r7 /* Compute highest index to 16byte boundary. */
|
||||
|
||||
/* Zero not found and n > loaded-byte-count. */
|
||||
vstl %v16,%r5,0(%r2) /* Copy loaded characters - no zero. */
|
||||
ahi %r5,1 /* Start loop at next character. */
|
||||
|
||||
/* Now we are 16byte aligned, so we can load a full vreg
|
||||
without page fault. */
|
||||
lgr %r1,%r5 /* If %r5 + 64 < maxlen? -> loop64. */
|
||||
aghi %r1,64
|
||||
clgrjl %r1,%r4,.Lloop64
|
||||
|
||||
vl %v16,0(%r5,%r3) /* Load s. */
|
||||
clgijl %r4,17,.Lremaining_v16 /* If n <= 16, process remaining
|
||||
bytes. */
|
||||
.Llt64:
|
||||
lgr %r7,%r4
|
||||
slgfi %r7,16 /* border_len = n - 16. */
|
||||
|
||||
clgrjhe %r5,%r7,.Lremaining_v16 /* If current_len >= border
|
||||
then process remaining bytes. */
|
||||
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) /* Save previous part without zero to dst. */
|
||||
aghi %r5,16
|
||||
|
||||
clgrjhe %r5,%r7,.Lremaining_v18
|
||||
vfenezbs %v17,%v18,%v18
|
||||
je .Lfound_v18
|
||||
vl %v16,16(%r5,%r3)
|
||||
vst %v18,0(%r5,%r2)
|
||||
aghi %r5,16
|
||||
|
||||
clgrjhe %r5,%r7,.Lremaining_v16
|
||||
vfenezbs %v17,%v16,%v16
|
||||
je .Lfound_v16
|
||||
vl %v18,16(%r5,%r3)
|
||||
vst %v16,0(%r5,%r2)
|
||||
aghi %r5,16
|
||||
|
||||
.Lremaining_v18:
|
||||
vlr %v16,%v18
|
||||
.Lremaining_v16:
|
||||
/* v16 contains the remaining bytes [1...16].
|
||||
Store remaining bytes and append string-termination. */
|
||||
vfenezb %v17,%v16,%v16 /* Find element not equal with zero search. */
|
||||
slgrk %r7,%r4,%r5 /* Remaining bytes = maxlen - current_len */
|
||||
aghi %r7,-1 /* vstl needs highest index. */
|
||||
la %r2,0(%r5,%r2) /* vstl has no index register. */
|
||||
vlgvb %r1,%v17,7 /* Load zero index or 16 if not found. */
|
||||
/* Zero in remaining bytes? -> jump away (zero-index <= max-index). */
|
||||
clrjle %r1,%r7,.Lfound_v16_store
|
||||
vstl %v16,%r7,0(%r2) /* Store remaining bytes without null
|
||||
termination! */
|
||||
.Lend:
|
||||
/* Restore saved registers. */
|
||||
vlgvg %r6,%v31,0
|
||||
vlgvg %r7,%v31,1
|
||||
lgr %r2,%r0 /* Load saved dest-ptr. */
|
||||
br %r14
|
||||
|
||||
.Lfound_v16_32:
|
||||
aghi %r5,32
|
||||
j .Lfound_v16
|
||||
.Lfound_v18_48:
|
||||
aghi %r5,32
|
||||
.Lfound_v18_16:
|
||||
aghi %r5,16
|
||||
.Lfound_v18:
|
||||
vlr %v16,%v18
|
||||
.Lfound_v16:
|
||||
/* v16 contains a zero. Store remaining bytes to zero. current_len
|
||||
has not reached border, thus checking for n is not needed! */
|
||||
vlgvb %r1,%v17,7 /* Load byte index of zero. */
|
||||
la %r2,0(%r5,%r2) /* vstl has no support for index-register. */
|
||||
.Lfound_v16_store:
|
||||
vstl %v16,%r1,0(%r2) /* Copy characters including zero. */
|
||||
/* Fill remaining bytes with zero - remaining count always > 0. */
|
||||
algr %r5,%r1 /* Remaining bytes (=%r4) = ... */
|
||||
slgr %r4,%r5 /* = maxlen - (currlen + zero_index + 1) */
|
||||
la %r2,0(%r1,%r2) /* Pointer to zero. start filling beyond. */
|
||||
lgr %r0,%r2 /* Save return-pointer to found zero. */
|
||||
clgije %r4,1,.Lend /* Skip zero-filling, if found zero is last
|
||||
possible character.
|
||||
(1 is substracted from r4 below!). */
|
||||
aghi %r4,-2 /* mvc with exrl needs count - 1.
|
||||
(additional -1, see remaining bytes above) */
|
||||
srlg %r6,%r4,8 /* Split into 256 byte blocks. */
|
||||
ltgr %r6,%r6
|
||||
je .Lzero_lt256
|
||||
.Lzero_loop256:
|
||||
mvc 1(256,%r2),0(%r2) /* Fill 256 zeros at once. */
|
||||
la %r2,256(%r2)
|
||||
brctg %r6,.Lzero_loop256 /* Loop until all blocks are processed. */
|
||||
.Lzero_lt256:
|
||||
exrl %r4,.Lmvc_lt256
|
||||
j .Lend
|
||||
.Lmvc_lt256:
|
||||
mvc 1(1,%r2),0(%r2)
|
||||
|
||||
.Lloop64:
|
||||
vl %v16,0(%r5,%r3)
|
||||
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) /* Save previous part without zero to dst. */
|
||||
vfenezbs %v17,%v18,%v18
|
||||
je .Lfound_v18_16
|
||||
vl %v16,32(%r5,%r3)
|
||||
vst %v18,16(%r5,%r2)
|
||||
vfenezbs %v17,%v16,%v16
|
||||
je .Lfound_v16_32
|
||||
vl %v18,48(%r5,%r3)
|
||||
vst %v16,32(%r5,%r2)
|
||||
vfenezbs %v17,%v18,%v18
|
||||
je .Lfound_v18_48
|
||||
vst %v18,48(%r5,%r2)
|
||||
|
||||
aghi %r5,64
|
||||
lgr %r1,%r5 /* If %r5 + 64 < maxlen? -> loop64. */
|
||||
aghi %r1,64
|
||||
clgrjl %r1,%r4,.Lloop64
|
||||
|
||||
vl %v16,0(%r5,%r3) /* Load s. */
|
||||
j .Llt64
|
||||
END(__stpncpy_vx)
|
||||
#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
/* Multiple versions of stpncpy.
|
||||
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
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
|
||||
# include <string.h>
|
||||
# include <ifunc-resolve.h>
|
||||
|
||||
s390_vx_libc_ifunc (__stpncpy)
|
||||
weak_alias (__stpncpy, stpncpy)
|
||||
|
||||
#else
|
||||
# include <string/stpncpy.c>
|
||||
#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */
|
||||
|
|
@ -0,0 +1,25 @@
|
|||
/* Default wcsncpy 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
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
|
||||
# define WCPNCPY __wcpncpy_c
|
||||
|
||||
# include <wchar.h>
|
||||
extern __typeof (__wcpncpy) __wcpncpy_c;
|
||||
# include <wcsmbs/wcpncpy.c>
|
||||
#endif
|
||||
|
|
@ -0,0 +1,222 @@
|
|||
/* Vector optimized 32/64 bit S/390 version of wcpncpy.
|
||||
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
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
|
||||
|
||||
# include "sysdep.h"
|
||||
# include "asm-syntax.h"
|
||||
|
||||
.text
|
||||
|
||||
/* wchar_t * wcpncpy (wchar_t *dest, const wchar_t *src, size_t n)
|
||||
Copies at most n characters of string src to dest
|
||||
returning a pointer to its end or dest+n
|
||||
if src is smaller than n.
|
||||
|
||||
Register usage:
|
||||
-%r0 = return value
|
||||
-%r1 = zero byte index
|
||||
-%r2 = curr dst pointer
|
||||
-%r3 = curr src pointer
|
||||
-%r4 = n
|
||||
-%r5 = current_len
|
||||
-%r6 = loaded bytes
|
||||
-%r7 = border, tmp
|
||||
*/
|
||||
ENTRY(__wcpncpy_vx)
|
||||
.machine "z13"
|
||||
.machinemode "zarch_nohighgprs"
|
||||
|
||||
# if !defined __s390x__
|
||||
llgfr %r4,%r4
|
||||
# endif /* !defined __s390x__ */
|
||||
|
||||
clgfi %r4,0
|
||||
ber %r14 /* Nothing to do, if n == 0. */
|
||||
|
||||
vlbb %v16,0(%r3),6 /* Load s until next 4k-byte boundary. */
|
||||
|
||||
tmll %r3,3 /* Test if s is 4-byte aligned? */
|
||||
jne .Lfallback /* And use common-code variant if not. */
|
||||
|
||||
vlvgp %v31,%r6,%r7 /* Save registers. */
|
||||
lghi %r5,0 /* current_len = 0. */
|
||||
|
||||
lcbb %r6,0(%r3),6 /* Get bytes to 4k-byte boundary or 16. */
|
||||
llgfr %r6,%r6 /* Convert 32bit to 64bit. */
|
||||
|
||||
/* Check range of maxlen and convert to byte-count. */
|
||||
# ifdef __s390x__
|
||||
tmhh %r4,49152 /* Test bit 0 or 1 of maxlen. */
|
||||
lghi %r1,-4 /* Max byte-count is 18446744073709551612. */
|
||||
# else
|
||||
tmlh %r4,49152 /* Test bit 0 or 1 of maxlen. */
|
||||
llilf %r1,4294967292 /* Max byte-count is 4294967292. */
|
||||
# endif /* !__s390x__ */
|
||||
sllg %r4,%r4,2 /* Convert character-count to byte-count. */
|
||||
locgrne %r4,%r1 /* Use max byte-count, if bit 0/1 was one. */
|
||||
|
||||
la %r0,0(%r4,%r2) /* Save destination pointer + n for return. */
|
||||
|
||||
clgrjle %r4,%r6,.Lremaining_v16 /* If n <= loaded-bytes
|
||||
-> process remaining. */
|
||||
|
||||
/* n > loaded-byte-count */
|
||||
vfenezf %v17,%v16,%v16 /* Find element not equal with zero search. */
|
||||
vlgvb %r1,%v17,7 /* Load zero index or 16 if not found. */
|
||||
aghi %r1,3 /* Also copy remaining bytes of zero. */
|
||||
clrjl %r1,%r6,.Lfound_v16_store /* Found zero within loaded bytes,
|
||||
copy and return. */
|
||||
|
||||
/* Align s to 16 byte. */
|
||||
risbgn %r7,%r3,60,128+63,0 /* %r3 = bits 60-63 of %r2 'and' 15. */
|
||||
lghi %r5,15 /* current_len = 15. */
|
||||
slr %r5,%r7 /* Compute highest index to 16byte boundary. */
|
||||
|
||||
/* Zero not found and n > loaded-byte-count. */
|
||||
vstl %v16,%r5,0(%r2) /* Copy loaded characters - no zero. */
|
||||
ahi %r5,1 /* Start loop at next character. */
|
||||
|
||||
/* Now we are 16byte aligned, so we can load a full vreg
|
||||
without page fault. */
|
||||
lgr %r1,%r5 /* If %r5 + 64 < maxlen? -> loop64. */
|
||||
aghi %r1,64
|
||||
clgrjl %r1,%r4,.Lloop64
|
||||
|
||||
vl %v16,0(%r5,%r3) /* Load s. */
|
||||
clgijl %r4,17,.Lremaining_v16 /* If n <=16,
|
||||
process remaining bytes. */
|
||||
.Llt64:
|
||||
lgr %r7,%r4
|
||||
slgfi %r7,16 /* border_len = n - 16. */
|
||||
|
||||
clgrjhe %r5,%r7,.Lremaining_v16 /* If current_len >= border
|
||||
then process remaining bytes. */
|
||||
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
|
||||
|
||||
clgrjhe %r5,%r7,.Lremaining_v18
|
||||
vfenezfs %v17,%v18,%v18
|
||||
je .Lfound_v18
|
||||
vl %v16,16(%r5,%r3)
|
||||
vst %v18,0(%r5,%r2)
|
||||
aghi %r5,16
|
||||
|
||||
clgrjhe %r5,%r7,.Lremaining_v16
|
||||
vfenezfs %v17,%v16,%v16
|
||||
je .Lfound_v16
|
||||
vl %v18,16(%r5,%r3)
|
||||
vst %v16,0(%r5,%r2)
|
||||
aghi %r5,16
|
||||
|
||||
.Lremaining_v18:
|
||||
vlr %v16,%v18
|
||||
.Lremaining_v16:
|
||||
/* v16 contains the remaining bytes [1...16].
|
||||
Store remaining bytes and append string-termination. */
|
||||
vfenezf %v17,%v16,%v16 /* Find element not equal with zero search. */
|
||||
slgrk %r7,%r4,%r5 /* Remaining bytes = maxlen - current_len */
|
||||
aghi %r7,-1 /* vstl needs highest index. */
|
||||
la %r2,0(%r5,%r2) /* vstl has no index register. */
|
||||
vlgvb %r1,%v17,7 /* Load zero index or 16 if not found. */
|
||||
aghi %r1,3 /* Also copy remaining bytes of zero. */
|
||||
/* Zero in remaining bytes? -> jump away (zero-index <= max-index). */
|
||||
clrjle %r1,%r7,.Lfound_v16_store
|
||||
vstl %v16,%r7,0(%r2) /* Store remaining bytes without null
|
||||
termination! */
|
||||
.Lend:
|
||||
/* Restore saved registers. */
|
||||
vlgvg %r6,%v31,0
|
||||
vlgvg %r7,%v31,1
|
||||
lgr %r2,%r0 /* Load saved dest-ptr. */
|
||||
br %r14
|
||||
|
||||
.Lfound_v16_32:
|
||||
aghi %r5,32
|
||||
j .Lfound_v16
|
||||
.Lfound_v18_48:
|
||||
aghi %r5,32
|
||||
.Lfound_v18_16:
|
||||
aghi %r5,16
|
||||
.Lfound_v18:
|
||||
vlr %v16,%v18
|
||||
.Lfound_v16:
|
||||
/* v16 contains a zero. Store remaining bytes to zero. current_len
|
||||
has not reached border, thus checking for n is not needed! */
|
||||
vlgvb %r1,%v17,7 /* Load byte index of zero. */
|
||||
la %r2,0(%r5,%r2) /* vstl has no support for index-register. */
|
||||
aghi %r1,3 /* Also copy remaining bytes of zero. */
|
||||
.Lfound_v16_store:
|
||||
vstl %v16,%r1,0(%r2) /* Copy characters including zero. */
|
||||
/* Fill remaining bytes with zero - remaining byte count always > 0. */
|
||||
algr %r5,%r1 /* Remaining bytes (=%r4) = ... */
|
||||
slgr %r4,%r5 /* = n - (currlen + zero_index + 1) */
|
||||
la %r2,0(%r1,%r2) /* Pointer to zero. start filling beyond. */
|
||||
lay %r0,-3(%r2) /* Save return-pointer to found zero. */
|
||||
clgije %r4,1,.Lend /* Skip zero-filling, if found-zero is last
|
||||
possible character.
|
||||
(1 is substracted from r4 below!). */
|
||||
aghi %r4,-2 /* mvc with exrl needs count - 1.
|
||||
(additional -1, see remaining bytes above) */
|
||||
srlg %r6,%r4,8 /* Split into 256 byte blocks. */
|
||||
ltgr %r6,%r6
|
||||
je .Lzero_lt256
|
||||
.Lzero_loop256:
|
||||
mvc 1(256,%r2),0(%r2) /* Fill 256 zeros at once. */
|
||||
la %r2,256(%r2)
|
||||
brctg %r6,.Lzero_loop256 /* Loop until all blocks are processed. */
|
||||
.Lzero_lt256:
|
||||
exrl %r4,.Lmvc_lt256
|
||||
j .Lend
|
||||
.Lmvc_lt256:
|
||||
mvc 1(1,%r2),0(%r2)
|
||||
|
||||
/* Find zero in 16byte aligned loop. */
|
||||
.Lloop64:
|
||||
vl %v16,0(%r5,%r3)
|
||||
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. */
|
||||
vfenezfs %v17,%v18,%v18
|
||||
je .Lfound_v18_16
|
||||
vl %v16,32(%r5,%r3)
|
||||
vst %v18,16(%r5,%r2)
|
||||
vfenezfs %v17,%v16,%v16
|
||||
je .Lfound_v16_32
|
||||
vl %v18,48(%r5,%r3)
|
||||
vst %v16,32(%r5,%r2)
|
||||
vfenezfs %v17,%v18,%v18
|
||||
je .Lfound_v18_48
|
||||
vst %v18,48(%r5,%r2)
|
||||
|
||||
aghi %r5,64
|
||||
lgr %r1,%r5 /* If %r5 + 64 < maxlen? -> loop64. */
|
||||
aghi %r1,64
|
||||
clgrjl %r1,%r4,.Lloop64
|
||||
|
||||
vl %v16,0(%r5,%r3) /* Load s. */
|
||||
j .Llt64
|
||||
|
||||
.Lfallback:
|
||||
jg __wcpncpy_c
|
||||
END(__wcpncpy_vx)
|
||||
#endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */
|
||||
|
|
@ -0,0 +1,28 @@
|
|||
/* Multiple versions of wcpncpy.
|
||||
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
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#if defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)
|
||||
# include <wchar.h>
|
||||
# include <ifunc-resolve.h>
|
||||
|
||||
s390_vx_libc_ifunc (__wcpncpy)
|
||||
weak_alias (__wcpncpy, wcpncpy)
|
||||
|
||||
#else
|
||||
# include <wcsmbs/wcpncpy.c>
|
||||
#endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */
|
||||
|
|
@ -43,7 +43,7 @@ routines := wcscat wcschr wcscmp wcscpy wcscspn wcsdup wcslen wcsncat \
|
|||
mbrtoc16 c16rtomb
|
||||
|
||||
strop-tests := wcscmp wcsncmp wmemcmp wcslen wcschr wcsrchr wcscpy wcsnlen \
|
||||
wcpcpy wcsncpy
|
||||
wcpcpy wcsncpy wcpncpy
|
||||
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))
|
||||
|
|
|
|||
|
|
@ -0,0 +1,20 @@
|
|||
/* Test wcpncpy 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
|
||||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#define WIDE 1
|
||||
#include "../string/test-stpncpy.c"
|
||||
|
|
@ -18,6 +18,9 @@
|
|||
|
||||
#include <wchar.h>
|
||||
|
||||
#ifdef WCPNCPY
|
||||
# define __wcpncpy WCPNCPY
|
||||
#endif
|
||||
|
||||
/* Copy no more than N wide-characters of SRC to DEST, returning the
|
||||
address of the last character written into DEST. */
|
||||
|
|
@ -82,4 +85,6 @@ __wcpncpy (dest, src, n)
|
|||
return dest - 1;
|
||||
}
|
||||
|
||||
#ifndef WCPNCPY
|
||||
weak_alias (__wcpncpy, wcpncpy)
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Reference in New Issue