Skip to content

Commit

Permalink
[CMake] Default options for faster executables on MSVC
Browse files Browse the repository at this point in the history
- Disable incremental linking by default. /INCREMENTAL adds extra thunks in the EXE, which makes execution slower.
- Set /MT (static CRT lib) by default instead of CMake's default /MD (dll CRT lib). The previous default /MD makes all DLL functions to be thunked, thus making execution slower (memcmp, memset, etc.)
- Adds LLVM_ENABLE_INCREMENTAL_LINK which is set to OFF by default.

Differential revision: https://reviews.llvm.org/D55056

llvm-svn: 349517
  • Loading branch information
aganea committed Dec 18, 2018
1 parent b67d91e commit b505319
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 0 deletions.
4 changes: 4 additions & 0 deletions llvm/CMakeLists.txt
Expand Up @@ -370,6 +370,10 @@ option(LLVM_ENABLE_LLD "Use lld as C and C++ linker." OFF)
option(LLVM_ENABLE_PEDANTIC "Compile with pedantic enabled." ON)
option(LLVM_ENABLE_WERROR "Fail and stop if a warning is triggered." OFF)

if (MSVC)
option(LLVM_ENABLE_INCREMENTAL_LINK "Link incrementally. Enabling it might produce slower executables." OFF)
endif()

option(LLVM_ENABLE_DUMP "Enable dump functions even when assertions are disabled" OFF)

if( NOT uppercase_CMAKE_BUILD_TYPE STREQUAL "DEBUG" )
Expand Down
9 changes: 9 additions & 0 deletions llvm/cmake/modules/ChooseMSVCCRT.cmake
Expand Up @@ -66,6 +66,15 @@ variables (LLVM_USE_CRT_DEBUG, etc) instead.")
get_current_crt(LLVM_USE_CRT_${build}
MSVC_CRT_REGEX
CMAKE_CXX_FLAGS_${build})

# Make /MT the default in Release builds to make them faster
# and avoid the DLL function thunking.
if ((${build} STREQUAL "MINSIZEREL") OR
(${build} STREQUAL "RELEASE") OR
(${build} STREQUAL "RELWITHDEBINFO"))
set(LLVM_USE_CRT_${build} "MT")
endif()

set(LLVM_USE_CRT_${build}
"${LLVM_USE_CRT_${build}}"
CACHE STRING "Specify VC++ CRT to use for ${build_type} configurations."
Expand Down
8 changes: 8 additions & 0 deletions llvm/cmake/modules/HandleLLVMOptions.cmake
Expand Up @@ -381,6 +381,14 @@ if( MSVC )
# "Enforce type conversion rules".
append("/Zc:rvalueCast" CMAKE_CXX_FLAGS)

if (CMAKE_CXX_COMPILER_ID MATCHES "MSVC" AND NOT LLVM_ENABLE_INCREMENTAL_LINK)
foreach(CONFIG RELEASE RELWITHDEBINFO MINSIZEREL)
foreach(FLAG EXE MODULE SHARED STATIC)
string(REGEX REPLACE "[-/](INCREMENTAL:YES|INCREMENTAL:NO|INCREMENTAL)" "/INCREMENTAL:NO" CMAKE_${FLAG}_LINKER_FLAGS_${CONFIG} "${CMAKE_${FLAG}_LINKER_FLAGS_${CONFIG}}")
endforeach()
endforeach()
endif()

if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND NOT LLVM_ENABLE_LTO)
# clang-cl and cl by default produce non-deterministic binaries because
# link.exe /incremental requires a timestamp in the .obj file. clang-cl
Expand Down

0 comments on commit b505319

Please sign in to comment.