Revert "[BOLT][CMake] Redo the build and install targets"

petrhosek · petrhosek · commit 1d6a2c535793 · 2023-06-01T08:03:50.000Z
This reverts commit f99a7d3 since it broke the bolt-aarch64-ubuntu-clang-shared bot.
diff --git a/bolt/CMakeLists.txt b/bolt/CMakeLists.txt
@@ -4,9 +4,6 @@ set(BOLT_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
 set(BOLT_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR})
 set(CMAKE_CXX_STANDARD 17)
 
-# Add path for custom modules.
-list(INSERT CMAKE_MODULE_PATH 0 "${BOLT_SOURCE_DIR}/cmake/modules")
-
 # Determine default set of targets to build -- the intersection of
 # those BOLT supports and those LLVM is targeting.
 set(BOLT_TARGETS_TO_BUILD_all "AArch64;X86")
@@ -114,15 +111,6 @@ endif()
 
 find_program(GNU_LD_EXECUTABLE NAMES ${LLVM_DEFAULT_TARGET_TRIPLE}-ld.bfd ld.bfd DOC "GNU ld")
 
-include(AddBOLT)
-
-option(BOLT_BUILD_TOOLS
-  "Build the BOLT tools. If OFF, just generate build targets." ON)
-
-add_custom_target(bolt)
-set_target_properties(bolt PROPERTIES FOLDER "BOLT")
-add_llvm_install_targets(install-bolt DEPENDS bolt COMPONENT bolt)
-
 include_directories(
   ${CMAKE_CURRENT_SOURCE_DIR}/include
   ${CMAKE_CURRENT_BINARY_DIR}/include
diff --git a/bolt/cmake/modules/AddBOLT.cmake b/bolt/cmake/modules/AddBOLT.cmake
diff --git a/bolt/test/CMakeLists.txt b/bolt/test/CMakeLists.txt
@@ -37,6 +37,7 @@ list(APPEND BOLT_TEST_DEPS
   lld
   llvm-config
   llvm-bolt
+  llvm-boltdiff
   llvm-bolt-heatmap
   llvm-bat-dump
   llvm-dwarfdump
@@ -51,6 +52,7 @@ list(APPEND BOLT_TEST_DEPS
   llvm-objcopy
   merge-fdata
   not
+  perf2bolt
   split-file
   yaml2obj
   )
diff --git a/bolt/tools/CMakeLists.txt b/bolt/tools/CMakeLists.txt
@@ -2,6 +2,16 @@ set(BOLT_TOOLS_INSTALL_DIR "${CMAKE_INSTALL_BINDIR}" CACHE PATH
     "Path for binary subdirectory (defaults to '${CMAKE_INSTALL_BINDIR}')")
 mark_as_advanced(BOLT_TOOLS_INSTALL_DIR)
 
+# Move these macros to AddBolt if such a CMake module is ever created.
+
+macro(add_bolt_tool name)
+  llvm_add_tool(BOLT ${ARGV})
+endmacro()
+
+macro(add_bolt_tool_symlink name)
+  llvm_add_tool_symlink(BOLT ${ARGV})
+endmacro()
+
 add_subdirectory(driver)
 add_subdirectory(llvm-bolt-fuzzer)
 add_subdirectory(bat-dump)
diff --git a/bolt/tools/bat-dump/CMakeLists.txt b/bolt/tools/bat-dump/CMakeLists.txt
@@ -3,7 +3,7 @@ set(LLVM_LINK_COMPONENTS
   Support
   )
 
-add_bolt_executable(llvm-bat-dump
+add_llvm_tool(llvm-bat-dump
   bat-dump.cpp
 
   DISABLE_LLVM_LINK_LLVM_DYLIB
@@ -13,3 +13,5 @@ target_link_libraries(llvm-bat-dump
   PRIVATE
   LLVMBOLTProfile
   )
+
+set_target_properties(llvm-bat-dump PROPERTIES FOLDER "BOLT")
diff --git a/bolt/tools/driver/CMakeLists.txt b/bolt/tools/driver/CMakeLists.txt
@@ -30,6 +30,22 @@ target_link_libraries(llvm-bolt
 add_bolt_tool_symlink(perf2bolt llvm-bolt)
 add_bolt_tool_symlink(llvm-boltdiff llvm-bolt)
 
-add_dependencies(bolt llvm-bolt)
+set(BOLT_DEPENDS
+  llvm-bolt
+  perf2bolt
+  llvm-boltdiff
+  )
+
+add_custom_target(bolt DEPENDS ${BOLT_DEPENDS})
+install(PROGRAMS
+  ${CMAKE_BINARY_DIR}/bin/llvm-bolt
+  ${CMAKE_BINARY_DIR}/bin/perf2bolt
+  ${CMAKE_BINARY_DIR}/bin/llvm-boltdiff
+  DESTINATION ${CMAKE_INSTALL_BINDIR}
+  COMPONENT bolt
+  )
+add_llvm_install_targets(install-bolt DEPENDS bolt COMPONENT bolt)
+set_target_properties(bolt PROPERTIES FOLDER "BOLT")
+set_target_properties(install-bolt PROPERTIES FOLDER "BOLT")
 
-include_directories(${BOLT_SOURCE_DIR}/lib)
+include_directories( ${BOLT_SOURCE_DIR}/lib )
diff --git a/bolt/tools/heatmap/CMakeLists.txt b/bolt/tools/heatmap/CMakeLists.txt
@@ -17,4 +17,4 @@ target_link_libraries(llvm-bolt-heatmap
   LLVMBOLTUtils
   )
 
-add_dependencies(bolt llvm-bolt-heatmap)
+set_target_properties(llvm-bolt-heatmap PROPERTIES FOLDER "BOLT")
diff --git a/bolt/tools/merge-fdata/CMakeLists.txt b/bolt/tools/merge-fdata/CMakeLists.txt
@@ -8,8 +8,14 @@ add_bolt_tool(merge-fdata
   DEPENDS
   intrinsics_gen
 )
+set_target_properties(merge-fdata PROPERTIES FOLDER "BOLT")
 
 add_dependencies(bolt merge-fdata)
+install(PROGRAMS
+  ${CMAKE_BINARY_DIR}/bin/merge-fdata
+  DESTINATION ${CMAKE_INSTALL_BINDIR}
+  COMPONENT bolt
+  )
 
 # Emit relocations for BOLT meta test (bolt/test/runtime/meta-merge-fdata.test)
 if (BOLT_INCLUDE_TESTS AND UNIX AND NOT APPLE)
diff --git a/clang/cmake/caches/Fuchsia-stage2.cmake b/clang/cmake/caches/Fuchsia-stage2.cmake
@@ -6,7 +6,7 @@ set(LLVM_TARGETS_TO_BUILD X86;ARM;AArch64;RISCV CACHE STRING "")
 
 set(PACKAGE_VENDOR Fuchsia CACHE STRING "")
 
-set(_FUCHSIA_ENABLE_PROJECTS "bolt;clang;clang-tools-extra;lld;llvm;polly")
+set(_FUCHSIA_ENABLE_PROJECTS "clang;clang-tools-extra;lld;llvm;polly")
 set(LLVM_ENABLE_RUNTIMES "compiler-rt;libcxx;libcxxabi;libunwind" CACHE STRING "")
 
 set(LLVM_ENABLE_BACKTRACES OFF CACHE BOOL "")
@@ -329,7 +329,6 @@ set(LLVM_TOOLCHAIN_TOOLS
   CACHE STRING "")
 
 set(LLVM_Toolchain_DISTRIBUTION_COMPONENTS
-  bolt
   clang
   lld
   clang-apply-replacements
diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake
@@ -2121,7 +2121,7 @@ function(llvm_install_symlink project name dest)
   if (NOT LLVM_ENABLE_IDE AND NOT ARG_ALWAYS_GENERATE)
     add_llvm_install_targets(install-${name}
                              DEPENDS ${name} ${dest}
-                             COMPONENT ${component}
+                             COMPONENT ${name}
                              SYMLINK ${dest})
   endif()
 endfunction()

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ set(LLVM_LINK_COMPONENTS`
`3`	`3`	`Support`
`4`	`4`	`)`
`5`	`5`
`6`		`-add_bolt_executable(llvm-bat-dump`
	`6`	`+add_llvm_tool(llvm-bat-dump`
`7`	`7`	`bat-dump.cpp`
`8`	`8`
`9`	`9`	`DISABLE_LLVM_LINK_LLVM_DYLIB`
`@@ -13,3 +13,5 @@ target_link_libraries(llvm-bat-dump`
`13`	`13`	`PRIVATE`
`14`	`14`	`LLVMBOLTProfile`
`15`	`15`	`)`
	`16`	`+`
	`17`	`+set_target_properties(llvm-bat-dump PROPERTIES FOLDER "BOLT")`
Original file line number	Diff line number	Diff line change
`@@ -17,4 +17,4 @@ target_link_libraries(llvm-bolt-heatmap`
`17`	`17`	`LLVMBOLTUtils`
`18`	`18`	`)`
`19`	`19`
`20`		`-add_dependencies(bolt llvm-bolt-heatmap)`
	`20`	`+set_target_properties(llvm-bolt-heatmap PROPERTIES FOLDER "BOLT")`