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

Stricter autoconf checks for MMX/SSE2/SSE3

Browse Source
This commit is contained in:
Frank Denis 2014-05-09 20:26:43 -07:00
parent be3c786e23
commit 4ea26f0b8c
2 changed files with 33 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
configure.ac
View File

@ -243,9 +243,35 @@ AC_CHECK_TOOL([AR], [ar], [ar])
dnl Checks for headers dnl Checks for headers
AS_IF([test "x$EMSCRIPTEN" = "x"],[ AS_IF([test "x$EMSCRIPTEN" = "x"],[
AC_CHECK_HEADERS([mmintrin.h], [], [], [#pragma GCC target("mmx")])
AC_CHECK_HEADERS([emmintrin.h], [], [], [#pragma GCC target("sse2")]) AC_MSG_CHECKING(for MMX instructions set)
AC_CHECK_HEADERS([pmmintrin.h], [], [], [#pragma GCC target("sse3")]) AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#pragma GCC target("mmx")
#include <mmintrin.h>
]], [[ __m64 x = _mm_setzero_si64(); ]])],
[AC_MSG_RESULT(yes)
AC_DEFINE([HAVE_MMINTRIN_H], [1], [mmx is available])],
[AC_MSG_RESULT(no)])
AC_MSG_CHECKING(for SSE2 instructions set)
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#pragma GCC target("sse2")
#include <emmintrin.h>
]], [[ __m128d x = _mm_setzero_pd(); ]])],
[AC_MSG_RESULT(yes)
AC_DEFINE([HAVE_EMMINTRIN_H], [1], [sse2 is available])],
[AC_MSG_RESULT(no)])
AC_MSG_CHECKING(for SSE3 instructions set)
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
#pragma GCC target("sse3")
#include <pmmintrin.h>
]], [[ __m128 x = _mm_addsub_ps(_mm_cvtpd_ps(_mm_setzero_pd()),
_mm_cvtpd_ps(_mm_setzero_pd())); ]])],
[AC_MSG_RESULT(yes)
AC_DEFINE([HAVE_PMMINTRIN_H], [1], [sse3 is available])],
[AC_MSG_RESULT(no)])
]) ])
AC_CHECK_HEADERS([sys/mman.h]) AC_CHECK_HEADERS([sys/mman.h])

8
src/libsodium/crypto_pwhash/scryptxsalsa208sha256/sse/pwhash_scryptxsalsa208sha256_sse.c
View File

@ -29,12 +29,12 @@
*/ */
#if defined(HAVE_EMMINTRIN_H) || defined(_MSC_VER) #if defined(HAVE_EMMINTRIN_H) || defined(_MSC_VER)
# if __GNUC__ #if __GNUC__
# pragma GCC target("sse2") # pragma GCC target("sse2")
# endif #endif
#include <emmintrin.h> #include <emmintrin.h>
#if defined(__XOP__) && defined(DISABLED) #if defined(__XOP__) && defined(DISABLED)
#include <x86intrin.h> # include <x86intrin.h>
#endif #endif
#include <errno.h> #include <errno.h>