This is an archive of the discontinued LLVM Phabricator instance.

Differential D134434

[BOLT] Support building bolt when LLVM_LINK_LLVM_DYLIB is ON
ClosedPublic

Authored by serge-sans-paille on Sep 22 2022, 6:05 AM.

Details

Reviewers
rafauler
sylvestre.ledru
Amir
maksfb
Commits
rG61cff9079c08: [BOLT] Support building bolt when LLVM_LINK_LLVM_DYLIB is ON
Summary

This does *not* link with libLLVM, but with static archives instead. Not
super-great, but at least the build works, which is probably better than
failing.

Related to #57551

Diff Detail

Event Timeline

serge-sans-paille created this revision.Sep 22 2022, 6:05 AM
Herald added a reviewer: maksfb. · View Herald TranscriptSep 22 2022, 6:05 AM
Herald added a project: Restricted Project. · View Herald Transcript
Herald added subscribers: treapster, ayermolo, pengfei. · View Herald Transcript
serge-sans-paille requested review of this revision.Sep 22 2022, 6:05 AM
Harbormaster completed remote builds in B188161: Diff 462158.Sep 22 2022, 6:05 AM
Herald added a project: Restricted Project. · View Herald TranscriptSep 22 2022, 6:05 AM
Herald added subscribers: llvm-commits, yota9. · View Herald Transcript
Amir added a comment.Sep 22 2022, 9:57 AM

Awesome, thank you for fixing the issue! Let me test the diff locally first.

Amir added a comment.Sep 22 2022, 11:20 AM

Nice. Works for me. Do you think we really need this statement DISABLE_LLVM_LINK_LLVM_DYLIB in all CMakeLists, or just the ones that touch LLVM's Target libraries?
I've tried setting it only for bolt/lib/Target/*/CMakeLists.txt and it appears to build as well.

Amir accepted this revision.Sep 22 2022, 11:55 AM
Amir added a subscriber: rafaelauler.
In D134434#3809386, @Amir wrote:

Nice. Works for me. Do you think we really need this statement DISABLE_LLVM_LINK_LLVM_DYLIB in all CMakeLists, or just the ones that touch LLVM's Target libraries?
I've tried setting it only for bolt/lib/Target/*/CMakeLists.txt and it appears to build as well.

Sorry, it looks like we need to set it everywhere because otherwise some global symbols are present in both libLLVM and llvm-bolt and that causes a runtime crash:

$ bin/llvm-bolt --version
: CommandLine Error: Option 'aarch64-mark-bti-property' registered more than once!
LLVM ERROR: inconsistency in registered CommandLine options
Aborted (core dumped)

With that, LGTM. @rafaelauler @maksfb - please take a look if the change makes sense to you.

This revision is now accepted and ready to land.Sep 22 2022, 11:55 AM
Closed by commit rG61cff9079c08: [BOLT] Support building bolt when LLVM_LINK_LLVM_DYLIB is ON (authored by serge-sans-paille). · Explain WhySep 22 2022, 10:59 PM
This revision was automatically updated to reflect the committed changes.
serge-sans-paille added a commit: rG61cff9079c08: [BOLT] Support building bolt when LLVM_LINK_LLVM_DYLIB is ON.
Amir mentioned this in D134085: [BOLT] Enable llvm-dylib build.Sep 27 2022, 12:08 PM

Revision Contents

PathSize
bolt/
lib/
Core/
1 line
Passes/
2 lines
Profile/
2 lines
Rewrite/
2 lines
RuntimeLibs/
2 lines
Target/
AArch64/
2 lines
X86/
2 lines
Utils/
2 lines
tools/
bat-dump/
2 lines
driver/
2 lines
heatmap/
1 line
llvm-bolt-fuzzer/
2 lines
merge-fdata/
2 lines
unittests/
Core/
2 lines
Profile/
2 lines

Diff 462393

bolt/lib/Core/CMakeLists.txt

Show All 18 Linesadd_llvm_library(LLVMBOLTCore
DynoStats.cpp DynoStats.cpp
Exceptions.cpp Exceptions.cpp
FunctionLayout.cpp FunctionLayout.cpp
JumpTable.cpp JumpTable.cpp
MCPlusBuilder.cpp MCPlusBuilder.cpp
ParallelUtilities.cpp ParallelUtilities.cpp
Relocation.cpp Relocation.cpp
DISABLE_LLVM_LINK_LLVM_DYLIB
LINK_LIBS LINK_LIBS
${LLVM_PTHREAD_LIB} ${LLVM_PTHREAD_LIB}
) )
target_link_libraries(LLVMBOLTCore target_link_libraries(LLVMBOLTCore
PRIVATE PRIVATE
LLVMBOLTUtils LLVMBOLTUtils
) )

