move things out of mir/mod.rs #115865

RalfJung · 2023-09-15T06:54:09Z

This moves a bunch of things out of mir/mod.rs:

all const-related stuff to a new file consts.rs
all statement/place/operand-related stuff to a new file statement.rs
all pretty-printing related stuff to pretty.rs

mod.rs started out with 3100 lines and ends up with 1600. :)

Also there was some pretty-printing stuff in terminator.rs, that also got moved to pretty.rs, and I reordered things in pretty.rs so that it can be grouped by functionality.

Only the commit "use pretty_print_const_value from MIR constant 'extra' printing" has any behavior changes; it resolves the issue of having a fancy and a very crude pretty-printer for ConstValue.

r? @oli-obk

rustbot · 2023-09-15T06:54:18Z

This PR changes MIR

cc @oli-obk, @RalfJung, @JakobDegen, @davidtwco, @celinval, @vakaras

rustbot · 2023-09-16T07:36:54Z

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

Some changes might have occurred in exhaustiveness checking

cc @Nadrieril

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

This PR changes Stable MIR

cc @oli-obk, @celinval, @spastorino

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

Some changes occurred to the CTFE / Miri engine

cc @rust-lang/miri

RalfJung · 2023-09-16T07:42:31Z

I added two more commits that move things around a bit and clarify a commit; they can be reviewed separately (and they would conflict terribly if I made them a separate PR).

This bitrots quickly so I'd appreciate quick feedback. :)

compiler/rustc_codegen_cranelift/src/constant.rs

bors · 2023-09-18T08:06:05Z

☔ The latest upstream changes (presumably #115831) made this pull request unmergeable. Please resolve the merge conflicts.

…elated things out of mir/mod.rs

this way we have mir::ConstValue and ty::ValTree as reasonably parallel

…mir::ConstantKind::Ty(ty::ConstKind::Unevaluated)

RalfJung · 2023-09-19T09:13:55Z

@bors r=oli-obk p=1
(high bitrot risk)

bors · 2023-09-19T09:13:56Z

📌 Commit d14e601 has been approved by oli-obk

It is now in the queue for this repository.

bors · 2023-09-19T09:25:21Z

⌛ Testing commit d14e601 with merge 794eab8...

move things out of mir/mod.rs This moves a bunch of things out of `mir/mod.rs`: - all const-related stuff to a new file consts.rs - all statement/place/operand-related stuff to a new file statement.rs - all pretty-printing related stuff to pretty.rs `mod.rs` started out with 3100 lines and ends up with 1600. :) Also there was some pretty-printing stuff in terminator.rs, that also got moved to pretty.rs, and I reordered things in pretty.rs so that it can be grouped by functionality. Only the commit "use pretty_print_const_value from MIR constant 'extra' printing" has any behavior changes; it resolves the issue of having a fancy and a very crude pretty-printer for `ConstValue`. r? `@oli-obk`

bors · 2023-09-19T11:16:57Z

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 794eab8 to master...

bors · 2023-09-19T11:17:58Z

👀 Test was successful, but fast-forwarding failed: 422 Update is not a fast forward

RalfJung · 2023-09-19T11:21:05Z

@bors retry

rust-timer · 2023-09-19T12:40:38Z

Finished benchmarking commit (794eab8): 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)

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

Cycles

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

Binary size

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

Bootstrap: 631.926s -> 631.523s (-0.06%)
Artifact size: 317.94 MiB -> 317.81 MiB (-0.04%)

RalfJung · 2023-09-19T12:58:43Z

Uh, it did not land but we got a perf result??

bors · 2023-09-19T13:22:51Z

⌛ Testing commit d14e601 with merge 0692db1...

bors · 2023-09-19T15:17:41Z

☀️ Test successful - checks-actions
Approved by: oli-obk
Pushing 0692db1 to master...

rust-timer · 2023-09-19T16:40:02Z

