nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-01 15:01:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #95724 - Kobzol:ci-update-rustc-perf, r=nnethercote

Browse Source 
CI: update `rustc-perf` version used in CI and also the corresponding PGO benchmarks

The old version was from May 2021. The `rustc-perf` benchmarks have seen a significant overhaul recently, so let's see if the new benchmarks can improve PGO performance.
This commit is contained in:
bors 2022-04-09 07:53:34 +00:00
commit 399dd8049d
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ci/docker/host-x86_64/dist-x86_64-linux/Dockerfile
View File

@ -98,7 +98,8 @@ COPY host-x86_64/dist-x86_64-linux/build-clang.sh /tmp/
RUN ./build-clang.sh RUN ./build-clang.sh
ENV CC=clang CXX=clang++ ENV CC=clang CXX=clang++
ENV PERF_COMMIT 1e19fc4c6168d2f7596e512f42f358f245d8f09d # rustc-perf version from 2022-04-05
ENV PERF_COMMIT 04fccd80396f954b339c366e30221f4bd52c5e03
RUN curl -LS -o perf.zip https://github.com/rust-lang/rustc-perf/archive/$PERF_COMMIT.zip && \ RUN curl -LS -o perf.zip https://github.com/rust-lang/rustc-perf/archive/$PERF_COMMIT.zip && \
unzip perf.zip && \ unzip perf.zip && \
mv rustc-perf-$PERF_COMMIT rustc-perf && \ mv rustc-perf-$PERF_COMMIT rustc-perf && \

19
src/ci/pgo.sh
View File

@ -3,8 +3,8 @@
set -euxo pipefail set -euxo pipefail
# Compile several crates to gather execution PGO profiles. # Compile several crates to gather execution PGO profiles.
# Arg0 => builds (Debug, Opt) # Arg0 => profiles (Debug, Opt)
# Arg1 => runs (Full, IncrFull, All) # Arg1 => scenarios (Full, IncrFull, All)
# Arg2 => crates (syn, cargo, ...) # Arg2 => crates (syn, cargo, ...)
gather_profiles () { gather_profiles () {
cd /checkout/obj cd /checkout/obj
@ -27,10 +27,10 @@ gather_profiles () {
profile_local \ profile_local \
eprintln \ eprintln \
/checkout/obj/build/$PGO_HOST/stage2/bin/rustc \ /checkout/obj/build/$PGO_HOST/stage2/bin/rustc \
Test \ --id Test \
--builds $1 \ --profiles $1 \
--cargo /checkout/obj/build/$PGO_HOST/stage0/bin/cargo \ --cargo /checkout/obj/build/$PGO_HOST/stage0/bin/cargo \
--runs $2 \ --scenarios $2 \
--include $3 --include $3
cd /checkout/obj cd /checkout/obj
@ -64,7 +64,10 @@ RUSTC=/checkout/obj/build/$PGO_HOST/stage0/bin/rustc \
RUSTC_BOOTSTRAP=1 \ RUSTC_BOOTSTRAP=1 \
/checkout/obj/build/$PGO_HOST/stage0/bin/cargo build -p collector /checkout/obj/build/$PGO_HOST/stage0/bin/cargo build -p collector
gather_profiles "Debug,Opt" "Full" "syn,cargo,serde,ripgrep,regex,clap-rs,hyper-2" # Here we're profiling LLVM, so we only care about `Debug` and `Opt`, because we want to stress
# codegen. We also profile some of the most prolific crates.
gather_profiles "Debug,Opt" "Full" \
"syn-1.0.89,cargo-0.60.0,serde-1.0.136,ripgrep-13.0.0,regex-1.5.5,clap-3.1.6,hyper-0.14.18"
# Merge the profile data we gathered for LLVM # Merge the profile data we gathered for LLVM
# Note that this uses the profdata from the clang we used to build LLVM, # Note that this uses the profdata from the clang we used to build LLVM,
@ -83,8 +86,10 @@ python3 ../x.py build --target=$PGO_HOST --host=$PGO_HOST \
--stage 2 library/std \ --stage 2 library/std \
--rust-profile-generate=/tmp/rustc-pgo --rust-profile-generate=/tmp/rustc-pgo
# Here we're profiling the `rustc` frontend, so we also include `Check`.
# The benchmark set includes various stress tests that put the frontend under pressure.
gather_profiles "Check,Debug,Opt" "All" \ gather_profiles "Check,Debug,Opt" "All" \
"externs,ctfe-stress-4,inflate,cargo,token-stream-stress,match-stress-enum" "externs,ctfe-stress-4,cargo-0.60.0,token-stream-stress,match-stress,tuple-stress"
# Merge the profile data we gathered # Merge the profile data we gathered
./build/$PGO_HOST/llvm/bin/llvm-profdata \ ./build/$PGO_HOST/llvm/bin/llvm-profdata \