2016-12-27 19:48:37 +00:00
|
|
|
/* Optimized strchr implementation for PowerPC64/POWER8.
|
2021-01-02 19:32:25 +00:00
|
|
|
Copyright (C) 2016-2021 Free Software Foundation, Inc.
|
2016-12-27 19:48:37 +00:00
|
|
|
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
|
Prefer https to http for gnu.org and fsf.org URLs
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 05:40:42 +00:00
|
|
|
<https://www.gnu.org/licenses/>. */
|
2016-12-27 19:48:37 +00:00
|
|
|
|
|
|
|
#include <sysdep.h>
|
|
|
|
|
|
|
|
#ifdef USE_AS_STRCHRNUL
|
2017-04-11 17:18:35 +00:00
|
|
|
# ifndef STRCHRNUL
|
|
|
|
# define FUNC_NAME __strchrnul
|
|
|
|
# else
|
|
|
|
# define FUNC_NAME STRCHRNUL
|
|
|
|
# endif
|
2016-12-27 19:48:37 +00:00
|
|
|
#else
|
2017-04-11 17:18:35 +00:00
|
|
|
# ifndef STRCHR
|
|
|
|
# define FUNC_NAME strchr
|
|
|
|
# else
|
|
|
|
# define FUNC_NAME STRCHR
|
|
|
|
# endif
|
|
|
|
#endif /* !USE_AS_STRCHRNUL */
|
|
|
|
|
2016-12-27 19:48:37 +00:00
|
|
|
/* int [r3] strchr (char *s [r3], int c [r4]) */
|
powerpc: Cleanup: use actual power8 assembly mnemonics
Some implementations in sysdeps/powerpc/powerpc64/power8/*.S still had
pre power8 compatible binutils hardcoded macros and were not using
.machine power8.
This patch should not have semantic changes, in fact it should have the
same exact code generated.
Tested that generated stripped shared objects are identical when
using "strip --remove-section=.note.gnu.build-id".
Checked on:
- powerpc64le, power9, build-many-glibcs.py, gcc 6.4.1 20180104, binutils 2.26.2.20160726
- powerpc64le, power8, debian 9, gcc 6.3.0 20170516, binutils 2.28
- powerpc64le, power9, ubuntu 19.04, gcc 8.3.0, binutils 2.32
- powerpc64le, power9, opensuse tumbleweed, gcc 9.1.1 20190527, binutils 2.32
- powerpc64, power9, debian 10, gcc 8.3.0, binutils 2.31.1
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Reviewed-by: Gabriel F. T. Gomes <gabrielftg@linux.ibm.com>
2019-06-27 18:44:17 +00:00
|
|
|
.machine power8
|
PowerPC64 ENTRY_TOCLESS
A number of functions in the sysdeps/powerpc/powerpc64/ tree don't use
or change r2, yet declare a global entry that sets up r2. This patch
fixes that problem, and consolidates the ENTRY and EALIGN macros.
* sysdeps/powerpc/powerpc64/sysdep.h: Formatting.
(NOPS, ENTRY_3): New macros.
(ENTRY): Rewrite.
(ENTRY_TOCLESS): Define.
(EALIGN, EALIGN_W_0, EALIGN_W_1, EALIGN_W_2, EALIGN_W_4, EALIGN_W_5,
EALIGN_W_6, EALIGN_W_7, EALIGN_W_8): Delete.
* sysdeps/powerpc/powerpc64/a2/memcpy.S: Replace EALIGN with ENTRY.
* sysdeps/powerpc/powerpc64/dl-trampoline.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_ceil.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_ceilf.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_floor.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_floorf.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_nearbyint.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_nearbyintf.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_rint.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_rintf.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_round.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_roundf.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_trunc.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_truncf.S: Likewise.
* sysdeps/powerpc/powerpc64/memset.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/fpu/s_finite.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/fpu/s_isinf.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/fpu/s_isnan.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/strstr.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/fpu/e_expf.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/fpu/s_cosf.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/fpu/s_sinf.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/strcasestr.S: Likewise.
* sysdeps/powerpc/powerpc64/addmul_1.S: Use ENTRY_TOCLESS.
* sysdeps/powerpc/powerpc64/cell/memcpy.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_copysign.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_copysignl.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_fabsl.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_isnan.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_llrint.S: Likewise.
* sysdeps/powerpc/powerpc64/fpu/s_llrintf.S: Likewise.
* sysdeps/powerpc/powerpc64/lshift.S: Likewise.
* sysdeps/powerpc/powerpc64/memcpy.S: Likewise.
* sysdeps/powerpc/powerpc64/mul_1.S: Likewise.
* sysdeps/powerpc/powerpc64/power4/memcmp.S: Likewise.
* sysdeps/powerpc/powerpc64/power4/memcpy.S: Likewise.
* sysdeps/powerpc/powerpc64/power4/memset.S: Likewise.
* sysdeps/powerpc/powerpc64/power4/strncmp.S: Likewise.
* sysdeps/powerpc/powerpc64/power5+/fpu/s_ceil.S: Likewise.
* sysdeps/powerpc/powerpc64/power5+/fpu/s_ceilf.S: Likewise.
* sysdeps/powerpc/powerpc64/power5+/fpu/s_floor.S: Likewise.
* sysdeps/powerpc/powerpc64/power5+/fpu/s_floorf.S: Likewise.
* sysdeps/powerpc/powerpc64/power5+/fpu/s_llround.S: Likewise.
* sysdeps/powerpc/powerpc64/power5+/fpu/s_round.S: Likewise.
* sysdeps/powerpc/powerpc64/power5+/fpu/s_roundf.S: Likewise.
* sysdeps/powerpc/powerpc64/power5+/fpu/s_trunc.S: Likewise.
* sysdeps/powerpc/powerpc64/power5+/fpu/s_truncf.S: Likewise.
* sysdeps/powerpc/powerpc64/power5/fpu/s_isnan.S: Likewise.
* sysdeps/powerpc/powerpc64/power6/fpu/s_copysign.S: Likewise.
* sysdeps/powerpc/powerpc64/power6/fpu/s_isnan.S: Likewise.
* sysdeps/powerpc/powerpc64/power6/memcpy.S: Likewise.
* sysdeps/powerpc/powerpc64/power6/memset.S: Likewise.
* sysdeps/powerpc/powerpc64/power6x/fpu/s_isnan.S: Likewise.
* sysdeps/powerpc/powerpc64/power6x/fpu/s_llrint.S: Likewise.
* sysdeps/powerpc/powerpc64/power6x/fpu/s_llround.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/add_n.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/memchr.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/memcmp.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/memcpy.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/memmove.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/mempcpy.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/memrchr.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/memset.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/rawmemchr.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/strcasecmp.S (strcasecmp_l):
Likewise.
* sysdeps/powerpc/powerpc64/power7/strchr.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/strchrnul.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/strcmp.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/strlen.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/strncmp.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/strncpy.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/strnlen.S: Likewise.
* sysdeps/powerpc/powerpc64/power7/strrchr.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/fpu/s_finite.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/fpu/s_isinf.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/fpu/s_isnan.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/fpu/s_llrint.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/fpu/s_llround.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/memcmp.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/memset.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/strchr.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/strcmp.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/strcpy.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/strlen.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/strncmp.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/strncpy.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/strnlen.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/strrchr.S: Likewise.
* sysdeps/powerpc/powerpc64/power8/strspn.S: Likewise.
* sysdeps/powerpc/powerpc64/power9/strcmp.S: Likewise.
* sysdeps/powerpc/powerpc64/power9/strncmp.S: Likewise.
* sysdeps/powerpc/powerpc64/strchr.S: Likewise.
* sysdeps/powerpc/powerpc64/strcmp.S: Likewise.
* sysdeps/powerpc/powerpc64/strlen.S: Likewise.
* sysdeps/powerpc/powerpc64/strncmp.S: Likewise.
* sysdeps/powerpc/powerpc64/ppc-mcount.S: Store LR earlier. Don't
add nop when SHARED.
* sysdeps/powerpc/powerpc64/start.S: Fix comment.
* sysdeps/powerpc/powerpc64/multiarch/strrchr-power8.S (ENTRY): Don't
define.
(ENTRY_TOCLESS): Define.
* sysdeps/powerpc/powerpc32/sysdep.h (ENTRY_TOCLESS): Define.
* sysdeps/powerpc/fpu/s_fma.S: Use ENTRY_TOCLESS.
* sysdeps/powerpc/fpu/s_fmaf.S: Likewise.
2017-06-14 01:15:50 +00:00
|
|
|
ENTRY_TOCLESS (FUNC_NAME)
|
2016-12-27 19:48:37 +00:00
|
|
|
CALL_MCOUNT 2
|
|
|
|
dcbt 0,r3
|
|
|
|
clrrdi r8,r3,3 /* Align the address to doubleword boundary. */
|
|
|
|
cmpdi cr7,r4,0
|
|
|
|
ld r12,0(r8) /* Load doubleword from memory. */
|
|
|
|
li r0,0 /* Doubleword with null chars to use
|
|
|
|
with cmpb. */
|
|
|
|
|
|
|
|
rlwinm r6,r3,3,26,28 /* Calculate padding. */
|
|
|
|
|
|
|
|
beq cr7,L(null_match)
|
|
|
|
|
|
|
|
/* Replicate byte to doubleword. */
|
|
|
|
insrdi r4,r4,8,48
|
|
|
|
insrdi r4,r4,16,32
|
|
|
|
insrdi r4,r4,32,0
|
|
|
|
|
|
|
|
/* Now r4 has a doubleword of c bytes and r0 has
|
|
|
|
a doubleword of null bytes. */
|
|
|
|
|
|
|
|
cmpb r10,r12,r4 /* Compare each byte against c byte. */
|
|
|
|
cmpb r11,r12,r0 /* Compare each byte against null byte. */
|
|
|
|
|
|
|
|
/* Move the doublewords left and right to discard the bits that are
|
|
|
|
not part of the string and bring them back as zeros. */
|
|
|
|
#ifdef __LITTLE_ENDIAN__
|
|
|
|
srd r10,r10,r6
|
|
|
|
srd r11,r11,r6
|
|
|
|
sld r10,r10,r6
|
|
|
|
sld r11,r11,r6
|
|
|
|
#else
|
|
|
|
sld r10,r10,r6
|
|
|
|
sld r11,r11,r6
|
|
|
|
srd r10,r10,r6
|
|
|
|
srd r11,r11,r6
|
|
|
|
#endif
|
|
|
|
or r5,r10,r11 /* OR the results to speed things up. */
|
|
|
|
cmpdi 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 doubleword boundary? If so, skip to
|
|
|
|
the main loop. Otherwise, go through the alignment code. */
|
|
|
|
|
|
|
|
bt 28,L(loop)
|
|
|
|
|
|
|
|
/* Handle WORD2 of pair. */
|
|
|
|
ldu r12,8(r8)
|
|
|
|
cmpb r10,r12,r4
|
|
|
|
cmpb r11,r12,r0
|
|
|
|
or r5,r10,r11
|
|
|
|
cmpdi 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 doublewords, compare and merge in a
|
|
|
|
single register for speed. This is an attempt
|
|
|
|
to speed up the null-checking process for bigger strings. */
|
|
|
|
ld r12,8(r8)
|
|
|
|
ldu r9,16(r8)
|
|
|
|
cmpb r10,r12,r4
|
|
|
|
cmpb r11,r12,r0
|
|
|
|
cmpb r6,r9,r4
|
|
|
|
cmpb r7,r9,r0
|
|
|
|
or r5,r10,r11
|
|
|
|
or r9,r6,r7
|
|
|
|
or r12,r5,r9
|
|
|
|
cmpdi cr7,r12,0
|
|
|
|
beq cr7,L(vector)
|
|
|
|
/* OK, one (or both) of the doublewords contains a c/null byte. Check
|
|
|
|
the first doubleword and decrement the address in case the first
|
|
|
|
doubleword really contains a c/null byte. */
|
|
|
|
|
|
|
|
cmpdi cr6,r5,0
|
|
|
|
addi r8,r8,-8
|
|
|
|
bne cr6,L(done)
|
|
|
|
|
|
|
|
/* The c/null byte must be in the second doubleword. Adjust the
|
|
|
|
address again and move the result of cmpb to r10 so we can calculate
|
|
|
|
the pointer. */
|
|
|
|
|
|
|
|
mr r10,r6
|
|
|
|
mr r11,r7
|
|
|
|
addi r8,r8,8
|
|
|
|
#ifdef USE_AS_STRCHRNUL
|
|
|
|
mr r5, r9
|
|
|
|
#endif
|
|
|
|
/* r10/r11 have the output of the cmpb instructions, that is,
|
|
|
|
0xff in the same position as the c/null byte in the original
|
|
|
|
doubleword from the string. Use that to calculate the pointer. */
|
|
|
|
L(done):
|
|
|
|
#ifdef USE_AS_STRCHRNUL
|
|
|
|
mr r10, r5
|
|
|
|
#endif
|
|
|
|
#ifdef __LITTLE_ENDIAN__
|
|
|
|
addi r3,r10,-1
|
|
|
|
andc r3,r3,r10
|
|
|
|
popcntd r0,r3
|
|
|
|
# ifndef USE_AS_STRCHRNUL
|
|
|
|
addi r4,r11,-1
|
|
|
|
andc r4,r4,r11
|
|
|
|
cmpld cr7,r3,r4
|
|
|
|
bgt cr7,L(no_match)
|
|
|
|
# endif
|
|
|
|
#else
|
|
|
|
cntlzd r0,r10 /* Count leading zeros before c matches. */
|
|
|
|
# ifndef USE_AS_STRCHRNUL
|
|
|
|
cmpld cr7,r11,r10
|
|
|
|
bgt cr7,L(no_match)
|
|
|
|
# endif
|
|
|
|
#endif
|
|
|
|
srdi r0,r0,3 /* Convert leading zeros to bytes. */
|
|
|
|
add r3,r8,r0 /* Return address of the matching c byte
|
|
|
|
or null in case c was not found. */
|
|
|
|
blr
|
|
|
|
|
|
|
|
/* Check the first 32B in GPR's and move to vectorized loop. */
|
|
|
|
.p2align 5
|
|
|
|
L(vector):
|
|
|
|
addi r3, r8, 8
|
|
|
|
andi. r10, r3, 31
|
|
|
|
bne cr0, L(loop)
|
|
|
|
vspltisb v0, 0
|
|
|
|
/* Precompute vbpermq constant. */
|
|
|
|
vspltisb v10, 3
|
|
|
|
lvsl v11, r0, r0
|
|
|
|
vslb v10, v11, v10
|
powerpc: Cleanup: use actual power8 assembly mnemonics
Some implementations in sysdeps/powerpc/powerpc64/power8/*.S still had
pre power8 compatible binutils hardcoded macros and were not using
.machine power8.
This patch should not have semantic changes, in fact it should have the
same exact code generated.
Tested that generated stripped shared objects are identical when
using "strip --remove-section=.note.gnu.build-id".
Checked on:
- powerpc64le, power9, build-many-glibcs.py, gcc 6.4.1 20180104, binutils 2.26.2.20160726
- powerpc64le, power8, debian 9, gcc 6.3.0 20170516, binutils 2.28
- powerpc64le, power9, ubuntu 19.04, gcc 8.3.0, binutils 2.32
- powerpc64le, power9, opensuse tumbleweed, gcc 9.1.1 20190527, binutils 2.32
- powerpc64, power9, debian 10, gcc 8.3.0, binutils 2.31.1
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Reviewed-by: Gabriel F. T. Gomes <gabrielftg@linux.ibm.com>
2019-06-27 18:44:17 +00:00
|
|
|
mtvrd v1, r4
|
2016-12-27 19:48:37 +00:00
|
|
|
li r5, 16
|
|
|
|
vspltb v1, v1, 7
|
|
|
|
/* Compare 32 bytes in each loop. */
|
|
|
|
L(continue):
|
|
|
|
lvx v4, 0, r3
|
|
|
|
lvx v5, r3, r5
|
|
|
|
vcmpequb v2, v0, v4
|
|
|
|
vcmpequb v3, v0, v5
|
|
|
|
vcmpequb v6, v1, v4
|
|
|
|
vcmpequb v7, v1, v5
|
|
|
|
vor v8, v2, v3
|
|
|
|
vor v9, v6, v7
|
|
|
|
vor v11, v8, v9
|
|
|
|
vcmpequb. v11, v0, v11
|
|
|
|
addi r3, r3, 32
|
|
|
|
blt cr6, L(continue)
|
|
|
|
/* One (or both) of the quadwords contains a c/null byte. */
|
|
|
|
addi r3, r3, -32
|
|
|
|
#ifndef USE_AS_STRCHRNUL
|
|
|
|
vcmpequb. v11, v0, v9
|
|
|
|
blt cr6, L(no_match)
|
|
|
|
#endif
|
|
|
|
/* Permute the first bit of each byte into bits 48-63. */
|
powerpc: Cleanup: use actual power8 assembly mnemonics
Some implementations in sysdeps/powerpc/powerpc64/power8/*.S still had
pre power8 compatible binutils hardcoded macros and were not using
.machine power8.
This patch should not have semantic changes, in fact it should have the
same exact code generated.
Tested that generated stripped shared objects are identical when
using "strip --remove-section=.note.gnu.build-id".
Checked on:
- powerpc64le, power9, build-many-glibcs.py, gcc 6.4.1 20180104, binutils 2.26.2.20160726
- powerpc64le, power8, debian 9, gcc 6.3.0 20170516, binutils 2.28
- powerpc64le, power9, ubuntu 19.04, gcc 8.3.0, binutils 2.32
- powerpc64le, power9, opensuse tumbleweed, gcc 9.1.1 20190527, binutils 2.32
- powerpc64, power9, debian 10, gcc 8.3.0, binutils 2.31.1
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Reviewed-by: Gabriel F. T. Gomes <gabrielftg@linux.ibm.com>
2019-06-27 18:44:17 +00:00
|
|
|
vbpermq v2, v2, v10
|
|
|
|
vbpermq v3, v3, v10
|
|
|
|
vbpermq v6, v6, v10
|
|
|
|
vbpermq v7, v7, v10
|
2016-12-27 19:48:37 +00:00
|
|
|
/* Shift each component into its correct position for merging. */
|
|
|
|
#ifdef __LITTLE_ENDIAN__
|
|
|
|
vsldoi v3, v3, v3, 2
|
|
|
|
vsldoi v7, v7, v7, 2
|
|
|
|
#else
|
|
|
|
vsldoi v2, v2, v2, 6
|
|
|
|
vsldoi v3, v3, v3, 4
|
|
|
|
vsldoi v6, v6, v6, 6
|
|
|
|
vsldoi v7, v7, v7, 4
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Merge the results and move to a GPR. */
|
|
|
|
vor v1, v3, v2
|
|
|
|
vor v2, v6, v7
|
|
|
|
vor v4, v1, v2
|
powerpc: Cleanup: use actual power8 assembly mnemonics
Some implementations in sysdeps/powerpc/powerpc64/power8/*.S still had
pre power8 compatible binutils hardcoded macros and were not using
.machine power8.
This patch should not have semantic changes, in fact it should have the
same exact code generated.
Tested that generated stripped shared objects are identical when
using "strip --remove-section=.note.gnu.build-id".
Checked on:
- powerpc64le, power9, build-many-glibcs.py, gcc 6.4.1 20180104, binutils 2.26.2.20160726
- powerpc64le, power8, debian 9, gcc 6.3.0 20170516, binutils 2.28
- powerpc64le, power9, ubuntu 19.04, gcc 8.3.0, binutils 2.32
- powerpc64le, power9, opensuse tumbleweed, gcc 9.1.1 20190527, binutils 2.32
- powerpc64, power9, debian 10, gcc 8.3.0, binutils 2.31.1
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Reviewed-by: Gabriel F. T. Gomes <gabrielftg@linux.ibm.com>
2019-06-27 18:44:17 +00:00
|
|
|
mfvrd r5, v4
|
2016-12-27 19:48:37 +00:00
|
|
|
#ifdef __LITTLE_ENDIAN__
|
|
|
|
addi r6, r5, -1
|
|
|
|
andc r6, r6, r5
|
|
|
|
popcntd r6, r6
|
|
|
|
#else
|
|
|
|
cntlzd r6, r5 /* Count leading zeros before the match. */
|
|
|
|
#endif
|
|
|
|
add r3, r3, r6 /* Compute final length. */
|
|
|
|
/* Return NULL if null found before c. */
|
|
|
|
#ifndef USE_AS_STRCHRNUL
|
|
|
|
lbz r4, 0(r3)
|
|
|
|
cmpdi cr7, r4, 0
|
|
|
|
beq cr7, L(no_match)
|
|
|
|
#endif
|
|
|
|
blr
|
|
|
|
|
|
|
|
#ifndef USE_AS_STRCHRNUL
|
|
|
|
.align 4
|
|
|
|
L(no_match):
|
|
|
|
li r3,0
|
|
|
|
blr
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* We are here because strchr was called with a null byte. */
|
|
|
|
.align 4
|
|
|
|
L(null_match):
|
|
|
|
/* r0 has a doubleword of null bytes. */
|
|
|
|
|
|
|
|
cmpb r5,r12,r0 /* Compare each byte against null bytes. */
|
|
|
|
|
|
|
|
/* Move the doublewords left and right to discard the bits that are
|
|
|
|
not part of the string and bring them back as zeros. */
|
|
|
|
#ifdef __LITTLE_ENDIAN__
|
|
|
|
srd r5,r5,r6
|
|
|
|
sld r5,r5,r6
|
|
|
|
#else
|
|
|
|
sld r5,r5,r6
|
|
|
|
srd r5,r5,r6
|
|
|
|
#endif
|
|
|
|
cmpdi cr7,r5,0 /* If r10 == 0, no c or null bytes
|
|
|
|
have been found. */
|
|
|
|
bne cr7,L(done_null)
|
|
|
|
|
|
|
|
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 28,L(loop_null)
|
|
|
|
|
|
|
|
/* Handle WORD2 of pair. */
|
|
|
|
ldu r12,8(r8)
|
|
|
|
cmpb r5,r12,r0
|
|
|
|
cmpdi cr7,r5,0
|
|
|
|
bne cr7,L(done_null)
|
|
|
|
b L(loop_null) /* We branch here (rather than falling through)
|
|
|
|
to skip the nops due to heavy alignment
|
|
|
|
of the loop below. */
|
|
|
|
|
|
|
|
/* Main loop to look for the end of the string. Since it's a
|
|
|
|
small loop (< 8 instructions), align it to 32-bytes. */
|
|
|
|
.p2align 5
|
|
|
|
L(loop_null):
|
|
|
|
/* Load two doublewords, compare and merge in a
|
|
|
|
single register for speed. This is an attempt
|
|
|
|
to speed up the null-checking process for bigger strings. */
|
|
|
|
ld r12,8(r8)
|
|
|
|
ldu r11,16(r8)
|
|
|
|
cmpb r5,r12,r0
|
|
|
|
cmpb r10,r11,r0
|
|
|
|
or r6,r5,r10
|
|
|
|
cmpdi cr7,r6,0
|
|
|
|
beq cr7,L(vector1)
|
|
|
|
|
|
|
|
/* OK, one (or both) of the doublewords contains a null byte. Check
|
|
|
|
the first doubleword and decrement the address in case the first
|
|
|
|
doubleword really contains a null byte. */
|
|
|
|
|
|
|
|
cmpdi cr6,r5,0
|
|
|
|
addi r8,r8,-8
|
|
|
|
bne cr6,L(done_null)
|
|
|
|
|
|
|
|
/* The null byte must be in the second doubleword. Adjust the address
|
|
|
|
again and move the result of cmpb to r10 so we can calculate the
|
|
|
|
pointer. */
|
|
|
|
|
|
|
|
mr r5,r10
|
|
|
|
addi r8,r8,8
|
|
|
|
|
|
|
|
/* r5 has the output of the cmpb instruction, that is, it contains
|
|
|
|
0xff in the same position as the null byte in the original
|
|
|
|
doubleword from the string. Use that to calculate the pointer. */
|
|
|
|
L(done_null):
|
|
|
|
#ifdef __LITTLE_ENDIAN__
|
|
|
|
addi r0,r5,-1
|
|
|
|
andc r0,r0,r5
|
|
|
|
popcntd r0,r0
|
|
|
|
#else
|
|
|
|
cntlzd r0,r5 /* Count leading zeros before the match. */
|
|
|
|
#endif
|
|
|
|
srdi r0,r0,3 /* Convert leading zeros to bytes. */
|
|
|
|
add r3,r8,r0 /* Return address of the matching null byte. */
|
|
|
|
blr
|
|
|
|
.p2align 5
|
|
|
|
L(vector1):
|
|
|
|
addi r3, r8, 8
|
|
|
|
andi. r10, r3, 31
|
|
|
|
bne cr0, L(loop_null)
|
|
|
|
vspltisb v8, -1
|
|
|
|
vspltisb v0, 0
|
|
|
|
vspltisb v10, 3
|
|
|
|
lvsl v11, r0, r0
|
|
|
|
vslb v10, v11, v10
|
|
|
|
li r5, 16
|
|
|
|
L(continue1):
|
|
|
|
lvx v4, 0, r3
|
|
|
|
lvx v5, r3, r5
|
|
|
|
vcmpequb v2, v0, v4
|
|
|
|
vcmpequb v3, v0, v5
|
|
|
|
vor v8, v2, v3
|
|
|
|
vcmpequb. v11, v0, v8
|
|
|
|
addi r3, r3, 32
|
|
|
|
blt cr6, L(continue1)
|
|
|
|
addi r3, r3, -32
|
|
|
|
L(end1):
|
powerpc: Cleanup: use actual power8 assembly mnemonics
Some implementations in sysdeps/powerpc/powerpc64/power8/*.S still had
pre power8 compatible binutils hardcoded macros and were not using
.machine power8.
This patch should not have semantic changes, in fact it should have the
same exact code generated.
Tested that generated stripped shared objects are identical when
using "strip --remove-section=.note.gnu.build-id".
Checked on:
- powerpc64le, power9, build-many-glibcs.py, gcc 6.4.1 20180104, binutils 2.26.2.20160726
- powerpc64le, power8, debian 9, gcc 6.3.0 20170516, binutils 2.28
- powerpc64le, power9, ubuntu 19.04, gcc 8.3.0, binutils 2.32
- powerpc64le, power9, opensuse tumbleweed, gcc 9.1.1 20190527, binutils 2.32
- powerpc64, power9, debian 10, gcc 8.3.0, binutils 2.31.1
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Reviewed-by: Gabriel F. T. Gomes <gabrielftg@linux.ibm.com>
2019-06-27 18:44:17 +00:00
|
|
|
vbpermq v2, v2, v10
|
|
|
|
vbpermq v3, v3, v10
|
2016-12-27 19:48:37 +00:00
|
|
|
/* Shift each component into its correct position for merging. */
|
|
|
|
#ifdef __LITTLE_ENDIAN__
|
|
|
|
vsldoi v3, v3, v3, 2
|
|
|
|
#else
|
|
|
|
vsldoi v2, v2, v2, 6
|
|
|
|
vsldoi v3, v3, v3, 4
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/* Merge the results and move to a GPR. */
|
|
|
|
vor v4, v3, v2
|
powerpc: Cleanup: use actual power8 assembly mnemonics
Some implementations in sysdeps/powerpc/powerpc64/power8/*.S still had
pre power8 compatible binutils hardcoded macros and were not using
.machine power8.
This patch should not have semantic changes, in fact it should have the
same exact code generated.
Tested that generated stripped shared objects are identical when
using "strip --remove-section=.note.gnu.build-id".
Checked on:
- powerpc64le, power9, build-many-glibcs.py, gcc 6.4.1 20180104, binutils 2.26.2.20160726
- powerpc64le, power8, debian 9, gcc 6.3.0 20170516, binutils 2.28
- powerpc64le, power9, ubuntu 19.04, gcc 8.3.0, binutils 2.32
- powerpc64le, power9, opensuse tumbleweed, gcc 9.1.1 20190527, binutils 2.32
- powerpc64, power9, debian 10, gcc 8.3.0, binutils 2.31.1
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Reviewed-by: Gabriel F. T. Gomes <gabrielftg@linux.ibm.com>
2019-06-27 18:44:17 +00:00
|
|
|
mfvrd r5, v4
|
2016-12-27 19:48:37 +00:00
|
|
|
#ifdef __LITTLE_ENDIAN__
|
|
|
|
addi r6, r5, -1
|
|
|
|
andc r6, r6, r5
|
|
|
|
popcntd r6, r6
|
|
|
|
#else
|
|
|
|
cntlzd r6, r5 /* Count leading zeros before the match. */
|
|
|
|
#endif
|
|
|
|
add r3, r3, r6 /* Compute final length. */
|
|
|
|
blr
|
|
|
|
END (FUNC_NAME)
|
|
|
|
|
|
|
|
#ifndef USE_AS_STRCHRNUL
|
|
|
|
weak_alias (strchr, index)
|
|
|
|
libc_hidden_builtin_def (strchr)
|
|
|
|
#endif
|