Skip to content

Commit 139cf3d

Browse files
committed
Workaround for MSVC ARM64 build performance regression
MSVC has a major performance regression observed when targeting ARM64 since v19.32 (VS 17.2.0). `cl.exe` spends a lot of time on compiling `StandardLibrary.cpp` and `CGBuiltin.cpp`, and total build duration rises extremely. This makes builds stagnate even on a real hardware, but VM-based builds (like building on cloud agents from GitHub Actions and Azure Pipelines) are experiencing most damage as they also performance- and time-limited. The issue appears to be related to some optimizations applied in `/O2` mode. It is reported on [Developer Community](https://developercommunity.visualstudio.com/t/Compiling-a-specific-code-for-ARM64-with/10444970). While the investigation is in progress, we could apply a workaround to improve build time. `/O2` actually enables a set of optimizations, and only one of them does all slowdown. The idea is to disable optimizations, and then apply all but one back, effectively excluding the problematic option from the set. This patch alters the CMake configuration for aforementioned files. Changes are limited to: - non-debug builds - MSVC of the specific version - target arch (ARM64). This cherrypicks upstream commit llvm@c6f0f88
1 parent d124615 commit 139cf3d

File tree

2 files changed

+40
-0
lines changed

2 files changed

+40
-0
lines changed

clang/lib/CodeGen/CMakeLists.txt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,26 @@ set(LLVM_LINK_COMPONENTS
3030
TransformUtils
3131
)
3232

33+
# Workaround for MSVC ARM64 performance regression:
34+
# https://developercommunity.visualstudio.com/t/Compiling-a-specific-code-for-ARM64-with/10444970
35+
# Since /O1 and /O2 represent a set of optimizations,
36+
# our goal is to disable the /Og flag while retaining the other optimizations from the /O1|/O2 set
37+
if(MSVC AND NOT CMAKE_CXX_COMPILER_ID MATCHES Clang
38+
AND MSVC_VERSION VERSION_GREATER_EQUAL 1932
39+
AND CMAKE_SYSTEM_PROCESSOR MATCHES "ARM64")
40+
41+
string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
42+
string(REGEX MATCHALL "/[Oo][12]" opt_flags "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}}")
43+
if (opt_flags)
44+
if(opt_flags MATCHES "1$")
45+
set(opt_flags "/Od;/Os;/Oy;/Ob2;/GF;/Gy")
46+
elseif (opt_flags MATCHES "2$")
47+
set(opt_flags "/Od;/Oi;/Ot;/Oy;/Ob2;/GF;/Gy")
48+
endif()
49+
set_source_files_properties(CGBuiltin.cpp PROPERTIES COMPILE_OPTIONS "${opt_flags}")
50+
endif()
51+
endif()
52+
3353
add_clang_library(clangCodeGen
3454
ABIInfo.cpp
3555
ABIInfoImpl.cpp

clang/lib/Tooling/Inclusions/Stdlib/CMakeLists.txt

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,23 @@
1+
# Workaround for MSVC ARM64 performance regression:
2+
# https://developercommunity.visualstudio.com/t/Compiling-a-specific-code-for-ARM64-with/10444970
3+
# Since /O1 and /O2 represent a set of optimizations,
4+
# our goal is to disable the /Og flag while retaining the other optimizations from the /O1|/O2 set
5+
if(MSVC AND NOT CMAKE_CXX_COMPILER_ID MATCHES Clang
6+
AND MSVC_VERSION VERSION_GREATER_EQUAL 1932
7+
AND CMAKE_SYSTEM_PROCESSOR MATCHES "ARM64")
8+
9+
string(TOUPPER "${CMAKE_BUILD_TYPE}" uppercase_CMAKE_BUILD_TYPE)
10+
string(REGEX MATCHALL "/[Oo][12]" opt_flags "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_${uppercase_CMAKE_BUILD_TYPE}}")
11+
if (opt_flags)
12+
if(opt_flags MATCHES "1$")
13+
set(opt_flags "/Od;/Os;/Oy;/Ob2;/GF;/Gy")
14+
elseif (opt_flags MATCHES "2$")
15+
set(opt_flags "/Od;/Oi;/Ot;/Oy;/Ob2;/GF;/Gy")
16+
endif()
17+
set_source_files_properties(StandardLibrary.cpp PROPERTIES COMPILE_OPTIONS "${opt_flags}")
18+
endif()
19+
endif()
20+
121
add_clang_library(clangToolingInclusionsStdlib
222
StandardLibrary.cpp
323

0 commit comments

Comments
 (0)