From: Loic Dachary Date: Wed, 26 Mar 2014 10:11:48 +0000 (+0100) Subject: autotools: intel cpu features detection X-Git-Tag: v0.79~80^2~5 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c07aedb6db91acd43f7b0a75a6d15ec5eb74c811;p=ceph.git autotools: intel cpu features detection Rename SIMD to INTEL for clarity. Instead of agregating all flags in INTEL_FLAGS, create individual flags for each feature (INTEL_SSE2_FLAGS etc.) for finer control in the makefiles. Signed-off-by: Loic Dachary --- diff --git a/configure.ac b/configure.ac index 5ff7a06e63a..7f05188b40d 100644 --- a/configure.ac +++ b/configure.ac @@ -499,7 +499,7 @@ AC_CHECK_HEADER([leveldb/filter_policy.h], [AC_DEFINE([HAVE_LEVELDB_FILTER_POLIC AC_LANG_POP([C++]) # Find supported SIMD / SSE extensions supported by the compiler -#AX_SSE() +AX_INTEL_FEATURES() # use system libs3? AC_ARG_WITH([system-libs3], diff --git a/m4/ax_intel.m4 b/m4/ax_intel.m4 new file mode 100644 index 00000000000..3bcde6b0cac --- /dev/null +++ b/m4/ax_intel.m4 @@ -0,0 +1,62 @@ +AC_DEFUN([AX_INTEL_FEATURES], +[ + AC_REQUIRE([AC_CANONICAL_HOST]) + + AX_CHECK_COMPILE_FLAG(-msse, ax_cv_support_sse_ext=yes, []) + if test x"$ax_cv_support_sse_ext" = x"yes"; then + INTEL_SSE_FLAGS="-msse -DINTEL_SSE" + AC_SUBST(INTEL_SSE_FLAGS) + INTEL_FLAGS="$INTEL_FLAGS $INTEL_SSE_FLAGS" + AC_DEFINE(HAVE_SSE,,[Support SSE (Streaming SIMD Extensions) instructions]) + fi + + AX_CHECK_COMPILE_FLAG(-msse2, ax_cv_support_sse2_ext=yes, []) + if test x"$ax_cv_support_sse2_ext" = x"yes"; then + INTEL_SSE2_FLAGS="-msse2 -DINTEL_SSE2" + AC_SUBST(INTEL_SSE2_FLAGS) + INTEL_FLAGS="$INTEL_FLAGS $INTEL_SSE2_FLAGS" + AC_DEFINE(HAVE_SSE2,,[Support SSE2 (Streaming SIMD Extensions 2) instructions]) + fi + + AX_CHECK_COMPILE_FLAG(-msse3, ax_cv_support_sse3_ext=yes, []) + if test x"$ax_cv_support_sse3_ext" = x"yes"; then + INTEL_SSE3_FLAGS="-mssse3 -DINTEL_SSE3" + AC_SUBST(INTEL_SSE3_FLAGS) + INTEL_FLAGS="$INTEL_FLAGS $INTEL_SSE3_FLAGS" + AC_DEFINE(HAVE_SSE3,,[Support SSE3 (Streaming SIMD Extensions 3) instructions]) + fi + + AX_CHECK_COMPILE_FLAG(-mpclmul, ax_cv_support_pclmuldq_ext=yes, []) + if test x"$ax_cv_support_pclmuldq_ext" = x"yes"; then + INTEL_PCLMUL_FLAGS="-mpclmul -DINTEL_SSE4_PCLMUL" + AC_SUBST(INTEL_PCLMUL_FLAGS) + INTEL_FLAGS="$INTEL_FLAGS $INTEL_PCLMUL_FLAGS" + AC_DEFINE(HAVE_PCLMUL,,[Support (PCLMUL) Carry-Free Muliplication]) + fi + + AX_CHECK_COMPILE_FLAG(-mssse3, ax_cv_support_ssse3_ext=yes, []) + if test x"$ax_cv_support_ssse3_ext" = x"yes"; then + INTEL_SSSE3_FLAGS="-mssse3 -DINTEL_SSSE3" + AC_SUBST(INTEL_SSSE3_FLAGS) + INTEL_FLAGS="$INTEL_FLAGS $INTEL_SSSE3_FLAGS" + AC_DEFINE(HAVE_SSSE3,,[Support SSSE3 (Supplemental Streaming SIMD Extensions 3) instructions]) + fi + + AX_CHECK_COMPILE_FLAG(-msse4.1, ax_cv_support_sse41_ext=yes, []) + if test x"$ax_cv_support_sse41_ext" = x"yes"; then + INTEL_SSE4_1_FLAGS="-msse4.1 -DINTEL_SSE4" + AC_SUBST(INTEL_SSE4_1_FLAGS) + INTEL_FLAGS="$INTEL_FLAGS $INTEL_SSE4_1_FLAGS" + AC_DEFINE(HAVE_SSE4_1,,[Support SSE4.1 (Streaming SIMD Extensions 4.1) instructions]) + fi + + AX_CHECK_COMPILE_FLAG(-msse4.2, ax_cv_support_sse42_ext=yes, []) + if test x"$ax_cv_support_sse42_ext" = x"yes"; then + INTEL_SSE4_2_FLAGS="-msse4.2 -DINTEL_SSE4" + AC_SUBST(INTEL_SSE4_2_FLAGS) + INTEL_FLAGS="$INTEL_FLAGS $INTEL_SSE4_2_FLAGS" + AC_DEFINE(HAVE_SSE4_2,,[Support SSE4.2 (Streaming SIMD Extensions 4.2) instructions]) + fi + + AC_SUBST(INTEL_FLAGS) +]) diff --git a/m4/ax_sse.m4 b/m4/ax_sse.m4 deleted file mode 100644 index 0e4e44fa1b3..00000000000 --- a/m4/ax_sse.m4 +++ /dev/null @@ -1,54 +0,0 @@ -AC_DEFUN([AX_SSE], -[ - AC_REQUIRE([AC_CANONICAL_HOST]) - - AX_CHECK_COMPILE_FLAG(-msse, ax_cv_support_sse_ext=yes, []) - if test x"$ax_cv_support_sse_ext" = x"yes"; then - SIMD_FLAGS="$SIMD_FLAGS -msse -DINTEL_SSE" - AC_DEFINE(HAVE_SSE,,[Support SSE (Streaming SIMD Extensions) instructions]) - fi - - AX_CHECK_COMPILE_FLAG(-msse2, ax_cv_support_sse2_ext=yes, []) - if test x"$ax_cv_support_sse2_ext" = x"yes"; then - SIMD_FLAGS="$SIMD_FLAGS -msse2 -DINTEL_SSE2" - AC_DEFINE(HAVE_SSE2,,[Support SSE2 (Streaming SIMD Extensions 2) instructions]) - fi - - AX_CHECK_COMPILE_FLAG(-msse3, ax_cv_support_sse3_ext=yes, []) - if test x"$ax_cv_support_sse3_ext" = x"yes"; then - SIMD_FLAGS="$SIMD_FLAGS -msse3 -DINTEL_SSE3" - AC_DEFINE(HAVE_SSE3,,[Support SSE3 (Streaming SIMD Extensions 3) instructions]) - fi - - AX_CHECK_COMPILE_FLAG(-mpclmul, ax_cv_support_pclmuldq_ext=yes, []) - if test x"$ax_cv_support_pclmuldq_ext" = x"yes"; then - SIMD_FLAGS="$SIMD_FLAGS -mpclmul -DINTEL_SSE4_PCLMUL" - AC_DEFINE(HAVE_PCLMULDQ,,[Support (PCLMULDQ) Carry-Free Muliplication]) - fi - - AX_CHECK_COMPILE_FLAG(-mssse3, ax_cv_support_ssse3_ext=yes, []) - if test x"$ax_cv_support_ssse3_ext" = x"yes"; then - SIMD_FLAGS="$SIMD_FLAGS -mssse3 -DINTEL_SSSE3" - AC_DEFINE(HAVE_SSSE3,,[Support SSSE3 (Supplemental Streaming SIMD Extensions 3) instructions]) - fi - - AX_CHECK_COMPILE_FLAG(-msse4.1, ax_cv_support_sse41_ext=yes, []) - if test x"$ax_cv_support_sse41_ext" = x"yes"; then - SIMD_FLAGS="$SIMD_FLAGS -msse4.1 -DINTEL_SSE4" - AC_DEFINE(HAVE_SSE4_1,,[Support SSSE4.1 (Streaming SIMD Extensions 4.1) instructions]) - fi - - AX_CHECK_COMPILE_FLAG(-msse4.2, ax_cv_support_sse42_ext=yes, []) - if test x"$ax_cv_support_sse42_ext" = x"yes"; then - SIMD_FLAGS="$SIMD_FLAGS -msse4.2 -DINTEL_SSE4" - AC_DEFINE(HAVE_SSE4_2,,[Support SSSE4.2 (Streaming SIMD Extensions 4.2) instructions]) - fi - - AX_CHECK_COMPILE_FLAG(-mavx, ax_cv_support_avx_ext=yes, []) - if test x"$ax_cv_support_avx_ext" = x"yes"; then - SIMD_FLAGS="$SIMD_FLAGS -mavx" - AC_DEFINE(HAVE_AVX,,[Support AVX (Advanced Vector Extensions) instructions]) - fi - - AC_SUBST(SIMD_FLAGS) -])