[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commits] r18607 - in /fsf/glibc-2_15-branch/libc: ./ scripts/ sysdeps/i386/i686/multiarch/ sysdeps/x86_64/fpu/multiarch/ sysdeps/x86_...
- To: commits@xxxxxxxxxx
- Subject: [Commits] r18607 - in /fsf/glibc-2_15-branch/libc: ./ scripts/ sysdeps/i386/i686/multiarch/ sysdeps/x86_64/fpu/multiarch/ sysdeps/x86_...
- From: eglibc@xxxxxxxxxx
- Date: Sat, 19 May 2012 00:03:18 -0000
Author: eglibc
Date: Sat May 19 00:03:16 2012
New Revision: 18607
Log:
Import glibc-2.15 for 2012-05-19
Added:
fsf/glibc-2_15-branch/libc/sysdeps/i386/i686/multiarch/test-multiarch.c
fsf/glibc-2_15-branch/libc/sysdeps/x86_64/multiarch/test-multiarch.c
Modified:
fsf/glibc-2_15-branch/libc/ChangeLog
fsf/glibc-2_15-branch/libc/NEWS
fsf/glibc-2_15-branch/libc/scripts/firstversions.awk
fsf/glibc-2_15-branch/libc/sysdeps/i386/i686/multiarch/Makefile
fsf/glibc-2_15-branch/libc/sysdeps/x86_64/fpu/multiarch/e_atan2.c
fsf/glibc-2_15-branch/libc/sysdeps/x86_64/fpu/multiarch/e_exp.c
fsf/glibc-2_15-branch/libc/sysdeps/x86_64/fpu/multiarch/e_log.c
fsf/glibc-2_15-branch/libc/sysdeps/x86_64/fpu/multiarch/s_atan.c
fsf/glibc-2_15-branch/libc/sysdeps/x86_64/fpu/multiarch/s_sin.c
fsf/glibc-2_15-branch/libc/sysdeps/x86_64/fpu/multiarch/s_tan.c
fsf/glibc-2_15-branch/libc/sysdeps/x86_64/multiarch/Makefile
fsf/glibc-2_15-branch/libc/sysdeps/x86_64/multiarch/init-arch.c
fsf/glibc-2_15-branch/libc/sysdeps/x86_64/multiarch/init-arch.h
fsf/glibc-2_15-branch/libc/sysdeps/x86_64/multiarch/strcmp.S
Modified: fsf/glibc-2_15-branch/libc/ChangeLog
==============================================================================
--- fsf/glibc-2_15-branch/libc/ChangeLog (original)
+++ fsf/glibc-2_15-branch/libc/ChangeLog Sat May 19 00:03:16 2012
@@ -1,3 +1,33 @@
+2012-05-17 Andreas Jaeger <aj@xxxxxxx>
+ Carlos O'Donell <carlos_odonell@xxxxxxxxxx>
+
+ [BZ #14059]
+ * sysdeps/x86_64/multiarch/init-arch.h
+ (bit_YMM_Usable): Rename to...
+ (bit_AVX_Usable): ... this.
+ (bit_FMA4_Usable): New macro.
+ (bit_XMM_state): New macro.
+ (bit_YMM_state): New macro.
+ [__ASSEMBLER__] (index_YMM_Usable): Rename to...
+ [__ASSEMBLER__] (index_AVX_Usable): ... this.
+ [__ASSEMBLER__] (index_FMA4_Usable): New macro.
+ (CPUID_OSXSAVE): New macro.
+ (CPUID_AVX): New macro.
+ (CPUID_FMA4): New macro.
+ (index_YMM_Usable): Rename to...
+ (index_AVX_Usable): ... this.
+ (HAS_AVX): Use HAS_ARCH_FEATURE.
+ (HAS_FMA4): Likewise.
+ (HAS_YMM_USABLE): Remove.
+ * sysdeps/x86_64/multiarch/init-arch.c (__init_cpu_features):
+ Enable AVX or FMA4 IFF YMM and XMM states are usable and the features
+ are present.
+ * sysdeps/x86_64/multiarch/strcmp.S: Use bit_AVX_Usable.
+ * sysdeps/i386/i686/multiarch/Makefile: Add test-multiarch to tests.
+ * sysdeps/x86_64/multiarch/Makefile: Likewise.
+ * sysdeps/i386/i686/multiarch/test-multiarch.c: New file.
+ * sysdeps/x86_64/multiarch/test-multiarch.c: New file.
+
2012-02-27 David S. Miller <davem@xxxxxxxxxxxxx>
* sysdeps/ieee754/ldbl-128/s_nearbyintl.c (__nearbyintl): Do not
@@ -100,6 +130,26 @@
* sysdeps/i386/fpu/feupdateenv.c (__feupdateenv) Invoke __feraiseexcept
instead of feraiseexcept.
+
+2012-01-28 Chris Metcalf <cmetcalf@xxxxxxxxxx>
+
+ * scripts/firstversions.awk: Fix bug in version range handling.
+
+2012-01-26 Ulrich Drepper <drepper@xxxxxxxxx>
+
+ [BZ #13583]
+ * sysdeps/x86_64/multiarch/init-arch.h: Define bit_OSXSAVE.
+ Clean up HAS_* macros.
+ * sysdeps/x86_64/multiarch/init-arch.c (__init_cpu_features): If
+ bit_AVX is set also check OSXAVE/XCR0 and set bit_YMM_Usable if
+ possible.
+ * sysdeps/x86_64/fpu/multiarch/e_atan2.c: Use HAS_YMM_USABLE, not
+ HAS_AVX.
+ * sysdeps/x86_64/fpu/multiarch/e_exp.c: Likewise.
+ * sysdeps/x86_64/fpu/multiarch/e_log.c: Likewise.
+ * sysdeps/x86_64/fpu/multiarch/s_atan.c: Likewise.
+ * sysdeps/x86_64/fpu/multiarch/s_sin.c: Likewise.
+ * sysdeps/x86_64/fpu/multiarch/s_tan.c: Likewise.
2012-01-01 Ulrich Drepper <drepper@xxxxxxxxx>
Modified: fsf/glibc-2_15-branch/libc/NEWS
==============================================================================
--- fsf/glibc-2_15-branch/libc/NEWS (original)
+++ fsf/glibc-2_15-branch/libc/NEWS Sat May 19 00:03:16 2012
@@ -1,5 +1,5 @@
GNU C Library NEWS -- history of user-visible changes. 2011-12-23
-Copyright (C) 1992-2009, 2010, 2011 Free Software Foundation, Inc.
+Copyright (C) 1992-2012 Free Software Foundation, Inc.
See the end for copying conditions.
Please send GNU C library bug reports via <http://sources.redhat.com/bugzilla/>
@@ -9,7 +9,8 @@
* The following bugs are resolved with this release:
- 411, 2547, 2548, 11365, 11494, 13731, 13732, 13733, 13747, 13748, 13749
+ 411, 2547, 2548, 11365, 11494, 13583, 13731, 13732, 13733, 13747, 13748,
+ 13749, 13753, 13771, 13774, 14059
Version 2.15
Modified: fsf/glibc-2_15-branch/libc/scripts/firstversions.awk
==============================================================================
--- fsf/glibc-2_15-branch/libc/scripts/firstversions.awk (original)
+++ fsf/glibc-2_15-branch/libc/scripts/firstversions.awk Sat May 19 00:03:16 2012
@@ -54,9 +54,13 @@
while (vers_compare($1, v) >= 0) {
delete firstversion[thislib, idx[thislib]];
idx[thislib]++;
- if ((thislib, idx[thislib]) in firstversion)
+ if ((thislib, idx[thislib]) in firstversion) {
+ # If we're skipping a referenced version to jump ahead to a
+ # later version, synthesize the earlier referenced version now.
+ if (v != $1 && (thislib, v) in usedversion)
+ print " " v;
v = firstversion[thislib, idx[thislib]];
- else
+ } else
break;
}
if ($1 == v || $1 == f)
Modified: fsf/glibc-2_15-branch/libc/sysdeps/i386/i686/multiarch/Makefile
==============================================================================
--- fsf/glibc-2_15-branch/libc/sysdeps/i386/i686/multiarch/Makefile (original)
+++ fsf/glibc-2_15-branch/libc/sysdeps/i386/i686/multiarch/Makefile Sat May 19 00:03:16 2012
@@ -1,5 +1,6 @@
ifeq ($(subdir),csu)
aux += init-arch
+tests += test-multiarch
gen-as-const-headers += ifunc-defines.sym
endif
Added: fsf/glibc-2_15-branch/libc/sysdeps/i386/i686/multiarch/test-multiarch.c
==============================================================================
--- fsf/glibc-2_15-branch/libc/sysdeps/i386/i686/multiarch/test-multiarch.c (added)
+++ fsf/glibc-2_15-branch/libc/sysdeps/i386/i686/multiarch/test-multiarch.c Sat May 19 00:03:16 2012
@@ -1,0 +1,1 @@
+#include <sysdeps/x86_64/multiarch/test-multiarch.c>
Modified: fsf/glibc-2_15-branch/libc/sysdeps/x86_64/fpu/multiarch/e_atan2.c
==============================================================================
--- fsf/glibc-2_15-branch/libc/sysdeps/x86_64/fpu/multiarch/e_atan2.c (original)
+++ fsf/glibc-2_15-branch/libc/sysdeps/x86_64/fpu/multiarch/e_atan2.c Sat May 19 00:03:16 2012
@@ -14,7 +14,7 @@
libm_ifunc (__ieee754_atan2,
HAS_FMA4 ? __ieee754_atan2_fma4
- : (HAS_AVX ? __ieee754_atan2_avx : __ieee754_atan2_sse2));
+ : (HAS_YMM_USABLE ? __ieee754_atan2_avx : __ieee754_atan2_sse2));
strong_alias (__ieee754_atan2, __atan2_finite)
# define __ieee754_atan2 __ieee754_atan2_sse2
Modified: fsf/glibc-2_15-branch/libc/sysdeps/x86_64/fpu/multiarch/e_exp.c
==============================================================================
--- fsf/glibc-2_15-branch/libc/sysdeps/x86_64/fpu/multiarch/e_exp.c (original)
+++ fsf/glibc-2_15-branch/libc/sysdeps/x86_64/fpu/multiarch/e_exp.c Sat May 19 00:03:16 2012
@@ -14,7 +14,7 @@
libm_ifunc (__ieee754_exp,
HAS_FMA4 ? __ieee754_exp_fma4
- : (HAS_AVX ? __ieee754_exp_avx : __ieee754_exp_sse2));
+ : (HAS_YMM_USABLE ? __ieee754_exp_avx : __ieee754_exp_sse2));
strong_alias (__ieee754_exp, __exp_finite)
# define __ieee754_exp __ieee754_exp_sse2
Modified: fsf/glibc-2_15-branch/libc/sysdeps/x86_64/fpu/multiarch/e_log.c
==============================================================================
--- fsf/glibc-2_15-branch/libc/sysdeps/x86_64/fpu/multiarch/e_log.c (original)
+++ fsf/glibc-2_15-branch/libc/sysdeps/x86_64/fpu/multiarch/e_log.c Sat May 19 00:03:16 2012
@@ -14,7 +14,7 @@
libm_ifunc (__ieee754_log,
HAS_FMA4 ? __ieee754_log_fma4
- : (HAS_AVX ? __ieee754_log_avx
+ : (HAS_YMM_USABLE ? __ieee754_log_avx
: __ieee754_log_sse2));
strong_alias (__ieee754_log, __log_finite)
Modified: fsf/glibc-2_15-branch/libc/sysdeps/x86_64/fpu/multiarch/s_atan.c
==============================================================================
--- fsf/glibc-2_15-branch/libc/sysdeps/x86_64/fpu/multiarch/s_atan.c (original)
+++ fsf/glibc-2_15-branch/libc/sysdeps/x86_64/fpu/multiarch/s_atan.c Sat May 19 00:03:16 2012
@@ -12,7 +12,8 @@
# define __atan_fma4 ((void *) 0)
# endif
-libm_ifunc (atan, HAS_FMA4 ? __atan_fma4 : HAS_AVX ? __atan_avx : __atan_sse2);
+libm_ifunc (atan, (HAS_FMA4 ? __atan_fma4 :
+ HAS_YMM_USABLE ? __atan_avx : __atan_sse2));
# define atan __atan_sse2
#endif
Modified: fsf/glibc-2_15-branch/libc/sysdeps/x86_64/fpu/multiarch/s_sin.c
==============================================================================
--- fsf/glibc-2_15-branch/libc/sysdeps/x86_64/fpu/multiarch/s_sin.c (original)
+++ fsf/glibc-2_15-branch/libc/sysdeps/x86_64/fpu/multiarch/s_sin.c Sat May 19 00:03:16 2012
@@ -17,10 +17,12 @@
# define __sin_fma4 ((void *) 0)
# endif
-libm_ifunc (__cos, HAS_FMA4 ? __cos_fma4 : HAS_AVX ? __cos_avx : __cos_sse2);
+libm_ifunc (__cos, (HAS_FMA4 ? __cos_fma4 :
+ HAS_YMM_USABLE ? __cos_avx : __cos_sse2));
weak_alias (__cos, cos)
-libm_ifunc (__sin, HAS_FMA4 ? __sin_fma4 : HAS_AVX ? __sin_avx : __sin_sse2);
+libm_ifunc (__sin, (HAS_FMA4 ? __sin_fma4 :
+ HAS_YMM_USABLE ? __sin_avx : __sin_sse2));
weak_alias (__sin, sin)
# define __cos __cos_sse2
Modified: fsf/glibc-2_15-branch/libc/sysdeps/x86_64/fpu/multiarch/s_tan.c
==============================================================================
--- fsf/glibc-2_15-branch/libc/sysdeps/x86_64/fpu/multiarch/s_tan.c (original)
+++ fsf/glibc-2_15-branch/libc/sysdeps/x86_64/fpu/multiarch/s_tan.c Sat May 19 00:03:16 2012
@@ -12,7 +12,8 @@
# define __tan_fma4 ((void *) 0)
# endif
-libm_ifunc (tan, HAS_FMA4 ? __tan_fma4 : HAS_AVX ? __tan_avx : __tan_sse2);
+libm_ifunc (tan, (HAS_FMA4 ? __tan_fma4 :
+ HAS_YMM_USABLE ? __tan_avx : __tan_sse2));
# define tan __tan_sse2
#endif
Modified: fsf/glibc-2_15-branch/libc/sysdeps/x86_64/multiarch/Makefile
==============================================================================
--- fsf/glibc-2_15-branch/libc/sysdeps/x86_64/multiarch/Makefile (original)
+++ fsf/glibc-2_15-branch/libc/sysdeps/x86_64/multiarch/Makefile Sat May 19 00:03:16 2012
@@ -1,5 +1,6 @@
ifeq ($(subdir),csu)
aux += init-arch
+tests += test-multiarch
gen-as-const-headers += ifunc-defines.sym
endif
Modified: fsf/glibc-2_15-branch/libc/sysdeps/x86_64/multiarch/init-arch.c
==============================================================================
--- fsf/glibc-2_15-branch/libc/sysdeps/x86_64/multiarch/init-arch.c (original)
+++ fsf/glibc-2_15-branch/libc/sysdeps/x86_64/multiarch/init-arch.c Sat May 19 00:03:16 2012
@@ -1,6 +1,6 @@
/* Initialize CPU feature data.
This file is part of the GNU C Library.
- Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 2008-2012 Free Software Foundation, Inc.
Contributed by Ulrich Drepper <drepper@xxxxxxxxxx>.
The GNU C Library is free software; you can redistribute it and/or
@@ -144,6 +144,25 @@
else
kind = arch_kind_other;
+ /* Can we call xgetbv? */
+ if (CPUID_OSXSAVE)
+ {
+ unsigned int xcrlow;
+ unsigned int xcrhigh;
+ asm ("xgetbv" : "=a" (xcrlow), "=d" (xcrhigh) : "c" (0));
+ /* Is YMM and XMM state usable? */
+ if ((xcrlow & (bit_YMM_state | bit_XMM_state)) ==
+ (bit_YMM_state | bit_XMM_state))
+ {
+ /* Determine if AVX is usable. */
+ if (CPUID_AVX)
+ __cpu_features.feature[index_AVX_Usable] |= bit_AVX_Usable;
+ /* Determine if FMA4 is usable. */
+ if (CPUID_FMA4)
+ __cpu_features.feature[index_FMA4_Usable] |= bit_FMA4_Usable;
+ }
+ }
+
__cpu_features.family = family;
__cpu_features.model = model;
atomic_write_barrier ();
Modified: fsf/glibc-2_15-branch/libc/sysdeps/x86_64/multiarch/init-arch.h
==============================================================================
--- fsf/glibc-2_15-branch/libc/sysdeps/x86_64/multiarch/init-arch.h (original)
+++ fsf/glibc-2_15-branch/libc/sysdeps/x86_64/multiarch/init-arch.h Sat May 19 00:03:16 2012
@@ -1,5 +1,5 @@
/* This file is part of the GNU C Library.
- Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 2008-2012 Free Software Foundation, Inc.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -22,15 +22,23 @@
#define bit_Prefer_SSE_for_memop (1 << 3)
#define bit_Fast_Unaligned_Load (1 << 4)
#define bit_Prefer_PMINUB_for_stringop (1 << 5)
+#define bit_AVX_Usable (1 << 6)
+#define bit_FMA4_Usable (1 << 7)
+/* CPUID Feature flags. */
#define bit_SSE2 (1 << 26)
#define bit_SSSE3 (1 << 9)
#define bit_SSE4_1 (1 << 19)
#define bit_SSE4_2 (1 << 20)
+#define bit_OSXSAVE (1 << 27)
#define bit_AVX (1 << 28)
#define bit_POPCOUNT (1 << 23)
#define bit_FMA (1 << 12)
#define bit_FMA4 (1 << 16)
+
+/* XCR0 Feature flags. */
+#define bit_XMM_state (1 << 1)
+#define bit_YMM_state (2 << 1)
#ifdef __ASSEMBLER__
@@ -48,6 +56,8 @@
# define index_Prefer_SSE_for_memop FEATURE_INDEX_1*FEATURE_SIZE
# define index_Fast_Unaligned_Load FEATURE_INDEX_1*FEATURE_SIZE
# define index_Prefer_PMINUB_for_stringop FEATURE_INDEX_1*FEATURE_SIZE
+# define index_AVX_Usable FEATURE_INDEX_1*FEATURE_SIZE
+# define index_FMA4_Usable FEATURE_INDEX_1*FEATURE_SIZE
#else /* __ASSEMBLER__ */
@@ -92,7 +102,7 @@
extern void __init_cpu_features (void) attribute_hidden;
-#define INIT_ARCH()\
+# define INIT_ARCH() \
do \
if (__cpu_features.kind == arch_kind_unknown) \
__init_cpu_features (); \
@@ -111,37 +121,45 @@
/* Following are the feature tests used throughout libc. */
+/* CPUID_* evaluates to true if the feature flag is enabled.
+ We always use &__cpu_features because the HAS_CPUID_* macros
+ are called only within __init_cpu_features, where we can't
+ call __get_cpu_features without infinite recursion. */
+# define HAS_CPUID_FLAG(idx, reg, bit) \
+ (((&__cpu_features)->cpuid[idx].reg & (bit)) != 0)
+
+# define CPUID_OSXSAVE \
+ HAS_CPUID_FLAG (COMMON_CPUID_INDEX_1, ecx, bit_OSXSAVE)
+# define CPUID_AVX \
+ HAS_CPUID_FLAG (COMMON_CPUID_INDEX_1, ecx, bit_AVX)
+# define CPUID_FMA4 \
+ HAS_CPUID_FLAG (COMMON_CPUID_INDEX_80000001, ecx, bit_FMA4)
+
+/* HAS_* evaluates to true if we may use the feature at runtime. */
# define HAS_SSE2 HAS_CPU_FEATURE (COMMON_CPUID_INDEX_1, edx, bit_SSE2)
# define HAS_POPCOUNT HAS_CPU_FEATURE (COMMON_CPUID_INDEX_1, ecx, bit_POPCOUNT)
# define HAS_SSSE3 HAS_CPU_FEATURE (COMMON_CPUID_INDEX_1, ecx, bit_SSSE3)
# define HAS_SSE4_1 HAS_CPU_FEATURE (COMMON_CPUID_INDEX_1, ecx, bit_SSE4_1)
# define HAS_SSE4_2 HAS_CPU_FEATURE (COMMON_CPUID_INDEX_1, ecx, bit_SSE4_2)
# define HAS_FMA HAS_CPU_FEATURE (COMMON_CPUID_INDEX_1, ecx, bit_FMA)
-# define HAS_AVX HAS_CPU_FEATURE (COMMON_CPUID_INDEX_1, ecx, bit_AVX)
-# define HAS_FMA4 HAS_CPU_FEATURE (COMMON_CPUID_INDEX_80000001, ecx, bit_FMA4)
# define index_Fast_Rep_String FEATURE_INDEX_1
# define index_Fast_Copy_Backward FEATURE_INDEX_1
# define index_Slow_BSF FEATURE_INDEX_1
# define index_Prefer_SSE_for_memop FEATURE_INDEX_1
# define index_Fast_Unaligned_Load FEATURE_INDEX_1
+# define index_AVX_Usable FEATURE_INDEX_1
+# define index_FMA4_Usable FEATURE_INDEX_1
-#define HAS_ARCH_FEATURE(idx, bit) \
- ((__get_cpu_features ()->feature[idx] & (bit)) != 0)
+# define HAS_ARCH_FEATURE(name) \
+ ((__get_cpu_features ()->feature[index_##name] & (bit_##name)) != 0)
-#define HAS_FAST_REP_STRING \
- HAS_ARCH_FEATURE (index_Fast_Rep_String, bit_Fast_Rep_String)
-
-#define HAS_FAST_COPY_BACKWARD \
- HAS_ARCH_FEATURE (index_Fast_Copy_Backward, bit_Fast_Copy_Backward)
-
-#define HAS_SLOW_BSF \
- HAS_ARCH_FEATURE (index_Slow_BSF, bit_Slow_BSF)
-
-#define HAS_PREFER_SSE_FOR_MEMOP \
- HAS_ARCH_FEATURE (index_Prefer_SSE_for_memop, bit_Prefer_SSE_for_memop)
-
-#define HAS_FAST_UNALIGNED_LOAD \
- HAS_ARCH_FEATURE (index_Fast_Unaligned_Load, bit_Fast_Unaligned_Load)
+# define HAS_FAST_REP_STRING HAS_ARCH_FEATURE (Fast_Rep_String)
+# define HAS_FAST_COPY_BACKWARD HAS_ARCH_FEATURE (Fast_Copy_Backward)
+# define HAS_SLOW_BSF HAS_ARCH_FEATURE (Slow_BSF)
+# define HAS_PREFER_SSE_FOR_MEMOP HAS_ARCH_FEATURE (Prefer_SSE_for_memop)
+# define HAS_FAST_UNALIGNED_LOAD HAS_ARCH_FEATURE (Fast_Unaligned_Load)
+# define HAS_AVX HAS_ARCH_FEATURE (AVX_Usable)
+# define HAS_FMA4 HAS_ARCH_FEATURE (FMA4_Usable)
#endif /* __ASSEMBLER__ */
Modified: fsf/glibc-2_15-branch/libc/sysdeps/x86_64/multiarch/strcmp.S
==============================================================================
--- fsf/glibc-2_15-branch/libc/sysdeps/x86_64/multiarch/strcmp.S (original)
+++ fsf/glibc-2_15-branch/libc/sysdeps/x86_64/multiarch/strcmp.S Sat May 19 00:03:16 2012
@@ -1,5 +1,5 @@
/* strcmp with SSE4.2
- Copyright (C) 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 2009-2012 Free Software Foundation, Inc.
Contributed by Intel Corporation.
This file is part of the GNU C Library.
@@ -84,6 +84,7 @@
.text
ENTRY(STRCMP)
.type STRCMP, @gnu_indirect_function
+ /* Manually inlined call to __get_cpu_features. */
cmpl $0, __cpu_features+KIND_OFFSET(%rip)
jne 1f
call __init_cpu_features
@@ -101,13 +102,14 @@
# ifdef USE_AS_STRCASECMP_L
ENTRY(__strcasecmp)
.type __strcasecmp, @gnu_indirect_function
+ /* Manually inlined call to __get_cpu_features. */
cmpl $0, __cpu_features+KIND_OFFSET(%rip)
jne 1f
call __init_cpu_features
1:
# ifdef HAVE_AVX_SUPPORT
leaq __strcasecmp_avx(%rip), %rax
- testl $bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip)
+ testl $bit_AVX_Usable, __cpu_features+FEATURE_OFFSET+index_AVX_Usable(%rip)
jnz 2f
# endif
leaq __strcasecmp_sse42(%rip), %rax
@@ -124,13 +126,14 @@
# ifdef USE_AS_STRNCASECMP_L
ENTRY(__strncasecmp)
.type __strncasecmp, @gnu_indirect_function
+ /* Manually inlined call to __get_cpu_features. */
cmpl $0, __cpu_features+KIND_OFFSET(%rip)
jne 1f
call __init_cpu_features
1:
# ifdef HAVE_AVX_SUPPORT
leaq __strncasecmp_avx(%rip), %rax
- testl $bit_AVX, __cpu_features+CPUID_OFFSET+index_AVX(%rip)
+ testl $bit_AVX_Usable, __cpu_features+FEATURE_OFFSET+index_AVX_Usable(%rip)
jnz 2f
# endif
leaq __strncasecmp_sse42(%rip), %rax
Added: fsf/glibc-2_15-branch/libc/sysdeps/x86_64/multiarch/test-multiarch.c
==============================================================================
--- fsf/glibc-2_15-branch/libc/sysdeps/x86_64/multiarch/test-multiarch.c (added)
+++ fsf/glibc-2_15-branch/libc/sysdeps/x86_64/multiarch/test-multiarch.c Sat May 19 00:03:16 2012
@@ -1,0 +1,90 @@
+/* Test CPU feature data.
+ This file is part of the GNU C Library.
+ Copyright (C) 2012 Free Software Foundation, Inc.
+
+ 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 <init-arch.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+static char *cpu_flags;
+
+/* Search for flags in /proc/cpuinfo and store line
+ in cpu_flags. */
+void
+get_cpuinfo (void)
+{
+ FILE *f;
+ char *line = NULL;
+ size_t len = 0;
+ ssize_t read;
+
+ f = fopen ("/proc/cpuinfo", "r");
+ if (f == NULL)
+ {
+ printf ("cannot open /proc/cpuinfo");
+ exit (1);
+ }
+
+ while ((read = getline (&line, &len, f)) != -1)
+ {
+ if (strncmp (line, "flags", 5) == 0)
+ {
+ cpu_flags = strdup (line);
+ break;
+ }
+ }
+ fclose (f);
+ free (line);
+}
+
+int
+check_proc (const char *proc_name, int flag, const char *name)
+{
+ int found = 0;
+
+ printf ("Checking %s:\n", name);
+ printf (" init-arch %d\n", flag);
+ if (strstr (cpu_flags, proc_name) != NULL)
+ found = 1;
+ printf (" cpuinfo (%s) %d\n", proc_name, found);
+
+ if (found != flag)
+ printf (" *** failure ***\n");
+
+ return (found != flag);
+}
+
+static int
+do_test (int argc, char **argv)
+{
+ int fails;
+
+ get_cpuinfo ();
+ fails = check_proc ("avx", HAS_AVX, "HAS_AVX");
+ fails += check_proc ("fma4", HAS_FMA4, "HAS_FMA4");
+ fails += check_proc ("sse4_2", HAS_SSE4_2, "HAS_SSE4_2");
+ fails += check_proc ("sse4_1", HAS_SSE4_1, "HAS_SSE4_1");
+ fails += check_proc ("ssse3", HAS_SSSE3, "HAS_SSSE3");
+ fails += check_proc ("popcnt", HAS_POPCOUNT, "HAS_POPCOUNT");
+
+ printf ("%d differences between /proc/cpuinfo and glibc code.\n", fails);
+
+ return (fails != 0);
+}
+
+#include "../../../test-skeleton.c"
_______________________________________________
Commits mailing list
Commits@xxxxxxxxxx
http://eglibc.org/cgi-bin/mailman/listinfo/commits