diff options
| author | Pieter Wuille <pieter.wuille@gmail.com> | 2018-06-11 09:59:20 -0700 |
|---|---|---|
| committer | Pieter Wuille <pieter.wuille@gmail.com> | 2018-06-26 10:11:08 -0700 |
| commit | 66b2cf1ccfad545a8ec3f2a854e23f647322bf30 (patch) | |
| tree | 42d9bf2ea25002af6a18bcd02fa4458340a44092 | |
| parent | 4c935e2eee456ff66cdfb908b0edffdd1e8a6c04 (diff) | |
Use immintrin.h everywhere for intrinsics
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | src/crypto/sha256_avx2.cpp | 4 | ||||
| -rw-r--r-- | src/crypto/sha256_shani.cpp | 4 | ||||
| -rw-r--r-- | src/crypto/sha256_sse41.cpp | 4 |
4 files changed, 0 insertions, 24 deletions
diff --git a/configure.ac b/configure.ac index 2826f29ed8..9e635994ef 100644 --- a/configure.ac +++ b/configure.ac @@ -348,11 +348,7 @@ CXXFLAGS="$CXXFLAGS $SSE41_CXXFLAGS" AC_MSG_CHECKING(for SSE4.1 intrinsics) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <stdint.h> - #if defined(_MSC_VER) #include <immintrin.h> - #elif defined(__GNUC__) - #include <x86intrin.h> - #endif ]],[[ __m128i l = _mm_set1_epi32(0); return _mm_extract_epi32(l, 3); @@ -367,11 +363,7 @@ CXXFLAGS="$CXXFLAGS $AVX2_CXXFLAGS" AC_MSG_CHECKING(for AVX2 intrinsics) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <stdint.h> - #if defined(_MSC_VER) #include <immintrin.h> - #elif defined(__GNUC__) && defined(__AVX2__) - #include <x86intrin.h> - #endif ]],[[ __m256i l = _mm256_set1_epi32(0); return _mm256_extract_epi32(l, 7); @@ -386,11 +378,7 @@ CXXFLAGS="$CXXFLAGS $SHANI_CXXFLAGS" AC_MSG_CHECKING(for SHA-NI intrinsics) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <stdint.h> - #if defined(_MSC_VER) #include <immintrin.h> - #elif defined(__GNUC__) - #include <x86intrin.h> - #endif ]],[[ __m128i i = _mm_set1_epi32(0); __m128i j = _mm_set1_epi32(1); diff --git a/src/crypto/sha256_avx2.cpp b/src/crypto/sha256_avx2.cpp index b338b06927..068e0e5ff6 100644 --- a/src/crypto/sha256_avx2.cpp +++ b/src/crypto/sha256_avx2.cpp @@ -1,11 +1,7 @@ #ifdef ENABLE_AVX2 #include <stdint.h> -#if defined(_MSC_VER) #include <immintrin.h> -#elif defined(__GNUC__) -#include <x86intrin.h> -#endif #include <crypto/sha256.h> #include <crypto/common.h> diff --git a/src/crypto/sha256_shani.cpp b/src/crypto/sha256_shani.cpp index 924135848a..e561da42c5 100644 --- a/src/crypto/sha256_shani.cpp +++ b/src/crypto/sha256_shani.cpp @@ -9,11 +9,7 @@ #ifdef ENABLE_SHANI #include <stdint.h> -#if defined(_MSC_VER) #include <immintrin.h> -#elif defined(__GNUC__) -#include <x86intrin.h> -#endif #include <crypto/common.h> diff --git a/src/crypto/sha256_sse41.cpp b/src/crypto/sha256_sse41.cpp index be71dd8fb8..adca870e2d 100644 --- a/src/crypto/sha256_sse41.cpp +++ b/src/crypto/sha256_sse41.cpp @@ -1,11 +1,7 @@ #ifdef ENABLE_SSE41 #include <stdint.h> -#if defined(_MSC_VER) #include <immintrin.h> -#elif defined(__GNUC__) -#include <x86intrin.h> -#endif #include <crypto/sha256.h> #include <crypto/common.h> |