Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bootstrap: allow setting --jobs in config.toml #131838

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

bootstrap: allow setting --jobs in config.toml #131838

wants to merge 1 commit into from
+74 −3

Conversation

jieyouxu
Copy link
Member

Allow setting --jobs in config.toml's [build] section.

[build]
jobs = 0

If this is unset or set to zero in config.toml, we look at --jobs flag. If that is also unset, then we fallback to std::thread::available_parallelism. If that is not available, then we default to 1. The flags and available_parallelism fallback are already setup, this PR just adds a config.toml option to wire that up.

Closes #131836.

r? bootstrap

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Oct 17, 2024
@rustbot
Copy link
Collaborator

rustbot commented Oct 17, 2024

This PR modifies src/bootstrap/src/core/config.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

This PR modifies config.example.toml.

If appropriate, please update CONFIG_CHANGE_HISTORY in src/bootstrap/src/utils/change_tracker.rs.

@jieyouxu jieyouxu mentioned this pull request Oct 17, 2024
Open
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jieyouxu
Copy link
Member Author

@rustbot author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 17, 2024
@jieyouxu jieyouxu force-pushed the boopjob branch 2 times, most recently from 8302cba to e057ca5 Compare October 18, 2024 02:54
@jieyouxu
Copy link
Member Author

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 18, 2024
onur-ozkan
onur-ozkan reviewed Oct 18, 2024
View reviewed changes
src/bootstrap/src/core/config/config.rs Outdated
Comment on lines 1626 to 1630
if let Some(jobs) = jobs {
if jobs > 0 {
config.jobs = Some(jobs);
}
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should handle it here:

rust/src/bootstrap/src/core/config/config.rs

Line 1293 in e057ca5

config.jobs = Some(threads_from_config(flags.jobs as u32));

Copy link
Member Author

@jieyouxu jieyouxu Oct 18, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note that there's two layers of precedence, the line there is the top priority --jobs flag. I changed the logic to better reflect the precedence such that:

  • config.jobs and flags.jobs are initially None.
  • config.jobs is Some based on --jobs=N if N > 0 and still None otherwise.
  • If config.jobs is still None, then we fallback to --set build.jobs then [build] jobs. Note that the build toml section is read below this.

I added a precedence test to check this.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(Remark: I found this config layering somewhat hard to follow)

src/bootstrap/src/core/config/tests.rs Show resolved Hide resolved
onur-ozkan
onur-ozkan reviewed Oct 18, 2024
View reviewed changes
config.example.toml Outdated Show resolved Hide resolved
@jieyouxu jieyouxu force-pushed the boopjob branch 2 times, most recently from 4adaf51 to 2fdc3b1 Compare October 18, 2024 05:25
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@jieyouxu
Copy link
Member Author

@rustbot author

@rustbot rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 18, 2024
@jieyouxu
Copy link
Member Author

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 18, 2024
@jieyouxu jieyouxu added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 18, 2024
@jieyouxu
Copy link
Member Author

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 19, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@onur-ozkan onur-ozkan onur-ozkan left review comments

Assignees

@onur-ozkan onur-ozkan

Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Bootstrap feature request: set --jobs in config.toml
4 participants
@jieyouxu @rustbot @rust-log-analyzer @onur-ozkan