Revert "remove num_cpus dependency" in rustc and update cargo #97911
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1 commit in 85e457e158db216a2938d51bc3b617a5a7fe6015..4d92f07f34ba7fb7d7f207564942508f46c225d3 2022-06-07 21:57:52 +0000 to 2022-06-09 01:18:36 +0000 - Revert 10427: switch from num_cpus
… rustc_session" This reverts commit 2d854f9.
rustbot
added
the
T-compiler
|
Updates src/tools/cargo. cc @ehuss |
|
(rust-highfive has picked a reviewer for you, use r? to override) |
|
rust-highfive
added
the
S-waiting-on-review
|
@bors r+ rollup=never |
|
📌 Commit fbc86e0 has been approved by |
bors
added
S-waiting-on-bors
I already claimed the issue and wrote that I'll be working on that. |
|
@dtolnay @Mark-Simulacrum, should this be beta nominated so users don't have to wait for 1.63 for this to reach stable? |
Mark-Simulacrum
added
the
beta-nominated
|
☀️ Test successful - checks-actions |
|
Finished benchmarking commit (420c970): comparison url. Instruction count
Max RSS (memory usage)Results
CyclesResults
If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf. @rustbot label: -perf-regression Footnotes |
rustbot
added
the
beta-accepted
ehuss
pushed a commit
to ehuss/rust
that referenced
this pull request
Jun 24, 2022
Revert "remove num_cpus dependency" in rustc and update cargo Fixes rust-lang#97549. This PR reverts rust-lang#94524 and does a Cargo update to pull in rust-lang/cargo#10737. Rust 1.61.0 has a regression in which it misidentifies the number of available CPUs in some environments, leading to enormously increased memory usage and failing builds. In between Rust 1.60 and 1.61 both rustc and cargo replaced some uses of `num_cpus` with `available_parallelism`, which eliminated support for cgroupv1, still apparently in common use. This PR switches both rustc and cargo back to using `num_cpus` in order to support environments where the available parallelism is controlled by cgroupv1. Both can use `available_parallism` again once it handles cgroupv1 (if ever). I have confirmed that the rustc part of this PR fixes the memory usage regression in my non-Cargo environment, and others have confirmed in rust-lang#97549 that the Cargo regression was at fault for the memory usage regression in their environments.
Merged
ehuss
removed
the
beta-nominated
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 24, 2022
[beta] Beta backports * Remove the unused-#[doc(hidden)] logic from the unused_attributes lint rust-lang#98336 * debuginfo: Fix NatVis for Rc and Arc with unsized pointees. rust-lang#98137 * Revert "remove num_cpus dependency" in rustc and update cargo rust-lang#97911 * Update LLVM submodule rust-lang#97690 * Revert rust-lang#96682. rust-lang#97636 * don't do Sized and other return type checks on RPIT's real type rust-lang#97431 * Temporarily disable submodule archive downloads. rust-lang#98423
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Aug 15, 2022
…=jyn514 Reland changes replacing num_cpus with available_parallelism Since rust-lang#97925 added cgroupv1 support the problem in rust-lang#97549 which lead to the previous revert should be addressed now. Cargo has reapplied the replacement too rust-lang/cargo#10969 Reverts 1ae4b25 (part of rust-lang#97911) Relands rust-lang#94524
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Aug 15, 2022
…=jyn514 Reland changes replacing num_cpus with available_parallelism Since rust-lang#97925 added cgroupv1 support the problem in rust-lang#97549 which lead to the previous revert should be addressed now. Cargo has reapplied the replacement too rust-lang/cargo#10969 Reverts 1ae4b25 (part of rust-lang#97911) Relands rust-lang#94524
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #97549. This PR reverts #94524 and does a Cargo update to pull in rust-lang/cargo#10737.
Rust 1.61.0 has a regression in which it misidentifies the number of available CPUs in some environments, leading to enormously increased memory usage and failing builds. In between Rust 1.60 and 1.61 both rustc and cargo replaced some uses of
num_cpuswithavailable_parallelism, which eliminated support for cgroupv1, still apparently in common use. This PR switches both rustc and cargo back to usingnum_cpusin order to support environments where the available parallelism is controlled by cgroupv1. Both can useavailable_parallismagain once it handles cgroupv1 (if ever).I have confirmed that the rustc part of this PR fixes the memory usage regression in my non-Cargo environment, and others have confirmed in #97549 that the Cargo regression was at fault for the memory usage regression in their environments.