From 16b562b9bfb0c00bde8c3c215738bec67c062154 Mon Sep 17 00:00:00 2001 From: Jeongseok Lee Date: Thu, 13 Oct 2016 13:55:15 -0400 Subject: [PATCH] [build] Modify default SIMD option for Visual Studio as well --- CMakeLists.txt | 8 -------- dart/CMakeLists.txt | 15 +++++++++++++-- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e6520f401be04..5dc08c126ee52 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -168,14 +168,6 @@ if(MSVC) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} ${DART_RUNTIME_LIBRARY}d /Zi /Gy /W1 /EHsc") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ${DART_RUNTIME_LIBRARY} /Zi /GL /Gy /W1 /EHsc") endif(NOT DART_MSVC_DEFAULT_OPTIONS) - if(DART_ENABLE_SIMD) - add_definitions(/arch:SSE2 /arch:AVX /arch:AVX2) - # /arch:SSE2 option is effective only for x86 but not for x64 since it's - # enabled for x64 by default. The option will be ignored on x64 with a - # warning message. If anyone knows how to detect the system's architecture - # in CMake time, then I would gratefully apply these options differently - # depending on the architectures. - endif() elseif(CMAKE_COMPILER_IS_GNUCXX) diff --git a/dart/CMakeLists.txt b/dart/CMakeLists.txt index 2fa95d6493c8f..5dcf25df49d26 100644 --- a/dart/CMakeLists.txt +++ b/dart/CMakeLists.txt @@ -147,8 +147,19 @@ target_link_libraries( ) # Build DART with all available SIMD instructions -if(DART_ENABLE_SIMD AND NOT MSVC) - target_compile_options(dart PUBLIC -march=native) +if(DART_ENABLE_SIMD) + if(MSVC) + target_compile_options(dart PUBLIC /arch:SSE2 /arch:AVX /arch:AVX2) + # /arch:SSE2 option is effective only for x86 but not for x64 since it's + # enabled for x64 by default. The option will be ignored on x64 with a + # warning message. If anyone knows how to detect the system's architecture + # in CMake time, then I would gratefully apply these options differently + # depending on the architectures. + elseif(CMAKE_COMPILER_IS_GNUCXX) + target_compile_options(dart PUBLIC -march=native) + elseif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + target_compile_options(dart PUBLIC -march=native) + endif() endif() # Default component