Rollup of 4 pull requests #116598

matthiaskrgr · 2023-10-10T12:07:49Z

Successful merges:

use env variable to control thread ids in rustc_log #116586 (use env variable to control thread ids in rustc_log)
coverage: Unbox and simplify bcb_filtered_successors #116589 (coverage: Unbox and simplify bcb_filtered_successors)
-Zmir-enable-passes: document that this may enable unsound passes #116595 (-Zmir-enable-passes: document that this may enable unsound passes)
reorder files in solve #116596 (reorder files in solve)

r? @ghost
@rustbot modify labels: rollup

Instead of defining a named struct, we can use `std::iter::from_fn` and store intermediate state in a closure.

This function already has access to the MIR body, so instead of taking a reference to a terminator, it's simpler and easier to pass in a basic block index. There is no need to box the returned iterator if we instead add appropriate lifetime captures, since `short_circuit_preorder` is now generic over the type of iterator it expects. We can also greatly simplify the function's implementation by observing that the only difference between its two cases is whether we take all of a BB's successors, or just the first one.

use env variable to control thread ids in rustc_log Currently, when parallel rustc is enabled, even if the number of threads is 1, the thread ID will be included before all the logs. E.g. `WARN rustc_mir_build::thir::pattern::const_to_pat ...` => `2:rustcWARN rustc_mir_build::thir::pattern::const_to_pat ...` This makes the logs confusing and results in inconsistent UI test results for serial and parallel rustc. Therefore I think we should let users decide whether thread id information is needed through explicit control.

coverage: Unbox and simplify `bcb_filtered_successors` This is a small cleanup in the coverage instrumentor's graph-building code. --- This function already has access to the MIR body, so instead of taking a reference to a terminator, it's simpler and easier to pass in a basic block index. There is no need to box the returned iterator if we instead add appropriate lifetime captures, and make `short_circuit_preorder` generic over the type of iterator it expects. We can also greatly simplify the function's implementation by observing that the only difference between its two cases is whether we take all of a BB's successors, or just the first one. --- `@rustbot` label +A-code-coverage

-Zmir-enable-passes: document that this may enable unsound passes also add some comments explaining why MIR opts are marked as unsound

…errors reorder files in solve r? `@compiler-errors`

matthiaskrgr · 2023-10-10T12:08:03Z

@bors r+ rollup=never p=4

bors · 2023-10-10T12:08:06Z

📌 Commit da42858 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2023-10-10T13:29:13Z

⌛ Testing commit da42858 with merge 5b88d65...

bors · 2023-10-10T15:47:48Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 5b88d65 to master...

rust-timer · 2023-10-10T15:49:00Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#116586	use env variable to control thread ids in rustc_log	`28824c44e9eb86273990a8df309b748342b1aa25` (link)
#116589	coverage: Unbox and simplify `bcb_filtered_successors`	`dea89786b45abfc259f5bdb826e1acb8294727d9` (link)
#116595	-Zmir-enable-passes: document that this may enable unsound …	`2b9b98c225f1be0e8b101c9626c4dca96d02c4ea` (link)
#116596	reorder files in solve	`0bafa8f27ec3318552223a04c2c375ef3f42520a` (link)

previous master: 061c33051a

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

rust-timer · 2023-10-10T17:10:23Z

Finished benchmarking commit (5b88d65): 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

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

Binary size

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

Bootstrap: 625.33s -> 627.121s (0.29%)
Artifact size: 270.81 MiB -> 270.84 MiB (0.01%)

SparrowLii and others added 10 commits October 10, 2023 09:39

use env variable to control thread ids in rustc_log

2dcc828

coverage: Replace ShortCircuitPreorder with a single function

f214497

Instead of defining a named struct, we can use `std::iter::from_fn` and store intermediate state in a closure.

-Zmir-enable-passes: document that this may enable unsound passes

2de4546

add some comments explaining why MIR opts are marked as unsound

d805b26

reorder files in solve

c70ef36

Rollup merge of rust-lang#116595 - RalfJung:mir-enable-passes, r=oli-obk

de4980c

-Zmir-enable-passes: document that this may enable unsound passes also add some comments explaining why MIR opts are marked as unsound

Rollup merge of rust-lang#116596 - lcnr:normalize-subdir, r=compiler-…

da42858

…errors reorder files in solve r? `@compiler-errors`

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

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

bors merged commit 5b88d65 into rust-lang:master Oct 10, 2023
12 checks passed

rustbot added this to the 1.75.0 milestone Oct 10, 2023

This was referenced Oct 10, 2023

test for parallel compiler by default #115235

Closed

Normalize opaques before defining them in the new solver #116369

Closed

Dajamante mentioned this pull request Oct 12, 2023

Pull upstream master 2023 10 12 ferrocene/ferrocene#48

Merged

matthiaskrgr deleted the rollup-6xra4jx branch March 16, 2024 18:18

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 4 pull requests #116598

Rollup of 4 pull requests #116598

matthiaskrgr commented Oct 10, 2023

matthiaskrgr commented Oct 10, 2023

bors commented Oct 10, 2023

bors commented Oct 10, 2023

bors commented Oct 10, 2023

rust-timer commented Oct 10, 2023

rust-timer commented Oct 10, 2023

Rollup of 4 pull requests #116598

Rollup of 4 pull requests #116598

Conversation

matthiaskrgr commented Oct 10, 2023

matthiaskrgr commented Oct 10, 2023

bors commented Oct 10, 2023

bors commented Oct 10, 2023

bors commented Oct 10, 2023

rust-timer commented Oct 10, 2023

rust-timer commented Oct 10, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size