-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
S390: Optimize strchrnul and wcschrnul.
This patch provides optimized versions of strchrnul and wcschrnul with the z13 vector instructions. ChangeLog: * sysdeps/s390/multiarch/strchrnul-c.c: New File. * sysdeps/s390/multiarch/strchrnul-vx.S: Likewise. * sysdeps/s390/multiarch/strchrnul.c: Likewise. * sysdeps/s390/multiarch/wcschrnul-c.c: Likewise. * sysdeps/s390/multiarch/wcschrnul-vx.S: Likewise. * sysdeps/s390/multiarch/wcschrnul.c: Likewise. * sysdeps/s390/multiarch/Makefile (sysdep_routines): Add strchrnul and wcschrnul functions. * sysdeps/s390/multiarch/ifunc-impl-list.c (__libc_ifunc_impl_list): Add ifunc test for strchrnul, wcschrnul. * wcsmbs/wcschrnul.c: Use WCSCHRNUL if defined. * string/test-strchr.c: Add wcschrnul support. * wcsmbs/test-wcschrnul.c: New File. * wcsmbs/Makefile (strop-tests): Add wcschrnul. * benchtests/bench-strchr.c: Add wcschrnul support. * benchtests/bench-wcschrnul.c: New File. * benchtests/Makefile (wcsmbs-bench): Add wcschrnul.
- Loading branch information
Stefan Liebler
authored and
Andreas Krebbel
committed
Aug 26, 2015
1 parent
cf150d4
commit d23d4ef
Showing
16 changed files
with
406 additions
and
19 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| /* Measure wcschrnul 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-strchrnul.c" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| /* Default strchrnul 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 STRCHRNUL __strchrnul_c | ||
| # define __strchrnul STRCHRNUL | ||
| # undef weak_alias | ||
| # define weak_alias(name, alias) | ||
|
|
||
| # include <string/strchrnul.c> | ||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,93 @@ | ||
| /* Vector optimized 32/64 bit S/390 version of strchrnul. | ||
| 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 *strchrnul (const char *s, int c) | ||
| Returns pointer to first c or to \0 if c not found. | ||
| Register usage: | ||
| -r1=tmp | ||
| -r2=s and return pointer | ||
| -r3=c | ||
| -r4=tmp | ||
| -r5=current_len | ||
| -v16=part of s | ||
| -v18=vector with c replicated in every byte | ||
| */ | ||
| ENTRY(__strchrnul_vx) | ||
| .machine "z13" | ||
| .machinemode "zarch_nohighgprs" | ||
|
|
||
| vlbb %v16,0(%r2),6 /* Load s until next 4k-byte boundary. */ | ||
| lcbb %r1,0(%r2),6 /* Get bytes to 4k-byte boundary or 16. */ | ||
|
|
||
| lghi %r5,0 /* current_len = 0. */ | ||
|
|
||
| vlvgb %v18,%r3,0 /* Generate vector which elements are all c. | ||
| If c > 255, c will be truncated. */ | ||
| vrepb %v18,%v18,0 | ||
|
|
||
| vfeezbs %v16,%v16,%v18 /* Find element equal with zero search. */ | ||
| vlgvb %r4,%v16,7 /* Load byte index of character or zero. */ | ||
| clrjl %r4,%r1,.Lfound /* Return if c/zero is in loaded bytes. */ | ||
|
|
||
| /* Align s to 16 byte. */ | ||
| risbgn %r4,%r2,60,128+63,0 /* %r3 = bits 60-63 of %r2 'and' 15. */ | ||
| lghi %r5,16 /* current_len = 16. */ | ||
| slr %r5,%r4 /* Compute bytes to 16bytes boundary. */ | ||
|
|
||
| /* Find c/zero in 16byte aligned loop */ | ||
| .Lloop: | ||
| vl %v16,0(%r5,%r2) /* Load s */ | ||
| vfeezbs %v16,%v16,%v18 /* Find element equal with zero search. */ | ||
| jno .Lfound /* Found c/zero (cc=0|1|2). */ | ||
| vl %v16,16(%r5,%r2) | ||
| vfeezbs %v16,%v16,%v18 | ||
| jno .Lfound16 | ||
| vl %v16,32(%r5,%r2) | ||
| vfeezbs %v16,%v16,%v18 | ||
| jno .Lfound32 | ||
| vl %v16,48(%r5,%r2) | ||
| vfeezbs %v16,%v16,%v18 | ||
| jno .Lfound48 | ||
|
|
||
| aghi %r5,64 | ||
| j .Lloop /* No character and no zero -> loop. */ | ||
|
|
||
| /* Found character or zero */ | ||
| .Lfound48: | ||
| aghi %r5,16 | ||
| .Lfound32: | ||
| aghi %r5,16 | ||
| .Lfound16: | ||
| aghi %r5,16 | ||
| .Lfound: | ||
| vlgvb %r1,%v16,7 /* Load byte index of character. */ | ||
| algr %r5,%r1 | ||
| la %r2,0(%r5,%r2) /* Return pointer to character. */ | ||
|
|
||
| .Lend: | ||
| br %r14 | ||
| END(__strchrnul_vx) | ||
| #endif /* HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc) */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| /* Multiple versions of strchrnul. | ||
| 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 (__strchrnul) | ||
| weak_alias (__strchrnul, strchrnul) | ||
|
|
||
| #else | ||
| # include <string/strchrnul.c> | ||
| #endif /* !(defined HAVE_S390_VX_ASM_SUPPORT && IS_IN (libc)) */ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| /* Default wcschrnul 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 WCSCHRNUL __wcschrnul_c | ||
|
|
||
| # include <wchar.h> | ||
| extern __typeof (__wcschrnul) __wcschrnul_c; | ||
| # include <wcsmbs/wcschrnul.c> | ||
| #endif |
Oops, something went wrong.