Add FileCheck annotations to mir-opt/dest-prop tests #122300

CastilloDel · 2024-03-10T16:38:19Z

Part of #116971, adds FileCheck annotations to MIR-opt tests in tests/mir-opt/dest-prop.

I would like some feedback. Also, I don't know how to approach union.rs. I couldn't figure out what it is testing.

r? cjgillot

bors · 2024-04-03T13:08:38Z

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

cjgillot

In a general manner, the checks you add {{_.*}} = {{_.*}} are very underspecified. Why copying and allow moving? Why only bare locals and not projections?

Could you make them more specific, for instance with the help of debug statements to identify locals by name.

I don't understand your remark about union.rs. There is a (small) summary of what should be tested. If you can't understand what it does, why did you change what it does? For the background, did you find which PR introduced it?

cjgillot · 2024-04-06T13:41:10Z

tests/mir-opt/dest-prop/branch.rs

@@ -12,6 +11,8 @@ fn cond() -> bool {

 // EMIT_MIR branch.foo.DestinationPropagation.diff
 fn foo() -> i32 {
+    // CHECK-LABEL: fn foo
+    // CHECK-NOT: {{_.*}} = {{_.*}}


The check needs to be more specific.

I hope it's better now

cjgillot · 2024-04-06T13:42:36Z

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

@@ -9,25 +8,35 @@ fn dummy(x: u8) -> u8 {

 // EMIT_MIR copy_propagation_arg.foo.DestinationPropagation.diff
 fn foo(mut x: u8) {
+    // CHECK: foo


Use CHECK-LABEL for function names.

…r.rs

CastilloDel · 2024-04-14T09:46:04Z

Could you make them more specific, for instance with the help of debug statements to identify locals by name.

I went over all of them, trying to improve them with what you said.

I don't understand your remark about union.rs. There is a (small) summary of what should be tested. If you can't understand what it does, why did you change what it does? For the background, did you find which PR introduced it?

I found this PR, but I still couldn't understand. After reading the summary "Tests that we can propagate into places that are projections into unions" I would understand the test would check a propagation is performed correctly, but in the MIR (union.main.DestinationPropagation.panic-abort.diff) I don't see any changes, so I'm not sure how the test works. That's why I tried changing it to a unit test, but I'm still lost as to how to approach it.

CastilloDel · 2024-06-11T17:57:10Z

@cjgillot Could you take another look when you have time? Thanks

cjgillot · 2024-06-26T08:39:23Z

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

    dummy(x);
    x = 5;
 }

 // EMIT_MIR copy_propagation_arg.baz.DestinationPropagation.diff
 fn baz(mut x: i32) -> i32 {
+    // CHECK-LABEL: fn baz(
+    // CHECK: debug x => [[x:_.*]];
+    // CHECK-NOT: [[x]] = {{_.*}}


Suggested change

// CHECK-NOT: [[x]] = {{_.*}}

// CHECK-NOT: [[x]] =

Just to be on the safe side.

cjgillot · 2024-06-26T08:40:47Z

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

+    // CHECK: debug y => [[y:_.*]];
+    // CHECK: [[y]] = [[x]]
+    // CHECK: [[x]] = const 123_i32;
+    // CHECK-NOT: {{_.*}} = [[y]];


Should we directly give them their names, aka x is _1 and y is _0?

Hmm for me, it feels easier to read the test because you can more easily read the checks directly referencing the variable names (x and y), but maybe I'm misunderstanding something.

cjgillot · 2024-06-26T08:42:02Z

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

+    // CHECK: debug a => [[a:_.*]];
+    // CHECK: debug b => [[b:_.*]];
+    // CHECK: [[b]] = [[a]];
+    // CHECK: [[a]] = const 5_usize;


Shouldn't DSE have removed this?

I was surprised too, but the test was like this

cjgillot · 2024-06-26T08:43:00Z

tests/mir-opt/dest-prop/simple.rs

+    // CHECK-LABEL: fn nrvo(
+    // CHECK: debug init => [[init:_.*]];
+    // CHECK-NOT: {{_.*}} = [[init]];
+    // CHECK: move [[init]](move {{_.*}})


IIUC, the point of this test is to track what happens to buf.

I missed that, because there were no changes to buf. I added some more checks, let me know if it's better.

cjgillot · 2024-06-26T08:44:19Z

@cjgillot Could you take another look when you have time? Thanks

hi. Please mark this PR as ready when you are finished, otherwise it won't appear in my todo list.

cjgillot · 2024-07-13T13:48:09Z

@bors r+ rollup

bors · 2024-07-13T13:48:11Z

📌 Commit 2d5a483 has been approved by cjgillot

It is now in the queue for this repository.

Add FileCheck annotations to mir-opt/dest-prop tests Part of rust-lang#116971, adds FileCheck annotations to MIR-opt tests in tests/mir-opt/dest-prop. I would like some feedback. Also, I don't know how to approach `union.rs`. I couldn't figure out what it is testing. r? cjgillot

…kingjubilee Rollup of 8 pull requests Successful merges: - rust-lang#122300 (Add FileCheck annotations to mir-opt/dest-prop tests) - rust-lang#126967 (Promote the `wasm32-wasip2` target to Tier 2) - rust-lang#127370 (Windows: Add experimental support for linking std-required system DLLs using raw-dylib) - rust-lang#127434 (use "bootstrap" instead of "rustbuild" in comments and docs) - rust-lang#127477 (Clear `inner_attr_ranges` regularly.) - rust-lang#127558 (More attribute cleanups) - rust-lang#127659 (Use ManuallyDrop in BufWriter::into_parts) - rust-lang#127677 (using correct tool mode for `run-make-support` crate) r? `@ghost` `@rustbot` modify labels: rollup

Add FileCheck annotations to mir-opt/dest-prop tests Part of rust-lang#116971, adds FileCheck annotations to MIR-opt tests in tests/mir-opt/dest-prop. I would like some feedback. Also, I don't know how to approach `union.rs`. I couldn't figure out what it is testing. r? cjgillot

Rollup of 7 pull requests Successful merges: - rust-lang#122300 (Add FileCheck annotations to mir-opt/dest-prop tests) - rust-lang#127153 (Initial implementation of anonymous_pipe API) - rust-lang#127434 (use "bootstrap" instead of "rustbuild" in comments and docs) - rust-lang#127477 (Clear `inner_attr_ranges` regularly.) - rust-lang#127659 (Use ManuallyDrop in BufWriter::into_parts) - rust-lang#127671 (rustdoc: rename `issue-\d+.rs` tests to have meaningful names (part 8)) - rust-lang#127677 (using correct tool mode for `run-make-support` crate) r? `@ghost` `@rustbot` modify labels: rollup

…kingjubilee Rollup of 6 pull requests Successful merges: - rust-lang#122300 (Add FileCheck annotations to mir-opt/dest-prop tests) - rust-lang#127434 (use "bootstrap" instead of "rustbuild" in comments and docs) - rust-lang#127477 (Clear `inner_attr_ranges` regularly.) - rust-lang#127558 (More attribute cleanups) - rust-lang#127659 (Use ManuallyDrop in BufWriter::into_parts) - rust-lang#127671 (rustdoc: rename `issue-\d+.rs` tests to have meaningful names (part 8)) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#122300 - CastilloDel:master, r=cjgillot Add FileCheck annotations to mir-opt/dest-prop tests Part of rust-lang#116971, adds FileCheck annotations to MIR-opt tests in tests/mir-opt/dest-prop. I would like some feedback. Also, I don't know how to approach `union.rs`. I couldn't figure out what it is testing. r? cjgillot

rustbot assigned cjgillot Mar 10, 2024

rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 10, 2024

This comment has been minimized.

Sign in to view

CastilloDel force-pushed the master branch from e912c8f to 2e87b18 Compare March 10, 2024 17:38

CastilloDel marked this pull request as draft March 10, 2024 17:44

This comment has been minimized.

Sign in to view

CastilloDel force-pushed the master branch from 2e87b18 to 7090831 Compare March 10, 2024 18:40

This comment has been minimized.

Sign in to view

cjgillot reviewed Apr 6, 2024

View reviewed changes

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 Apr 6, 2024

CastilloDel added 4 commits April 14, 2024 11:35

Run filecheck on dest-prop/branch.rs

6bd68fc

Run filecheck on dest-prop/copy_propagation.rs

f238eba

Run filecheck on dest-prop/cycle.rs

853311c

Run filecheck on dest-prop/dead_stores_79191.rs and dead_stores_bette…

0692090

…r.rs

CastilloDel force-pushed the master branch from 7090831 to 1439ea1 Compare April 14, 2024 09:38

This comment has been minimized.

Sign in to view

CastilloDel force-pushed the master branch 2 times, most recently from 6774e8a to 7ecf674 Compare April 14, 2024 10:04

This comment has been minimized.

Sign in to view

Run filecheck on dest-prop/simple.rs

f0f867e

CastilloDel force-pushed the master branch from 7ecf674 to f0f867e Compare April 14, 2024 10:24

cjgillot reviewed Jun 26, 2024

View reviewed changes

Acknowledge comments

2d5a483

CastilloDel marked this pull request as ready for review June 26, 2024 17:40

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 13, 2024

workingjubilee mentioned this pull request Jul 13, 2024

Rollup of 9 pull requests #127695

Closed

workingjubilee mentioned this pull request Jul 13, 2024

Rollup of 8 pull requests #127696

Closed

jhpratt mentioned this pull request Jul 13, 2024

Rollup of 7 pull requests #127701

Closed

workingjubilee mentioned this pull request Jul 14, 2024

Rollup of 6 pull requests #127706

Merged

bors merged commit 4c493db into rust-lang:master Jul 14, 2024
6 checks passed

rustbot added this to the 1.81.0 milestone Jul 14, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add FileCheck annotations to mir-opt/dest-prop tests #122300

Add FileCheck annotations to mir-opt/dest-prop tests #122300

CastilloDel commented Mar 10, 2024 •

edited

Loading

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

bors commented Apr 3, 2024

cjgillot left a comment

cjgillot Apr 6, 2024

CastilloDel Apr 14, 2024

cjgillot Apr 6, 2024

CastilloDel commented Apr 14, 2024

This comment has been minimized.

This comment has been minimized.

CastilloDel commented Jun 11, 2024

cjgillot Jun 26, 2024

cjgillot Jun 26, 2024

CastilloDel Jun 26, 2024

cjgillot Jun 26, 2024

CastilloDel Jun 26, 2024

cjgillot Jun 26, 2024

CastilloDel Jun 26, 2024

cjgillot commented Jun 26, 2024

cjgillot commented Jul 13, 2024

bors commented Jul 13, 2024

Add FileCheck annotations to mir-opt/dest-prop tests #122300

Add FileCheck annotations to mir-opt/dest-prop tests #122300

Conversation

CastilloDel commented Mar 10, 2024 • edited Loading

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

bors commented Apr 3, 2024

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

CastilloDel commented Apr 14, 2024

This comment has been minimized.

This comment has been minimized.

CastilloDel commented Jun 11, 2024

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

cjgillot commented Jun 26, 2024

cjgillot commented Jul 13, 2024

bors commented Jul 13, 2024

CastilloDel commented Mar 10, 2024 •

edited

Loading