bolt/lib/Passes/CMakeLists.txt

Show All 39 Linesadd_llvm_library(LLVMBOLTPasses
StackReachingUses.cpp StackReachingUses.cpp
StokeInfo.cpp StokeInfo.cpp
TailDuplication.cpp TailDuplication.cpp
ThreeWayBranch.cpp ThreeWayBranch.cpp
ValidateInternalCalls.cpp ValidateInternalCalls.cpp
VeneerElimination.cpp VeneerElimination.cpp
RetpolineInsertion.cpp RetpolineInsertion.cpp
DISABLE_LLVM_LINK_LLVM_DYLIB
LINK_LIBS LINK_LIBS
${LLVM_PTHREAD_LIB} ${LLVM_PTHREAD_LIB}
LINK_COMPONENTS LINK_COMPONENTS
AsmPrinter AsmPrinter
MC MC
Support Support
TransformUtils TransformUtils
) )
target_link_libraries(LLVMBOLTPasses target_link_libraries(LLVMBOLTPasses
PRIVATE PRIVATE
LLVMBOLTCore LLVMBOLTCore
LLVMBOLTUtils LLVMBOLTUtils
) )

bolt/lib/Profile/CMakeLists.txt

add_llvm_library(LLVMBOLTProfile add_llvm_library(LLVMBOLTProfile
BoltAddressTranslation.cpp BoltAddressTranslation.cpp
DataAggregator.cpp DataAggregator.cpp
DataReader.cpp DataReader.cpp
Heatmap.cpp Heatmap.cpp
ProfileReaderBase.cpp ProfileReaderBase.cpp
YAMLProfileReader.cpp YAMLProfileReader.cpp
YAMLProfileWriter.cpp YAMLProfileWriter.cpp
DISABLE_LLVM_LINK_LLVM_DYLIB
LINK_COMPONENTS LINK_COMPONENTS
Support Support
) )
target_link_libraries(LLVMBOLTProfile target_link_libraries(LLVMBOLTProfile
PRIVATE PRIVATE
LLVMBOLTCore LLVMBOLTCore
LLVMBOLTPasses LLVMBOLTPasses
LLVMBOLTUtils LLVMBOLTUtils
) )

bolt/lib/Rewrite/CMakeLists.txt

Show All 27 Lines
add_llvm_library(LLVMBOLTRewrite add_llvm_library(LLVMBOLTRewrite
BinaryPassManager.cpp BinaryPassManager.cpp
BoltDiff.cpp BoltDiff.cpp
DWARFRewriter.cpp DWARFRewriter.cpp
ExecutableFileMemoryManager.cpp ExecutableFileMemoryManager.cpp
MachORewriteInstance.cpp MachORewriteInstance.cpp
RewriteInstance.cpp RewriteInstance.cpp
DISABLE_LLVM_LINK_LLVM_DYLIB
LINK_LIBS LINK_LIBS
${LLVM_PTHREAD_LIB} ${LLVM_PTHREAD_LIB}
) )
target_link_libraries(LLVMBOLTRewrite target_link_libraries(LLVMBOLTRewrite
PRIVATE PRIVATE
${TARGET_LINK_LIBRARIES} ${TARGET_LINK_LIBRARIES}
) )
if (DEFINED BOLT_AArch64) if (DEFINED BOLT_AArch64)
target_compile_definitions(LLVMBOLTRewrite PRIVATE AARCH64_AVAILABLE) target_compile_definitions(LLVMBOLTRewrite PRIVATE AARCH64_AVAILABLE)
endif() endif()
if (DEFINED BOLT_X64) if (DEFINED BOLT_X64)
target_compile_definitions(LLVMBOLTRewrite PRIVATE X86_AVAILABLE) target_compile_definitions(LLVMBOLTRewrite PRIVATE X86_AVAILABLE)
endif() endif()

bolt/lib/RuntimeLibs/CMakeLists.txt

set(LLVM_LINK_COMPONENTS set(LLVM_LINK_COMPONENTS
BinaryFormat BinaryFormat
MC MC
Object Object
RuntimeDyld RuntimeDyld
Support Support
) )
add_llvm_library(LLVMBOLTRuntimeLibs add_llvm_library(LLVMBOLTRuntimeLibs
RuntimeLibrary.cpp RuntimeLibrary.cpp
HugifyRuntimeLibrary.cpp HugifyRuntimeLibrary.cpp
InstrumentationRuntimeLibrary.cpp InstrumentationRuntimeLibrary.cpp
DISABLE_LLVM_LINK_LLVM_DYLIB
) )
target_link_libraries(LLVMBOLTRuntimeLibs target_link_libraries(LLVMBOLTRuntimeLibs
PRIVATE PRIVATE
LLVMBOLTCore LLVMBOLTCore
LLVMBOLTPasses LLVMBOLTPasses
LLVMBOLTUtils LLVMBOLTUtils
) )

