x86: Extend CPUID support in struct cpu_features
Extend CPUID support for all feature bits from CPUID. Add a new macro, CPU_FEATURE_USABLE, which can be used to check if a feature is usable at run-time, instead of HAS_CPU_FEATURE and HAS_ARCH_FEATURE. Add COMMON_CPUID_INDEX_D_ECX_1, COMMON_CPUID_INDEX_80000007 and COMMON_CPUID_INDEX_80000008 to check CPU feature bits in them. Tested on i686 and x86-64 as well as using build-many-glibcs.py with x86 targets. * sysdeps/x86/cacheinfo.c (intel_check_word): Updated for cpu_features_basic. (__cache_sysconf): Likewise. (init_cacheinfo): Likewise. * sysdeps/x86/cpu-features.c (get_extended_indeces): Also populate COMMON_CPUID_INDEX_80000007 and COMMON_CPUID_INDEX_80000008. (get_common_indices): Also populate COMMON_CPUID_INDEX_D_ECX_1. Use CPU_FEATURES_CPU_P (cpu_features, XSAVEC) to check if XSAVEC is available. Set the bit_arch_XXX_Usable bits. (init_cpu_features): Use _Static_assert on index_arch_Fast_Unaligned_Load. __get_cpuid_registers and __get_arch_feature. Updated for cpu_features_basic. Set stepping in cpu_features. * sysdeps/x86/cpu-features.h: (FEATURE_INDEX_1): Changed to enum. (FEATURE_INDEX_2): New. (FEATURE_INDEX_MAX): Changed to enum. (COMMON_CPUID_INDEX_D_ECX_1): New. (COMMON_CPUID_INDEX_80000007): Likewise. (COMMON_CPUID_INDEX_80000008): Likewise. (cpuid_registers): Likewise. (cpu_features_basic): Likewise. (CPU_FEATURE_USABLE): Likewise. (bit_arch_XXX_Usable): Likewise. (cpu_features): Use cpuid_registers and cpu_features_basic. (bit_arch_XXX): Reweritten. (bit_cpu_XXX): Likewise. (index_cpu_XXX): Likewise. (reg_XXX): Likewise. * sysdeps/x86/tst-get-cpu-features.c: Include <stdio.h> and <support/check.h>. (CHECK_CPU_FEATURE): New. (CHECK_CPU_FEATURE_USABLE): Likewise. (cpu_kinds): Likewise. (do_test): Print vendor, family, model and stepping. Check HAS_CPU_FEATURE and CPU_FEATURE_USABLE. (TEST_FUNCTION): Removed. Include <support/test-driver.c> instead of "../../test-skeleton.c". * sysdeps/x86_64/multiarch/sched_cpucount.c (__sched_cpucount): Check POPCNT instead of POPCOUNT. * sysdeps/x86_64/multiarch/test-multiarch.c (do_test): Likewise.
This commit is contained in:
H.J. Lu
parent
7b36d26b22
commit
c22e4c2a14
45
ChangeLog
45
ChangeLog
|
|
@ -1,3 +1,48 @@
|
|||
2018-12-03 H.J. Lu <hongjiu.lu@intel.com>
|
||||
|
||||
* sysdeps/x86/cacheinfo.c (intel_check_word): Updated for
|
||||
cpu_features_basic.
|
||||
(__cache_sysconf): Likewise.
|
||||
(init_cacheinfo): Likewise.
|
||||
* sysdeps/x86/cpu-features.c (get_extended_indeces): Also
|
||||
populate COMMON_CPUID_INDEX_80000007 and
|
||||
COMMON_CPUID_INDEX_80000008.
|
||||
(get_common_indices): Also populate COMMON_CPUID_INDEX_D_ECX_1.
|
||||
Use CPU_FEATURES_CPU_P (cpu_features, XSAVEC) to check if
|
||||
XSAVEC is available. Set the bit_arch_XXX_Usable bits.
|
||||
(init_cpu_features): Use _Static_assert on
|
||||
index_arch_Fast_Unaligned_Load.
|
||||
__get_cpuid_registers and __get_arch_feature. Updated for
|
||||
cpu_features_basic. Set stepping in cpu_features.
|
||||
* sysdeps/x86/cpu-features.h: (FEATURE_INDEX_1): Changed to enum.
|
||||
(FEATURE_INDEX_2): New.
|
||||
(FEATURE_INDEX_MAX): Changed to enum.
|
||||
(COMMON_CPUID_INDEX_D_ECX_1): New.
|
||||
(COMMON_CPUID_INDEX_80000007): Likewise.
|
||||
(COMMON_CPUID_INDEX_80000008): Likewise.
|
||||
(cpuid_registers): Likewise.
|
||||
(cpu_features_basic): Likewise.
|
||||
(CPU_FEATURE_USABLE): Likewise.
|
||||
(bit_arch_XXX_Usable): Likewise.
|
||||
(cpu_features): Use cpuid_registers and cpu_features_basic.
|
||||
(bit_arch_XXX): Reweritten.
|
||||
(bit_cpu_XXX): Likewise.
|
||||
(index_cpu_XXX): Likewise.
|
||||
(reg_XXX): Likewise.
|
||||
* sysdeps/x86/tst-get-cpu-features.c: Include <stdio.h> and
|
||||
<support/check.h>.
|
||||
(CHECK_CPU_FEATURE): New.
|
||||
(CHECK_CPU_FEATURE_USABLE): Likewise.
|
||||
(cpu_kinds): Likewise.
|
||||
(do_test): Print vendor, family, model and stepping. Check
|
||||
HAS_CPU_FEATURE and CPU_FEATURE_USABLE.
|
||||
(TEST_FUNCTION): Removed.
|
||||
Include <support/test-driver.c> instead of
|
||||
"../../test-skeleton.c".
|
||||
* sysdeps/x86_64/multiarch/sched_cpucount.c (__sched_cpucount):
|
||||
Check POPCNT instead of POPCOUNT.
|
||||
* sysdeps/x86_64/multiarch/test-multiarch.c (do_test): Likewise.
|
||||
|
||||
2018-12-03 Samuel Thibault <samuel.thibault@ens-lyon.org>
|
||||
|
||||
* scripts/gen-as-const.py (main): Avoid emitting empty line when
|
||||
|
|
|
|||
|
|
@ -205,8 +205,8 @@ intel_check_word (int name, unsigned int value, bool *has_level_2,
|
|||
/* Intel reused this value. For family 15, model 6 it
|
||||
specifies the 3rd level cache. Otherwise the 2nd
|
||||
level cache. */
|
||||
unsigned int family = cpu_features->family;
|
||||
unsigned int model = cpu_features->model;
|
||||
unsigned int family = cpu_features->basic.family;
|
||||
unsigned int model = cpu_features->basic.model;
|
||||
|
||||
if (family == 15 && model == 6)
|
||||
{
|
||||
|
|
@ -258,7 +258,7 @@ intel_check_word (int name, unsigned int value, bool *has_level_2,
|
|||
static long int __attribute__ ((noinline))
|
||||
handle_intel (int name, const struct cpu_features *cpu_features)
|
||||
{
|
||||
unsigned int maxidx = cpu_features->max_cpuid;
|
||||
unsigned int maxidx = cpu_features->basic.max_cpuid;
|
||||
|
||||
/* Return -1 for older CPUs. */
|
||||
if (maxidx < 2)
|
||||
|
|
@ -443,10 +443,10 @@ __cache_sysconf (int name)
|
|||
{
|
||||
const struct cpu_features *cpu_features = __get_cpu_features ();
|
||||
|
||||
if (cpu_features->kind == arch_kind_intel)
|
||||
if (cpu_features->basic.kind == arch_kind_intel)
|
||||
return handle_intel (name, cpu_features);
|
||||
|
||||
if (cpu_features->kind == arch_kind_amd)
|
||||
if (cpu_features->basic.kind == arch_kind_amd)
|
||||
return handle_amd (name);
|
||||
|
||||
// XXX Fill in more vendors.
|
||||
|
|
@ -497,9 +497,9 @@ init_cacheinfo (void)
|
|||
unsigned int level;
|
||||
unsigned int threads = 0;
|
||||
const struct cpu_features *cpu_features = __get_cpu_features ();
|
||||
int max_cpuid = cpu_features->max_cpuid;
|
||||
int max_cpuid = cpu_features->basic.max_cpuid;
|
||||
|
||||
if (cpu_features->kind == arch_kind_intel)
|
||||
if (cpu_features->basic.kind == arch_kind_intel)
|
||||
{
|
||||
data = handle_intel (_SC_LEVEL1_DCACHE_SIZE, cpu_features);
|
||||
|
||||
|
|
@ -538,8 +538,8 @@ init_cacheinfo (void)
|
|||
highest cache level. */
|
||||
if (max_cpuid >= 4)
|
||||
{
|
||||
unsigned int family = cpu_features->family;
|
||||
unsigned int model = cpu_features->model;
|
||||
unsigned int family = cpu_features->basic.family;
|
||||
unsigned int model = cpu_features->basic.model;
|
||||
|
||||
int i = 0;
|
||||
|
||||
|
|
@ -700,7 +700,7 @@ intel_bug_no_cache_info:
|
|||
shared += core;
|
||||
}
|
||||
}
|
||||
else if (cpu_features->kind == arch_kind_amd)
|
||||
else if (cpu_features->basic.kind == arch_kind_amd)
|
||||
{
|
||||
data = handle_amd (_SC_LEVEL1_DCACHE_SIZE);
|
||||
long int core = handle_amd (_SC_LEVEL2_CACHE_SIZE);
|
||||
|
|
|
|||
|
|
@ -53,7 +53,18 @@ get_extended_indices (struct cpu_features *cpu_features)
|
|||
cpu_features->cpuid[COMMON_CPUID_INDEX_80000001].ebx,
|
||||
cpu_features->cpuid[COMMON_CPUID_INDEX_80000001].ecx,
|
||||
cpu_features->cpuid[COMMON_CPUID_INDEX_80000001].edx);
|
||||
|
||||
if (eax >= 0x80000007)
|
||||
__cpuid (0x80000007,
|
||||
cpu_features->cpuid[COMMON_CPUID_INDEX_80000007].eax,
|
||||
cpu_features->cpuid[COMMON_CPUID_INDEX_80000007].ebx,
|
||||
cpu_features->cpuid[COMMON_CPUID_INDEX_80000007].ecx,
|
||||
cpu_features->cpuid[COMMON_CPUID_INDEX_80000007].edx);
|
||||
if (eax >= 0x80000008)
|
||||
__cpuid (0x80000008,
|
||||
cpu_features->cpuid[COMMON_CPUID_INDEX_80000008].eax,
|
||||
cpu_features->cpuid[COMMON_CPUID_INDEX_80000008].ebx,
|
||||
cpu_features->cpuid[COMMON_CPUID_INDEX_80000008].ecx,
|
||||
cpu_features->cpuid[COMMON_CPUID_INDEX_80000008].edx);
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
@ -79,13 +90,20 @@ get_common_indices (struct cpu_features *cpu_features,
|
|||
}
|
||||
}
|
||||
|
||||
if (cpu_features->max_cpuid >= 7)
|
||||
if (cpu_features->basic.max_cpuid >= 7)
|
||||
__cpuid_count (7, 0,
|
||||
cpu_features->cpuid[COMMON_CPUID_INDEX_7].eax,
|
||||
cpu_features->cpuid[COMMON_CPUID_INDEX_7].ebx,
|
||||
cpu_features->cpuid[COMMON_CPUID_INDEX_7].ecx,
|
||||
cpu_features->cpuid[COMMON_CPUID_INDEX_7].edx);
|
||||
|
||||
if (cpu_features->basic.max_cpuid >= 0xd)
|
||||
__cpuid_count (0xd, 1,
|
||||
cpu_features->cpuid[COMMON_CPUID_INDEX_D_ECX_1].eax,
|
||||
cpu_features->cpuid[COMMON_CPUID_INDEX_D_ECX_1].ebx,
|
||||
cpu_features->cpuid[COMMON_CPUID_INDEX_D_ECX_1].ecx,
|
||||
cpu_features->cpuid[COMMON_CPUID_INDEX_D_ECX_1].edx);
|
||||
|
||||
/* Can we call xgetbv? */
|
||||
if (CPU_FEATURES_CPU_P (cpu_features, OSXSAVE))
|
||||
{
|
||||
|
|
@ -117,6 +135,18 @@ get_common_indices (struct cpu_features *cpu_features,
|
|||
if (CPU_FEATURES_CPU_P (cpu_features, FMA))
|
||||
cpu_features->feature[index_arch_FMA_Usable]
|
||||
|= bit_arch_FMA_Usable;
|
||||
/* Determine if VAES is usable. */
|
||||
if (CPU_FEATURES_CPU_P (cpu_features, VAES))
|
||||
cpu_features->feature[index_arch_VAES_Usable]
|
||||
|= bit_arch_VAES_Usable;
|
||||
/* Determine if VPCLMULQDQ is usable. */
|
||||
if (CPU_FEATURES_CPU_P (cpu_features, VPCLMULQDQ))
|
||||
cpu_features->feature[index_arch_VPCLMULQDQ_Usable]
|
||||
|= bit_arch_VPCLMULQDQ_Usable;
|
||||
/* Determine if XOP is usable. */
|
||||
if (CPU_FEATURES_CPU_P (cpu_features, XOP))
|
||||
cpu_features->feature[index_arch_XOP_Usable]
|
||||
|= bit_arch_XOP_Usable;
|
||||
}
|
||||
|
||||
/* Check if OPMASK state, upper 256-bit of ZMM0-ZMM15 and
|
||||
|
|
@ -130,17 +160,69 @@ get_common_indices (struct cpu_features *cpu_features,
|
|||
{
|
||||
cpu_features->feature[index_arch_AVX512F_Usable]
|
||||
|= bit_arch_AVX512F_Usable;
|
||||
/* Determine if AVX512CD is usable. */
|
||||
if (CPU_FEATURES_CPU_P (cpu_features, AVX512CD))
|
||||
cpu_features->feature[index_arch_AVX512CD_Usable]
|
||||
|= bit_arch_AVX512CD_Usable;
|
||||
/* Determine if AVX512ER is usable. */
|
||||
if (CPU_FEATURES_CPU_P (cpu_features, AVX512ER))
|
||||
cpu_features->feature[index_arch_AVX512ER_Usable]
|
||||
|= bit_arch_AVX512ER_Usable;
|
||||
/* Determine if AVX512PF is usable. */
|
||||
if (CPU_FEATURES_CPU_P (cpu_features, AVX512PF))
|
||||
cpu_features->feature[index_arch_AVX512PF_Usable]
|
||||
|= bit_arch_AVX512PF_Usable;
|
||||
/* Determine if AVX512VL is usable. */
|
||||
if (CPU_FEATURES_CPU_P (cpu_features, AVX512VL))
|
||||
cpu_features->feature[index_arch_AVX512VL_Usable]
|
||||
|= bit_arch_AVX512VL_Usable;
|
||||
/* Determine if AVX512DQ is usable. */
|
||||
if (CPU_FEATURES_CPU_P (cpu_features, AVX512DQ))
|
||||
cpu_features->feature[index_arch_AVX512DQ_Usable]
|
||||
|= bit_arch_AVX512DQ_Usable;
|
||||
/* Determine if AVX512BW is usable. */
|
||||
if (CPU_FEATURES_CPU_P (cpu_features, AVX512BW))
|
||||
cpu_features->feature[index_arch_AVX512BW_Usable]
|
||||
|= bit_arch_AVX512BW_Usable;
|
||||
/* Determine if AVX512_4FMAPS is usable. */
|
||||
if (CPU_FEATURES_CPU_P (cpu_features, AVX512_4FMAPS))
|
||||
cpu_features->feature[index_arch_AVX512_4FMAPS_Usable]
|
||||
|= bit_arch_AVX512_4FMAPS_Usable;
|
||||
/* Determine if AVX512_4VNNIW is usable. */
|
||||
if (CPU_FEATURES_CPU_P (cpu_features, AVX512_4VNNIW))
|
||||
cpu_features->feature[index_arch_AVX512_4VNNIW_Usable]
|
||||
|= bit_arch_AVX512_4VNNIW_Usable;
|
||||
/* Determine if AVX512_BITALG is usable. */
|
||||
if (CPU_FEATURES_CPU_P (cpu_features, AVX512_BITALG))
|
||||
cpu_features->feature[index_arch_AVX512_BITALG_Usable]
|
||||
|= bit_arch_AVX512_BITALG_Usable;
|
||||
/* Determine if AVX512_IFMA is usable. */
|
||||
if (CPU_FEATURES_CPU_P (cpu_features, AVX512_IFMA))
|
||||
cpu_features->feature[index_arch_AVX512_IFMA_Usable]
|
||||
|= bit_arch_AVX512_IFMA_Usable;
|
||||
/* Determine if AVX512_VBMI is usable. */
|
||||
if (CPU_FEATURES_CPU_P (cpu_features, AVX512_VBMI))
|
||||
cpu_features->feature[index_arch_AVX512_VBMI_Usable]
|
||||
|= bit_arch_AVX512_VBMI_Usable;
|
||||
/* Determine if AVX512_VBMI2 is usable. */
|
||||
if (CPU_FEATURES_CPU_P (cpu_features, AVX512_VBMI2))
|
||||
cpu_features->feature[index_arch_AVX512_VBMI2_Usable]
|
||||
|= bit_arch_AVX512_VBMI2_Usable;
|
||||
/* Determine if is AVX512_VNNI usable. */
|
||||
if (CPU_FEATURES_CPU_P (cpu_features, AVX512_VNNI))
|
||||
cpu_features->feature[index_arch_AVX512_VNNI_Usable]
|
||||
|= bit_arch_AVX512_VNNI_Usable;
|
||||
/* Determine if AVX512_VPOPCNTDQ is usable. */
|
||||
if (CPU_FEATURES_CPU_P (cpu_features, AVX512_VPOPCNTDQ))
|
||||
cpu_features->feature[index_arch_AVX512_VPOPCNTDQ_Usable]
|
||||
|= bit_arch_AVX512_VPOPCNTDQ_Usable;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/* For _dl_runtime_resolve, set xsave_state_size to xsave area
|
||||
size + integer register save size and align it to 64 bytes. */
|
||||
if (cpu_features->max_cpuid >= 0xd)
|
||||
if (cpu_features->basic.max_cpuid >= 0xd)
|
||||
{
|
||||
unsigned int eax, ebx, ecx, edx;
|
||||
|
||||
|
|
@ -155,10 +237,8 @@ get_common_indices (struct cpu_features *cpu_features,
|
|||
cpu_features->xsave_state_full_size
|
||||
= xsave_state_full_size;
|
||||
|
||||
__cpuid_count (0xd, 1, eax, ebx, ecx, edx);
|
||||
|
||||
/* Check if XSAVEC is available. */
|
||||
if ((eax & (1 << 1)) != 0)
|
||||
if (CPU_FEATURES_CPU_P (cpu_features, XSAVEC))
|
||||
{
|
||||
unsigned int xstate_comp_offsets[32];
|
||||
unsigned int xstate_comp_sizes[32];
|
||||
|
|
@ -210,12 +290,25 @@ get_common_indices (struct cpu_features *cpu_features,
|
|||
}
|
||||
}
|
||||
|
||||
_Static_assert (((index_arch_Fast_Unaligned_Load
|
||||
== index_arch_Fast_Unaligned_Copy)
|
||||
&& (index_arch_Fast_Unaligned_Load
|
||||
== index_arch_Prefer_PMINUB_for_stringop)
|
||||
&& (index_arch_Fast_Unaligned_Load
|
||||
== index_arch_Slow_SSE4_2)
|
||||
&& (index_arch_Fast_Unaligned_Load
|
||||
== index_arch_Fast_Rep_String)
|
||||
&& (index_arch_Fast_Unaligned_Load
|
||||
== index_arch_Fast_Copy_Backward)),
|
||||
"Incorrect index_arch_Fast_Unaligned_Load");
|
||||
|
||||
static inline void
|
||||
init_cpu_features (struct cpu_features *cpu_features)
|
||||
{
|
||||
unsigned int ebx, ecx, edx;
|
||||
unsigned int family = 0;
|
||||
unsigned int model = 0;
|
||||
unsigned int stepping = 0;
|
||||
enum cpu_features_kind kind;
|
||||
|
||||
#if !HAS_CPUID
|
||||
|
|
@ -226,12 +319,12 @@ init_cpu_features (struct cpu_features *cpu_features)
|
|||
}
|
||||
#endif
|
||||
|
||||
__cpuid (0, cpu_features->max_cpuid, ebx, ecx, edx);
|
||||
__cpuid (0, cpu_features->basic.max_cpuid, ebx, ecx, edx);
|
||||
|
||||
/* This spells out "GenuineIntel". */
|
||||
if (ebx == 0x756e6547 && ecx == 0x6c65746e && edx == 0x49656e69)
|
||||
{
|
||||
unsigned int extended_model, stepping;
|
||||
unsigned int extended_model;
|
||||
|
||||
kind = arch_kind_intel;
|
||||
|
||||
|
|
@ -270,15 +363,6 @@ init_cpu_features (struct cpu_features *cpu_features)
|
|||
case 0x5d:
|
||||
/* Unaligned load versions are faster than SSSE3
|
||||
on Silvermont. */
|
||||
#if index_arch_Fast_Unaligned_Load != index_arch_Prefer_PMINUB_for_stringop
|
||||
# error index_arch_Fast_Unaligned_Load != index_arch_Prefer_PMINUB_for_stringop
|
||||
#endif
|
||||
#if index_arch_Fast_Unaligned_Load != index_arch_Slow_SSE4_2
|
||||
# error index_arch_Fast_Unaligned_Load != index_arch_Slow_SSE4_2
|
||||
#endif
|
||||
#if index_arch_Fast_Unaligned_Load != index_arch_Fast_Unaligned_Copy
|
||||
# error index_arch_Fast_Unaligned_Load != index_arch_Fast_Unaligned_Copy
|
||||
#endif
|
||||
cpu_features->feature[index_arch_Fast_Unaligned_Load]
|
||||
|= (bit_arch_Fast_Unaligned_Load
|
||||
| bit_arch_Fast_Unaligned_Copy
|
||||
|
|
@ -301,15 +385,6 @@ init_cpu_features (struct cpu_features *cpu_features)
|
|||
case 0x2f:
|
||||
/* Rep string instructions, unaligned load, unaligned copy,
|
||||
and pminub are fast on Intel Core i3, i5 and i7. */
|
||||
#if index_arch_Fast_Rep_String != index_arch_Fast_Unaligned_Load
|
||||
# error index_arch_Fast_Rep_String != index_arch_Fast_Unaligned_Load
|
||||
#endif
|
||||
#if index_arch_Fast_Rep_String != index_arch_Prefer_PMINUB_for_stringop
|
||||
# error index_arch_Fast_Rep_String != index_arch_Prefer_PMINUB_for_stringop
|
||||
#endif
|
||||
#if index_arch_Fast_Rep_String != index_arch_Fast_Unaligned_Copy
|
||||
# error index_arch_Fast_Rep_String != index_arch_Fast_Unaligned_Copy
|
||||
#endif
|
||||
cpu_features->feature[index_arch_Fast_Rep_String]
|
||||
|= (bit_arch_Fast_Rep_String
|
||||
| bit_arch_Fast_Unaligned_Load
|
||||
|
|
@ -353,7 +428,7 @@ init_cpu_features (struct cpu_features *cpu_features)
|
|||
/* This spells out "AuthenticAMD". */
|
||||
else if (ebx == 0x68747541 && ecx == 0x444d4163 && edx == 0x69746e65)
|
||||
{
|
||||
unsigned int extended_model, stepping;
|
||||
unsigned int extended_model;
|
||||
|
||||
kind = arch_kind_amd;
|
||||
|
||||
|
|
@ -375,9 +450,6 @@ init_cpu_features (struct cpu_features *cpu_features)
|
|||
|
||||
if (family == 0x15)
|
||||
{
|
||||
#if index_arch_Fast_Unaligned_Load != index_arch_Fast_Copy_Backward
|
||||
# error index_arch_Fast_Unaligned_Load != index_arch_Fast_Copy_Backward
|
||||
#endif
|
||||
/* "Excavator" */
|
||||
if (model >= 0x60 && model <= 0x7f)
|
||||
{
|
||||
|
|
@ -409,9 +481,10 @@ init_cpu_features (struct cpu_features *cpu_features)
|
|||
no_cpuid:
|
||||
#endif
|
||||
|
||||
cpu_features->family = family;
|
||||
cpu_features->model = model;
|
||||
cpu_features->kind = kind;
|
||||
cpu_features->basic.kind = kind;
|
||||
cpu_features->basic.family = family;
|
||||
cpu_features->basic.model = model;
|
||||
cpu_features->basic.stepping = stepping;
|
||||
|
||||
#if HAVE_TUNABLES
|
||||
TUNABLE_GET (hwcaps, tunable_val_t *, TUNABLE_CALLBACK (set_hwcaps));
|
||||
|
|
@ -432,7 +505,7 @@ no_cpuid:
|
|||
|
||||
#ifdef __x86_64__
|
||||
GLRO(dl_hwcap) = HWCAP_X86_64;
|
||||
if (cpu_features->kind == arch_kind_intel)
|
||||
if (cpu_features->basic.kind == arch_kind_intel)
|
||||
{
|
||||
const char *platform = NULL;
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -17,15 +17,271 @@
|
|||
<http://www.gnu.org/licenses/>. */
|
||||
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <cpu-features.h>
|
||||
#include <support/check.h>
|
||||
|
||||
#define CHECK_CPU_FEATURE(name) \
|
||||
{ \
|
||||
if (HAS_CPU_FEATURE (name)) \
|
||||
printf (" " #name "\n"); \
|
||||
}
|
||||
|
||||
#define CHECK_CPU_FEATURE_USABLE(name) \
|
||||
{ \
|
||||
if (CPU_FEATURE_USABLE(name)) \
|
||||
printf (" " #name "\n"); \
|
||||
}
|
||||
|
||||
static const char * const cpu_kinds[] =
|
||||
{
|
||||
"Unknown",
|
||||
"Intel",
|
||||
"AMD",
|
||||
"Other",
|
||||
};
|
||||
|
||||
static int
|
||||
do_test (void)
|
||||
{
|
||||
if (__get_cpu_features ()->kind == arch_kind_unknown)
|
||||
abort ();
|
||||
const struct cpu_features *cpu_features = __get_cpu_features ();
|
||||
|
||||
switch (cpu_features->basic.kind)
|
||||
{
|
||||
case arch_kind_intel:
|
||||
case arch_kind_amd:
|
||||
case arch_kind_other:
|
||||
printf ("Vendor: %s\n", cpu_kinds[cpu_features->basic.kind]);
|
||||
printf ("Family: 0x%x\n", cpu_features->basic.family);
|
||||
printf ("Model: 0x%x\n", cpu_features->basic.model);
|
||||
printf ("Stepping: 0x%x\n", cpu_features->basic.stepping);
|
||||
break;
|
||||
|
||||
default:
|
||||
abort ();
|
||||
}
|
||||
|
||||
#ifdef __SSE2__
|
||||
TEST_VERIFY_EXIT (HAS_CPU_FEATURE (SSE2));
|
||||
#endif
|
||||
|
||||
printf ("CPU features:\n");
|
||||
CHECK_CPU_FEATURE (SSE3);
|
||||
CHECK_CPU_FEATURE (PCLMULQDQ);
|
||||
CHECK_CPU_FEATURE (DTES64);
|
||||
CHECK_CPU_FEATURE (MONITOR);
|
||||
CHECK_CPU_FEATURE (DS_CPL);
|
||||
CHECK_CPU_FEATURE (VMX);
|
||||
CHECK_CPU_FEATURE (SMX);
|
||||
CHECK_CPU_FEATURE (EST);
|
||||
CHECK_CPU_FEATURE (TM2);
|
||||
CHECK_CPU_FEATURE (SSSE3);
|
||||
CHECK_CPU_FEATURE (CNXT_ID);
|
||||
CHECK_CPU_FEATURE (SDBG);
|
||||
CHECK_CPU_FEATURE (FMA);
|
||||
CHECK_CPU_FEATURE (CMPXCHG16B);
|
||||
CHECK_CPU_FEATURE (XTPRUPDCTRL);
|
||||
CHECK_CPU_FEATURE (PDCM);
|
||||
CHECK_CPU_FEATURE (PCID);
|
||||
CHECK_CPU_FEATURE (DCA);
|
||||
CHECK_CPU_FEATURE (SSE4_1);
|
||||
CHECK_CPU_FEATURE (SSE4_2);
|
||||
CHECK_CPU_FEATURE (X2APIC);
|
||||
CHECK_CPU_FEATURE (MOVBE);
|
||||
CHECK_CPU_FEATURE (POPCNT);
|
||||
CHECK_CPU_FEATURE (TSC_DEADLINE);
|
||||
CHECK_CPU_FEATURE (AES);
|
||||
CHECK_CPU_FEATURE (XSAVE);
|
||||
CHECK_CPU_FEATURE (OSXSAVE);
|
||||
CHECK_CPU_FEATURE (AVX);
|
||||
CHECK_CPU_FEATURE (F16C);
|
||||
CHECK_CPU_FEATURE (RDRAND);
|
||||
CHECK_CPU_FEATURE (FPU);
|
||||
CHECK_CPU_FEATURE (VME);
|
||||
CHECK_CPU_FEATURE (DE);
|
||||
CHECK_CPU_FEATURE (PSE);
|
||||
CHECK_CPU_FEATURE (TSC);
|
||||
CHECK_CPU_FEATURE (MSR);
|
||||
CHECK_CPU_FEATURE (PAE);
|
||||
CHECK_CPU_FEATURE (MCE);
|
||||
CHECK_CPU_FEATURE (CX8);
|
||||
CHECK_CPU_FEATURE (APIC);
|
||||
CHECK_CPU_FEATURE (SEP);
|
||||
CHECK_CPU_FEATURE (MTRR);
|
||||
CHECK_CPU_FEATURE (PGE);
|
||||
CHECK_CPU_FEATURE (MCA);
|
||||
CHECK_CPU_FEATURE (CMOV);
|
||||
CHECK_CPU_FEATURE (PAT);
|
||||
CHECK_CPU_FEATURE (PSE_36);
|
||||
CHECK_CPU_FEATURE (PSN);
|
||||
CHECK_CPU_FEATURE (CLFSH);
|
||||
CHECK_CPU_FEATURE (DS);
|
||||
CHECK_CPU_FEATURE (ACPI);
|
||||
CHECK_CPU_FEATURE (MMX);
|
||||
CHECK_CPU_FEATURE (FXSR);
|
||||
CHECK_CPU_FEATURE (SSE);
|
||||
CHECK_CPU_FEATURE (SSE2);
|
||||
CHECK_CPU_FEATURE (SS);
|
||||
CHECK_CPU_FEATURE (HTT);
|
||||
CHECK_CPU_FEATURE (TM);
|
||||
CHECK_CPU_FEATURE (PBE);
|
||||
CHECK_CPU_FEATURE (FSGSBASE);
|
||||
CHECK_CPU_FEATURE (TSC_ADJUST);
|
||||
CHECK_CPU_FEATURE (SGX);
|
||||
CHECK_CPU_FEATURE (BMI1);
|
||||
CHECK_CPU_FEATURE (HLE);
|
||||
CHECK_CPU_FEATURE (AVX2);
|
||||
CHECK_CPU_FEATURE (SMEP);
|
||||
CHECK_CPU_FEATURE (BMI2);
|
||||
CHECK_CPU_FEATURE (ERMS);
|
||||
CHECK_CPU_FEATURE (INVPCID);
|
||||
CHECK_CPU_FEATURE (RTM);
|
||||
CHECK_CPU_FEATURE (PQM);
|
||||
CHECK_CPU_FEATURE (MPX);
|
||||
CHECK_CPU_FEATURE (PQE);
|
||||
CHECK_CPU_FEATURE (AVX512F);
|
||||
CHECK_CPU_FEATURE (AVX512DQ);
|
||||
CHECK_CPU_FEATURE (RDSEED);
|
||||
CHECK_CPU_FEATURE (ADX);
|
||||
CHECK_CPU_FEATURE (SMAP);
|
||||
CHECK_CPU_FEATURE (AVX512_IFMA);
|
||||
CHECK_CPU_FEATURE (CLFLUSHOPT);
|
||||
CHECK_CPU_FEATURE (CLWB);
|
||||
CHECK_CPU_FEATURE (TRACE);
|
||||
CHECK_CPU_FEATURE (AVX512PF);
|
||||
CHECK_CPU_FEATURE (AVX512ER);
|
||||
CHECK_CPU_FEATURE (AVX512CD);
|
||||
CHECK_CPU_FEATURE (SHA);
|
||||
CHECK_CPU_FEATURE (AVX512BW);
|
||||
CHECK_CPU_FEATURE (AVX512VL);
|
||||
CHECK_CPU_FEATURE (PREFETCHWT1);
|
||||
CHECK_CPU_FEATURE (AVX512_VBMI);
|
||||
CHECK_CPU_FEATURE (UMIP);
|
||||
CHECK_CPU_FEATURE (PKU);
|
||||
CHECK_CPU_FEATURE (OSPKE);
|
||||
CHECK_CPU_FEATURE (WAITPKG);
|
||||
CHECK_CPU_FEATURE (AVX512_VBMI2);
|
||||
CHECK_CPU_FEATURE (SHSTK);
|
||||
CHECK_CPU_FEATURE (GFNI);
|
||||
CHECK_CPU_FEATURE (VAES);
|
||||
CHECK_CPU_FEATURE (VPCLMULQDQ);
|
||||
CHECK_CPU_FEATURE (AVX512_VNNI);
|
||||
CHECK_CPU_FEATURE (AVX512_BITALG);
|
||||
CHECK_CPU_FEATURE (AVX512_VPOPCNTDQ);
|
||||
CHECK_CPU_FEATURE (RDPID);
|
||||
CHECK_CPU_FEATURE (CLDEMOTE);
|
||||
CHECK_CPU_FEATURE (MOVDIRI);
|
||||
CHECK_CPU_FEATURE (MOVDIR64B);
|
||||
CHECK_CPU_FEATURE (SGX_LC);
|
||||
CHECK_CPU_FEATURE (AVX512_4VNNIW);
|
||||
CHECK_CPU_FEATURE (AVX512_4FMAPS);
|
||||
CHECK_CPU_FEATURE (FSRM);
|
||||
CHECK_CPU_FEATURE (PCONFIG);
|
||||
CHECK_CPU_FEATURE (IBT);
|
||||
CHECK_CPU_FEATURE (IBRS_IBPB);
|
||||
CHECK_CPU_FEATURE (STIBP);
|
||||
CHECK_CPU_FEATURE (CAPABILITIES);
|
||||
CHECK_CPU_FEATURE (SSBD);
|
||||
CHECK_CPU_FEATURE (LAHF64_SAHF64);
|
||||
CHECK_CPU_FEATURE (SVM);
|
||||
CHECK_CPU_FEATURE (LZCNT);
|
||||
CHECK_CPU_FEATURE (SSE4A);
|
||||
CHECK_CPU_FEATURE (PREFETCHW);
|
||||
CHECK_CPU_FEATURE (XOP);
|
||||
CHECK_CPU_FEATURE (LWP);
|
||||
CHECK_CPU_FEATURE (FMA4);
|
||||
CHECK_CPU_FEATURE (TBM);
|
||||
CHECK_CPU_FEATURE (SYSCALL_SYSRET);
|
||||
CHECK_CPU_FEATURE (NX);
|
||||
CHECK_CPU_FEATURE (PAGE1GB);
|
||||
CHECK_CPU_FEATURE (RDTSCP);
|
||||
CHECK_CPU_FEATURE (LM);
|
||||
CHECK_CPU_FEATURE (XSAVEOPT);
|
||||
CHECK_CPU_FEATURE (XSAVEC);
|
||||
CHECK_CPU_FEATURE (XGETBV_ECX_1);
|
||||
CHECK_CPU_FEATURE (XSAVES);
|
||||
CHECK_CPU_FEATURE (INVARIANT_TSC);
|
||||
CHECK_CPU_FEATURE (WBNOINVD);
|
||||
|
||||
printf ("Usable CPU features:\n");
|
||||
CHECK_CPU_FEATURE_USABLE (SSE3);
|
||||
CHECK_CPU_FEATURE_USABLE (PCLMULQDQ);
|
||||
CHECK_CPU_FEATURE_USABLE (SSSE3);
|
||||
CHECK_CPU_FEATURE_USABLE (FMA);
|
||||
CHECK_CPU_FEATURE_USABLE (CMPXCHG16B);
|
||||
CHECK_CPU_FEATURE_USABLE (SSE4_1);
|
||||
CHECK_CPU_FEATURE_USABLE (SSE4_2);
|
||||
CHECK_CPU_FEATURE_USABLE (MOVBE);
|
||||
CHECK_CPU_FEATURE_USABLE (POPCNT);
|
||||
CHECK_CPU_FEATURE_USABLE (AES);
|
||||
CHECK_CPU_FEATURE_USABLE (XSAVE);
|
||||
CHECK_CPU_FEATURE_USABLE (OSXSAVE);
|
||||
CHECK_CPU_FEATURE_USABLE (AVX);
|
||||
CHECK_CPU_FEATURE_USABLE (F16C);
|
||||
CHECK_CPU_FEATURE_USABLE (RDRAND);
|
||||
CHECK_CPU_FEATURE_USABLE (FPU);
|
||||
CHECK_CPU_FEATURE_USABLE (TSC);
|
||||
CHECK_CPU_FEATURE_USABLE (MSR);
|
||||
CHECK_CPU_FEATURE_USABLE (CX8);
|
||||
CHECK_CPU_FEATURE_USABLE (SEP);
|
||||
CHECK_CPU_FEATURE_USABLE (CMOV);
|
||||
CHECK_CPU_FEATURE_USABLE (CLFSH);
|
||||
CHECK_CPU_FEATURE_USABLE (MMX);
|
||||
CHECK_CPU_FEATURE_USABLE (FXSR);
|
||||
CHECK_CPU_FEATURE_USABLE (SSE);
|
||||
CHECK_CPU_FEATURE_USABLE (SSE2);
|
||||
CHECK_CPU_FEATURE_USABLE (FSGSBASE);
|
||||
CHECK_CPU_FEATURE_USABLE (BMI1);
|
||||
CHECK_CPU_FEATURE_USABLE (HLE);
|
||||
CHECK_CPU_FEATURE_USABLE (AVX2);
|
||||
CHECK_CPU_FEATURE_USABLE (BMI2);
|
||||
CHECK_CPU_FEATURE_USABLE (ERMS);
|
||||
CHECK_CPU_FEATURE_USABLE (AVX512F);
|
||||
CHECK_CPU_FEATURE_USABLE (AVX512DQ);
|
||||
CHECK_CPU_FEATURE_USABLE (RDSEED);
|
||||
CHECK_CPU_FEATURE_USABLE (ADX);
|
||||
CHECK_CPU_FEATURE_USABLE (AVX512_IFMA);
|
||||
CHECK_CPU_FEATURE_USABLE (CLFLUSHOPT);
|
||||
CHECK_CPU_FEATURE_USABLE (CLWB);
|
||||
CHECK_CPU_FEATURE_USABLE (AVX512PF);
|
||||
CHECK_CPU_FEATURE_USABLE (AVX512ER);
|
||||
CHECK_CPU_FEATURE_USABLE (AVX512CD);
|
||||
CHECK_CPU_FEATURE_USABLE (SHA);
|
||||
CHECK_CPU_FEATURE_USABLE (AVX512BW);
|
||||
CHECK_CPU_FEATURE_USABLE (AVX512VL);
|
||||
CHECK_CPU_FEATURE_USABLE (PREFETCHWT1);
|
||||
CHECK_CPU_FEATURE_USABLE (AVX512_VBMI);
|
||||
CHECK_CPU_FEATURE_USABLE (AVX512_VBMI2);
|
||||
CHECK_CPU_FEATURE_USABLE (GFNI);
|
||||
CHECK_CPU_FEATURE_USABLE (VAES);
|
||||
CHECK_CPU_FEATURE_USABLE (VPCLMULQDQ);
|
||||
CHECK_CPU_FEATURE_USABLE (AVX512_VNNI);
|
||||
CHECK_CPU_FEATURE_USABLE (AVX512_BITALG);
|
||||
CHECK_CPU_FEATURE_USABLE (AVX512_VPOPCNTDQ);
|
||||
CHECK_CPU_FEATURE_USABLE (RDPID);
|
||||
CHECK_CPU_FEATURE_USABLE (CLDEMOTE);
|
||||
CHECK_CPU_FEATURE_USABLE (MOVDIRI);
|
||||
CHECK_CPU_FEATURE_USABLE (MOVDIR64B);
|
||||
CHECK_CPU_FEATURE_USABLE (AVX512_4VNNIW);
|
||||
CHECK_CPU_FEATURE_USABLE (AVX512_4FMAPS);
|
||||
CHECK_CPU_FEATURE_USABLE (FSRM);
|
||||
CHECK_CPU_FEATURE_USABLE (LAHF64_SAHF64);
|
||||
CHECK_CPU_FEATURE_USABLE (LZCNT);
|
||||
CHECK_CPU_FEATURE_USABLE (SSE4A);
|
||||
CHECK_CPU_FEATURE_USABLE (PREFETCHW);
|
||||
CHECK_CPU_FEATURE_USABLE (XOP);
|
||||
CHECK_CPU_FEATURE_USABLE (FMA4);
|
||||
CHECK_CPU_FEATURE_USABLE (TBM);
|
||||
CHECK_CPU_FEATURE_USABLE (SYSCALL_SYSRET);
|
||||
CHECK_CPU_FEATURE_USABLE (RDTSCP);
|
||||
CHECK_CPU_FEATURE_USABLE (XSAVEOPT);
|
||||
CHECK_CPU_FEATURE_USABLE (XSAVEC);
|
||||
CHECK_CPU_FEATURE_USABLE (XGETBV_ECX_1);
|
||||
CHECK_CPU_FEATURE_USABLE (XSAVES);
|
||||
CHECK_CPU_FEATURE_USABLE (INVARIANT_TSC);
|
||||
CHECK_CPU_FEATURE_USABLE (WBNOINVD);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
#define TEST_FUNCTION do_test ()
|
||||
#include "../../test-skeleton.c"
|
||||
#include <support/test-driver.c>
|
||||
|
|
|
|||
|
|
@ -33,4 +33,4 @@
|
|||
#undef __sched_cpucount
|
||||
|
||||
libc_ifunc (__sched_cpucount,
|
||||
HAS_CPU_FEATURE (POPCOUNT) ? popcount_cpucount : generic_cpucount);
|
||||
HAS_CPU_FEATURE (POPCNT) ? popcount_cpucount : generic_cpucount);
|
||||
|
|
|
|||
|
|
@ -85,8 +85,8 @@ do_test (int argc, char **argv)
|
|||
, "HAS_CPU_FEATURE (SSE4_1)");
|
||||
fails += check_proc ("ssse3", HAS_CPU_FEATURE (SSSE3),
|
||||
"HAS_CPU_FEATURE (SSSE3)");
|
||||
fails += check_proc ("popcnt", HAS_CPU_FEATURE (POPCOUNT),
|
||||
"HAS_CPU_FEATURE (POPCOUNT)");
|
||||
fails += check_proc ("popcnt", HAS_CPU_FEATURE (POPCNT),
|
||||
"HAS_CPU_FEATURE (POPCNT)");
|
||||
|
||||
printf ("%d differences between /proc/cpuinfo and glibc code.\n", fails);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue