From aec101aa9897a41f894f4cd9caa14e39fc73d091 Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Sun, 31 Mar 2013 08:16:46 -0500 Subject: PowerPC: strchrnul for PPC32 --- string/strchrnul.c | 6 +- sysdeps/powerpc/powerpc32/multiarch/Makefile | 3 +- .../powerpc/powerpc32/multiarch/ifunc-impl-list.c | 7 ++ sysdeps/powerpc/powerpc32/multiarch/strchrnul-c.c | 2 + .../powerpc/powerpc32/multiarch/strchrnul-power7.S | 112 ++++++++++++++++++++ sysdeps/powerpc/powerpc32/multiarch/strchrnul.c | 37 +++++++ sysdeps/powerpc/powerpc32/power7/strchrnul.S | 114 --------------------- 7 files changed, 165 insertions(+), 116 deletions(-) create mode 100644 sysdeps/powerpc/powerpc32/multiarch/strchrnul-c.c create mode 100644 sysdeps/powerpc/powerpc32/multiarch/strchrnul-power7.S create mode 100644 sysdeps/powerpc/powerpc32/multiarch/strchrnul.c delete mode 100644 sysdeps/powerpc/powerpc32/power7/strchrnul.S diff --git a/string/strchrnul.c b/string/strchrnul.c index 1f63572d6c..719d3803ae 100644 --- a/string/strchrnul.c +++ b/string/strchrnul.c @@ -26,6 +26,9 @@ #undef __strchrnul #undef strchrnul +#ifdef STRCHRNUL +# define __strchrnul STRCHRNUL +#endif /* Find the first occurrence of C in S or the final NUL byte. */ char * @@ -165,5 +168,6 @@ __strchrnul (s, c_in) /* This should never happen. */ return NULL; } - +#ifndef STRCHRNUL weak_alias (__strchrnul, strchrnul) +#endif diff --git a/sysdeps/powerpc/powerpc32/multiarch/Makefile b/sysdeps/powerpc/powerpc32/multiarch/Makefile index 05f30428ed..fbf298af0f 100644 --- a/sysdeps/powerpc/powerpc32/multiarch/Makefile +++ b/sysdeps/powerpc/powerpc32/multiarch/Makefile @@ -8,5 +8,6 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \ mempcpy-power7 mempcpy-c \ memchr-power7 memchr-c \ memrchr-power7 memrchr-c \ - rawmemchr-power7 rawmemchr-c + rawmemchr-power7 rawmemchr-c \ + strchrnul-power7 strchrnul-c endif diff --git a/sysdeps/powerpc/powerpc32/multiarch/ifunc-impl-list.c b/sysdeps/powerpc/powerpc32/multiarch/ifunc-impl-list.c index 00f309f309..1399548b67 100644 --- a/sysdeps/powerpc/powerpc32/multiarch/ifunc-impl-list.c +++ b/sysdeps/powerpc/powerpc32/multiarch/ifunc-impl-list.c @@ -141,6 +141,13 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array, __strnlen_power7) IFUNC_IMPL_ADD (array, i, strnlen, 1, __strnlen_ppc32)) + + IFUNC_IMPL (i, name, strchrnul, + IFUNC_IMPL_ADD (array, i, strchrnul, + hwcap & PPC_FEATURE_HAS_VSX, + __strchrnul_power7) + IFUNC_IMPL_ADD (array, i, strchrnul, 1, + __strchrnul_ppc32)) #endif return i; diff --git a/sysdeps/powerpc/powerpc32/multiarch/strchrnul-c.c b/sysdeps/powerpc/powerpc32/multiarch/strchrnul-c.c new file mode 100644 index 0000000000..102ea46705 --- /dev/null +++ b/sysdeps/powerpc/powerpc32/multiarch/strchrnul-c.c @@ -0,0 +1,2 @@ +#define STRCHRNUL __strchrnul_ppc32 +#include "string/strchrnul.c" diff --git a/sysdeps/powerpc/powerpc32/multiarch/strchrnul-power7.S b/sysdeps/powerpc/powerpc32/multiarch/strchrnul-power7.S new file mode 100644 index 0000000000..fff6be74d8 --- /dev/null +++ b/sysdeps/powerpc/powerpc32/multiarch/strchrnul-power7.S @@ -0,0 +1,112 @@ +/* Optimized strchrnul implementation for PowerPC32/POWER7 using cmpb insn. + Copyright (C) 2010-2013 Free Software Foundation, Inc. + Contributed by Luis Machado . + 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 + . */ + +#include + +/* int [r3] strchrnul (char *s [r3], int c [r4]) */ + .machine power7 +ENTRY (__strchrnul_power7) + CALL_MCOUNT + dcbt 0,r3 + clrrwi r8,r3,2 /* Align the address to word boundary. */ + + /* Replicate byte to word. */ + rlwimi r4,r4,8,16,23 + rlwimi r4,r4,16,0,15 + + rlwinm r6,r3,3,27,28 /* Calculate padding. */ + lwz r12,0(r8) /* Load word from memory. */ + li r0,0 /* Word with null chars to use + with cmpb. */ + + /* Now r4 has a word of c bytes and r0 has + a word of null bytes. */ + + cmpb r10,r12,r0 /* Compare each byte against c byte. */ + cmpb r9,r12,r4 /* Compare each byte against null byte. */ + + /* Move the words left and right to discard the bits that are + not part of the string and bring them back as zeros. */ + slw r10,r10,r6 + slw r9,r9,r6 + srw r10,r10,r6 + srw r9,r9,r6 + or r5,r9,r10 /* OR the results to speed things up. */ + cmpwi cr7,r5,0 /* If r5 == 0, no c or null bytes + have been found. */ + bne cr7,L(done) + + mtcrf 0x01,r8 + + /* Are we now aligned to a quadword boundary? If so, skip to + the main loop. Otherwise, go through the alignment code. */ + + bt 29,L(loop) + + /* Handle WORD2 of pair. */ + lwzu r12,4(r8) + cmpb r10,r12,r0 + cmpb r9,r12,r4 + or r5,r9,r10 + cmpwi cr7,r5,0 + bne cr7,L(done) + b L(loop) /* We branch here (rather than falling through) + to skip the nops due to heavy alignment + of the loop below. */ + + .p2align 5 +L(loop): + /* Load two words, compare and merge in a + single register for speed. This is an attempt + to speed up the null-checking process for bigger strings. */ + lwz r12,4(r8) + lwzu r11,8(r8) + cmpb r10,r12,r0 + cmpb r9,r12,r4 + cmpb r6,r11,r0 + cmpb r7,r11,r4 + or r5,r9,r10 + or r10,r6,r7 + or r11,r5,r10 + cmpwi cr7,r11,0 + beq cr7,L(loop) + + /* OK, one (or both) of the words contains a c/null byte. Check + the first word and decrement the address in case the first + word really contains a c/null byte. */ + + cmpwi cr6,r5,0 + addi r8,r8,-4 + bne cr6,L(done) + + /* The c/null byte must be in the second word. Adjust the + address again and move the result of cmpb to r10 so we can calculate + the pointer. */ + mr r5,r10 + addi r8,r8,4 + + /* r5 has the output of the cmpb instruction, that is, it contains + 0xff in the same position as the c/null byte in the original + word from the string. Use that to calculate the pointer. */ +L(done): + cntlzw r0,r5 /* Count leading zeros before the match. */ + srwi r0,r0,3 /* Convert leading zeros to bytes. */ + add r3,r8,r0 /* Return address of matching c/null byte. */ + blr +END (__strchrnul_power7) diff --git a/sysdeps/powerpc/powerpc32/multiarch/strchrnul.c b/sysdeps/powerpc/powerpc32/multiarch/strchrnul.c new file mode 100644 index 0000000000..874dd392d2 --- /dev/null +++ b/sysdeps/powerpc/powerpc32/multiarch/strchrnul.c @@ -0,0 +1,37 @@ +/* Multiple versions of strchrnul. + Copyright (C) 2013 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 + . */ + +#ifndef NOT_IN_libc +# include +# include +# include "init-arch.h" + +extern __typeof (__strchrnul) __strchrnul_ppc32 attribute_hidden; +extern __typeof (__strchrnul) __strchrnul_power7 attribute_hidden; + +/* Avoid DWARF definition DIE on ifunc symbol so that GDB can handle + ifunc symbol properly. */ +libc_ifunc (__strchrnul, + (hwcap & PPC_FEATURE_HAS_VSX) + ? __strchrnul_power7 + : __strchrnul_ppc32); + +weak_alias (__strchrnul, strchrnul) +#else +#include "string/strchrnul.c" +#endif diff --git a/sysdeps/powerpc/powerpc32/power7/strchrnul.S b/sysdeps/powerpc/powerpc32/power7/strchrnul.S deleted file mode 100644 index d4cacab60b..0000000000 --- a/sysdeps/powerpc/powerpc32/power7/strchrnul.S +++ /dev/null @@ -1,114 +0,0 @@ -/* Optimized strchrnul implementation for PowerPC32/POWER7 using cmpb insn. - Copyright (C) 2010-2013 Free Software Foundation, Inc. - Contributed by Luis Machado . - 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 - . */ - -#include - -/* int [r3] strchrnul (char *s [r3], int c [r4]) */ - .machine power7 -ENTRY (__strchrnul) - CALL_MCOUNT - dcbt 0,r3 - clrrwi r8,r3,2 /* Align the address to word boundary. */ - - /* Replicate byte to word. */ - rlwimi r4,r4,8,16,23 - rlwimi r4,r4,16,0,15 - - rlwinm r6,r3,3,27,28 /* Calculate padding. */ - lwz r12,0(r8) /* Load word from memory. */ - li r0,0 /* Word with null chars to use - with cmpb. */ - - /* Now r4 has a word of c bytes and r0 has - a word of null bytes. */ - - cmpb r10,r12,r0 /* Compare each byte against c byte. */ - cmpb r9,r12,r4 /* Compare each byte against null byte. */ - - /* Move the words left and right to discard the bits that are - not part of the string and bring them back as zeros. */ - slw r10,r10,r6 - slw r9,r9,r6 - srw r10,r10,r6 - srw r9,r9,r6 - or r5,r9,r10 /* OR the results to speed things up. */ - cmpwi cr7,r5,0 /* If r5 == 0, no c or null bytes - have been found. */ - bne cr7,L(done) - - mtcrf 0x01,r8 - - /* Are we now aligned to a quadword boundary? If so, skip to - the main loop. Otherwise, go through the alignment code. */ - - bt 29,L(loop) - - /* Handle WORD2 of pair. */ - lwzu r12,4(r8) - cmpb r10,r12,r0 - cmpb r9,r12,r4 - or r5,r9,r10 - cmpwi cr7,r5,0 - bne cr7,L(done) - b L(loop) /* We branch here (rather than falling through) - to skip the nops due to heavy alignment - of the loop below. */ - - .p2align 5 -L(loop): - /* Load two words, compare and merge in a - single register for speed. This is an attempt - to speed up the null-checking process for bigger strings. */ - lwz r12,4(r8) - lwzu r11,8(r8) - cmpb r10,r12,r0 - cmpb r9,r12,r4 - cmpb r6,r11,r0 - cmpb r7,r11,r4 - or r5,r9,r10 - or r10,r6,r7 - or r11,r5,r10 - cmpwi cr7,r11,0 - beq cr7,L(loop) - - /* OK, one (or both) of the words contains a c/null byte. Check - the first word and decrement the address in case the first - word really contains a c/null byte. */ - - cmpwi cr6,r5,0 - addi r8,r8,-4 - bne cr6,L(done) - - /* The c/null byte must be in the second word. Adjust the - address again and move the result of cmpb to r10 so we can calculate - the pointer. */ - mr r5,r10 - addi r8,r8,4 - - /* r5 has the output of the cmpb instruction, that is, it contains - 0xff in the same position as the c/null byte in the original - word from the string. Use that to calculate the pointer. */ -L(done): - cntlzw r0,r5 /* Count leading zeros before the match. */ - srwi r0,r0,3 /* Convert leading zeros to bytes. */ - add r3,r8,r0 /* Return address of matching c/null byte. */ - blr -END (__strchrnul) -weak_alias (__strchrnul,strchrnul) -libc_hidden_builtin_def (__strchrnul) -- cgit 1.4.1