Prepare the `bootstrap` tool for the new check-cfg syntax #116983

Urgau · 2023-10-20T16:02:04Z

This PR prepare the bootstrap tool for the new check-cfg syntax as well as the according changes to Cargo.

Note that while the new syntax can technically available on stage > 2, we actually cannot use it since we need a cargo version that supports the new syntax which won't happen until the next beta bump (if I understand everything correctly).

r? bootstrap

weihanglo · 2023-10-21T04:53:33Z

Hit this issue #117000 (comment). How can we help this moving forward?

Urgau · 2023-10-21T10:04:23Z

Hit this issue #117000 (comment). How can we help this moving forward?

This PR shouldn't be necessary until the next beta bump. Something unexpected is going on.

Kobzol · 2023-10-23T13:13:39Z

@bors try @rust-timer queue

bors · 2023-10-23T13:14:50Z

⌛ Trying commit 046bd07 with merge b8942ce...

…k-cfg, r=<try> Prepare the `bootstrap` tool for the new check-cfg syntax This PR prepare the `bootstrap` tool for the [new check-cfg syntax](rust-lang#111072) as well as the according [changes to Cargo](rust-lang/cargo#12845). Note that while the new syntax can technically available on stage > 2, we actually cannot use it since we need a cargo version that supports the new syntax which won't happen until the next beta bump (if I understand everything correctly). r? bootstrap

…go-stage0"

bors · 2023-10-23T14:36:53Z

☀️ Try build successful - checks-actions
Build commit: b8942ce (b8942cea92b3e99ee039753464783527b3fc3722)

Urgau · 2023-10-23T17:26:09Z

I've added a commit to enable the new {-Z,--}check-cfg arguments when doing a "local rebuild" (build the same version of rustc with it-self) and also added a revert commit of #117018 since it's no longer necessary.

rust-timer · 2023-10-23T19:18:37Z

Finished benchmarking commit (b8942ce): comparison URL.

Overall result: ❌ regressions - no action needed

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. While you can manually mark this PR as fit for rollup, we strongly recommend not doing so since this PR may lead to changes in compiler perf.

@bors rollup=never
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	3.6%	[3.6%, 3.6%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	3.6%	[3.6%, 3.6%]	1

Max RSS (memory usage)

Results

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.6%	[2.1%, 3.0%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Cycles

Results

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)	3.5%	[3.5%, 3.5%]	1
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	3.5%	[3.5%, 3.5%]	1

Binary size

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

Bootstrap: missing data
Artifact size: 304.30 MiB -> 304.32 MiB (0.01%)

Urgau · 2023-10-24T16:33:40Z

r? @Kobzol (or @Mark-Simulacrum given you suggested the 2nd commit)

Kobzol

I tried a few configurations locally and they were all working.

Hopefully, this will fix bootstrap timings on perf.RLO, so we should do that as soon as possible. Let's merge it and see if anything else breaks.

Kobzol · 2023-10-26T08:23:59Z

src/bootstrap/src/bin/rustdoc.rs

@@ -70,7 +70,9 @@ fn main() {
        cmd.arg("--cfg=bootstrap");
    }
    cmd.arg("-Zunstable-options");
+    // #[cfg(bootstrap)]
    cmd.arg("--check-cfg=values(bootstrap)");


I wonder if this should be also gated for local rebuilds, but I don't think we can even set a custom rustdoc in config.toml, so it probably doesn't matter.

Kobzol · 2023-10-26T08:29:21Z

@bors r+

bors · 2023-10-26T08:29:23Z

📌 Commit 0691c06 has been approved by Kobzol

It is now in the queue for this repository.

bors · 2023-10-26T08:54:46Z

⌛ Testing commit 0691c06 with merge 056f5b0...

bors · 2023-10-26T10:56:13Z

☀️ Test successful - checks-actions
Approved by: Kobzol
Pushing 056f5b0 to master...

rust-timer · 2023-10-26T13:03:45Z

Finished benchmarking commit (056f5b0): 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)

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

Cycles

Results

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)	3.2%	[2.4%, 4.6%]	3
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-9.5%	[-9.8%, -9.2%]	2
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: missing data
Artifact size: 304.42 MiB -> 304.47 MiB (0.01%)

