This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH 10/36] PowerPC: strnlen multilib for PowerPC32
- From: Adhemerval Zanella <azanella at linux dot vnet dot ibm dot com>
- To: "GNU C. Library" <libc-alpha at sourceware dot org>
- Date: Mon, 19 Aug 2013 18:28:09 -0300
- Subject: [PATCH 10/36] PowerPC: strnlen multilib for PowerPC32
- References: <52127ABC dot 40008 at linux dot vnet dot ibm dot com>
2013-08-19 Adhemerval Zanella <azanella@linux.vnet.ibm.com>
* sysdeps/powerpc/powerpc32/power7/strnlen.S: Move to ...
* sysdeps/powerpc/powerpc32/multiarch/strnlen-power7.S: ... here.
(strnlen): Rename symbol name to __strnlen_power7 and remove the
libc_hidden_builtin_def and weak_alias definitions.
* sysdeps/powerpc/powerpc32/multiarch/strnlen-ppc32.c: New file:
default strnlen PPC32 implementation.
* sysdeps/powerpc/powerpc32/multiarch/rtld-strnlen.c: New file:
default loader strnlen PPC32 implementation.
* sysdeps/powerpc/powerpc32/multiarch/strnlen.c: New file:
multiarch strnlen for PPC32.
* sysdeps/powerpc/powerpc32/multiarch/Makefile: Added strnlen
multiarch objects.
* sysdeps/powerpc/powerpc32/multiarch/ifunc-impl-list
(__libc_ifunc_impl_list): Likewise.
--
diff --git a/sysdeps/powerpc/powerpc32/multiarch/Makefile b/sysdeps/powerpc/powerpc32/multiarch/Makefile
index 0c0eb5d..5ccd8ff 100644
--- a/sysdeps/powerpc/powerpc32/multiarch/Makefile
+++ b/sysdeps/powerpc/powerpc32/multiarch/Makefile
@@ -4,5 +4,6 @@ sysdep_routines += memcpy-power7 memcpy-a2 memcpy-power6 memcpy-cell \
memcmp-ppc32 memset-power7 memset-power6 memset-power4 \
memset-ppc32 mempcpy-power7 mempcpy-ppc32 memchr-power7 \
memchr-ppc32 memrchr-power7 memrchr-ppc32 rawmemchr-power7 \
- rawmemchr-ppc32 strnlen-power7 strlen-power7 strlen-ppc32
+ rawmemchr-ppc32 strnlen-power7 strlen-power7 strlen-ppc32 \
+ strnlen-power7 strnlen-ppc32
endif
diff --git a/sysdeps/powerpc/powerpc32/multiarch/ifunc-impl-list.c b/sysdeps/powerpc/powerpc32/multiarch/ifunc-impl-list.c
index 33a023d..5d0080e 100644
--- a/sysdeps/powerpc/powerpc32/multiarch/ifunc-impl-list.c
+++ b/sysdeps/powerpc/powerpc32/multiarch/ifunc-impl-list.c
@@ -126,6 +126,12 @@ __libc_ifunc_impl_list (const char *name, struct libc_ifunc_impl *array,
__strlen_power7)
IFUNC_IMPL_ADD (array, i, strlen, 1,
__strlen_ppc32))
+ /* Support sysdeps/powerpc/powerpc32/multiarch/strnlen.c. */
+ IFUNC_IMPL (i, name, strnlen,
+ IFUNC_IMPL_ADD (array, i, strnlen, hwcap & PPC_FEATURE_HAS_VSX,
+ __strnlen_power7)
+ IFUNC_IMPL_ADD (array, i, strnlen, 1,
+ __strnlen_ppc32))
#endif
return i;
diff --git a/sysdeps/powerpc/powerpc32/multiarch/rtld-strnlen.c b/sysdeps/powerpc/powerpc32/multiarch/rtld-strnlen.c
new file mode 100644
index 0000000..11a7203
--- /dev/null
+++ b/sysdeps/powerpc/powerpc32/multiarch/rtld-strnlen.c
@@ -0,0 +1,18 @@
+/* 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
+ <http://www.gnu.org/licenses/>. */
+
+#include <string/strnlen.c>
diff --git a/sysdeps/powerpc/powerpc32/multiarch/strnlen-power7.S b/sysdeps/powerpc/powerpc32/multiarch/strnlen-power7.S
new file mode 100644
index 0000000..63ac821
--- /dev/null
+++ b/sysdeps/powerpc/powerpc32/multiarch/strnlen-power7.S
@@ -0,0 +1,167 @@
+/* Optimized strnlen implementation for PowerPC32/POWER7 using cmpb insn.
+ Copyright (C) 2010-2013 Free Software Foundation, Inc.
+ Contributed by Luis Machado <luisgpm@br.ibm.com>.
+ 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/>. */
+
+#include <sysdep.h>
+
+/* int [r3] strnlen (char *s [r3], int size [r4]) */
+ .machine power7
+ENTRY (__strnlen_power7)
+ CALL_MCOUNT
+ dcbt 0,r3
+ clrrwi r8,r3,2 /* Align the address to word boundary. */
+ add r7,r3,r4 /* Calculate the last acceptable address. */
+ cmplwi r4,16
+ li r0,0 /* Word with null chars. */
+ ble L(small_range)
+
+ cmplw cr7,r3,r7 /* Is the address equal or less than r3? If
+ it's equal or less, it means size is either 0
+ or a negative number. */
+ ble cr7,L(proceed)
+
+ li r7,-1 /* Make r11 the biggest if r4 <= 0. */
+L(proceed):
+ rlwinm r6,r3,3,27,28 /* Calculate padding. */
+ lwz r12,0(r8) /* Load word from memory. */
+ cmpb r10,r12,r0 /* Check for null bytes in DWORD1. */
+ slw r10,r10,r6
+ srw r10,r10,r6
+ cmplwi cr7,r10,0 /* If r10 == 0, no null's have been found. */
+ bne cr7,L(done)
+
+ /* Are we done already? */
+ addi r9,r8,4
+ cmplw cr6,r9,r7
+ bge cr6,L(end_max)
+
+ mtcrf 0x01,r8
+ /* Are we now aligned to a doubleword boundary? If so, skip to
+ the main loop. Otherwise, go through the alignment code. */
+
+ bt 29,L(loop_setup)
+
+ /* Handle DWORD2 of pair. */
+ lwzu r12,4(r8)
+ cmpb r10,r12,r0
+ cmplwi cr7,r10,0
+ bne cr7,L(done)
+
+ /* Are we done already? */
+ addi r9,r8,4
+ cmplw cr6,r9,r7
+ bge cr6,L(end_max)
+
+L(loop_setup):
+ sub r5,r7,r9
+ srwi r6,r5,3 /* Number of loop iterations. */
+ mtctr r6 /* Setup the counter. */
+ b L(loop)
+ /* Main loop to look for the null byte backwards in the string. Since
+ it's a small loop (< 8 instructions), align it to 32-bytes. */
+ .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,r11,r0
+ or r5,r9,r10 /* Merge everything in one word. */
+ cmplwi cr7,r5,0
+ bne cr7,L(found)
+ bdnz L(loop)
+ /* We're here because the counter reached 0, and that means we
+ didn't have any matches for null in the whole range. Just return
+ the original size. */
+ addi r9,r8,4
+ cmplw cr6,r9,r7
+ blt cr6,L(loop_small)
+
+L(end_max):
+ sub r3,r7,r3
+ blr
+
+ /* OK, one (or both) of the words contains a null byte. Check
+ the first word and decrement the address in case the first
+ word really contains a null byte. */
+ .align 4
+L(found):
+ cmplwi cr6,r10,0
+ addi r8,r8,-4
+ bne cr6,L(done)
+
+ /* The 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
+ length. */
+
+ mr r10,r9
+ addi r8,r8,4
+
+ /* r10 has the output of the cmpb instruction, that is, it contains
+ 0xff in the same position as the null byte in the original
+ word from the string. Use that to calculate the length.
+ We need to make sure the null char is *before* the end of the
+ range. */
+L(done):
+ cntlzw r0,r10 /* Count leading zeroes before the match. */
+ srwi r0,r0,3 /* Convert leading zeroes to bytes. */
+ add r9,r8,r0
+ sub r6,r9,r3 /* Length until the match. */
+ cmplw r9,r7
+ bgt L(end_max)
+ mr r3,r6
+ blr
+
+ .align 4
+L(zero):
+ li r3,0
+ blr
+
+/* Deals with size <= 32. */
+ .align 4
+L(small_range):
+ cmplwi r4,0
+ beq L(zero)
+
+ rlwinm r6,r3,3,27,28 /* Calculate padding. */
+ lwz r12,0(r8) /* Load word from memory. */
+ cmpb r10,r12,r0 /* Check for null bytes in WORD1. */
+ slw r10,r10,r6
+ srw r10,r10,r6
+ cmplwi cr7,r10,0
+ bne cr7,L(done)
+
+ addi r9,r8,4
+ cmplw r9,r7
+ bge L(end_max)
+ b L(loop_small)
+
+ .p2align 5
+L(loop_small):
+ lwzu r12,4(r8)
+ cmpb r10,r12,r0
+ addi r9,r8,4
+ cmplwi cr6,r10,0
+ bne cr6,L(done)
+ cmplw r9,r7
+ bge L(end_max)
+ b L(loop_small)
+END (__strnlen_power7)
diff --git a/sysdeps/powerpc/powerpc32/multiarch/strnlen-ppc32.c b/sysdeps/powerpc/powerpc32/multiarch/strnlen-ppc32.c
new file mode 100644
index 0000000..660c973
--- /dev/null
+++ b/sysdeps/powerpc/powerpc32/multiarch/strnlen-ppc32.c
@@ -0,0 +1,26 @@
+/* Default strnlen implementation for PowerPC32.
+ 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
+ <http://www.gnu.org/licenses/>. */
+
+#define STRNLEN __strnlen_ppc32
+#ifdef SHARED
+# undef libc_hidden_def
+# define libc_hidden_def(name) \
+ __hidden_ver1 (__strnlen_ppc32, __GI_strnlen, __strnlen_ppc32);
+#endif
+
+#include <string/strnlen.c>
diff --git a/sysdeps/powerpc/powerpc32/multiarch/strnlen.c b/sysdeps/powerpc/powerpc32/multiarch/strnlen.c
new file mode 100644
index 0000000..5816a04
--- /dev/null
+++ b/sysdeps/powerpc/powerpc32/multiarch/strnlen.c
@@ -0,0 +1,33 @@
+/* Multiple versions of strnlen.
+ 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
+ <http://www.gnu.org/licenses/>. */
+
+#ifndef NOT_IN_libc
+# include <string.h>
+# include <shlib-compat.h>
+# include "init-arch.h"
+
+extern __typeof (__strnlen) __strnlen_ppc32 attribute_hidden;
+extern __typeof (__strnlen) __strnlen_power7 attribute_hidden;
+
+libc_ifunc (__strnlen,
+ (hwcap & PPC_FEATURE_HAS_VSX)
+ ? __strnlen_power7
+ : __strnlen_ppc32);
+weak_alias (__strnlen, strnlen)
+libc_hidden_def (strnlen)
+#endif
diff --git a/sysdeps/powerpc/powerpc32/power7/strnlen.S b/sysdeps/powerpc/powerpc32/power7/strnlen.S
deleted file mode 100644
index ed08836..0000000
--- a/sysdeps/powerpc/powerpc32/power7/strnlen.S
+++ /dev/null
@@ -1,169 +0,0 @@
-/* Optimized strnlen implementation for PowerPC32/POWER7 using cmpb insn.
- Copyright (C) 2010-2013 Free Software Foundation, Inc.
- Contributed by Luis Machado <luisgpm@br.ibm.com>.
- 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/>. */
-
-#include <sysdep.h>
-
-/* int [r3] strnlen (char *s [r3], int size [r4]) */
- .machine power7
-ENTRY (__strnlen)
- CALL_MCOUNT
- dcbt 0,r3
- clrrwi r8,r3,2 /* Align the address to word boundary. */
- add r7,r3,r4 /* Calculate the last acceptable address. */
- cmplwi r4,16
- li r0,0 /* Word with null chars. */
- ble L(small_range)
-
- cmplw cr7,r3,r7 /* Is the address equal or less than r3? If
- it's equal or less, it means size is either 0
- or a negative number. */
- ble cr7,L(proceed)
-
- li r7,-1 /* Make r11 the biggest if r4 <= 0. */
-L(proceed):
- rlwinm r6,r3,3,27,28 /* Calculate padding. */
- lwz r12,0(r8) /* Load word from memory. */
- cmpb r10,r12,r0 /* Check for null bytes in DWORD1. */
- slw r10,r10,r6
- srw r10,r10,r6
- cmplwi cr7,r10,0 /* If r10 == 0, no null's have been found. */
- bne cr7,L(done)
-
- /* Are we done already? */
- addi r9,r8,4
- cmplw cr6,r9,r7
- bge cr6,L(end_max)
-
- mtcrf 0x01,r8
- /* Are we now aligned to a doubleword boundary? If so, skip to
- the main loop. Otherwise, go through the alignment code. */
-
- bt 29,L(loop_setup)
-
- /* Handle DWORD2 of pair. */
- lwzu r12,4(r8)
- cmpb r10,r12,r0
- cmplwi cr7,r10,0
- bne cr7,L(done)
-
- /* Are we done already? */
- addi r9,r8,4
- cmplw cr6,r9,r7
- bge cr6,L(end_max)
-
-L(loop_setup):
- sub r5,r7,r9
- srwi r6,r5,3 /* Number of loop iterations. */
- mtctr r6 /* Setup the counter. */
- b L(loop)
- /* Main loop to look for the null byte backwards in the string. Since
- it's a small loop (< 8 instructions), align it to 32-bytes. */
- .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,r11,r0
- or r5,r9,r10 /* Merge everything in one word. */
- cmplwi cr7,r5,0
- bne cr7,L(found)
- bdnz L(loop)
- /* We're here because the counter reached 0, and that means we
- didn't have any matches for null in the whole range. Just return
- the original size. */
- addi r9,r8,4
- cmplw cr6,r9,r7
- blt cr6,L(loop_small)
-
-L(end_max):
- sub r3,r7,r3
- blr
-
- /* OK, one (or both) of the words contains a null byte. Check
- the first word and decrement the address in case the first
- word really contains a null byte. */
- .align 4
-L(found):
- cmplwi cr6,r10,0
- addi r8,r8,-4
- bne cr6,L(done)
-
- /* The 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
- length. */
-
- mr r10,r9
- addi r8,r8,4
-
- /* r10 has the output of the cmpb instruction, that is, it contains
- 0xff in the same position as the null byte in the original
- word from the string. Use that to calculate the length.
- We need to make sure the null char is *before* the end of the
- range. */
-L(done):
- cntlzw r0,r10 /* Count leading zeroes before the match. */
- srwi r0,r0,3 /* Convert leading zeroes to bytes. */
- add r9,r8,r0
- sub r6,r9,r3 /* Length until the match. */
- cmplw r9,r7
- bgt L(end_max)
- mr r3,r6
- blr
-
- .align 4
-L(zero):
- li r3,0
- blr
-
-/* Deals with size <= 32. */
- .align 4
-L(small_range):
- cmplwi r4,0
- beq L(zero)
-
- rlwinm r6,r3,3,27,28 /* Calculate padding. */
- lwz r12,0(r8) /* Load word from memory. */
- cmpb r10,r12,r0 /* Check for null bytes in WORD1. */
- slw r10,r10,r6
- srw r10,r10,r6
- cmplwi cr7,r10,0
- bne cr7,L(done)
-
- addi r9,r8,4
- cmplw r9,r7
- bge L(end_max)
- b L(loop_small)
-
- .p2align 5
-L(loop_small):
- lwzu r12,4(r8)
- cmpb r10,r12,r0
- addi r9,r8,4
- cmplwi cr6,r10,0
- bne cr6,L(done)
- cmplw r9,r7
- bge L(end_max)
- b L(loop_small)
-END (__strnlen)
-weak_alias (__strnlen, strnlen)
-libc_hidden_builtin_def (strnlen)