Skip to content

Commit 6523b72

Browse files
committed
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 (483c1a8) is that this is more scoped in which benchmarks we allow unstable features, to prevent unintentionally enabling unstable features. r? `@Mark-Simulacrum`
2 parents f7534b5 + 7ecc995 commit 6523b72

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

Diff for: src/ci/pgo.sh

+4-2
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ rm -rf /tmp/rustc-pgo
77
python2.7 ../x.py build --target=$PGO_HOST --host=$PGO_HOST \
88
--stage 2 library/std --rust-profile-generate=/tmp/rustc-pgo
99

10-
./build/$PGO_HOST/stage2/bin/rustc --edition=2018 \
10+
RUSTC_BOOTSTRAP=1 ./build/$PGO_HOST/stage2/bin/rustc --edition=2018 \
1111
--crate-type=lib ../library/core/src/lib.rs
1212

1313
# Download and build a single-file stress test benchmark on perf.rust-lang.org.
@@ -16,7 +16,9 @@ function pgo_perf_benchmark {
1616
local github_prefix=https://raw.githubusercontent.com/rust-lang/rustc-perf/$PERF
1717
local name=$1
1818
curl -o /tmp/$name.rs $github_prefix/collector/benchmarks/$name/src/lib.rs
19-
./build/$PGO_HOST/stage2/bin/rustc --edition=2018 --crate-type=lib /tmp/$name.rs
19+
20+
RUSTC_BOOTSTRAP=1 ./build/$PGO_HOST/stage2/bin/rustc --edition=2018 \
21+
--crate-type=lib /tmp/$name.rs
2022
}
2123

2224
pgo_perf_benchmark externs

0 commit comments

Comments
 (0)