Use line numbers relative to the function in mir-opt tests #99780

Noratrieb · 2022-07-26T20:19:57Z

As shown in #99770, the line numbers can be a big source of needless and confusing diffs. This PR adds a new flag -Zmir-pretty-relative-line-numbers to make them relative to the function declaration, which avoids most needless diffs from attribute changes.

@JakobDegen told me that there has been a zulip conversation about disabling line numbers with mixed opinions, so I'd like to get some feedback here, for this hopefully better solution.

r? rust-lang/wg-mir-opt

rust-highfive · 2022-07-26T20:20:02Z

r? @estebank

(rust-highfive has picked a reviewer for you, use r? to override)

Noratrieb · 2022-07-26T20:20:33Z

r? rust-lang/mir-opt

klensy · 2022-07-26T21:17:22Z

Maybe reuse already existing style like LL:COL instead of $LINE:$COL?:

rust/src/test/mir-opt/const_prop/control_flow_simplification.hello.ConstProp.diff

Line 18 in c11207e

StorageLive(_2); // scope 0 at $SRC_DIR/std/src/panic.rs:LL:COL

oli-obk · 2022-07-27T10:45:01Z

Maybe we could make this info relative to the function start? That should avoid most of the noise, right?

Noratrieb · 2022-07-27T12:48:06Z

This should avoid most noise, yes. It would probably be a bit tricky to implement with the current code structure, but I could do it. What do you think would be the best way to solve this? Rename -Zmir-pretty-line-numbers to something like -Zmir-pretty-relative-line-numbers and adding a new method on source_map for relative line numbers? The span of the function should be available in mir pretty printing I think.

oli-obk · 2022-07-27T13:17:49Z

