Interleaved check statements in test

Author: ndegener-amd

mlir/test/Target/Cpp/for_loop_induction_vars.mlir

@@ -1,5 +1,6 @@
 // RUN: mlir-translate -mlir-to-cpp %s | FileCheck %s
 
+// CHECK-LABEL: test_for_siblings
 func.func @test_for_siblings() {
   %start = "emitc.constant"() <{value = 0 : index}> : () -> !emitc.size_t
   %stop = "emitc.constant"() <{value = 10 : index}> : () -> !emitc.size_t
@@ -8,32 +9,33 @@ func.func @test_for_siblings() {
   %var1 = "emitc.variable"() <{value = 0 : index}> : () -> !emitc.lvalue<!emitc.size_t>
   %var2 = "emitc.variable"() <{value = 0 : index}> : () -> !emitc.lvalue<!emitc.size_t>
 
+  // CHECK: for (size_t [[ITER0:i_[0-9]*]] = {{.*}}; [[ITER0]] < {{.*}}; [[ITER0]] += {{.*}}) {
   emitc.for %i0 = %start to %stop step %step {
+    // CHECK: for (size_t [[ITER1:j_[0-9]*]] = {{.*}}; [[ITER1]] < {{.*}}; [[ITER1]] += {{.*}}) {
     emitc.for %i1 = %start to %stop step %step {
+      // CHECK: {{.*}} = [[ITER0]];
       "emitc.assign"(%var1,%i0) : (!emitc.lvalue<!emitc.size_t>, !emitc.size_t) -> ()
+      // CHECK: {{.*}} = [[ITER1]];
       "emitc.assign"(%var2,%i1) : (!emitc.lvalue<!emitc.size_t>, !emitc.size_t) -> ()
     }
   }
+  // CHECK: for (size_t [[ITER2:i_[0-9]*]] = {{.*}}; [[ITER2]] < {{.*}}; [[ITER2]] += {{.*}})
   emitc.for %ki2 = %start to %stop step %step {
+    // CHECK: for (size_t [[ITER3:j_[0-9]*]] = {{.*}}; [[ITER3]] < {{.*}}; [[ITER3]] += {{.*}})
     emitc.for %i3 = %start to %stop step %step {
       %1 = emitc.call_opaque "f"() : () -> i32
     }
   }
   return
 }
-// CHECK-LABEL: test_for_siblings
-// CHECK: for (size_t [[ITER0:i_[0-9]*]] = {{.*}}; [[ITER0]] < {{.*}}; [[ITER0]] += {{.*}}) {
-  // CHECK: for (size_t [[ITER1:j_[0-9]*]] = {{.*}}; [[ITER1]] < {{.*}}; [[ITER1]] += {{.*}}) {
-    // CHECK-NEXT: {{.*}} = [[ITER0]];
-    // CHECK-NEXT: {{.*}} = [[ITER1]];
-// CHECK: for (size_t [[ITER2:i_[0-9]*]] = {{.*}}; [[ITER2]] < {{.*}}; [[ITER2]] += {{.*}})
-  // CHECK: for (size_t [[ITER3:j_[0-9]*]] = {{.*}}; [[ITER3]] < {{.*}}; [[ITER3]] += {{.*}})
 
+// CHECK-LABEL: test_for_nesting
 func.func @test_for_nesting() {
   %start = "emitc.constant"() <{value = 0 : index}> : () -> !emitc.size_t
   %stop = "emitc.constant"() <{value = 10 : index}> : () -> !emitc.size_t
   %step = "emitc.constant"() <{value = 1 : index}> : () -> !emitc.size_t
 
+  // CHECK-COUNT-18: for (size_t [[ITER:[i-z]_[0-9]*]] = {{.*}}; [[ITER]] < {{.*}}; [[ITER]] += {{.*}}) {
   emitc.for %i0 = %start to %stop step %step {
     emitc.for %i1 = %start to %stop step %step {
       emitc.for %i2 = %start to %stop step %step {
@@ -52,7 +54,9 @@ func.func @test_for_nesting() {
                                 emitc.for %i15 = %start to %stop step %step {
                                   emitc.for %i16 = %start to %stop step %step {
                                     emitc.for %i17 = %start to %stop step %step {
+                                      // CHECK: for (size_t [[ITERz0:z0_[0-9]*]] = {{.*}}; [[ITERz0]] < {{.*}}; [[ITERz0]] += {{.*}}) {
                                       emitc.for %i18 = %start to %stop step %step {
+                                        // CHECK: for (size_t [[ITERz1:z1_[0-9]*]] = {{.*}}; [[ITERz1]] < {{.*}}; [[ITERz1]] += {{.*}}) {
                                         emitc.for %i19 = %start to %stop step %step {
                                           %0 = emitc.call_opaque "f"() : () -> i32
                                         }
@@ -77,8 +81,3 @@ func.func @test_for_nesting() {
   }
   return
 }
-// CHECK-LABEL: test_for_nesting
-// CHECK-COUNT-18: for (size_t [[ITER:[i-z]_[0-9]*]] = {{.*}}; [[ITER]] < {{.*}}; [[ITER]] += {{.*}}) {
-  // CHECK: for (size_t [[ITERz0:z0_[0-9]*]] = {{.*}}; [[ITERz0]] < {{.*}}; [[ITERz0]] += {{.*}}) {
-    // CHECK: for (size_t [[ITERz1:z1_[0-9]*]] = {{.*}}; [[ITERz1]] < {{.*}}; [[ITERz1]] += {{.*}}) {
-