Finished benchmarking commit (0692db1): 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)	2.8%	[2.8%, 2.8%]	1
Regressions ❌ (secondary)	1.7%	[1.7%, 1.7%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-4.1%	[-4.1%, -4.1%]	1
All ❌✅ (primary)	2.8%	[2.8%, 2.8%]	1

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.6%	[3.6%, 3.6%]	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: 631.876s -> 631.446s (-0.07%)
Artifact size: 317.91 MiB -> 317.83 MiB (-0.03%)

rustbot assigned oli-obk Sep 15, 2023

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. labels Sep 15, 2023

RalfJung force-pushed the mir-mod branch from acf5943 to 497c0ae Compare September 15, 2023 14:03

bjorn3 reviewed Sep 16, 2023

View reviewed changes

compiler/rustc_codegen_cranelift/src/constant.rs Outdated Show resolved Hide resolved

RalfJung force-pushed the mir-mod branch from 6d0339a to a94c3bc Compare September 16, 2023 10:24

RalfJung mentioned this pull request Sep 16, 2023

explain the MIR const vs TY const situation rust-lang/rustc-dev-guide#1793

Merged

oli-obk approved these changes Sep 19, 2023

View reviewed changes

RalfJung added 6 commits September 19, 2023 11:06

more MIR const types to separate file

49f5b17

move some MIR const pretty-printing into pretty.rs

10a822b

use pretty_print_const_value from MIR constant 'extra' printing

57444cf

organize mir pretty.rs and move more things into it; move statement-r…

be8f5f6

…elated things out of mir/mod.rs

move ConstValue into mir

5a0a1ff

this way we have mir::ConstValue and ty::ValTree as reasonably parallel

comment on the difference between mir::ConstantKind::Unevaluated and …

d14e601

…mir::ConstantKind::Ty(ty::ConstKind::Unevaluated)

RalfJung force-pushed the mir-mod branch from a94c3bc to d14e601 Compare September 19, 2023 09:12

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 Sep 19, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 19, 2023

RalfJung mentioned this pull request Sep 19, 2023

422 Update is not a fast forward rust-lang/homu#75

Open

bors merged commit 0692db1 into rust-lang:master Sep 19, 2023
11 checks passed

rustbot added this to the 1.74.0 milestone Sep 19, 2023

bors mentioned this pull request Sep 19, 2023

(DRAFT) Combined draft branch for coverage work #115428

Closed

RalfJung deleted the mir-mod branch September 19, 2023 15:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

move things out of mir/mod.rs #115865

move things out of mir/mod.rs #115865

RalfJung commented Sep 15, 2023 •

edited

Loading

rustbot commented Sep 15, 2023

rustbot commented Sep 16, 2023

RalfJung commented Sep 16, 2023

bors commented Sep 18, 2023

RalfJung commented Sep 19, 2023

bors commented Sep 19, 2023

bors commented Sep 19, 2023

bors commented Sep 19, 2023

bors commented Sep 19, 2023

RalfJung commented Sep 19, 2023

rust-timer commented Sep 19, 2023

RalfJung commented Sep 19, 2023 via email

bors commented Sep 19, 2023

bors commented Sep 19, 2023

rust-timer commented Sep 19, 2023

move things out of mir/mod.rs #115865

move things out of mir/mod.rs #115865

Conversation

RalfJung commented Sep 15, 2023 • edited Loading

rustbot commented Sep 15, 2023

rustbot commented Sep 16, 2023

RalfJung commented Sep 16, 2023

bors commented Sep 18, 2023

RalfJung commented Sep 19, 2023

bors commented Sep 19, 2023

bors commented Sep 19, 2023

bors commented Sep 19, 2023

bors commented Sep 19, 2023

RalfJung commented Sep 19, 2023

rust-timer commented Sep 19, 2023

Overall result: no relevant changes - no action needed

RalfJung commented Sep 19, 2023 via email

bors commented Sep 19, 2023

bors commented Sep 19, 2023

rust-timer commented Sep 19, 2023

Overall result: no relevant changes - no action needed

RalfJung commented Sep 15, 2023 •

edited

Loading