|
 |
076f82 |
commit 3605c744078bb048d876298aaf12a2869e8071b8
|
|
|
076f82 |
Author: Noah Goldstein <goldstein.w.n@gmail.com>
|
|
|
076f82 |
Date: Wed Mar 23 16:57:38 2022 -0500
|
|
|
076f82 |
|
|
|
076f82 |
x86: Optimize str{n}casecmp TOLOWER logic in strcmp-sse42.S
|
|
|
076f82 |
|
|
|
076f82 |
Slightly faster method of doing TOLOWER that saves an
|
|
|
076f82 |
instruction.
|
|
|
076f82 |
|
|
|
076f82 |
Also replace the hard coded 5-byte no with .p2align 4. On builds with
|
|
|
076f82 |
CET enabled this misaligned entry to strcasecmp.
|
|
|
076f82 |
|
|
|
076f82 |
geometric_mean(N=40) of all benchmarks New / Original: .920
|
|
|
076f82 |
|
|
|
076f82 |
All string/memory tests pass.
|
|
|
076f82 |
Reviewed-by: H.J. Lu <hjl.tools@gmail.com>
|
|
|
076f82 |
|
|
|
076f82 |
(cherry picked from commit d154758e618ec9324f5d339c46db0aa27e8b1226)
|
|
|
076f82 |
|
|
|
076f82 |
diff --git a/sysdeps/x86_64/multiarch/strcmp-sse42.S b/sysdeps/x86_64/multiarch/strcmp-sse42.S
|
|
|
076f82 |
index 6197a723b9e0606e..a6825de8195ad8c6 100644
|
|
|
076f82 |
--- a/sysdeps/x86_64/multiarch/strcmp-sse42.S
|
|
|
076f82 |
+++ b/sysdeps/x86_64/multiarch/strcmp-sse42.S
|
|
|
076f82 |
@@ -89,9 +89,8 @@ ENTRY (GLABEL(__strcasecmp))
|
|
|
076f82 |
movq __libc_tsd_LOCALE@gottpoff(%rip),%rax
|
|
|
076f82 |
mov %fs:(%rax),%RDX_LP
|
|
|
076f82 |
|
|
|
076f82 |
- // XXX 5 byte should be before the function
|
|
|
076f82 |
- /* 5-byte NOP. */
|
|
|
076f82 |
- .byte 0x0f,0x1f,0x44,0x00,0x00
|
|
|
076f82 |
+ /* Either 1 or 5 bytes (dependeing if CET is enabled). */
|
|
|
076f82 |
+ .p2align 4
|
|
|
076f82 |
END (GLABEL(__strcasecmp))
|
|
|
076f82 |
/* FALLTHROUGH to strcasecmp_l. */
|
|
|
076f82 |
#endif
|
|
|
076f82 |
@@ -100,9 +99,8 @@ ENTRY (GLABEL(__strncasecmp))
|
|
|
076f82 |
movq __libc_tsd_LOCALE@gottpoff(%rip),%rax
|
|
|
076f82 |
mov %fs:(%rax),%RCX_LP
|
|
|
076f82 |
|
|
|
076f82 |
- // XXX 5 byte should be before the function
|
|
|
076f82 |
- /* 5-byte NOP. */
|
|
|
076f82 |
- .byte 0x0f,0x1f,0x44,0x00,0x00
|
|
|
076f82 |
+ /* Either 1 or 5 bytes (dependeing if CET is enabled). */
|
|
|
076f82 |
+ .p2align 4
|
|
|
076f82 |
END (GLABEL(__strncasecmp))
|
|
|
076f82 |
/* FALLTHROUGH to strncasecmp_l. */
|
|
|
076f82 |
#endif
|
|
|
076f82 |
@@ -170,27 +168,22 @@ STRCMP_SSE42:
|
|
|
076f82 |
#if defined USE_AS_STRCASECMP_L || defined USE_AS_STRNCASECMP_L
|
|
|
076f82 |
.section .rodata.cst16,"aM",@progbits,16
|
|
|
076f82 |
.align 16
|
|
|
076f82 |
-LABEL(belowupper):
|
|
|
076f82 |
- .quad 0x4040404040404040
|
|
|
076f82 |
- .quad 0x4040404040404040
|
|
|
076f82 |
-LABEL(topupper):
|
|
|
076f82 |
-# ifdef USE_AVX
|
|
|
076f82 |
- .quad 0x5a5a5a5a5a5a5a5a
|
|
|
076f82 |
- .quad 0x5a5a5a5a5a5a5a5a
|
|
|
076f82 |
-# else
|
|
|
076f82 |
- .quad 0x5b5b5b5b5b5b5b5b
|
|
|
076f82 |
- .quad 0x5b5b5b5b5b5b5b5b
|
|
|
076f82 |
-# endif
|
|
|
076f82 |
-LABEL(touppermask):
|
|
|
076f82 |
+LABEL(lcase_min):
|
|
|
076f82 |
+ .quad 0x3f3f3f3f3f3f3f3f
|
|
|
076f82 |
+ .quad 0x3f3f3f3f3f3f3f3f
|
|
|
076f82 |
+LABEL(lcase_max):
|
|
|
076f82 |
+ .quad 0x9999999999999999
|
|
|
076f82 |
+ .quad 0x9999999999999999
|
|
|
076f82 |
+LABEL(case_add):
|
|
|
076f82 |
.quad 0x2020202020202020
|
|
|
076f82 |
.quad 0x2020202020202020
|
|
|
076f82 |
.previous
|
|
|
076f82 |
- movdqa LABEL(belowupper)(%rip), %xmm4
|
|
|
076f82 |
-# define UCLOW_reg %xmm4
|
|
|
076f82 |
- movdqa LABEL(topupper)(%rip), %xmm5
|
|
|
076f82 |
-# define UCHIGH_reg %xmm5
|
|
|
076f82 |
- movdqa LABEL(touppermask)(%rip), %xmm6
|
|
|
076f82 |
-# define LCQWORD_reg %xmm6
|
|
|
076f82 |
+ movdqa LABEL(lcase_min)(%rip), %xmm4
|
|
|
076f82 |
+# define LCASE_MIN_reg %xmm4
|
|
|
076f82 |
+ movdqa LABEL(lcase_max)(%rip), %xmm5
|
|
|
076f82 |
+# define LCASE_MAX_reg %xmm5
|
|
|
076f82 |
+ movdqa LABEL(case_add)(%rip), %xmm6
|
|
|
076f82 |
+# define CASE_ADD_reg %xmm6
|
|
|
076f82 |
#endif
|
|
|
076f82 |
cmp $0x30, %ecx
|
|
|
076f82 |
ja LABEL(crosscache)/* rsi: 16-byte load will cross cache line */
|
|
|
076f82 |
@@ -201,32 +194,26 @@ LABEL(touppermask):
|
|
|
076f82 |
#if defined USE_AS_STRCASECMP_L || defined USE_AS_STRNCASECMP_L
|
|
|
076f82 |
# ifdef USE_AVX
|
|
|
076f82 |
# define TOLOWER(reg1, reg2) \
|
|
|
076f82 |
- vpcmpgtb UCLOW_reg, reg1, %xmm7; \
|
|
|
076f82 |
- vpcmpgtb UCHIGH_reg, reg1, %xmm8; \
|
|
|
076f82 |
- vpcmpgtb UCLOW_reg, reg2, %xmm9; \
|
|
|
076f82 |
- vpcmpgtb UCHIGH_reg, reg2, %xmm10; \
|
|
|
076f82 |
- vpandn %xmm7, %xmm8, %xmm8; \
|
|
|
076f82 |
- vpandn %xmm9, %xmm10, %xmm10; \
|
|
|
076f82 |
- vpand LCQWORD_reg, %xmm8, %xmm8; \
|
|
|
076f82 |
- vpand LCQWORD_reg, %xmm10, %xmm10; \
|
|
|
076f82 |
- vpor reg1, %xmm8, reg1; \
|
|
|
076f82 |
- vpor reg2, %xmm10, reg2
|
|
|
076f82 |
+ vpaddb LCASE_MIN_reg, reg1, %xmm7; \
|
|
|
076f82 |
+ vpaddb LCASE_MIN_reg, reg2, %xmm8; \
|
|
|
076f82 |
+ vpcmpgtb LCASE_MAX_reg, %xmm7, %xmm7; \
|
|
|
076f82 |
+ vpcmpgtb LCASE_MAX_reg, %xmm8, %xmm8; \
|
|
|
076f82 |
+ vpandn CASE_ADD_reg, %xmm7, %xmm7; \
|
|
|
076f82 |
+ vpandn CASE_ADD_reg, %xmm8, %xmm8; \
|
|
|
076f82 |
+ vpaddb %xmm7, reg1, reg1; \
|
|
|
076f82 |
+ vpaddb %xmm8, reg2, reg2
|
|
|
076f82 |
# else
|
|
|
076f82 |
# define TOLOWER(reg1, reg2) \
|
|
|
076f82 |
- movdqa reg1, %xmm7; \
|
|
|
076f82 |
- movdqa UCHIGH_reg, %xmm8; \
|
|
|
076f82 |
- movdqa reg2, %xmm9; \
|
|
|
076f82 |
- movdqa UCHIGH_reg, %xmm10; \
|
|
|
076f82 |
- pcmpgtb UCLOW_reg, %xmm7; \
|
|
|
076f82 |
- pcmpgtb reg1, %xmm8; \
|
|
|
076f82 |
- pcmpgtb UCLOW_reg, %xmm9; \
|
|
|
076f82 |
- pcmpgtb reg2, %xmm10; \
|
|
|
076f82 |
- pand %xmm8, %xmm7; \
|
|
|
076f82 |
- pand %xmm10, %xmm9; \
|
|
|
076f82 |
- pand LCQWORD_reg, %xmm7; \
|
|
|
076f82 |
- pand LCQWORD_reg, %xmm9; \
|
|
|
076f82 |
- por %xmm7, reg1; \
|
|
|
076f82 |
- por %xmm9, reg2
|
|
|
076f82 |
+ movdqa LCASE_MIN_reg, %xmm7; \
|
|
|
076f82 |
+ movdqa LCASE_MIN_reg, %xmm8; \
|
|
|
076f82 |
+ paddb reg1, %xmm7; \
|
|
|
076f82 |
+ paddb reg2, %xmm8; \
|
|
|
076f82 |
+ pcmpgtb LCASE_MAX_reg, %xmm7; \
|
|
|
076f82 |
+ pcmpgtb LCASE_MAX_reg, %xmm8; \
|
|
|
076f82 |
+ pandn CASE_ADD_reg, %xmm7; \
|
|
|
076f82 |
+ pandn CASE_ADD_reg, %xmm8; \
|
|
|
076f82 |
+ paddb %xmm7, reg1; \
|
|
|
076f82 |
+ paddb %xmm8, reg2
|
|
|
076f82 |
# endif
|
|
|
076f82 |
TOLOWER (%xmm1, %xmm2)
|
|
|
076f82 |
#else
|