Skip to content

Commit 4f54ba9

Browse files
committed
Switch clang++-bolt to clang-bolt, drop hard-coded revision
llvm/llvm-project@76b2915 has dropped the use of clang++-bolt target. llvm/llvm-project#109351 has introduced the clang-prebolt binary that can be used as base version (since clang-bolt binary is no longer produced).
1 parent 33bdf9b commit 4f54ba9

File tree

1 file changed

+8
-13
lines changed

1 file changed

+8
-13
lines changed

driver.sh

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,7 @@ TMPDIR=`mktemp -d`
1515
cd $TMPDIR
1616
echo $TMPDIR
1717

18-
# Checkout LLVM repo at a known commit
19-
git clone "$LLVM_SRC"
20-
pushd llvm-project
21-
# Trunk as of Oct 23, 2022
22-
git checkout e98501e27ed9ae9ceeaf80eac84d408c2ce4cd72
23-
popd
18+
git clone --no-local "$LLVM_SRC"
2419

2520
# Cmake configuration for benchmarking
2621
CMAKE_ARGS="-S llvm-project/llvm -GNinja -DCMAKE_BUILD_TYPE=Release -DLLVM_ENABLE_PROJECTS=clang -DLLVM_TARGETS_TO_BUILD=Native"
@@ -44,7 +39,7 @@ LTO_PGO_ARGS="-DPGO_INSTRUMENT_LTO=Thin $PGO_ARGS"
4439
BOLT_CMAKE="llvm-project/clang/cmake/caches/BOLT.cmake"
4540
BOLT_PGO_CMAKE="llvm-project/clang/cmake/caches/BOLT-PGO.cmake"
4641
BOLT_PASSTHRU_ARGS="-DCLANG_BOOTSTRAP_CMAKE_ARGS=-C../../../../$BOLT_CMAKE
47-
-DCLANG_BOOTSTRAP_TARGETS=clang++-bolt"
42+
-DCLANG_BOOTSTRAP_TARGETS=clang-bolt"
4843

4944
BOLT_BASELINE_ARGS="$BASELINE_ARGS $BOLT_PASSTHRU_ARGS"
5045
BOLT_LTO_ARGS="$LTO_ARGS $BOLT_PASSTHRU_ARGS"
@@ -58,7 +53,7 @@ build () {
5853
echo $bcfg
5954
args=${bcfg}_ARGS
6055
cmake -B $bcfg ${!args} |& tee ${bcfg}_build.log
61-
ninja -C $bcfg stage2-clang++-bolt |& tee -a ${bcfg}_build.log
56+
ninja -C $bcfg stage2-clang-bolt |& tee -a ${bcfg}_build.log
6257
done
6358
}
6459

@@ -71,17 +66,17 @@ bench () {
7166
RUNDIR=$3
7267
echo $cfg
7368

74-
clang_dir=`dirname $(find $TMPDIR/BOLT_$cfg -name clang-bolt)`
69+
clang_dir=`dirname $(find $TMPDIR/BOLT_$cfg -name clang-prebolt)`
7570
CC=$clang_dir/clang
7671
CXX=$clang_dir/clang++
7772

7873
log=${cfg}_${hwname}_run
7974

80-
for b in "" BOLT_
75+
for b in BOLT_ ""
8176
do
82-
if [[ -n $b ]]; then
83-
CC=$CC-bolt
84-
CXX=$CXX-bolt
77+
if [[ -z $b ]]; then
78+
CC=$CC-prebolt
79+
CXX=$CXX-prebolt
8580
fi
8681
rm -rf $RUNDIR/CMakeCache.txt $RUNDIR/CMakeFiles
8782
cmake -B $RUNDIR $CMAKE_ARGS -DCMAKE_C_COMPILER=$CC -DCMAKE_CXX_COMPILER=$CXX

0 commit comments

Comments
 (0)