bolt/lib/Target/AArch64/CMakeLists.txt

set(LLVM_LINK_COMPONENTS set(LLVM_LINK_COMPONENTS
MC MC
Support Support
AArch64Desc AArch64Desc
) )
add_llvm_library(LLVMBOLTTargetAArch64 add_llvm_library(LLVMBOLTTargetAArch64
AArch64MCPlusBuilder.cpp AArch64MCPlusBuilder.cpp
DISABLE_LLVM_LINK_LLVM_DYLIB
DEPENDS DEPENDS
AArch64CommonTableGen AArch64CommonTableGen
) )
target_link_libraries(LLVMBOLTTargetAArch64 PRIVATE LLVMBOLTCore) target_link_libraries(LLVMBOLTTargetAArch64 PRIVATE LLVMBOLTCore)
include_directories( include_directories(
${LLVM_MAIN_SRC_DIR}/lib/Target/AArch64 ${LLVM_MAIN_SRC_DIR}/lib/Target/AArch64
${LLVM_BINARY_DIR}/lib/Target/AArch64 ${LLVM_BINARY_DIR}/lib/Target/AArch64
) )

bolt/lib/Target/X86/CMakeLists.txt

set(LLVM_LINK_COMPONENTS set(LLVM_LINK_COMPONENTS
MC MC
MCDisassembler MCDisassembler
Support Support
X86Desc X86Desc
) )
add_llvm_library(LLVMBOLTTargetX86 add_llvm_library(LLVMBOLTTargetX86
X86MCPlusBuilder.cpp X86MCPlusBuilder.cpp
X86MCSymbolizer.cpp X86MCSymbolizer.cpp
DISABLE_LLVM_LINK_LLVM_DYLIB
DEPENDS DEPENDS
X86CommonTableGen X86CommonTableGen
) )
target_link_libraries(LLVMBOLTTargetX86 PRIVATE LLVMBOLTCore LLVMBOLTUtils) target_link_libraries(LLVMBOLTTargetX86 PRIVATE LLVMBOLTCore LLVMBOLTUtils)
include_directories( include_directories(
${LLVM_MAIN_SRC_DIR}/lib/Target/X86 ${LLVM_MAIN_SRC_DIR}/lib/Target/X86
${LLVM_BINARY_DIR}/lib/Target/X86 ${LLVM_BINARY_DIR}/lib/Target/X86
) )

bolt/lib/Utils/CMakeLists.txt

add_llvm_library(LLVMBOLTUtils add_llvm_library(LLVMBOLTUtils
CommandLineOpts.cpp CommandLineOpts.cpp
Utils.cpp Utils.cpp
DISABLE_LLVM_LINK_LLVM_DYLIB
LINK_LIBS LINK_LIBS
${LLVM_PTHREAD_LIB} ${LLVM_PTHREAD_LIB}
LINK_COMPONENTS LINK_COMPONENTS
Support Support
) )

bolt/tools/bat-dump/CMakeLists.txt

set(LLVM_LINK_COMPONENTS set(LLVM_LINK_COMPONENTS
Object Object
Support Support
) )
add_llvm_tool(llvm-bat-dump add_llvm_tool(llvm-bat-dump
bat-dump.cpp bat-dump.cpp
DISABLE_LLVM_LINK_LLVM_DYLIB
) )
target_link_libraries(llvm-bat-dump target_link_libraries(llvm-bat-dump
PRIVATE PRIVATE
LLVMBOLTProfile LLVMBOLTProfile
) )
set_target_properties(llvm-bat-dump PROPERTIES FOLDER "BOLT") set_target_properties(llvm-bat-dump PROPERTIES FOLDER "BOLT")

bolt/tools/driver/CMakeLists.txt

