add explicit mir checks for mir-opt test

Author: tesuji

tests/mir-opt/const_array_locals.main.GVN.diff

@@ -37,12 +37,13 @@
       }
 
       bb0: {
-          StorageLive(_1);
+-         StorageLive(_1);
 -         _1 = [const 255_i32, const 105_i32, const 15_i32, const 39_i32, const 62_i32];
++         nop;
 +         _1 = const [255_i32, 105_i32, 15_i32, 39_i32, 62_i32];
           StorageLive(_2);
 -         _2 = [const 255_i32, const 105_i32, const 15_i32, const 39_i32, const 62_i32];
-+         _2 = const [255_i32, 105_i32, 15_i32, 39_i32, 62_i32];
++         _2 = _1;
           StorageLive(_3);
           StorageLive(_4);
 -         _4 = [const 178_i32, const 9_i32, const 4_i32, const 56_i32, const 221_i32];
@@ -63,9 +64,8 @@
           StorageLive(_9);
           StorageLive(_10);
 -         _10 = [const 31_u32, const 96_u32, const 173_u32, const 50_u32, const 1_u32];
--         _9 = consume(move _10) -> [return: bb1, unwind continue];
 +         _10 = const [31_u32, 96_u32, 173_u32, 50_u32, 1_u32];
-+         _9 = consume(const [31_u32, 96_u32, 173_u32, 50_u32, 1_u32]) -> [return: bb1, unwind continue];
+          _9 = consume(move _10) -> [return: bb1, unwind continue];
       }
 
       bb1: {
@@ -94,7 +94,8 @@
           StorageDead(_6);
           StorageDead(_3);
           StorageDead(_2);
-          StorageDead(_1);
+-         StorageDead(_1);
++         nop;
           return;
       }
 + }

tests/mir-opt/const_array_locals.rs

@@ -6,17 +6,37 @@ struct F32x8([f32; 8]);
 
 // EMIT_MIR const_array_locals.main.GVN.diff
 // CHECK-LABEL: fn main(
+// CHECK: debug _arr => [[_arr:_[0-9]+]];
+// CHECK: debug _duplicated_arr => [[_duplicated_arr:_[0-9]+]];
+// CHECK: debug _foo => [[_foo:_[0-9]+]];
+// CHECK: debug _darr => [[_darr:_[0-9]+]];
+// CHECK: debug _f => [[_f:_[0-9]+]];
 pub fn main() {
+    // CHECK: [[_arr]] = const [255_i32, 105_i32, 15_i32, 39_i32, 62_i32];
     let _arr = [255, 105, 15, 39, 62];
+    // CHECK: [[_duplicated_arr]] = [[_arr]];
     let _duplicated_arr = [255, 105, 15, 39, 62];
+    // CHECK: [[subarray1:_[0-9]+]] = const [178_i32, 9_i32, 4_i32, 56_i32, 221_i32];
+    // CHECK: [[subarray2:_[0-9]+]] = const [193_i32, 164_i32, 194_i32, 197_i32, 6_i32];
+    // CHECK: [[_foo]] = [move [[subarray1]], move [[subarray2]]];
     let _foo = [[178, 9, 4, 56, 221], [193, 164, 194, 197, 6]];
+    // CHECK: [[PROMOTED:_[0-9]+]] = const main::promoted[0];
+    // CHECK: [[_darr]] = (*[[PROMOTED]]);
     let _darr = *&[254, 42, 15, 39, 62];
 
+    // CHECK: [[ARG:_[0-9]+]] = const [31_u32, 96_u32, 173_u32, 50_u32, 1_u32];
+    // CHECK: consume(move [[ARG]])
     consume([31, 96, 173, 50, 1]);
 
+    // CHECK: [[OP:_[0-9]+]] = const [1f32, 2f32, 3f32, 1f32, 1f32, 1f32, 1f32, 42f32];
+    // CHECK: [[_f]] = F32x8(move [[OP]]);
     let _f = F32x8([1.0, 2.0, 3.0, 1.0, 1.0, 1.0, 1.0, 42.0]);
 
-    // ice
+    // ice with small arrays
+    // CHECK: [[A:_[0-9]+]] = [const 1_i32, const 0_i32, const 0_i32];
+    // CHECK: [[B:_[0-9]+]] = [const 0_i32, const 1_i32, const 0_i32];
+    // CHECK: [[C:_[0-9]+]] = [const 0_i32, const 0_i32, const 1_i32];
+    // CHECK: {{_[0-9]+}} = [move [[A]], move [[B]], move [[C]]];
     [[1, 0, 0], [0, 1, 0], [0, 0, 1]]; // 2D array
 }