Rename -Zmir-pretty-line-numbers to something like-Zmir-pretty-relative-line-numbersand adding a new method onsource_map` for relative line numbers?

that sounds reasonable to me

bors · 2022-07-27T22:13:57Z

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

compiler/rustc_span/src/source_map.rs

oli-obk · 2022-07-28T09:07:02Z

@bors r+ p=1 bitrotty

bors · 2022-07-28T09:07:03Z

📌 Commit ba0af9561870ee2ba942f48a31ed0260f3cb3469 has been approved by oli-obk

It is now in the queue for this repository.

bors · 2022-07-28T09:25:14Z

⌛ Testing commit ba0af9561870ee2ba942f48a31ed0260f3cb3469 with merge 2cba4390459755873c122e7fe462bcc216572595...

Noratrieb · 2022-07-28T12:25:03Z

I figured it out. Maybe it works now.

Dylan-DPC · 2022-07-28T12:33:48Z

@bors r=oli-obk

bors · 2022-07-28T12:33:50Z

📌 Commit 11c0280 has been approved by oli-obk

It is now in the queue for this repository.

Dylan-DPC · 2022-07-28T12:46:50Z

@bors r-

Noratrieb · 2022-07-28T12:46:50Z

I think you're a bit late my friend, but thank you for your log analysis anyways :)

Dylan-DPC · 2022-07-28T12:47:13Z

@bors r=oli-obk

bors · 2022-07-28T12:47:14Z

📌 Commit 11c0280 has been approved by oli-obk

It is now in the queue for this repository.

bors · 2022-07-28T16:22:28Z

⌛ Testing commit 11c0280 with merge 36f4f4a...

bors · 2022-07-28T19:12:15Z

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

rust-timer · 2022-07-28T20:28:25Z

Finished benchmarking commit (36f4f4a): comparison url.

Instruction count

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

Max RSS (memory usage)

Results

Primary benchmarks: mixed results
Secondary benchmarks: mixed results

	mean¹	max	count²
Regressions 😿 (primary)	3.0%	3.0%	1
Regressions 😿 (secondary)	2.0%	2.0%	1
Improvements 🎉 (primary)	-2.1%	-3.0%	2
Improvements 🎉 (secondary)	-3.1%	-3.1%	1
All 😿🎉 (primary)	-0.4%	3.0%	3

Cycles

Results

Primary benchmarks: 😿 relevant regression found
Secondary benchmarks: no relevant changes found

	mean¹	max	count²
Regressions 😿 (primary)	2.5%	2.5%	1
Regressions 😿 (secondary)	N/A	N/A	0
Improvements 🎉 (primary)	N/A	N/A	0
Improvements 🎉 (secondary)	N/A	N/A	0
All 😿🎉 (primary)	2.5%	2.5%	1

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

the arithmetic mean of the percent change ↩ ↩²
number of relevant changes ↩ ↩²

Remove comments from mir-opt MIR dumps See https://rust-lang.zulipchat.com/#narrow/stream/189540-t-compiler.2Fwg-mir-opt/topic/Line.20numbers.20in.20mir-opt.20tests/near/363849874 In rust-lang#99780 there is mention that "there has been a zulip conversation about disabling line numbers with mixed opinions" which to me means that some people opposed this. I can't find the referenced conversation so... here we go. The current situation is quite chaotic. It's not hard to find MIR diffs which contain * Absolute line numbers * Relative line numbers * Substituted line numbers (LL) For example: https://github.com/rust-lang/rust/blob/408bbd040613f6776e0a7d05d582c81f4ddc189a/tests/mir-opt/inline/inline_shims.drop.Inline.diff#L10-L17 And sometimes adding a comment at the top of a mir-opt test generates a diff in the test because a line number changed: https://github.com/rust-lang/rust/pull/98112/files#diff-b8cf4bcce95078e6a3faf075e9abf6864872fb28a64d95c04f04513b9e3bbd81 And irrelevant changes to the standard library can generate diffs in mir-opt tests: https://github.com/rust-lang/rust/pull/110694/files#diff-bf96b0e7c67b8b272814536888fd9428c314991e155beae1f0a2a67f0ac47b2c rust-lang@769886c I think we should, specifically in mir-opt tests, completely remove the comments, or insert placeholders for all line and column numbers.

Remove comments from mir-opt MIR dumps See https://rust-lang.zulipchat.com/#narrow/stream/189540-t-compiler.2Fwg-mir-opt/topic/Line.20numbers.20in.20mir-opt.20tests/near/363849874 In rust-lang/rust#99780 there is mention that "there has been a zulip conversation about disabling line numbers with mixed opinions" which to me means that some people opposed this. I can't find the referenced conversation so... here we go. The current situation is quite chaotic. It's not hard to find MIR diffs which contain * Absolute line numbers * Relative line numbers * Substituted line numbers (LL) For example: https://github.com/rust-lang/rust/blob/408bbd040613f6776e0a7d05d582c81f4ddc189a/tests/mir-opt/inline/inline_shims.drop.Inline.diff#L10-L17 And sometimes adding a comment at the top of a mir-opt test generates a diff in the test because a line number changed: https://github.com/rust-lang/rust/pull/98112/files#diff-b8cf4bcce95078e6a3faf075e9abf6864872fb28a64d95c04f04513b9e3bbd81 And irrelevant changes to the standard library can generate diffs in mir-opt tests: https://github.com/rust-lang/rust/pull/110694/files#diff-bf96b0e7c67b8b272814536888fd9428c314991e155beae1f0a2a67f0ac47b2c rust-lang/rust@769886c I think we should, specifically in mir-opt tests, completely remove the comments, or insert placeholders for all line and column numbers.

rust-highfive assigned estebank Jul 26, 2022

rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jul 26, 2022

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 26, 2022

rust-highfive assigned oli-obk and unassigned estebank Jul 26, 2022

This comment has been minimized.

Sign in to view

Noratrieb force-pushed the mir-opt-test-line-no branch from bcd07bc to a948491 Compare July 26, 2022 21:02

Noratrieb force-pushed the mir-opt-test-line-no branch from a948491 to f795f79 Compare July 26, 2022 21:37

Noratrieb force-pushed the mir-opt-test-line-no branch from f795f79 to b1640a3 Compare July 27, 2022 18:47

Noratrieb changed the title ~~Don't show line numbers in mir-opt test diffs~~ Use line numbers relative to the function in mir-opt tests Jul 27, 2022

Noratrieb force-pushed the mir-opt-test-line-no branch from b1640a3 to cec398f Compare July 27, 2022 19:01

Noratrieb force-pushed the mir-opt-test-line-no branch from cec398f to c2cb876 Compare July 27, 2022 22:27

JakobDegen mentioned this pull request Jul 28, 2022

Make some const prop mir-opt tests unit-tests #99770

Merged

This comment has been minimized.

Sign in to view

oli-obk requested changes Jul 28, 2022

View reviewed changes

compiler/rustc_span/src/source_map.rs Outdated Show resolved Hide resolved

compiler/rustc_span/src/source_map.rs Outdated Show resolved Hide resolved

Noratrieb force-pushed the mir-opt-test-line-no branch 2 times, most recently from 3709c2a to ba0af95 Compare July 28, 2022 09:02

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 Jul 28, 2022

Noratrieb force-pushed the mir-opt-test-line-no branch from abebba5 to 11c0280 Compare July 28, 2022 12:25

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 Jul 28, 2022

This comment has been minimized.

Sign in to view

bors 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 28, 2022

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 28, 2022

Noratrieb mentioned this pull request Jul 28, 2022

Bad MIR spans #99854

Open

This comment has been minimized.

Sign in to view

bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 28, 2022

bors merged commit 36f4f4a into rust-lang:master Jul 28, 2022

rustbot added this to the 1.64.0 milestone Jul 28, 2022

Noratrieb deleted the mir-opt-test-line-no branch July 28, 2022 19:12

This was referenced Jul 28, 2022

Use only ty::Unevaluated<'tcx, ()> in type system #98588

Merged

Enable MIR inlining for generators too #99782

Closed

saethlin mentioned this pull request Jun 6, 2023

Remove comments from mir-opt MIR dumps #112346

Merged

Use line numbers relative to the function in mir-opt tests #99780

Use line numbers relative to the function in mir-opt tests #99780

Uh oh!

Conversation

Noratrieb commented Jul 26, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rust-highfive commented Jul 26, 2022

Uh oh!

Noratrieb commented Jul 26, 2022

Uh oh!

This comment has been minimized.

klensy commented Jul 26, 2022

Uh oh!

oli-obk commented Jul 27, 2022

Uh oh!

Noratrieb commented Jul 27, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

oli-obk commented Jul 27, 2022

Uh oh!

bors commented Jul 27, 2022

Uh oh!

This comment has been minimized.

Uh oh!

Uh oh!

oli-obk commented Jul 28, 2022

Uh oh!

bors commented Jul 28, 2022

Uh oh!

bors commented Jul 28, 2022

Uh oh!

Noratrieb commented Jul 28, 2022

Uh oh!

Dylan-DPC commented Jul 28, 2022

Uh oh!

bors commented Jul 28, 2022

Uh oh!

This comment has been minimized.

Dylan-DPC commented Jul 28, 2022

Uh oh!

Noratrieb commented Jul 28, 2022

Uh oh!

Dylan-DPC commented Jul 28, 2022

Uh oh!

bors commented Jul 28, 2022

Uh oh!

This comment has been minimized.

bors commented Jul 28, 2022

Uh oh!

bors commented Jul 28, 2022

Uh oh!

rust-timer commented Jul 28, 2022

Instruction count

Max RSS (memory usage)

Cycles

Footnotes

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

10 participants

Noratrieb commented Jul 26, 2022 •

edited

Loading

Noratrieb commented Jul 27, 2022 •

edited

Loading