about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2021-02-10 07:10:43 +0000
committerbors <bors@rust-lang.org>2021-02-10 07:10:43 +0000
commit6523b721c3d8a92cf06aab04dd15ebe7fd5a9fb7 (patch)
tree90bfedcf3c3674553fb3fd729b5ab1a759fc491d
parentf7534b566c850f860e11735b27a988dd9eec454a (diff)
parent7ecc995f0906f16c277c57206e17d2ae810b5476 (diff)
downloadrust-6523b721c3d8a92cf06aab04dd15ebe7fd5a9fb7.tar.gz
rust-6523b721c3d8a92cf06aab04dd15ebe7fd5a9fb7.zip
Auto merge of #81929 - pietroalbini:pgo-bootstrap, r=Mark-Simulacrum
Allow unstable features in some PGO benchmarks

Some of the benchmarks we're using for PGO require unstable features (such as compiling the standard library and some rustc-perf benchmarks), breaking CI on the beta and stable branches. For the past two releases we cherry-picked a commit directly onto the beta branch that unconditionally sets `RUSTC_BOOTSTRAP=1`, and this PR backports a similar change to the master branch.

The difference between this commit and the one we backported previously (483c1a83ca7cf53fd8f3432edb32cbe70ba39d45) is that this is more scoped in which benchmarks we allow unstable features, to prevent unintentionally enabling unstable features.

r? `@Mark-Simulacrum`
-rwxr-xr-xsrc/ci/pgo.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/ci/pgo.sh b/src/ci/pgo.sh
index a5f47ca78ff..95cf1183fc1 100755
--- a/src/ci/pgo.sh
+++ b/src/ci/pgo.sh
@@ -7,7 +7,7 @@ rm -rf /tmp/rustc-pgo
 python2.7 ../x.py build --target=$PGO_HOST --host=$PGO_HOST \
     --stage 2 library/std --rust-profile-generate=/tmp/rustc-pgo
 
-./build/$PGO_HOST/stage2/bin/rustc --edition=2018 \
+RUSTC_BOOTSTRAP=1 ./build/$PGO_HOST/stage2/bin/rustc --edition=2018 \
     --crate-type=lib ../library/core/src/lib.rs
 
 # Download and build a single-file stress test benchmark on perf.rust-lang.org.
@@ -16,7 +16,9 @@ function pgo_perf_benchmark {
     local github_prefix=https://raw.githubusercontent.com/rust-lang/rustc-perf/$PERF
     local name=$1
     curl -o /tmp/$name.rs $github_prefix/collector/benchmarks/$name/src/lib.rs
-    ./build/$PGO_HOST/stage2/bin/rustc --edition=2018 --crate-type=lib /tmp/$name.rs
+
+    RUSTC_BOOTSTRAP=1 ./build/$PGO_HOST/stage2/bin/rustc --edition=2018 \
+        --crate-type=lib /tmp/$name.rs
 }
 
 pgo_perf_benchmark externs