[CMake] Add install-clang-bolt target

[Amir]

Summary

Refactor symlink creation and add install-clang-bolt target

clang/CMakeLists.txt

foreach(target ${CLANG_BOOTSTRAP_TARGETS})
     endif()
 
     ExternalProject_Add_StepTargets(${NEXT_CLANG_STAGE} ${target})
   endforeach()
 endif()
 
 if (CLANG_BOLT_INSTRUMENT AND NOT LLVM_BUILD_INSTRUMENTED)
   set(CLANG_PATH ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang)
-  set(CLANGXX_PATH ${CLANG_PATH}++)
-  set(CLANG_INSTRUMENTED ${CLANG_PATH}-bolt.inst)
-  set(CLANGXX_INSTRUMENTED ${CLANGXX_PATH}-bolt.inst)
-  set(CLANG_OPTIMIZED ${CLANG_PATH}-bolt)
-  set(CLANGXX_OPTIMIZED ${CLANGXX_PATH}-bolt)
 
   # Instrument clang with BOLT
+  set(BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/bolt-instr-bins/)
+  set(CLANG_INSTRUMENTED ${BINARY_DIR}/clang)
   add_custom_target(clang-instrumented
     DEPENDS ${CLANG_INSTRUMENTED}
   )
   add_custom_command(OUTPUT ${CLANG_INSTRUMENTED}
     DEPENDS clang llvm-bolt
     COMMAND llvm-bolt ${CLANG_PATH} -o ${CLANG_INSTRUMENTED}
       -instrument --instrumentation-file-append-pid
       --instrumentation-file=${CMAKE_CURRENT_BINARY_DIR}/prof.fdata
     COMMENT "Instrumenting clang binary with BOLT"
     VERBATIM
   )
 
-  # Make a symlink from clang-bolt.inst to clang++-bolt.inst
-  add_custom_target(clang++-instrumented
-    DEPENDS ${CLANGXX_INSTRUMENTED}
-  )
-  add_custom_command(OUTPUT ${CLANGXX_INSTRUMENTED}
-    DEPENDS clang-instrumented
-    COMMAND ${CMAKE_COMMAND} -E create_symlink
-      ${CLANG_INSTRUMENTED}
-      ${CLANGXX_INSTRUMENTED}
-    COMMENT "Creating symlink from BOLT instrumented clang to clang++"
-    VERBATIM
-  )
+  # Make a symlink from instrumented clang to clang++
+  add_clang_symlink(clang++ clang)
 
   # Build specified targets with instrumented Clang to collect the profile
   set(STAMP_DIR ${CMAKE_CURRENT_BINARY_DIR}/bolt-instrumented-clang-stamps/)
   set(BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/bolt-instrumented-clang-bins/)
   set(build_configuration "$<CONFIG>")
   include(ExternalProject)
   ExternalProject_Add(bolt-instrumentation-profile
     DEPENDS clang++-instrumented
COMMAND ${Python3_EXECUTABLE}
       ${CMAKE_CURRENT_SOURCE_DIR}/utils/perf-training/perf-helper.py merge-fdata
       $<TARGET_FILE:merge-fdata> ${CMAKE_CURRENT_BINARY_DIR}/prof.fdata
       ${CMAKE_CURRENT_BINARY_DIR}
     COMMENT "Preparing BOLT profile"
     VERBATIM
   )
 
   # Optimize original (pre-bolt) Clang using the collected profile
+  set(BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/bolt-optimized-bins/)
+  set(CLANG_OPTIMIZED ${BINARY_DIR}/clang)
   add_custom_target(clang-bolt
     DEPENDS ${CLANG_OPTIMIZED}
   )
   add_custom_command(OUTPUT ${CLANG_OPTIMIZED}
     DEPENDS clang-bolt-profile
     COMMAND llvm-bolt ${CLANG_PATH}
       -o ${CLANG_OPTIMIZED}
       -data ${CMAKE_CURRENT_BINARY_DIR}/prof.fdata
       -reorder-blocks=ext-tsp -reorder-functions=hfsort+ -split-functions
       -split-all-cold -split-eh -dyno-stats -icf=1 -use-gnu-stack
     COMMENT "Optimizing Clang with BOLT"
     VERBATIM
   )
 
   # Make a symlink from clang-bolt to clang++-bolt
-  add_custom_target(clang++-bolt
-    DEPENDS ${CLANGXX_OPTIMIZED}
-  )
-  add_custom_command(OUTPUT ${CLANGXX_OPTIMIZED}
+  add_clang_symlink(clang++ clang)
+  add_llvm_install_targets(install-clang-bolt
                            DEPENDS clang-bolt
-    COMMAND ${CMAKE_COMMAND} -E create_symlink
-      ${CLANG_OPTIMIZED}
-      ${CLANGXX_OPTIMIZED}
-    COMMENT "Creating symlink from BOLT optimized clang to clang++"
-    VERBATIM
-  )
+                           COMPONENT clang-bolt)
 endif()
 
 if (LLVM_ADD_NATIVE_VISUALIZERS_TO_SOLUTION)
   add_subdirectory(utils/ClangVisualizers)
 endif()
 add_subdirectory(utils/hmaptool)
 
 if(CLANG_BUILT_STANDALONE)

clang/cmake/caches/BOLT-PGO.cmake

 set(LLVM_ENABLE_PROJECTS "bolt;clang;lld" CACHE STRING "")
 
 set(CLANG_BOOTSTRAP_TARGETS
-  stage2-clang++-bolt
+  stage2-clang-bolt
+  stage2-install-clang-bolt
   CACHE STRING "")
 set(BOOTSTRAP_CLANG_BOOTSTRAP_TARGETS
-  clang++-bolt
+  clang-bolt
+  install-clang-bolt
   CACHE STRING "")
 
 set(PGO_BUILD_CONFIGURATION ${CMAKE_CURRENT_LIST_DIR}/BOLT.cmake CACHE STRING "")
 include(${CMAKE_CURRENT_LIST_DIR}/PGO.cmake)