Merge pull request #2811 from martin-frbg/issue2806

Make NO_AVX512 option override the AVX512 compile test in CMAKE builds as well

diff --git a/cmake/system.cmake b/cmake/system.cmake
index e3617c4e28bb6b4be5bf87a0d2ef40d5ab91c76a..c0f3c6ed2e6cd3b7ed7851b99d1b68026a8b8db0 100644 (file)
--- a/cmake/system.cmake
+++ b/cmake/system.cmake
@@ -110,6 +110,11 @@ if (NO_AVX2)
   set(GETARCH_FLAGS "${GETARCH_FLAGS} -DNO_AVX2")
 endif ()
 
+if (NO_AVX512)
+  message(STATUS "Disabling Advanced Vector Extensions 512 (AVX512).")
+  set(GETARCH_FLAGS "${GETARCH_FLAGS} -DNO_AVX512")
+endif ()
+
 if (CMAKE_BUILD_TYPE STREQUAL "Debug")
   set(GETARCH_FLAGS "${GETARCH_FLAGS} ${CMAKE_C_FLAGS_DEBUG}")
 endif ()

diff --git a/cmake/system_check.cmake b/cmake/system_check.cmake
index 511a7c7d1ed718d77933694c01e20664103b6e0f..d06f4779fd454a6d1b22824d1c34ca6701a6241d 100644 (file)
--- a/cmake/system_check.cmake
+++ b/cmake/system_check.cmake
@@ -109,6 +109,7 @@ else()
 endif()
 
 if (X86_64 OR X86)
+if (NOT NO_AVX512)
   file(WRITE ${PROJECT_BINARY_DIR}/avx512.c "#include <immintrin.h>\n\nint main(void){ __asm__ volatile(\"vbroadcastss -4 * 4(%rsi), %zmm2\"); }")
 execute_process(COMMAND ${CMAKE_C_COMPILER} -march=skylake-avx512 -c -v -o ${PROJECT_BINARY_DIR}/avx512.o ${PROJECT_BINARY_DIR}/avx512.c OUTPUT_QUIET ERROR_QUIET RESULT_VARIABLE NO_AVX512)
 if (NO_AVX512 EQUAL 1)
@@ -116,6 +117,7 @@ set (CCOMMON_OPT "${CCOMMON_OPT} -DNO_AVX512")
 endif()
   file(REMOVE "avx512.c" "avx512.o")
 endif()
+endif()
 
 include(CheckIncludeFile)
 CHECK_INCLUDE_FILE("stdatomic.h" HAVE_C11)