Wrap cmake command with perf instead of clang to save time on perf2bolt conversions

Author: tstellar

clang/utils/perf-training/bolt.lit.cfg

@@ -25,8 +25,7 @@ clang_nowrapper = os.path.realpath(
     lit.util.which(clang_binary, config.clang_tools_dir)
 ).replace("\\", "/")
 config.clang = perf_wrapper + clang_nowrapper
-config.cmake_compiler_args = "-DCMAKE_CXX_COMPILER_LAUNCHER='{0}' -DCMAKE_C_COMPILER_LAUNCHER='{0}' -DCMAKE_C_COMPILER='{1}' -DCMAKE_CXX_COMPILER='{1};--driver-mode=g++'".format(
-    re.sub(r"\s+", ";", perf_wrapper.rstrip()),
+config.cmake_compiler_args = "-DCMAKE_C_COMPILER='{0}' -DCMAKE_CXX_COMPILER='{0};--driver-mode=g++'".format(
     re.sub(r"\s+", ";", clang_nowrapper)
 )
 
@@ -70,3 +69,4 @@ config.substitutions.append(('%cmake_generator', config.cmake_generator))
 config.substitutions.append(('%cmake', config.cmake_exe))
 config.substitutions.append(('%llvm_src_dir', config.llvm_src_dir))
 config.substitutions.append(('%ninja_args', ninja_args))
+config.substitutions.append(('%perf_wrapper', perf_wrapper))

clang/utils/perf-training/lit.cfg

@@ -44,6 +44,7 @@ config.substitutions.append( ('%cmake_generator', config.cmake_generator ) )
 config.substitutions.append( ('%cmake', config.cmake_exe ) )
 config.substitutions.append( ('%llvm_src_dir', config.llvm_src_dir ) )
 config.substitutions.append( ('%ninja_args', '' ) )
+config.substitutions.append( ('%perf_wrapper', '' ) )
 
 config.environment['LLVM_PROFILE_FILE'] = 'perf-training-%4m.profraw'
 

clang/utils/perf-training/llvm-support/build.test

@@ -1,2 +1,2 @@
 RUN: %cmake -G %cmake_generator -B %t -S %llvm_src_dir %cmake_compiler_args -DCMAKE_BUILD_TYPE=Release
-RUN: %cmake --build %t %ninja_args -v --target LLVMSupport
+RUN: %perf_wrapper %cmake --build %t -v --target LLVMSupport