diff --git a/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile b/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile index 5e6716baed6d9..ab6c888030e1b 100644 --- a/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile +++ b/src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile @@ -98,8 +98,8 @@ COPY host-x86_64/dist-x86_64-linux/build-clang.sh /tmp/ RUN ./build-clang.sh ENV CC=clang CXX=clang++ -# rustc-perf version from 2022-04-05 -ENV PERF_COMMIT 04fccd80396f954b339c366e30221f4bd52c5e03 +# rustc-perf version from 2022-05-18 +ENV PERF_COMMIT f66cc8f3e04392b0e2fd811f21fd1ece6ebaded3 RUN curl -LS -o perf.zip https://github.com/rust-lang/rustc-perf/archive/$PERF_COMMIT.zip && \ unzip perf.zip && \ mv rustc-perf-$PERF_COMMIT rustc-perf && \ diff --git a/src/ci/pgo.sh b/src/ci/pgo.sh index aedfe98bdea11..9b727947f6ad1 100755 --- a/src/ci/pgo.sh +++ b/src/ci/pgo.sh @@ -1,4 +1,5 @@ #!/bin/bash +# ignore-tidy-linelength set -euxo pipefail @@ -87,7 +88,7 @@ python3 ../x.py build --target=$PGO_HOST --host=$PGO_HOST \ # That's why we override the profile path to include the PID. This will produce many more profiling # files, but the resulting profile will produce a slightly faster rustc binary. LLVM_PROFILE_FILE=/tmp/rustc-pgo/default_%m_%p.profraw gather_profiles "Check,Debug,Opt" "All" \ - "externs,ctfe-stress-4,cargo-0.60.0,token-stream-stress,match-stress,tuple-stress" +"externs,ctfe-stress-5,cargo-0.60.0,token-stream-stress,match-stress,tuple-stress,diesel-1.4.8,bitmaps-3.1.0" # Merge the profile data we gathered ./build/$PGO_HOST/llvm/bin/llvm-profdata \