[CMake] Preserve clang-prebolt #109351
Merged
[CMake] Preserve clang-prebolt #109351
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Created using spr 1.3.4
Created using spr 1.3.4 [skip ci]
maksfb
approved these changes
Sep 20, 2024
Created using spr 1.3.4
|
@llvm/pr-subscribers-clang Author: Amir Ayupov (aaupov) ChangesFull diff: https://github.com/llvm/llvm-project/pull/109351.diff 1 Files Affected:
diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt
index 46e1412c0727aa..07eeb8a451b58b 100644
--- a/clang/CMakeLists.txt
+++ b/clang/CMakeLists.txt
@@ -923,11 +923,14 @@ if (CLANG_BOLT AND NOT LLVM_BUILD_INSTRUMENTED)
)
add_custom_command(OUTPUT ${CLANG_OPTIMIZED}
DEPENDS clang-bolt-profile
+ COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:clang> ${CLANG_PATH}.prebolt
+ COMMAND ${CMAKE_COMMAND} -E create_symlink ${CLANG_PATH}.prebolt ${CLANG_PATH}++.prebolt
COMMAND llvm-bolt ${CLANG_PATH}
-o ${CLANG_OPTIMIZED}
-data ${BOLT_FDATA}
- -reorder-blocks=ext-tsp -reorder-functions=hfsort+ -split-functions
- -split-all-cold -split-eh -dyno-stats -icf=1 -use-gnu-stack
+ -reorder-blocks=ext-tsp -reorder-functions=cdsort -split-functions
+ -split-all-cold -split-eh -dyno-stats -use-gnu-stack
+ -split-strategy=cdsplit
${BOLT_NO_LBR}
COMMAND ${CMAKE_COMMAND} -E rename ${CLANG_OPTIMIZED} $<TARGET_FILE:clang>
COMMENT "Optimizing Clang with BOLT"
|
aaupov
changed the title
Created using spr 1.3.4
Created using spr 1.3.4 [skip ci]
aaupov
changed the base branch from
users/aaupov/spr/main.cmake-preserve-clangpre-bolt
to
main
|
This commit is breaking LTO-PGO-BOLT build while optimizing clang with BOLT. More information on LTO-PGO-BOLT can be found on https://llvm.org/docs/AdvancedBuilds.html |
|
Here are CMAKE variables we use downstream. |
This change was tested on a buildbot: https://lab.llvm.org/buildbot/#/builders/113/builds/2934 Can you please try cleaning the build directory? |
|
@aaupov this happens on AArch64 target, and only with -split-strategy=cdsplit enabled. Changing it to profile2, for example, fixes the issue |
Thanks for clarification. I'll drop cdsplit as we never tested it on AArch64. ARM clang-bolt buildbot hasn't picked this change up yet so I didn't get the signal. |
aaupov
added a commit
that referenced
this pull request
Sep 23, 2024
Breaks AArch64 Clang-BOLT builds: #109351 (comment)
aaupov
added a commit
to aaupov/llvm-devmtg-2022
that referenced
this pull request
Sep 25, 2024
llvm/llvm-project@76b2915 has dropped the use of clang++-bolt target. llvm/llvm-project#109351 has introduced the clang-prebolt binary that can be used as base version (since clang-bolt binary is no longer produced).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
In Clang-BOLT step, preserve pre-BOLT Clang binary (as well as clang++
symlink).
Also modify the default set of BOLT flags: