Streamline CMake args

Author: aaupov

driver.sh

@@ -17,10 +17,13 @@ echo $TMPDIR
 
 git clone --no-local "$LLVM_SRC"
 
+LL="llvm-project/llvm"
+LCCC="llvm-project/clang/cmake/caches/"
+
 # Cmake configuration for benchmarking
-CMAKE_ARGS="-S llvm-project/llvm -GNinja -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_PROJECTS=clang -DLLVM_TARGETS_TO_BUILD=Native"
+CMAKE_ARGS="-S ${LL} -GNinja -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_PROJECTS=clang -DLLVM_TARGETS_TO_BUILD=Native"
 # Build different versions of Clang: baseline, +LTO, +PGO, +BOLT
-COMMON_CMAKE_ARGS="-S llvm-project/llvm -GNinja -DCMAKE_BUILD_TYPE=Release
+COMMON_CMAKE_ARGS="-S ${LL} -GNinja -DCMAKE_BUILD_TYPE=Release
     -DLLVM_ENABLE_PROJECTS=bolt;clang;lld -DLLVM_TARGETS_TO_BUILD=Native
     -DBOOTSTRAP_LLVM_ENABLE_LLD=ON -DBOOTSTRAP_BOOTSTRAP_LLVM_ENABLE_LLD=ON
     -DLLVM_CCACHE_BUILD=ON"
@@ -29,22 +32,23 @@ BASELINE_ARGS="$COMMON_CMAKE_ARGS -DCLANG_ENABLE_BOOTSTRAP=On
   -DCLANG_BOOTSTRAP_TARGETS=clang"
 # ThinLTO: Two-stage + LTO Clang build
 LTO_ARGS="$BASELINE_ARGS -DBOOTSTRAP_LLVM_ENABLE_LTO=Thin"
-# Instrumentation PGO: Two-stage + PGO build
-PGO_ARGS="$BASELINE_ARGS -DBOOTSTRAP_CLANG_BOOTSTRAP_TARGETS=clang
-  -DCLANG_BOOTSTRAP_TARGETS=stage2-clang
-  -C llvm-project/clang/cmake/caches/PGO.cmake"
+# Base PGO flags
+BASE_PGO_ARGS="$BASELINE_ARGS -DBOOTSTRAP_CLANG_BOOTSTRAP_TARGETS=clang
+  -DCLANG_BOOTSTRAP_TARGETS=stage2-clang"
+# Instrumentation PGO: Two-stage + PGO build, trained on hello-world
+PGO_ARGS="${BASE_PGO_ARGS} -C ${LCCC}PGO.cmake"
+# PGO with ThinLTO flag
+BASE_LTO_PGO_ARGS="-DPGO_INSTRUMENT_LTO=Thin"
 # LTO+PGO: Two-stage + LTO + PGO
-LTO_PGO_ARGS="-DPGO_INSTRUMENT_LTO=Thin $PGO_ARGS"
+LTO_PGO_ARGS="$BASE_LTO_PGO_ARGS $PGO_ARGS"
 
-BOLT_CMAKE="llvm-project/clang/cmake/caches/BOLT.cmake"
-BOLT_PGO_CMAKE="llvm-project/clang/cmake/caches/BOLT-PGO.cmake"
-BOLT_PASSTHRU_ARGS="-DCLANG_BOOTSTRAP_CMAKE_ARGS=-C../../../../$BOLT_CMAKE
+BOLT_PASSTHRU_ARGS="-DCLANG_BOOTSTRAP_CMAKE_ARGS=-C../../../../${LCCC}BOLT.cmake
   -DCLANG_BOOTSTRAP_TARGETS=clang-bolt"
 
 BOLT_BASELINE_ARGS="$BASELINE_ARGS $BOLT_PASSTHRU_ARGS"
 BOLT_LTO_ARGS="$LTO_ARGS $BOLT_PASSTHRU_ARGS"
-BOLT_PGO_ARGS="$COMMON_CMAKE_ARGS -C $BOLT_PGO_CMAKE"
-BOLT_LTO_PGO_ARGS="-DBOOTSTRAP_LLVM_ENABLE_LLD=ON -DPGO_INSTRUMENT_LTO=Thin $BOLT_PGO_ARGS"
+BOLT_PGO_ARGS="$COMMON_CMAKE_ARGS -C ${LCCC}BOLT-PGO.cmake"
+BOLT_LTO_PGO_ARGS="$BASE_LTO_PGO_ARGS $BOLT_PGO_ARGS"
 
 build () {
     for cfg in BASELINE LTO PGO LTO_PGO