cheng/libsodium
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Check the extended control register to see if AVX is actually usable

Browse Source
This commit is contained in:
Frank Denis 2015-12-14 16:45:44 +01:00
parent 53570303d0
commit ab4bade488
1 changed files with 27 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/libsodium/sodium/runtime.c
View File

@ -1,4 +1,6 @@
#include <stddef.h>
#include <stdint.h>
#ifdef HAVE_ANDROID_GETCPUFEATURES #ifdef HAVE_ANDROID_GETCPUFEATURES
# include <cpu-features.h> # include <cpu-features.h>
#endif #endif
@ -26,6 +28,11 @@ static CPUFeatures _cpu_features;
#define CPUIDECX_AVX 0x10000000 #define CPUIDECX_AVX 0x10000000
#define CPUIDECX_PCLMUL 0x00000002 #define CPUIDECX_PCLMUL 0x00000002
#define CPUIDECX_AESNI 0x02000000 #define CPUIDECX_AESNI 0x02000000
#define CPUIDECX_XSAVE 0x04000000
#define CPUIDECX_OSXSAVE 0x08000000
#define XCR0_SSE 0x00000002
#define XCR0_AVX 0x00000004
static int static int
_sodium_runtime_arm_cpu_features(CPUFeatures * const cpu_features) _sodium_runtime_arm_cpu_features(CPUFeatures * const cpu_features)
@ -130,11 +137,21 @@ _sodium_runtime_intel_cpu_features(CPUFeatures * const cpu_features)
cpu_features->has_sse41 = 0; cpu_features->has_sse41 = 0;
#endif #endif
cpu_features->has_avx = 0;
#if defined(HAVE_AVXINTRIN_H) || \ #if defined(HAVE_AVXINTRIN_H) || \
(defined(_MSC_VER) && (defined(_M_X64) || defined(_M_AMD64) || defined(_M_IX86))) (defined(_MSC_VER) && (defined(_M_X64) || defined(_M_AMD64) || defined(_M_IX86)))
# ifdef HAVE_AMD64_ASM
if ((cpu_info[2] & (CPUIDECX_AVX | CPUIDECX_XSAVE | CPUIDECX_OSXSAVE))
== (CPUIDECX_AVX | CPUIDECX_XSAVE | CPUIDECX_OSXSAVE)) {
uint32_t eax, edx;
__asm__ __volatile__ (".byte 0x0f, 0x01, 0xd0" /* XGETBV */
: "=a"(eax), "=d"(edx)
: "c"((uint32_t) 0U));
if ((eax & (XCR0_SSE | XCR0_AVX)) == (XCR0_SSE | XCR0_AVX)) {
cpu_features->has_avx = ((cpu_info[2] & CPUIDECX_AVX) != 0x0); cpu_features->has_avx = ((cpu_info[2] & CPUIDECX_AVX) != 0x0);
#else }
cpu_features->has_avx = 0; }
# endif
#endif #endif
#if defined(HAVE_WMMINTRIN_H) || \ #if defined(HAVE_WMMINTRIN_H) || \