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

Master bootstrap update #137237

Merged
merged 9 commits into from
Feb 23, 2025
Merged

Master bootstrap update #137237

merged 9 commits into from
Feb 23, 2025

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Feb 18, 2025

@rustbot rustbot added A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc 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) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue. labels Feb 18, 2025
@rustbot
Copy link
Collaborator

rustbot commented Feb 18, 2025

Some changes occurred to the intrinsics. Make sure the CTFE / Miri interpreter
gets adapted for the changes, if necessary.

cc @rust-lang/miri, @rust-lang/wg-const-eval

The Miri subtree was changed

cc @rust-lang/miri

Some changes occurred in src/tools/compiletest

cc @jieyouxu

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

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

@Urgau
Copy link
Member

Urgau commented Feb 18, 2025

If it's not too annoying could you also cleanup the different target_* check-cfg values in the different library crates.

rust/library/std/Cargo.toml

Lines 155 to 156 in 3b022d8

'cfg(target_arch, values("xtensa", "aarch64-unknown-nto-qnx710_iosock", "x86_64-pc-nto-qnx710_iosock", "x86_64-pc-nto-qnx800","aarch64-unknown-nto-qnx800"))',
'cfg(target_env, values("nto71_iosock", "nto80"))',

rust/library/core/Cargo.toml

Line 33 in 3b022d8

'cfg(target_arch, values("xtensa"))',

Replacing the values them with values() would be enough. If it's too annoying I will do it after this PR lands.

@cuviper
Copy link
Member Author

cuviper commented Feb 18, 2025

Replacing the values them with values() would be enough.

I can update it -- but what's the reason to leave an empty placeholder? Shouldn't we just remove them?

@Urgau
Copy link
Member

Urgau commented Feb 18, 2025

We can remove them, I just think that leaving the placeholders might help people not familiar with the code base know they are in the right direction, I don't have strong opinion, either is fine.

@rustbot
Copy link
Collaborator

rustbot commented Feb 18, 2025

Some changes occurred to the intrinsics. Make sure the CTFE / Miri interpreter
gets adapted for the changes, if necessary.

cc @rust-lang/miri, @rust-lang/wg-const-eval

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

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

The Miri subtree was changed

cc @rust-lang/miri

Some changes occurred in src/tools/compiletest

cc @jieyouxu

@tgross35 tgross35 mentioned this pull request Feb 20, 2025
Merged
Mark-Simulacrum
Mark-Simulacrum approved these changes Feb 21, 2025
View reviewed changes
src/bootstrap/src/core/build_steps/test.rs
@@ -3622,7 +3619,7 @@ impl Step for TestFloatParse {
let bootstrap_host = builder.config.build;
let compiler = builder.compiler(builder.top_stage, bootstrap_host);
let path = self.path.to_str().unwrap();
let crate_name = self.path.components().last().unwrap().as_os_str().to_str().unwrap();
let crate_name = self.path.iter().next_back().unwrap().to_str().unwrap();
Copy link
Member

Choose a reason for hiding this comment

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

What happened here? Just drive-by cleanup? Clippy complaints?

Copy link
Member Author

Choose a reason for hiding this comment

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

Clippy complained about last(), and then yes, the rest is a drive-by cleanup.

@Mark-Simulacrum
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Feb 21, 2025

📌 Commit e61cac2 has been approved by Mark-Simulacrum

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-review Status: Awaiting review from the assignee but also interested parties. labels Feb 21, 2025
@RalfJung
Copy link
Member

@bors rollup=never
as that seems dangerous?

@RalfJung
Copy link
Member

@bors p=1
there are several things blocked on this

@bors
Copy link
Contributor

bors commented Feb 23, 2025

⌛ Testing commit e61cac2 with merge b880760...

@bors
Copy link
Contributor

bors commented Feb 23, 2025

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing b880760 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 23, 2025
@bors bors merged commit b880760 into rust-lang:master Feb 23, 2025
7 checks passed
@rustbot rustbot added this to the 1.87.0 milestone Feb 23, 2025
This was referenced Feb 23, 2025
Open
Merged
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (b880760): comparison URL.

Overall result: ❌ regressions - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

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

Max RSS (memory usage)

Results (primary 1.2%)

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

Cycles

Results (secondary 1.6%)

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)		 1.6% [1.5%, 1.7%] 2
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 - - 0
All ❌✅ (primary) - - 0

Binary size

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

Bootstrap: 770.867s -> 772.144s (0.17%)
Artifact size: 359.80 MiB -> 359.81 MiB (0.00%)

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

@Mark-Simulacrum Mark-Simulacrum Mark-Simulacrum approved these changes

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
A-compiletest Area: The compiletest test runner A-testsuite Area: The testsuite used to check the correctness of rustc 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) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. T-release Relevant to the release subteam, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.87.0
Development

Successfully merging this pull request may close these issues.
7 participants
@cuviper @rustbot @Urgau @Mark-Simulacrum @bors @RalfJung @rust-timer