diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2017-04-05 15:24:30 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2017-04-07 08:09:47 -0700 |
| commit | 32ffd2e11cfe3f7c71988bca8cbe0ba514e71340 (patch) | |
| tree | aceb8c8179af8bae4f1a27f2e6a98455fb0698d4 /sysdeps/x86/cpu-features.c | |
| parent | bf7730194fed694a9ce821c306683266a5a7b78b (diff) | |
| download | glibc-hjl/hwcap/master.zip glibc-hjl/hwcap/master.tar.gz glibc-hjl/hwcap/master.tar.bz2 | |
x86: Set dl_hwcap from CPU featureshjl/hwcap/master
On x86, the usage of AT_HWCAP in glibc is obsolete since addition of
dl_x86_cpu_features. dl_hwcap, which was set from AT_HWCAP, is used by
dynamic linker to build an array of hardware capability names, which are
added to search path when loading shared object. dl_hwcap was unused on
x86-64 and only SSE2 was used on i386.
This patch sets dl_hwcap with new hardware capabilities from CPU
features. Currently, 2 capabilities, SSE2 and AVX2, are supported.
The maximum number of hardware capabilities is 64. Since x86-64
includes SSE2, SSE2 is skipped on x86-64. dl_x86_cap_flags is kepted
for i386 and is used by _dl_show_auxv. dl_x86_hwcap_flags is added
for new hardware capabilities.
* sysdeps/i386/dl-hwcap.h: New file.
* sysdeps/x86/dl-hwcap.h: Likewise.
* sysdeps/x86_64/dl-hwcap.h: Likewise.
* sysdeps/x86_64/dl-procinfo.h: Likewise.
* sysdeps/i386/dl-procinfo.c (_dl_x86_hwcap_flags): New.
* sysdeps/i386/dl-procinfo.h: Include <dl-hwcap.h>.
(_DL_HWCAP_COUNT): Removed.
(HWCAP_I386_XXX): Likewise.
(HWCAP_IMPORTANT): Likewise.
(_dl_procinfo): Likewise.
(_dl_hwcap_string): Likewise.
(_dl_string_hwcap): Likewise.
* sysdeps/unix/sysv/linux/i386/dl-procinfo.h (_dl_procinfo):
Replace _DL_HWCAP_COUNT with 32.
* sysdeps/unix/sysv/linux/x86_64/dl-procinfo.h [!IS_IN (ldconfig)]:
Include <sysdeps/x86_64/dl-procinfo.h>.
* sysdeps/x86/cpu-features.c: Include <dl-hwcap.h>.
(init_cpu_features): Set dl_hwcap and dl_hwcap_mask.
* sysdeps/x86_64/dl-procinfo.c (_dl_x86_hwcap_flags): New.
Diffstat (limited to 'sysdeps/x86/cpu-features.c')
| -rw-r--r-- | sysdeps/x86/cpu-features.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sysdeps/x86/cpu-features.c b/sysdeps/x86/cpu-features.c index 33788ed..10fe2f3 100644 --- a/sysdeps/x86/cpu-features.c +++ b/sysdeps/x86/cpu-features.c @@ -18,6 +18,7 @@ #include <cpuid.h> #include <cpu-features.h> +#include <dl-hwcap.h> static void get_common_indeces (struct cpu_features *cpu_features, @@ -302,4 +303,12 @@ no_cpuid: cpu_features->family = family; cpu_features->model = model; cpu_features->kind = kind; + + /* Reuse dl_hwcap and dl_hwcap_mask for x86. */ + GLRO(dl_hwcap) = 0; + if (CPU_FEATURES_CPU_P (cpu_features, SSE2)) + GLRO(dl_hwcap) |= HWCAP_X86_SSE2; + if (CPU_FEATURES_ARCH_P (cpu_features, AVX2_Usable)) + GLRO(dl_hwcap) |= HWCAP_X86_AVX2; + GLRO(dl_hwcap_mask) = HWCAP_IMPORTANT; } |