promote_consts: some clean-up after experimenting #125853

tesuji · 2024-06-01T11:24:28Z

This is some clean-up after experimenting in #125916,
Prefer to review commit-by-commit.

rustbot · 2024-06-01T11:24:36Z

rustbot has assigned @matthewjasper.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot · 2024-06-01T11:24:38Z

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

compiler-errors · 2024-06-01T14:52:30Z

library/panic_unwind/Cargo.toml

 unwind = { path = "../unwind" }
 compiler_builtins = "0.1.0"
-cfg-if = "1.0"
+cfg-if = { version = "1.0", features = ['rustc-dep-of-std'] }


what is this change for?

When building with x test test/mir-opt, I noticed that std keeps rebuilding after no changes in it.
Setting CARGO_LOG=cargo::core::compiler::fingerprint=info, it reveals a part of the problem
is that cfg-if built differently for panic_unwind and std.
Having said that, I try again with simple x build libary multiple times without this change,
std is not getting rebuilt when unchanged.

I'm happy to remove this diff if it adds noice.

That's a good find, we should keep this change.

compiler-errors · 2024-06-01T14:53:18Z

@bors try @rust-timer queue

bors · 2024-06-01T14:54:27Z

⌛ Trying commit 9a1a5a2 with merge 4020cf9...

promote_consts: fail fast if there are no candidates

bors · 2024-06-01T16:30:51Z

☀️ Try build successful - checks-actions
Build commit: 4020cf9 (4020cf9e04c3466ccf957b1da7394a56ce137892)

rust-timer · 2024-06-01T17:46:08Z

Finished benchmarking commit (4020cf9): comparison URL.

Overall result: no relevant changes - 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 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 (secondary 9.1%)

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

Binary size

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

Bootstrap: 667.575s -> 668.026s (0.07%)
Artifact size: 318.75 MiB -> 318.80 MiB (0.01%)

Wihout it, std keeps rebuiling when unchanged. But we could use `--keep-stage=1` to make it not rebuild.

There is no need to do it when mustn't.

rustbot · 2024-06-16T10:21:53Z

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

compiler/rustc_mir_transform/src/promote_consts.rs

cjgillot · 2024-06-21T15:52:01Z

@bors r+

bors · 2024-06-21T15:52:03Z

📌 Commit 7002a3f has been approved by cjgillot

It is now in the queue for this repository.

bors · 2024-06-21T16:00:18Z

⌛ Testing commit 7002a3f with merge 5ced3da...

bors · 2024-06-21T18:13:43Z

☀️ Test successful - checks-actions
Approved by: cjgillot
Pushing 5ced3da to master...

rust-timer · 2024-06-21T19:30:25Z

Finished benchmarking commit (5ced3da): 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 (secondary 2.0%)

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

Cycles

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

Binary size

Results (secondary -0.3%)

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

Bootstrap: 694.089s -> 694.66s (0.08%)
Artifact size: 326.85 MiB -> 326.79 MiB (-0.02%)

rustbot assigned matthewjasper Jun 1, 2024

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. 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. labels Jun 1, 2024

compiler-errors reviewed Jun 1, 2024

View reviewed changes

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 Jun 1, 2024

bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 1, 2024

Auto merge of rust-lang#125853 - tesuji:promote-fail-fast, r=<try>

4020cf9

promote_consts: fail fast if there are no candidates

This comment has been minimized.

Sign in to view

rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jun 1, 2024

tesuji changed the title ~~promote_consts: fail fast if there are no candidates~~ promote_consts: fail fast if there is no candidates Jun 2, 2024

tesuji added 3 commits June 16, 2024 09:38

use rustc-dep-of-std in panic_unwind

06aee7e

Wihout it, std keeps rebuiling when unchanged. But we could use `--keep-stage=1` to make it not rebuild.

prefer tracing::instrument over debug strings

2870891

promote_consts: eargerly return when there are no candidates

c036594

There is no need to do it when mustn't.

tesuji force-pushed the promote-fail-fast branch from 9a1a5a2 to 45aa179 Compare June 16, 2024 10:18

tesuji changed the title ~~promote_consts: fail fast if there is no candidates~~ promote_consts: some clean-up after experimenting Jun 16, 2024

cjgillot reviewed Jun 16, 2024

View reviewed changes

compiler/rustc_mir_transform/src/promote_consts.rs Outdated Show resolved Hide resolved

cjgillot self-assigned this Jun 16, 2024

cjgillot 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 Jun 16, 2024

tesuji force-pushed the promote-fail-fast branch from dcad234 to 742cf52 Compare June 17, 2024 19:18

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 Jun 17, 2024

cjgillot reviewed Jun 21, 2024

View reviewed changes

compiler/rustc_mir_transform/src/promote_consts.rs Outdated Show resolved Hide resolved

tesuji added 2 commits June 21, 2024 13:51

Reuse allocation for Vec<Candidate>

62a2875

interpret: use trace to reduce noice

7002a3f

tesuji force-pushed the promote-fail-fast branch from 742cf52 to 7002a3f Compare June 21, 2024 13:51

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 Jun 21, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 21, 2024

bors merged commit 5ced3da into rust-lang:master Jun 21, 2024

rustbot added this to the 1.81.0 milestone Jun 21, 2024

tesuji deleted the promote-fail-fast branch June 21, 2024 20:26

tesuji mentioned this pull request Jun 27, 2024

Binary size creep on Fuchsia after commit 5ced3da #127039

Open

Uh oh!

promote_consts: some clean-up after experimenting #125853

promote_consts: some clean-up after experimenting #125853

Uh oh!

Conversation

tesuji commented Jun 1, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Jun 1, 2024

Uh oh!

rustbot commented Jun 1, 2024

Uh oh!

Choose a reason for hiding this comment

Uh oh!

tesuji Jun 1, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

compiler-errors commented Jun 1, 2024

Uh oh!

This comment has been minimized.

bors commented Jun 1, 2024

Uh oh!

bors commented Jun 1, 2024

Uh oh!

This comment has been minimized.

rust-timer commented Jun 1, 2024

Overall result: no relevant changes - no action needed

Uh oh!

rustbot commented Jun 16, 2024

Uh oh!

Uh oh!

Uh oh!

cjgillot commented Jun 21, 2024

Uh oh!

bors commented Jun 21, 2024

Uh oh!

bors commented Jun 21, 2024

Uh oh!

bors commented Jun 21, 2024

Uh oh!

rust-timer commented Jun 21, 2024

Overall result: no relevant changes - no action needed

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

8 participants

tesuji commented Jun 1, 2024 •

edited

Loading

tesuji Jun 1, 2024 •

edited

Loading