set(LLVM_LINK_COMPONENTS set(LLVM_LINK_COMPONENTS
${LLVM_TARGETS_TO_BUILD} ${LLVM_TARGETS_TO_BUILD}
MC MC
Object Object
Support Support
) )
if (BOLT_ENABLE_RUNTIME) if (BOLT_ENABLE_RUNTIME)
set(BOLT_DRIVER_DEPS "bolt_rt") set(BOLT_DRIVER_DEPS "bolt_rt")
else() else()
set(BOLT_DRIVER_DEPS "") set(BOLT_DRIVER_DEPS "")
endif() endif()
add_bolt_tool(llvm-bolt add_bolt_tool(llvm-bolt
llvm-bolt.cpp llvm-bolt.cpp
DISABLE_LLVM_LINK_LLVM_DYLIB
DEPENDS DEPENDS
${BOLT_DRIVER_DEPS} ${BOLT_DRIVER_DEPS}
) )
target_link_libraries(llvm-bolt target_link_libraries(llvm-bolt
PRIVATE PRIVATE
LLVMBOLTProfile LLVMBOLTProfile
LLVMBOLTRewrite LLVMBOLTRewrite
Show All 25 Lines

bolt/tools/heatmap/CMakeLists.txt

set(LLVM_LINK_COMPONENTS set(LLVM_LINK_COMPONENTS
${LLVM_TARGETS_TO_BUILD} ${LLVM_TARGETS_TO_BUILD}
MC MC
Object Object
Support Support
) )
add_bolt_tool(llvm-bolt-heatmap add_bolt_tool(llvm-bolt-heatmap
heatmap.cpp heatmap.cpp
DISABLE_LLVM_LINK_LLVM_DYLIB
) )
target_link_libraries(llvm-bolt-heatmap target_link_libraries(llvm-bolt-heatmap
PRIVATE PRIVATE
LLVMBOLTProfile LLVMBOLTProfile
LLVMBOLTRewrite LLVMBOLTRewrite
LLVMBOLTUtils LLVMBOLTUtils
) )
set_target_properties(llvm-bolt-heatmap PROPERTIES FOLDER "BOLT") set_target_properties(llvm-bolt-heatmap PROPERTIES FOLDER "BOLT")

bolt/tools/llvm-bolt-fuzzer/CMakeLists.txt

set(LLVM_LINK_COMPONENTS set(LLVM_LINK_COMPONENTS
${LLVM_TARGETS_TO_BUILD} ${LLVM_TARGETS_TO_BUILD}
) )
add_llvm_fuzzer(llvm-bolt-fuzzer add_llvm_fuzzer(llvm-bolt-fuzzer
llvm-bolt-fuzzer.cpp llvm-bolt-fuzzer.cpp
DISABLE_LLVM_LINK_LLVM_DYLIB
) )
if (TARGET llvm-bolt-fuzzer) if (TARGET llvm-bolt-fuzzer)
target_link_libraries(llvm-bolt-fuzzer PRIVATE LLVMBOLTRewrite) target_link_libraries(llvm-bolt-fuzzer PRIVATE LLVMBOLTRewrite)
endif() endif()

bolt/tools/merge-fdata/CMakeLists.txt

set(LLVM_LINK_COMPONENTS Support) set(LLVM_LINK_COMPONENTS Support)
add_bolt_tool(merge-fdata add_bolt_tool(merge-fdata
merge-fdata.cpp merge-fdata.cpp
DISABLE_LLVM_LINK_LLVM_DYLIB
DEPENDS DEPENDS
intrinsics_gen intrinsics_gen
) )
set_target_properties(merge-fdata PROPERTIES FOLDER "BOLT") set_target_properties(merge-fdata PROPERTIES FOLDER "BOLT")
# Emit relocations for BOLT meta test (bolt/test/runtime/meta-merge-fdata.test) # Emit relocations for BOLT meta test (bolt/test/runtime/meta-merge-fdata.test)
if (BOLT_INCLUDE_TESTS AND UNIX AND NOT APPLE) if (BOLT_INCLUDE_TESTS AND UNIX AND NOT APPLE)
target_link_options(merge-fdata PRIVATE LINKER:--emit-relocs) target_link_options(merge-fdata PRIVATE LINKER:--emit-relocs)
endif() endif()

bolt/unittests/Core/CMakeLists.txt

set(LLVM_LINK_COMPONENTS set(LLVM_LINK_COMPONENTS
DebugInfoDWARF DebugInfoDWARF
Object Object
MC MC
${LLVM_TARGETS_TO_BUILD} ${LLVM_TARGETS_TO_BUILD}
) )
add_bolt_unittest(CoreTests add_bolt_unittest(CoreTests
BinaryContext.cpp BinaryContext.cpp
MCPlusBuilder.cpp MCPlusBuilder.cpp
DynoStats.cpp DynoStats.cpp
DISABLE_LLVM_LINK_LLVM_DYLIB
) )
target_link_libraries(CoreTests target_link_libraries(CoreTests
PRIVATE PRIVATE
LLVMBOLTCore LLVMBOLTCore
LLVMBOLTRewrite LLVMBOLTRewrite
) )
Show All 17 Lines

bolt/unittests/Profile/CMakeLists.txt

add_bolt_unittest(ProfileTests add_bolt_unittest(ProfileTests
DataAggregator.cpp DataAggregator.cpp
DISABLE_LLVM_LINK_LLVM_DYLIB
) )
target_link_libraries(ProfileTests target_link_libraries(ProfileTests
PRIVATE PRIVATE
LLVMBOLTProfile LLVMBOLTProfile
) )