lqd · 2023-10-26T13:05:27Z

🎉

rustbot assigned clubby789 Oct 20, 2023

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 20, 2023

weihanglo mentioned this pull request Oct 21, 2023

Update cargo #117000

Merged

This comment has been minimized.

Sign in to view

rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Oct 23, 2023

Urgau added 3 commits October 23, 2023 16:08

Prepare bootstrap tool for new check-cfg syntax

276a346

Use local_rebuild property to support new check-cfg in case of rebuild

ccbd304

Partial Revert: "Auto merge of rust-lang#117018 - Kobzol:opt-dist-car…

0691c06

…go-stage0"

This comment has been minimized.

Sign in to view

Urgau force-pushed the prepare-bootstrap-for-new-check-cfg branch from 046bd07 to cd70e2f Compare October 23, 2023 15:07

rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Oct 23, 2023

This comment has been minimized.

Sign in to view

Urgau force-pushed the prepare-bootstrap-for-new-check-cfg branch 2 times, most recently from a6868c6 to 0691c06 Compare October 23, 2023 17:23

rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Oct 23, 2023

rustbot assigned Kobzol and unassigned clubby789 Oct 24, 2023

Kobzol reviewed Oct 26, 2023

View reviewed changes

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-review Status: Awaiting review from the assignee but also interested parties. labels Oct 26, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 26, 2023

bors merged commit 056f5b0 into rust-lang:master Oct 26, 2023
12 checks passed

rustbot added this to the 1.75.0 milestone Oct 26, 2023

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Prepare the `bootstrap` tool for the new check-cfg syntax #116983

Prepare the `bootstrap` tool for the new check-cfg syntax #116983

Urgau commented Oct 20, 2023 •

edited

weihanglo commented Oct 21, 2023

Urgau commented Oct 21, 2023

Kobzol commented Oct 23, 2023

This comment has been minimized.

bors commented Oct 23, 2023

bors commented Oct 23, 2023

This comment has been minimized.

This comment has been minimized.

Urgau commented Oct 23, 2023

rust-timer commented Oct 23, 2023

Urgau commented Oct 24, 2023

Kobzol left a comment

Kobzol Oct 26, 2023

Kobzol commented Oct 26, 2023

bors commented Oct 26, 2023

bors commented Oct 26, 2023

bors commented Oct 26, 2023

rust-timer commented Oct 26, 2023

lqd commented Oct 26, 2023

Prepare the bootstrap tool for the new check-cfg syntax #116983

Prepare the bootstrap tool for the new check-cfg syntax #116983

Conversation

Urgau commented Oct 20, 2023 • edited

weihanglo commented Oct 21, 2023

Urgau commented Oct 21, 2023

Kobzol commented Oct 23, 2023

This comment has been minimized.

bors commented Oct 23, 2023

bors commented Oct 23, 2023

This comment has been minimized.

This comment has been minimized.

Urgau commented Oct 23, 2023

rust-timer commented Oct 23, 2023

Overall result: ❌ regressions - no action needed

Urgau commented Oct 24, 2023

Kobzol left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Kobzol commented Oct 26, 2023

bors commented Oct 26, 2023

bors commented Oct 26, 2023

bors commented Oct 26, 2023

rust-timer commented Oct 26, 2023

Overall result: no relevant changes - no action needed

lqd commented Oct 26, 2023

Prepare the `bootstrap` tool for the new check-cfg syntax #116983

Prepare the `bootstrap` tool for the new check-cfg syntax #116983

Urgau commented Oct 20, 2023 •

edited