Skip to content

Commit

Permalink
Add Atom-optimized strchr and strrchr for x86-64
Browse files Browse the repository at this point in the history
  • Loading branch information
Liubov Dmitrieva authored and Ulrich Drepper committed Sep 6, 2011
1 parent d96de96 commit a5f524e
Show file tree
Hide file tree
Showing 6 changed files with 861 additions and 3 deletions.
10 changes: 10 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
2011-07-20 Liubov Dmitrieva <liubov.dmitrieva@intel.com>

* sysdeps/x86_64/multiarch/Makefile (sysdep_routines): Add
strchr-sse2-no-bsf strrchr-sse2-no-bsf
* sysdeps/x86_64/multiarch/strchr.S: Update.
Check bit_slow_BSF bit.
* sysdeps/x86_64/multiarch/strrchr.S: Likewise.
* sysdeps/x86_64/multiarch/strchr-sse2-no-bsf.S: New file.
* sysdeps/x86_64/multiarch/strrchr-sse2-no-bsf.S: New file.

2011-09-05 Ulrich Drepper <drepper@gmail.com>

[BZ #13134]
Expand Down
3 changes: 2 additions & 1 deletion sysdeps/x86_64/multiarch/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ sysdep_routines += strncat-c stpncpy-c strncpy-c strcmp-ssse3 strncmp-ssse3 \
strcpy-sse2-unaligned strncpy-sse2-unaligned \
stpcpy-sse2-unaligned stpncpy-sse2-unaligned \
strcat-sse2-unaligned strncat-sse2-unaligned \
strcat-ssse3 strncat-ssse3 strlen-sse2-pminub
strcat-ssse3 strncat-ssse3 strlen-sse2-pminub \
strrchr-sse2-no-bsf strchr-sse2-no-bsf
ifeq (yes,$(config-cflags-sse4))
sysdep_routines += strcspn-c strpbrk-c strspn-c strstr-c strcasestr-c varshift
CFLAGS-varshift.c += -msse4
Expand Down
282 changes: 282 additions & 0 deletions sysdeps/x86_64/multiarch/strchr-sse2-no-bsf.S
Original file line number Diff line number Diff line change
@@ -0,0 +1,282 @@
/* strchr with SSE2 without bsf
Copyright (C) 2011 Free Software Foundation, Inc.
Contributed by Intel Corporation.
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, write to the Free
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
02111-1307 USA. */

#ifndef NOT_IN_libc

# include <sysdep.h>
# include "asm-syntax.h"

.text
ENTRY (__strchr_sse2_no_bsf)
movd %esi, %xmm1
movq %rdi, %rcx
punpcklbw %xmm1, %xmm1
andq $~15, %rdi
pxor %xmm2, %xmm2
punpcklbw %xmm1, %xmm1
orl $0xffffffff, %esi
movdqa (%rdi), %xmm0
pshufd $0, %xmm1, %xmm1
subq %rdi, %rcx
movdqa %xmm0, %xmm3
leaq 16(%rdi), %rdi
pcmpeqb %xmm1, %xmm0
pcmpeqb %xmm2, %xmm3
shl %cl, %esi
pmovmskb %xmm0, %eax
pmovmskb %xmm3, %edx
andl %esi, %eax
andl %esi, %edx
test %eax, %eax
jnz L(matches)
test %edx, %edx
jnz L(return_null)

L(loop):
movdqa (%rdi), %xmm0
leaq 16(%rdi), %rdi
movdqa %xmm0, %xmm3
pcmpeqb %xmm1, %xmm0
pcmpeqb %xmm2, %xmm3
pmovmskb %xmm0, %eax
pmovmskb %xmm3, %edx
or %eax, %edx
jz L(loop)

pmovmskb %xmm3, %edx
test %eax, %eax
jnz L(matches)

/* Return NULL. */
.p2align 4
L(return_null):
xor %rax, %rax
ret

L(matches):
/* There is a match. First find where NULL is. */
leaq -16(%rdi), %rdi
test %edx, %edx
jz L(match_case1)

.p2align 4
L(match_case2):
test %al, %al
jz L(match_high_case2)

mov %al, %cl
and $15, %cl
jnz L(match_case2_4)

mov %dl, %ch
and $15, %ch
jnz L(return_null)

test $0x10, %al
jnz L(Exit5)
test $0x10, %dl
jnz L(return_null)
test $0x20, %al
jnz L(Exit6)
test $0x20, %dl
jnz L(return_null)
test $0x40, %al
jnz L(Exit7)
test $0x40, %dl
jnz L(return_null)
lea 7(%rdi), %rax
ret

.p2align 4
L(match_case2_4):
test $0x01, %al
jnz L(Exit1)
test $0x01, %dl
jnz L(return_null)
test $0x02, %al
jnz L(Exit2)
test $0x02, %dl
jnz L(return_null)
test $0x04, %al
jnz L(Exit3)
test $0x04, %dl
jnz L(return_null)
lea 3(%rdi), %rax
ret

.p2align 4
L(match_high_case2):
test %dl, %dl
jnz L(return_null)

mov %ah, %cl
and $15, %cl
jnz L(match_case2_12)

mov %dh, %ch
and $15, %ch
jnz L(return_null)

test $0x10, %ah
jnz L(Exit13)
test $0x10, %dh
jnz L(return_null)
test $0x20, %ah
jnz L(Exit14)
test $0x20, %dh
jnz L(return_null)
test $0x40, %ah
jnz L(Exit15)
test $0x40, %dh
jnz L(return_null)
lea 15(%rdi), %rax
ret

.p2align 4
L(match_case2_12):
test $0x01, %ah
jnz L(Exit9)
test $0x01, %dh
jnz L(return_null)
test $0x02, %ah
jnz L(Exit10)
test $0x02, %dh
jnz L(return_null)
test $0x04, %ah
jnz L(Exit11)
test $0x04, %dh
jnz L(return_null)
lea 11(%rdi), %rax
ret

.p2align 4
L(match_case1):
test %al, %al
jz L(match_high_case1)

test $0x01, %al
jnz L(Exit1)
test $0x02, %al
jnz L(Exit2)
test $0x04, %al
jnz L(Exit3)
test $0x08, %al
jnz L(Exit4)
test $0x10, %al
jnz L(Exit5)
test $0x20, %al
jnz L(Exit6)
test $0x40, %al
jnz L(Exit7)
lea 7(%rdi), %rax
ret

.p2align 4
L(match_high_case1):
test $0x01, %ah
jnz L(Exit9)
test $0x02, %ah
jnz L(Exit10)
test $0x04, %ah
jnz L(Exit11)
test $0x08, %ah
jnz L(Exit12)
test $0x10, %ah
jnz L(Exit13)
test $0x20, %ah
jnz L(Exit14)
test $0x40, %ah
jnz L(Exit15)
lea 15(%rdi), %rax
ret

.p2align 4
L(Exit1):
lea (%rdi), %rax
ret

.p2align 4
L(Exit2):
lea 1(%rdi), %rax
ret

.p2align 4
L(Exit3):
lea 2(%rdi), %rax
ret

.p2align 4
L(Exit4):
lea 3(%rdi), %rax
ret

.p2align 4
L(Exit5):
lea 4(%rdi), %rax
ret

.p2align 4
L(Exit6):
lea 5(%rdi), %rax
ret

.p2align 4
L(Exit7):
lea 6(%rdi), %rax
ret

.p2align 4
L(Exit9):
lea 8(%rdi), %rax
ret

.p2align 4
L(Exit10):
lea 9(%rdi), %rax
ret

.p2align 4
L(Exit11):
lea 10(%rdi), %rax
ret

.p2align 4
L(Exit12):
lea 11(%rdi), %rax
ret

.p2align 4
L(Exit13):
lea 12(%rdi), %rax
ret

.p2align 4
L(Exit14):
lea 13(%rdi), %rax
ret

.p2align 4
L(Exit15):
lea 14(%rdi), %rax
ret

END (__strchr_sse2_no_bsf)
#endif

6 changes: 5 additions & 1 deletion sysdeps/x86_64/multiarch/strchr.S
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,11 @@ ENTRY(strchr)
testl $bit_SSE4_2, __cpu_features+CPUID_OFFSET+index_SSE4_2(%rip)
jz 2f
leaq __strchr_sse42(%rip), %rax
2: ret
ret
2: testl $bit_Slow_BSF, __cpu_features+FEATURE_OFFSET+index_Slow_BSF(%rip)
jz 3f
leaq __strchr_sse2_no_bsf(%rip), %rax
3: ret
END(strchr)


Expand Down
Loading

0 comments on commit a5f524e

Please sign in to comment.