[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[commits] r10980 - in /fsf/trunk/libc: ./ sysdeps/x86_64/multiarch/
- To: commits@xxxxxxxxxx
- Subject: [commits] r10980 - in /fsf/trunk/libc: ./ sysdeps/x86_64/multiarch/
- From: eglibc@xxxxxxxxxx
- Date: Sat, 17 Jul 2010 07:02:38 -0000
Author: eglibc
Date: Sat Jul 17 00:02:38 2010
New Revision: 10980
Log:
Import glibc-mainline for 2010-07-17
Added:
fsf/trunk/libc/sysdeps/x86_64/multiarch/strcasestr-nonascii.c
Modified:
fsf/trunk/libc/ChangeLog
fsf/trunk/libc/sysdeps/x86_64/multiarch/Makefile
fsf/trunk/libc/sysdeps/x86_64/multiarch/strcasestr.c
fsf/trunk/libc/sysdeps/x86_64/multiarch/strstr.c
Modified: fsf/trunk/libc/ChangeLog
==============================================================================
--- fsf/trunk/libc/ChangeLog (original)
+++ fsf/trunk/libc/ChangeLog Sat Jul 17 00:02:38 2010
@@ -1,3 +1,13 @@
+2010-07-16 Ulrich Drepper <drepper@xxxxxxxxxx>
+
+ * sysdeps/x86_64/multiarch/strstr.c: Rewrite to avoid indirect function
+ call in strcasestr.
+ * sysdeps/x86_64/multiarch/strcasestr.c: Declare
+ __strcasestr_sse42_nonascii.
+ * sysdeps/x86_64/multiarch/Makefile: Add rules to build
+ strcasestr-nonascii.c.
+ * sysdeps/x86_64/multiarch/strcasestr-nonascii.c: New file.
+
2010-06-15 Luis Machado <luisgpm@xxxxxxxxxx>
* sysdeps/powerpc/powerpc32/power6/fpu/s_copysign.S: New file.
Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/Makefile
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/Makefile (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/Makefile Sat Jul 17 00:02:38 2010
@@ -7,7 +7,7 @@
sysdep_routines += stpncpy-c strncpy-c strcmp-ssse3 strncmp-ssse3 \
strend-sse4 memcmp-sse4 memcpy-ssse3 mempcpy-ssse3 \
memmove-ssse3 memcpy-ssse3-back mempcpy-ssse3-back \
- memmove-ssse3-back
+ memmove-ssse3-back strcasestr-nonascii
ifeq (yes,$(config-cflags-sse4))
sysdep_routines += strcspn-c strpbrk-c strspn-c strstr-c strcasestr-c
CFLAGS-strcspn-c.c += -msse4
@@ -15,5 +15,6 @@
CFLAGS-strspn-c.c += -msse4
CFLAGS-strstr.c += -msse4
CFLAGS-strcasestr.c += -msse4
+CFLAGS-strcasestr-nonascii.c += -msse4
endif
endif
Added: fsf/trunk/libc/sysdeps/x86_64/multiarch/strcasestr-nonascii.c
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/strcasestr-nonascii.c (added)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/strcasestr-nonascii.c Sat Jul 17 00:02:38 2010
@@ -1,0 +1,50 @@
+/* strstr with SSE4.2 intrinsics
+ Copyright (C) 2010 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, write to the Free
+ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
+ 02111-1307 USA. */
+
+# include <ctype.h>
+
+
+/* Similar to __m128i_strloadu. Convert to lower case for none-POSIX/C
+ locale. */
+static inline __m128i
+__m128i_strloadu_tolower (const unsigned char * p)
+{
+ union
+ {
+ char b[16];
+ __m128i x;
+ } u;
+
+ for (int i = 0; i < 16; ++i)
+ if (p[i] == 0)
+ {
+ u.b[i] = 0;
+ break;
+ }
+ else
+ u.b[i] = tolower (p[i]);
+
+ return u.x;
+}
+
+
+#define STRCASESTR_NONASCII
+#define USE_AS_STRCASESTR
+#define STRSTR_SSE42 attribute_hidden __strcasestr_sse42_nonascii
+#include "strstr.c"
Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/strcasestr.c
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/strcasestr.c (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/strcasestr.c Sat Jul 17 00:02:38 2010
@@ -1,3 +1,7 @@
+extern char *__strcasestr_sse42_nonascii (const unsigned char *s1,
+ const unsigned char *s2)
+ attribute_hidden;
+
#define USE_AS_STRCASESTR
#define STRSTR_SSE42 __strcasestr_sse42
#include "strstr.c"
Modified: fsf/trunk/libc/sysdeps/x86_64/multiarch/strstr.c
==============================================================================
--- fsf/trunk/libc/sysdeps/x86_64/multiarch/strstr.c (original)
+++ fsf/trunk/libc/sysdeps/x86_64/multiarch/strstr.c Sat Jul 17 00:02:38 2010
@@ -1,5 +1,5 @@
/* strstr with SSE4.2 intrinsics
- Copyright (C) 2009 Free Software Foundation, Inc.
+ Copyright (C) 2009, 2010 Free Software Foundation, Inc.
Contributed by Intel Corporation.
This file is part of the GNU C Library.
@@ -67,10 +67,10 @@
case ECX CFlag ZFlag SFlag
3 X 1 0 0/1
- 4a 0 1 0 0
- 4b 0 1 0 1
- 4c 0 < X 1 0 0/1
- 5 16 0 1 0
+ 4a 0 1 0 0
+ 4b 0 1 0 1
+ 4c 0 < X 1 0 0/1
+ 5 16 0 1 0
3. An initial ordered-comparison fragment match, we fix up to do
subsequent string comparison
@@ -147,8 +147,7 @@
If EOS occurs within less than 16B before 4KB boundary, we don't
cross to next page. */
-static __m128i
-__attribute__ ((section (".text.sse4.2")))
+static inline __m128i
__m128i_strloadu (const unsigned char * p)
{
int offset = ((size_t) p & (16 - 1));
@@ -164,14 +163,12 @@
return _mm_loadu_si128 ((__m128i *) p);
}
-#ifdef USE_AS_STRCASESTR
+#if defined USE_AS_STRCASESTR && !defined STRCASESTR_NONASCII
/* Similar to __m128i_strloadu. Convert to lower case for POSIX/C
locale. */
-
-static __m128i
-__attribute__ ((section (".text.sse4.2")))
-__m128i_strloadu_tolower_posix (const unsigned char * p)
+static inline __m128i
+__m128i_strloadu_tolower (const unsigned char * p)
{
__m128i frag = __m128i_strloadu (p);
@@ -184,39 +181,13 @@
return _mm_blendv_epi8 (frag, mask2, mask1);
}
-/* Similar to __m128i_strloadu. Convert to lower case for none-POSIX/C
- locale. */
-
-static __m128i
-__attribute__ ((section (".text.sse4.2")))
-__m128i_strloadu_tolower (const unsigned char * p)
-{
- union
- {
- char b[16];
- __m128i x;
- } u;
-
- for (int i = 0; i < 16; i++)
- if (p[i] == 0)
- {
- u.b[i] = 0;
- break;
- }
- else
- u.b[i] = tolower (p[i]);
-
- return u.x;
-}
#endif
/* Calculate Knuth-Morris-Pratt string searching algorithm (or KMP
algorithm) overlap for a fully populated 16B vector.
Input parameter: 1st 16Byte loaded from the reference string of a
strstr function.
- We don't use KMP algorithm if reference string is less than 16B.
- */
-
+ We don't use KMP algorithm if reference string is less than 16B. */
static int
__inline__ __attribute__ ((__always_inline__,))
KMP16Bovrlap (__m128i s2)
@@ -236,7 +207,7 @@
return 1;
else if (!k1)
{
- /* There are al least two ditinct char in s2. If byte 0 and 1 are
+ /* There are al least two distinct chars in s2. If byte 0 and 1 are
idential and the distinct value lies farther down, we can deduce
the next byte offset to restart full compare is least no earlier
than byte 3. */
@@ -256,23 +227,26 @@
#define p1 s1
const unsigned char *p2 = s2;
- if (p2[0] == '\0')
+#ifndef STRCASESTR_NONASCII
+ if (__builtin_expect (p2[0] == '\0', 0))
return (char *) p1;
- if (p1[0] == '\0')
+ if (__builtin_expect (p1[0] == '\0', 0))
return NULL;
/* Check if p1 length is 1 byte long. */
- if (p1[1] == '\0')
+ if (__builtin_expect (p1[1] == '\0', 0))
return p2[1] == '\0' && CMPBYTE (p1[0], p2[0]) ? (char *) p1 : NULL;
+#endif
#ifdef USE_AS_STRCASESTR
- __m128i (*strloadu) (const unsigned char *);
-
- if (_NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_NONASCII_CASE) == 0)
- strloadu = __m128i_strloadu_tolower_posix;
- else
- strloadu = __m128i_strloadu_tolower;
+# ifndef STRCASESTR_NONASCII
+ if (__builtin_expect (_NL_CURRENT_WORD (LC_CTYPE, _NL_CTYPE_NONASCII_CASE)
+ != 0, 0))
+ return __strcasestr_sse42_nonascii (s1, s2);
+# endif
+
+# define strloadu __m128i_strloadu_tolower
#else
# define strloadu __m128i_strloadu
#endif