[AArch64] AArch64ISelDAGToDAG.cpp - disable inlining on MSVC release builds #115292
Conversation
RKSimon
requested review from
rnk,
davemgreen,
sdesmalen-arm and
tmatheson-arm
|
@llvm/pr-subscribers-backend-aarch64 Author: Simon Pilgrim (RKSimon) ChangesSimilar to #110986 - disabling inlining on MSVC release builds avoids an excessive build time issue affecting all recent versions of CL.EXE Fixes #114425 Full diff: https://github.com/llvm/llvm-project/pull/115292.diff 1 Files Affected:
diff --git a/llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp b/llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp
index 511ab4fe7e9a39..97050ba2476ff5 100644
--- a/llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp
+++ b/llvm/lib/Target/AArch64/AArch64ISelDAGToDAG.cpp
@@ -31,6 +31,11 @@ using namespace llvm;
#define DEBUG_TYPE "aarch64-isel"
#define PASS_NAME "AArch64 Instruction Selection"
+// https://github.com/llvm/llvm-project/issues/114425
+#if defined(_WIN32) && !defined(__clang__) && !defined(NDEBUG)
+#pragma inline_depth(0)
+#endif
+
//===--------------------------------------------------------------------===//
/// AArch64DAGToDAGISel - AArch64 specific code to select AArch64 machine
/// instructions for SelectionDAG operations.
|
| @@ -31,6 +31,11 @@ using namespace llvm; | |||
| #define DEBUG_TYPE "aarch64-isel" | |||
| #define PASS_NAME "AArch64 Instruction Selection" | |||
|
|
|||
| // https://github.com/llvm/llvm-project/issues/114425 | |||
| #if defined(_WIN32) && !defined(__clang__) && !defined(NDEBUG) | |||
There was a problem hiding this comment.
Should this test for MSVC specifically, rather than !defined(__clang__) ?
There was a problem hiding this comment.
I've matched #110986 - which IIRC is doing this to avoid it firing on clang-cl
There was a problem hiding this comment.
Just to make sure I understand, does the clang-cl driver define the MSVC macro for compatibility reasons such that checking for MSVC here doesn't mean it's actually the MSVC compiler?
There was a problem hiding this comment.
Yes - clang-cl defines the _MSC_VER macro as well as __clang__ :https://clang.godbolt.org/z/fo9aMYosK
There was a problem hiding this comment.
But this condition as it stands, defined(_WIN32) && !defined(__clang__) will also match for GCC.
The correct one for singling out MSVC but not clang in msvc mode, would be defined(_MSC_VER) && !defined(__clang__).
There was a problem hiding this comment.
I assume you mean mignw builds? I'll create a patch
…builds Similar to llvm#110986 - disabling inlining on MSVC release builds avoids an excessive build time issue affecting all recent versions of CL.EXE Fixes llvm#114425
RKSimon
force-pushed
the
aarch64-msvc-build-time-fix
branch
from
c0104e4 to
25ac7a8
Compare
…builds (llvm#115292) Similar to llvm#110986 - disabling inlining on MSVC release builds avoids an excessive build time issue affecting all recent versions of CL.EXE Fixes llvm#114425
Alter the #ifdef values from llvm#110986 and llvm#115292 to use _MSC_VER instead of _WIN32 to stop the pragmas being used on gcc/mingw builds Noticed by @mstorsjo
Alter the #ifdef values from llvm#110986 and llvm#115292 to use _MSC_VER instead of _WIN32 to stop the pragmas being used on gcc/mingw builds Noticed by @mstorsjo
Similar to #110986 - disabling inlining on MSVC release builds avoids an excessive build time issue affecting all recent versions of CL.EXE
Fixes #114425