Add FileCheck annotations to mir-opt/copy-prop #135099

Shunpoco · 2025-01-04T12:42:49Z

This resolves a part of #116971 .

This PR adds FileCheck annotations to test files under mir-opt/copy-prop.

Signed-off-by: Shunpoco <tkngsnsk313320@gmail.com>

rustbot · 2025-01-04T12:42:57Z

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @Mark-Simulacrum (or someone else) some time within the next two weeks.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

@rustbot author: the review is finished, PR author should check the comments and take action accordingly
@rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

Shunpoco · 2025-01-04T13:14:07Z

tests/mir-opt/copy-prop/copy_propagation_arg.rs

    dummy(x);
    x = 5;
 }

 // EMIT_MIR copy_propagation_arg.baz.CopyProp.diff
 fn baz(mut x: i32) -> i32 {
+    // CHECK-LABEL: fn baz(


I'm wondering if we don't need this function for CopyProp.
I guess this test file originally from dest-prop, and in dest-prop the self-assignment is eliminated. But in copy-prop, it is not eliminated.

Indeed. Do you mind fixing the comment and adding a CHECK: [[x]] = copy [[x]];?

and adding a CHECK: [[x]] = copy [[x]];?

There is no self-copy instruction in the mir file, but it has _2 = copy _1 and _0 = copy _1 (I already added).
Do you mean that I should add CHECK: _2 = copy [[x]];?

I modified it in 7a64137. Please check if the change matches with your thought 🙏

Shunpoco · 2025-01-04T13:16:12Z

tests/mir-opt/copy-prop/partial_init.rs

@@ -9,6 +8,9 @@ use core::intrinsics::mir::*;
 // EMIT_MIR partial_init.main.CopyProp.diff
 #[custom_mir(dialect = "runtime", phase = "post-cleanup")]
 pub fn main() {
+    // CHECK-LABEL: fn main(


I added this FileCheck annotations, but actually this test case doesn't need them since it checks if rustc compiles the function with CopyProp.
I'd like to confirm that we should keep skip-filecheck, or go forward with those annotations.

The annotations you put are enough.

Shunpoco · 2025-01-04T13:16:31Z

r? @cjgillot

cjgillot

Thanks a lot for the great work. A few nits.

cjgillot · 2025-01-08T19:47:02Z

tests/mir-opt/copy-prop/calls.rs

+    // CHECK-NOT: StorageLive(_1);
+    // CHECK-NOT: _1 = dummy(const 5_u8)
+    // CHECK-NOT: _0 = copy _1;
+    // CHECK-NOT: StorageDead(_1);


Do you mind adding a CHECK: _0 = dummy(const 5_u8)?

Addressed in 1aeeebc

cjgillot · 2025-01-08T19:47:50Z

tests/mir-opt/copy-prop/calls.rs

    let y = dummy(5); // this should get NRVO
    y
 }

 // EMIT_MIR calls.multiple_edges.CopyProp.diff
 #[custom_mir(dialect = "runtime", phase = "initial")]
 fn multiple_edges(t: bool) -> u8 {
+    // CHECK-LABEL: fn multiple_edges(
+    // CHECK: bb2: {
+    // CHECK: _0 = copy _2;


Do you mind adding a CHECK: _2 = dummy(const 13_u8)?

Added in 1aeeebc

cjgillot · 2025-01-08T19:50:11Z

tests/mir-opt/copy-prop/copy_propagation_arg.rs

    dummy(x);
    x = 5;
 }

 // EMIT_MIR copy_propagation_arg.baz.CopyProp.diff
 fn baz(mut x: i32) -> i32 {
+    // CHECK-LABEL: fn baz(


Indeed. Do you mind fixing the comment and adding a CHECK: [[x]] = copy [[x]];?

cjgillot · 2025-01-08T20:11:48Z

tests/mir-opt/copy-prop/cycle.rs

@@ -8,6 +7,16 @@ fn val() -> i32 {

 // EMIT_MIR cycle.main.CopyProp.diff
 fn main() {
+    // CHECK-LABEL: fn main(
+    // CHECK: debug z => _2;


Could you add the debug info for x and y too?

Added in 30a656a

cjgillot · 2025-01-08T20:24:38Z

tests/mir-opt/copy-prop/dead_stores_better.rs

@@ -1,4 +1,3 @@
-// skip-filecheck
 // EMIT_MIR_FOR_EACH_PANIC_STRATEGY
 // This is a copy of the `dead_stores_79191` test, except that we turn on DSE. This demonstrates
 // that that pass enables this one to do more optimizations.


The compile-flags are not up-to-date. They should specify DeadStoreElimination-initial

Modified in 0d6fa54

cjgillot · 2025-01-08T20:25:36Z

tests/mir-opt/copy-prop/issue_107511.rs

 // EMIT_MIR_FOR_EACH_PANIC_STRATEGY
 //@ test-mir-pass: CopyProp

 // EMIT_MIR issue_107511.main.CopyProp.diff
 fn main() {
+    // CHECK-LABEL: fn main(
+    // CHECK-NOT: StorageLive(_16);


Could you add debuginfo for _16, so we understand what happens?

Added in 430d888

cjgillot · 2025-01-08T20:27:45Z

tests/mir-opt/copy-prop/move_projection.rs

+    // CHECK: bb0: {
+    // CHECK-NOT: _2 = copy [[a]];
+    // CHECK-NOT: _3 = move (_2.0: u8);
+    // CHECK: _3 = copy ([[a]].0: u8);


Could you add the CHECK: _0 = opaque(copy [[a]]) and CHECK: _0 = opaque(move _3)

Addressed in 6eab7c7

cjgillot · 2025-01-08T20:30:02Z

tests/mir-opt/copy-prop/partial_init.rs

@@ -9,6 +8,9 @@ use core::intrinsics::mir::*;
 // EMIT_MIR partial_init.main.CopyProp.diff
 #[custom_mir(dialect = "runtime", phase = "post-cleanup")]
 pub fn main() {
+    // CHECK-LABEL: fn main(


The annotations you put are enough.

Signed-off-by: Shunpoco <tkngsnsk313320@gmail.com>

…-initial Signed-off-by: Shunpoco <tkngsnsk313320@gmail.com>

Signed-off-by: Shunpoco <tkngsnsk313320@gmail.com>

Shunpoco added 14 commits January 4, 2025 11:18

Add FileCheck to branch.rs

1b5a744

Signed-off-by: Shunpoco <tkngsnsk313320@gmail.com>

Add FileCheck to calls.rs

e6dcb25

Signed-off-by: Shunpoco <tkngsnsk313320@gmail.com>

Add FileCheck to copy_propagation_arg.rs

78a143f

Signed-off-by: Shunpoco <tkngsnsk313320@gmail.com>

Add FileCheck to custom_move_arg.rs

ab21ba3

Signed-off-by: Shunpoco <tkngsnsk313320@gmail.com>

Add FileCheck to cycle.rs

4057797

Signed-off-by: Shunpoco <tkngsnsk313320@gmail.com>

Add FileCheck to dead_stores_79191.rs

77d5711

Signed-off-by: Shunpoco <tkngsnsk313320@gmail.com>

Add FileCheck to dead_stores_better.rs

f53476b

Signed-off-by: Shunpoco <tkngsnsk313320@gmail.com>

Add FileCheck to issue_107511.rs

2d04a63

Signed-off-by: Shunpoco <tkngsnsk313320@gmail.com>

Add FileCheck to move_arg.rs

d0365d3

Signed-off-by: Shunpoco <tkngsnsk313320@gmail.com>

Add FileCheck to move_projection.rs

334d501

Signed-off-by: Shunpoco <tkngsnsk313320@gmail.com>

Add FileCheck to mutate_through_pointer.rs

d3176d5

Signed-off-by: Shunpoco <tkngsnsk313320@gmail.com>

Add FileCheck to non_dominate.rs

ef42830

Signed-off-by: Shunpoco <tkngsnsk313320@gmail.com>

Add FileCheck to partial_init.rs

4627ea1

Signed-off-by: Shunpoco <tkngsnsk313320@gmail.com>

Add FileCheck to reborrow.rs

381466c

Signed-off-by: Shunpoco <tkngsnsk313320@gmail.com>

rustbot assigned Mark-Simulacrum Jan 4, 2025

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 Jan 4, 2025

Shunpoco commented Jan 4, 2025

View reviewed changes

Shunpoco marked this pull request as ready for review January 4, 2025 13:16

rustbot assigned cjgillot and unassigned Mark-Simulacrum Jan 4, 2025

cjgillot reviewed Jan 8, 2025

View reviewed changes

Shunpoco added 5 commits January 8, 2025 22:05

address review: add CHECKs in calls.rs

1aeeebc

Signed-off-by: Shunpoco <tkngsnsk313320@gmail.com>

address review: add CHECKs in cycle.rs

30a656a

Signed-off-by: Shunpoco <tkngsnsk313320@gmail.com>

address review: dead_stores_better.rs should use DeadStoreElimination…

0d6fa54

…-initial Signed-off-by: Shunpoco <tkngsnsk313320@gmail.com>

address review: add debug info in issue_107511.rs

430d888

Signed-off-by: Shunpoco <tkngsnsk313320@gmail.com>

address review: add opaques in move_projection.rs

6eab7c7

Signed-off-by: Shunpoco <tkngsnsk313320@gmail.com>

address review: add CHECKs for baz in copy_propagation_arg.rs

7a64137

Signed-off-by: Shunpoco <tkngsnsk313320@gmail.com>

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add FileCheck annotations to mir-opt/copy-prop #135099

Add FileCheck annotations to mir-opt/copy-prop #135099

Shunpoco commented Jan 4, 2025

rustbot commented Jan 4, 2025

Shunpoco Jan 4, 2025

cjgillot Jan 8, 2025

Shunpoco Jan 8, 2025

Shunpoco Jan 8, 2025 •

edited

Loading

Shunpoco Jan 4, 2025

cjgillot Jan 8, 2025

Shunpoco commented Jan 4, 2025

cjgillot left a comment

cjgillot Jan 8, 2025

Shunpoco Jan 8, 2025

cjgillot Jan 8, 2025

Shunpoco Jan 8, 2025

cjgillot Jan 8, 2025

cjgillot Jan 8, 2025

Shunpoco Jan 8, 2025

cjgillot Jan 8, 2025

Shunpoco Jan 8, 2025

cjgillot Jan 8, 2025

Shunpoco Jan 8, 2025

cjgillot Jan 8, 2025

Shunpoco Jan 8, 2025

cjgillot Jan 8, 2025

Add FileCheck annotations to mir-opt/copy-prop #135099

Are you sure you want to change the base?

Add FileCheck annotations to mir-opt/copy-prop #135099

Conversation

Shunpoco commented Jan 4, 2025

rustbot commented Jan 4, 2025

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Shunpoco Jan 8, 2025 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Shunpoco commented Jan 4, 2025

cjgillot left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Shunpoco Jan 8, 2025 •

edited

Loading