Skip to content

Commit f9b6446

Browse files
borsbors
committed
Auto merge of #117435 - SparrowLii:nightly_parallel, r=oli-obk,davidtwco
enable parallel rustc front end in nightly builds Refers to the [MCP](rust-lang/compiler-team#681), this pr does: 1. Enable the parallel front end in nightly builds, and keep the default number of threads as 1. Then users can use the parallel rustc front end via -Z threads=n option. 2. Set it up to serial front end for beta/stable builds via bootstrap. 3. Switch over the alt builders from parallel rustc to serial, so we have artifacts without parallel to test against the artifacts with parallel. r? `@oli-obk` cc `@cjgillot` `@nnethercote` `@bjorn3` `@Kobzol`
2 parents fcca978 + f2a40e9 commit f9b6446

File tree

9 files changed

+41
-13
lines changed

9 files changed

+41
-13
lines changed

‎Cargo.lock

+3-2
Original file line numberDiff line numberDiff line change
@@ -3005,9 +3005,9 @@ dependencies = [
30053005

30063006
[[package]]
30073007
name = "portable-atomic"
3008-
version = "1.4.2"
3008+
version = "1.5.1"
30093009
source = "registry+https://github.com/rust-lang/crates.io-index"
3010-
checksum = "f32154ba0af3a075eefa1eda8bb414ee928f62303a54ea85b8d6638ff1a6ee9e"
3010+
checksum = "3bccab0e7fd7cc19f820a1c8c91720af652d0c88dc9664dd72aef2614f04af3b"
30113011

30123012
[[package]]
30133013
name = "ppv-lite86"
@@ -3734,6 +3734,7 @@ dependencies = [
37343734
"measureme",
37353735
"memmap2",
37363736
"parking_lot 0.12.1",
3737+
"portable-atomic",
37373738
"rustc-hash",
37383739
"rustc-rayon",
37393740
"rustc-rayon-core",

‎compiler/rustc_data_structures/Cargo.toml

+3
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ features = [
4747
memmap2 = "0.2.1"
4848
# tidy-alphabetical-end
4949

50+
[target.'cfg(any(target_arch = "powerpc", target_arch = "mips"))'.dependencies]
51+
portable-atomic = "1.5.1"
52+
5053
[features]
5154
# tidy-alphabetical-start
5255
rustc_use_parallel_compiler = ["indexmap/rustc-rayon", "rustc-rayon", "rustc-rayon-core"]

‎compiler/rustc_data_structures/src/marker.rs

+12-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ cfg_match! {
138138
[std::sync::atomic::AtomicUsize]
139139
[std::sync::atomic::AtomicU8]
140140
[std::sync::atomic::AtomicU32]
141-
[std::sync::atomic::AtomicU64]
142141
[std::backtrace::Backtrace]
143142
[std::io::Error]
144143
[std::fs::File]
@@ -148,6 +147,18 @@ cfg_match! {
148147
[crate::owned_slice::OwnedSlice]
149148
);
150149

150+
// PowerPC and MIPS platforms with 32-bit pointers do not
151+
// have AtomicU64 type.
152+
#[cfg(not(any(target_arch = "powerpc", target_arch = "mips")))]
153+
already_sync!(
154+
[std::sync::atomic::AtomicU64]
155+
);
156+
157+
#[cfg(any(target_arch = "powerpc", target_arch = "mips"))]
158+
already_sync!(
159+
[portable_atomic::AtomicU64]
160+
);
161+
151162
macro_rules! impl_dyn_sync {
152163
($($($attr: meta)* [$ty: ty where $($generics2: tt)*])*) => {
153164
$(unsafe impl<$($generics2)*> DynSync for $ty {})*

‎compiler/rustc_data_structures/src/sync.rs

+9-1
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,15 @@ cfg_match! {
265265

266266
pub use std::sync::OnceLock;
267267

268-
pub use std::sync::atomic::{AtomicBool, AtomicUsize, AtomicU32, AtomicU64};
268+
pub use std::sync::atomic::{AtomicBool, AtomicUsize, AtomicU32};
269+
270+
// PowerPC and MIPS platforms with 32-bit pointers do not
271+
// have AtomicU64 type.
272+
#[cfg(not(any(target_arch = "powerpc", target_arch = "mips")))]
273+
pub use std::sync::atomic::AtomicU64;
274+
275+
#[cfg(any(target_arch = "powerpc", target_arch = "mips"))]
276+
pub use portable_atomic::AtomicU64;
269277

270278
pub use std::sync::Arc as Lrc;
271279
pub use std::sync::Weak as Weak;

‎config.example.toml

+6-5
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#
3131
# If `change-id` does not match the version that is currently running,
3232
# `x.py` will prompt you to update it and check the related PR for more details.
33-
change-id = 116998
33+
change-id = 117435
3434

3535
# =============================================================================
3636
# Tweaking how LLVM is compiled
@@ -553,10 +553,11 @@ change-id = 116998
553553
# Whether to always use incremental compilation when building rustc
554554
#incremental = false
555555

556-
# Build a multi-threaded rustc
557-
# FIXME(#75760): Some UI tests fail when this option is enabled.
558-
# NOTE: This option is NOT SUPPORTED. See #48685.
559-
#parallel-compiler = false
556+
# Build a multi-threaded rustc. This allows users to use parallel rustc
557+
# via the unstable option `-Z threads=n`.
558+
# Since stable/beta channels only allow using stable features,
559+
# `parallel-compiler = false` should be set for these channels.
560+
#parallel-compiler = true
560561

561562
# The default linker that will be hard-coded into the generated
562563
# compiler for targets that don't specify a default linker explicitly

‎src/bootstrap/src/core/config/config.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -1072,6 +1072,7 @@ impl Config {
10721072
config.bindir = "bin".into();
10731073
config.dist_include_mingw_linker = true;
10741074
config.dist_compression_profile = "fast".into();
1075+
config.rustc_parallel = true;
10751076

10761077
config.stdout_is_tty = std::io::stdout().is_terminal();
10771078
config.stderr_is_tty = std::io::stderr().is_terminal();
@@ -1429,7 +1430,9 @@ impl Config {
14291430
set(&mut config.use_lld, rust.use_lld);
14301431
set(&mut config.lld_enabled, rust.lld);
14311432
set(&mut config.llvm_tools_enabled, rust.llvm_tools);
1432-
config.rustc_parallel = rust.parallel_compiler.unwrap_or(false);
1433+
config.rustc_parallel = rust
1434+
.parallel_compiler
1435+
.unwrap_or(config.channel == "dev" || config.channel == "nightly");
14331436
config.rustc_default_linker = rust.default_linker;
14341437
config.musl_root = rust.musl_root.map(PathBuf::from);
14351438
config.save_toolstates = rust.save_toolstates.map(PathBuf::from);

‎src/bootstrap/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ const LLD_FILE_NAMES: &[&str] = &["ld.lld", "ld64.lld", "lld-link", "wasm-ld"];
7777
///
7878
/// If you make any major changes (such as adding new values or changing default values), please
7979
/// ensure that the associated PR ID is added to the end of this list.
80-
pub const CONFIG_CHANGE_HISTORY: &[usize] = &[115898, 116998];
80+
pub const CONFIG_CHANGE_HISTORY: &[usize] = &[115898, 116998, 117435];
8181

8282
/// Extra --check-cfg to add when building
8383
/// (Mode restriction, config name, config values (if any))

‎src/ci/run.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ if [ "$DEPLOY$DEPLOY_ALT" = "1" ]; then
9898
if [ "$NO_LLVM_ASSERTIONS" = "1" ]; then
9999
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --disable-llvm-assertions"
100100
elif [ "$DEPLOY_ALT" != "" ]; then
101-
if [ "$NO_PARALLEL_COMPILER" = "" ]; then
102-
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.parallel-compiler"
101+
if [ "$ALT_PARALLEL_COMPILER" = "" ]; then
102+
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.parallel-compiler=false"
103103
fi
104104
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --enable-llvm-assertions"
105105
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.verify-llvm-ir"

‎src/tools/tidy/src/deps.rs

+1
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,7 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
287287
"perf-event-open-sys",
288288
"pin-project-lite",
289289
"polonius-engine",
290+
"portable-atomic", // dependency for platforms doesn't support `AtomicU64` in std
290291
"ppv-lite86",
291292
"proc-macro-hack",
292293
"proc-macro2",

0 commit comments

Comments
 (0)