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

detect incompatible CI rustc options more precisely #129052

Merged
merged 10 commits into from
Aug 16, 2024
Merged

detect incompatible CI rustc options more precisely #129052

merged 10 commits into from
Aug 16, 2024

Conversation

onur-ozkan
Copy link
Member

Previously, the logic here was simply checking whether the option was set in config.toml. This approach was not manageable in our CI runners as we set so many options in config.toml. In reality, those values are not incompatible since they are usually the same value used to generate the CI rustc. Now, the new logic compares the configuration values with the values used to generate the CI rustc, so we get more precise results and make the process more manageable.

r? Kobzol

Blocker for #122709

@onur-ozkan
copy builder-config file into ci-rustc sysroot
aba675f 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
separate inner function (get_toml) of Config::parse
b2f1fc1 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
detect incompatible CI rustc options more precisely
0518e8c 
Previously, the logic here was simply checking whether the option was set in `config.toml`.
This approach was not manageable in our CI runners as we set so many options in config.toml.
In reality, those values are not incompatible since they are usually the same value used to generate
the CI rustc. Now, the new logic compares the configuration values with the values used to generate
the CI rustc, so we get more precise results and make the process more manageable.

Signed-off-by: onur-ozkan <work@onurozkan.dev>
@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 Aug 13, 2024
@rustbot
Copy link
Collaborator

rustbot commented Aug 13, 2024

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

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

Kobzol
Kobzol reviewed Aug 13, 2024
View reviewed changes
Copy link
Contributor

@Kobzol Kobzol left a comment

Choose a reason for hiding this comment

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

Awesome! Left a few comments. I think that we might need a bit more robust handling of the CI config in cases where the config changes.

src/bootstrap/src/core/download.rs Outdated Show resolved Hide resolved
src/bootstrap/src/core/download.rs Outdated Show resolved Hide resolved
src/bootstrap/src/core/config/config.rs Outdated Show resolved Hide resolved
src/bootstrap/src/core/config/config.rs Outdated Show resolved Hide resolved
src/bootstrap/src/core/config/config.rs Outdated Show resolved Hide resolved
@onur-ozkan
print values of incompatible options
b76f6a3 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
do not check incompatibility if config.toml isn't present
43320d5 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@rust-log-analyzer

This comment has been minimized.

Sign in to view
Kobzol
Kobzol reviewed Aug 14, 2024
View reviewed changes
Copy link
Contributor

@Kobzol Kobzol left a comment

Choose a reason for hiding this comment

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

Thanks. Left a few more comments.

I think we should deal with the fallibility of config parsing before we merge this though, because without it any config changes might result in a broken CI when download-rustc is used.

src/bootstrap/src/core/config/config.rs Outdated Show resolved Hide resolved
src/bootstrap/src/core/config/config.rs Show resolved Hide resolved
src/bootstrap/src/core/download.rs Outdated Show resolved Hide resolved
@onur-ozkan
Copy link
Member Author

@rustbot author (due to #129052 (comment))

@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 Aug 14, 2024
@Kobzol
Copy link
Contributor

Kobzol commented Aug 14, 2024

This is much better than what we had before. Let's try it and see how well it works in practice.

@bors r+ rollup=never

@bors
Copy link
Contributor

bors commented Aug 14, 2024

📌 Commit af6eedc has been approved by Kobzol

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 14, 2024
@onur-ozkan
Copy link
Member Author

@bors r- (missed something)

@bors bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 14, 2024
@onur-ozkan
Copy link
Member Author

@bors r- (missed something)

Pushed.

@bors r=Kobzol

@bors
Copy link
Contributor

bors commented Aug 14, 2024

📌 Commit 469d593 has been approved by Kobzol

It is now in the queue for this repository.

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 14, 2024
@onur-ozkan
create const BUILDER_CONFIG_FILENAME for builder-config file
4d21c73 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
fix the incorrect unpacking logic
4d13470 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
improve config::check_incompatible_options_for_ci_rustc logs
151e8cd 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
leave a FIXME note for --set flags coverage
0935c86 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@onur-ozkan
disable download-rustc if CI rustc has unsupported options
469d593 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
@Kobzol Kobzol mentioned this pull request Aug 15, 2024
Merged
@bors
Copy link
Contributor

bors commented Aug 16, 2024

⌛ Testing commit 469d593 with merge 27b93da...

@onur-ozkan onur-ozkan mentioned this pull request Aug 16, 2024
Closed
@bors
Copy link
Contributor

bors commented Aug 16, 2024

☀️ Test successful - checks-actions
Approved by: Kobzol
Pushing 27b93da to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Aug 16, 2024
@bors bors merged commit 27b93da into rust-lang:master Aug 16, 2024
7 checks passed
@rustbot rustbot added this to the 1.82.0 milestone Aug 16, 2024
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (27b93da): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (primary 4.5%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 4.5% [3.0%, 5.9%] 2
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) 4.5% [3.0%, 5.9%] 2

Cycles

Results (secondary 2.7%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 2.7% [2.1%, 3.2%] 3
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 751.027s -> 751.393s (0.05%)
Artifact size: 339.18 MiB -> 339.23 MiB (0.02%)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Kobzol Kobzol Kobzol left review comments

Assignees

@Kobzol Kobzol

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Milestone
1.82.0
Development

Successfully merging this pull request may close these issues.
6 participants
@onur-ozkan @rustbot @rust-log-analyzer @Kobzol @bors @rust-timer