From a40f31ed4a245dbf6a59a6c96aeefb756a37a99d Mon Sep 17 00:00:00 2001 From: f4exb Date: Tue, 8 Nov 2016 00:38:57 +0100 Subject: [PATCH] SIMD optimizations: do not use AVX2 flag globally --- CMakeLists.txt | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d28581f15..15aafa0a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -416,17 +416,17 @@ message( STATUS "Architecture: ${ARCHITECTURE}" ) if (${ARCHITECTURE} MATCHES "x86_64|AMD64|x86") EXECUTE_PROCESS( COMMAND grep flags /proc/cpuinfo OUTPUT_VARIABLE CPU_FLAGS ) - if (${CPU_FLAGS} MATCHES "avx2") - set(HAS_AVX2 ON CACHE BOOL "Architecture has AVX2 SIMD enabled") - if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX) - set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mavx2" ) - set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -mavx2" ) - message(STATUS "Use AVX2 SIMD instructions") - add_definitions(-DUSE_AVX2) - else() - set(HAS_AVX2 OFF CACHE BOOL "Architecture does not have AVX2 SIMD enabled") - endif() - endif() +# if (${CPU_FLAGS} MATCHES "avx2") +# set(HAS_AVX2 ON CACHE BOOL "Architecture has AVX2 SIMD enabled") +# if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX) +# set( CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -mavx2" ) +# set( CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -mavx2" ) +# message(STATUS "Use AVX2 SIMD instructions") +# add_definitions(-DUSE_AVX2) +# else() +# set(HAS_AVX2 OFF CACHE BOOL "Architecture does not have AVX2 SIMD enabled") +# endif() +# endif() if (${CPU_FLAGS} MATCHES "sse4_1") set(HAS_SSE4_1 ON CACHE BOOL "Architecture has SSE 4.1 SIMD enabled") if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANGXX)