From 8ebb4281aa89ddfc1985f30873190a4598a81816 Mon Sep 17 00:00:00 2001
From: Nicolas Vasilache <ntv@google.com>
Date: Wed, 24 Jul 2019 10:28:04 -0700
Subject: [PATCH] Cleanup slicing test.

Remove hardcoded SSA names and make use of CHECK-LABEL directives.

PiperOrigin-RevId: 259767803
---
 mlir/test/Transforms/slicing-utils.mlir            | 397 +++++++++++----------
 .../test/lib/Transforms/TestVectorizationUtils.cpp |   4 +
 2 files changed, 207 insertions(+), 194 deletions(-)

diff --git a/mlir/test/Transforms/slicing-utils.mlir b/mlir/test/Transforms/slicing-utils.mlir
index 07e1a50..ae59ecd 100644
--- a/mlir/test/Transforms/slicing-utils.mlir
+++ b/mlir/test/Transforms/slicing-utils.mlir
@@ -12,204 +12,213 @@
 ///     |_______________|
 ///             |
 ///             9
+// FWD-LABEL: slicing_test
+// BWD-LABEL: slicing_test
+// FWDBWD-LABEL: slicing_test
 func @slicing_test() {
   // Fake 0 to align on 1 and match ASCII art.
   %0 = alloc() : memref<1xi32>
 
-  // FWD: matched: %1 {{.*}} forward static slice:
-  // FWD-NEXT: %5 {{.*}} (i32, i32) -> i32
-  // FWD-DAG: %8 {{.*}} (i32, i32) -> i32
-  // FWD-DAG: %7 {{.*}} (i32, i32) -> i32
-  // FWD-NEXT: %9 {{.*}} (i32, i32) -> i32
-  //
-  // BWD: matched: %1 {{.*}} backward static slice:
-  //
-  // FWDBWD: matched: %1 {{.*}} static slice:
-  // FWDBWD-DAG: %4 = "slicing-test-op"() : () -> i32
-  // FWDBWD-DAG: %3 = "slicing-test-op"() : () -> i32
-  // FWDBWD-NEXT: %6 = "slicing-test-op"(%3, %4) : (i32, i32) -> i32
-  // FWDBWD-DAG: %2 = "slicing-test-op"() : () -> i32
-  // FWDBWD-DAG: %1 = "slicing-test-op"() : () -> i32
-  // FWDBWD-NEXT: %5 = "slicing-test-op"(%1, %2) : (i32, i32) -> i32
-  // FWDBWD-DAG: %8 = "slicing-test-op"(%5, %6) : (i32, i32) -> i32
-  // FWDBWD-DAG: %7 = "slicing-test-op"(%1, %5) : (i32, i32) -> i32
-  // FWDBWD-NEXT: %9 = "slicing-test-op"(%7, %8) : (i32, i32) -> i32
-
-  %1 = "slicing-test-op" () : () -> i32
-
-  // FWD-NEXT: matched: %2 {{.*}} forward static slice:
-  // FWD-NEXT: %5 {{.*}} (i32, i32) -> i32
-  // FWD-DAG: %8 {{.*}} (i32, i32) -> i32
-  // FWD-DAG: %7 {{.*}} (i32, i32) -> i32
-  // FWD-NEXT: %9 {{.*}} (i32, i32) -> i32
-  //
-  // BWD: matched: %2 {{.*}} backward static slice:
-  //
-  // FWDBWD-NEXT: matched: %2 {{.*}} static slice:
-  // FWDBWD-DAG: %4 = "slicing-test-op"() : () -> i32
-  // FWDBWD-DAG: %3 = "slicing-test-op"() : () -> i32
-  // FWDBWD-NEXT: %6 = "slicing-test-op"(%3, %4) : (i32, i32) -> i32
-  // FWDBWD-DAG: %2 = "slicing-test-op"() : () -> i32
-  // FWDBWD-DAG: %1 = "slicing-test-op"() : () -> i32
-  // FWDBWD-NEXT: %5 = "slicing-test-op"(%1, %2) : (i32, i32) -> i32
-  // FWDBWD-DAG: %8 = "slicing-test-op"(%5, %6) : (i32, i32) -> i32
-  // FWDBWD-DAG: %7 = "slicing-test-op"(%1, %5) : (i32, i32) -> i32
-  // FWDBWD-NEXT: %9 = "slicing-test-op"(%7, %8) : (i32, i32) -> i32
-
-  %2 = "slicing-test-op" () : () -> i32
-
-  // FWD-NEXT: matched: %3 {{.*}} forward static slice:
-  // FWD-NEXT: %6 {{.*}} (i32, i32) -> i32
-  // FWD-NEXT: %8 {{.*}} (i32, i32) -> i32
-  // FWD-NEXT: %9 {{.*}} (i32, i32) -> i32
-  //
-  // BWD: matched: %3 {{.*}} backward static slice:
-  //
-  // FWDBWD-NEXT: matched: %3 {{.*}} static slice:
-  // FWDBWD-DAG: %2 = "slicing-test-op"() : () -> i32
-  // FWDBWD-DAG: %1 = "slicing-test-op"() : () -> i32
-  // FWDBWD-NEXT: %5 = "slicing-test-op"(%1, %2) : (i32, i32) -> i32
-  // FWDBWD-NEXT: %7 = "slicing-test-op"(%1, %5) : (i32, i32) -> i32
-  // FWDBWD-DAG: %4 = "slicing-test-op"() : () -> i32
-  // FWDBWD-DAG: %3 = "slicing-test-op"() : () -> i32
-  // FWDBWD-NEXT: %6 = "slicing-test-op"(%3, %4) : (i32, i32) -> i32
-  // FWDBWD-NEXT: %8 = "slicing-test-op"(%5, %6) : (i32, i32) -> i32
-  // FWDBWD-NEXT: %9 = "slicing-test-op"(%7, %8) : (i32, i32) -> i32
-
-  %3 = "slicing-test-op" () : () -> i32
-
-  // FWD-NEXT: matched: %4 {{.*}} forward static slice:
-  // FWD-NEXT: %6 {{.*}} (i32, i32) -> i32
-  // FWD-NEXT: %8 {{.*}} (i32, i32) -> i32
-  // FWD-NEXT: %9 {{.*}} (i32, i32) -> i32
-  //
-  // BWD: matched: %4 {{.*}} backward static slice:
-  //
-  // FWDBWD-NEXT: matched: %4 {{.*}} static slice:
-  // FWDBWD-DAG: %2 = "slicing-test-op"() : () -> i32
-  // FWDBWD-DAG: %1 = "slicing-test-op"() : () -> i32
-  // FWDBWD-NEXT: %5 = "slicing-test-op"(%1, %2) : (i32, i32) -> i32
-  // FWDBWD-NEXT: %7 = "slicing-test-op"(%1, %5) : (i32, i32) -> i32
-  // FWDBWD-DAG: %4 = "slicing-test-op"() : () -> i32
-  // FWDBWD-DAG: %3 = "slicing-test-op"() : () -> i32
-  // FWDBWD-NEXT: %6 = "slicing-test-op"(%3, %4) : (i32, i32) -> i32
-  // FWDBWD-NEXT: %8 = "slicing-test-op"(%5, %6) : (i32, i32) -> i32
-  // FWDBWD-NEXT: %9 = "slicing-test-op"(%7, %8) : (i32, i32) -> i32
-
-  %4 = "slicing-test-op" () : () -> i32
-
-  // FWD-NEXT: matched: %5 {{.*}} forward static slice:
-  // FWD-DAG: %7 {{.*}} (i32, i32) -> i32
-  // FWD-DAG: %8 {{.*}} (i32, i32) -> i32
-  // FWD-NEXT: %9 {{.*}} (i32, i32) -> i32
-  //
-  // BWD: matched: %5 {{.*}} backward static slice:
-  // BWD-DAG: %1 = "slicing-test-op"() : () -> i32
-  // BWD-DAG: %2 = "slicing-test-op"() : () -> i32
-  //
-  // FWDBWD-NEXT: matched: %5 {{.*}} static slice:
-  // FWDBWD-DAG: %4 = "slicing-test-op"() : () -> i32
-  // FWDBWD-DAG: %3 = "slicing-test-op"() : () -> i32
-  // FWDBWD-NEXT: %6 = "slicing-test-op"(%3, %4) : (i32, i32) -> i32
-  // FWDBWD-DAG: %2 = "slicing-test-op"() : () -> i32
-  // FWDBWD-DAG: %1 = "slicing-test-op"() : () -> i32
-  // FWDBWD-NEXT: %5 = "slicing-test-op"(%1, %2) : (i32, i32) -> i32
-  // FWDBWD-DAG: %8 = "slicing-test-op"(%5, %6) : (i32, i32) -> i32
-  // FWDBWD-DAG: %7 = "slicing-test-op"(%1, %5) : (i32, i32) -> i32
-  // FWDBWD-NEXT: %9 = "slicing-test-op"(%7, %8) : (i32, i32) -> i32
-
-  %5 = "slicing-test-op" (%1, %2) : (i32, i32) -> i32
-
-  // FWD-NEXT: matched: %6 {{.*}} forward static slice:
-  // FWD-NEXT: %8 {{.*}} (i32, i32) -> i32
-  // FWD-NEXT: %9 {{.*}} (i32, i32) -> i32
-  //
-  // BWD: matched: %6 {{.*}} backward static slice:
-  // BWD-DAG: %3 = "slicing-test-op"() : () -> i32
-  // BWD-DAG: %4 = "slicing-test-op"() : () -> i32
-  //
-  // FWDBWD-NEXT: matched: %6 {{.*}} static slice:
-  // FWDBWD-DAG: %2 = "slicing-test-op"() : () -> i32
-  // FWDBWD-DAG: %1 = "slicing-test-op"() : () -> i32
-  // FWDBWD-NEXT: %5 = "slicing-test-op"(%1, %2) : (i32, i32) -> i32
-  // FWDBWD-NEXT: %7 = "slicing-test-op"(%1, %5) : (i32, i32) -> i32
-  // FWDBWD-DAG: %4 = "slicing-test-op"() : () -> i32
-  // FWDBWD-DAG: %3 = "slicing-test-op"() : () -> i32
-  // FWDBWD-NEXT: %6 = "slicing-test-op"(%3, %4) : (i32, i32) -> i32
-  // FWDBWD-NEXT: %8 = "slicing-test-op"(%5, %6) : (i32, i32) -> i32
-  // FWDBWD-NEXT: %9 = "slicing-test-op"(%7, %8) : (i32, i32) -> i32
-
-  %6 = "slicing-test-op" (%3, %4) : (i32, i32) -> i32
-
-  // FWD-NEXT: matched: %7 {{.*}} forward static slice:
-  // FWD-NEXT: %9 {{.*}} (i32, i32) -> i32
-  //
-  // BWD: matched: %7 {{.*}} backward static slice:
-  // BWD-DAG: %1 = "slicing-test-op"() : () -> i32
-  // BWD-DAG: %2 = "slicing-test-op"() : () -> i32
-  // BWD-NEXT: %5 = "slicing-test-op"(%1, %2) : (i32, i32) -> i32
-  //
-  // FWDBWD-NEXT: matched: %7 {{.*}} static slice:
-  // FWDBWD-DAG: %4 = "slicing-test-op"() : () -> i32
-  // FWDBWD-DAG: %3 = "slicing-test-op"() : () -> i32
-  // FWDBWD-NEXT: %6 = "slicing-test-op"(%3, %4) : (i32, i32) -> i32
-  // FWDBWD-DAG: %2 = "slicing-test-op"() : () -> i32
-  // FWDBWD-DAG: %1 = "slicing-test-op"() : () -> i32
-  // FWDBWD: %5 = "slicing-test-op"(%1, %2) : (i32, i32) -> i32
-  // FWDBWD-DAG: %8 = "slicing-test-op"(%5, %6) : (i32, i32) -> i32
-  // FWDBWD-DAG: %7 = "slicing-test-op"(%1, %5) : (i32, i32) -> i32
-  // FWDBWD-NEXT: %9 = "slicing-test-op"(%7, %8) : (i32, i32) -> i32
-  
-  %7 = "slicing-test-op" (%1, %5) : (i32, i32) -> i32
-
-  // FWD-NEXT: matched: %8 {{.*}} forward static slice:
-  // FWD-NEXT: %9 {{.*}} (i32, i32) -> i32
-  //
-  // BWD: matched: %8 {{.*}} backward static slice:
-  // BWD-DAG: %1 = "slicing-test-op"() : () -> i32
-  // BWD-DAG: %2 = "slicing-test-op"() : () -> i32
-  // BWD-NEXT: %5 = "slicing-test-op"(%1, %2) : (i32, i32) -> i32
-  // BWD-DAG: %3 = "slicing-test-op"() : () -> i32
-  // BWD-DAG: %4 = "slicing-test-op"() : () -> i32
-  // BWD-NEXT: %6 = "slicing-test-op"(%3, %4) : (i32, i32) -> i32
-  //
-  // FWDBWD-NEXT: matched: %8 {{.*}} static slice:
-  // FWDBWD-DAG: %4 = "slicing-test-op"() : () -> i32
-  // FWDBWD-DAG: %3 = "slicing-test-op"() : () -> i32
-  // FWDBWD-NEXT: %6 = "slicing-test-op"(%3, %4) : (i32, i32) -> i32
-  // FWDBWD-DAG: %2 = "slicing-test-op"() : () -> i32
-  // FWDBWD-DAG: %1 = "slicing-test-op"() : () -> i32
-  // FWDBWD-NEXT: %5 = "slicing-test-op"(%1, %2) : (i32, i32) -> i32
-  // FWDBWD-DAG: %8 = "slicing-test-op"(%5, %6) : (i32, i32) -> i32
-  // FWDBWD-DAG: %7 = "slicing-test-op"(%1, %5) : (i32, i32) -> i32
-  // FWDBWD-NEXT: %9 = "slicing-test-op"(%7, %8) : (i32, i32) -> i32
-
-  %8 = "slicing-test-op" (%5, %6) : (i32, i32) -> i32
-
-  // FWD-NEXT: matched: %9 {{.*}} forward static slice:
-  //
-  // BWD: matched: %9 {{.*}} backward static slice:
-  // BWD-DAG: %1 = "slicing-test-op"() : () -> i32
-  // BWD-DAG: %2 = "slicing-test-op"() : () -> i32
-  // BWD-NEXT: %5 = "slicing-test-op"(%1, %2) : (i32, i32) -> i32
-  // BWD-NEXT: %7 = "slicing-test-op"(%1, %5) : (i32, i32) -> i32
-  // BWD-DAG: %3 = "slicing-test-op"() : () -> i32
-  // BWD-DAG: %4 = "slicing-test-op"() : () -> i32
-  // BWD-NEXT: %6 = "slicing-test-op"(%3, %4) : (i32, i32) -> i32
-  // BWD-NEXT: %8 = "slicing-test-op"(%5, %6) : (i32, i32) -> i32
-  //
-  // FWDBWD-NEXT: matched: %9 {{.*}} static slice:
-  // FWDBWD-DAG: %4 = "slicing-test-op"() : () -> i32
-  // FWDBWD-DAG: %3 = "slicing-test-op"() : () -> i32
-  // FWDBWD-NEXT: %6 = "slicing-test-op"(%3, %4) : (i32, i32) -> i32
-  // FWDBWD-DAG: %2 = "slicing-test-op"() : () -> i32
-  // FWDBWD-DAG: %1 = "slicing-test-op"() : () -> i32
-  // FWDBWD-NEXT: %5 = "slicing-test-op"(%1, %2) : (i32, i32) -> i32
-  // FWDBWD-DAG: %8 = "slicing-test-op"(%5, %6) : (i32, i32) -> i32
-  // FWDBWD-DAG: %7 = "slicing-test-op"(%1, %5) : (i32, i32) -> i32
-  // FWDBWD-NEXT: %9 = "slicing-test-op"(%7, %8) : (i32, i32) -> i32
-
-  %9 = "slicing-test-op" (%7, %8) : (i32, i32) -> i32
+  // FWD: matched: %[[v1:.*]] {{.*}} forward static slice:
+  // FWD-NEXT: %[[v5:.*]] {{.*}} -> i5
+  // FWD-DAG: %[[v8:.*]] {{.*}} -> i8
+  // FWD-DAG: %[[v7:.*]] {{.*}} -> i7
+  // FWD-NEXT: %[[v9:.*]] {{.*}} -> i9
+  //
+  // BWD: matched: %[[v1:.*]] {{.*}} backward static slice:
+  //
+  // FWDBWD: matched: %[[v1:.*]] {{.*}} static slice:
+  // FWDBWD-DAG: %[[v4:.*]] = "slicing-test-op"() : () -> i4
+  // FWDBWD-DAG: %[[v3:.*]] = "slicing-test-op"() : () -> i3
+  // FWDBWD-NEXT: %[[v6:.*]] = "slicing-test-op"(%[[v3]], %[[v4]]) : (i3, i4) -> i6
+  // FWDBWD-DAG: %[[v2:.*]] = "slicing-test-op"() : () -> i2
+  // FWDBWD-DAG: %[[v1:.*]] = "slicing-test-op"() : () -> i1
+  // FWDBWD-NEXT: %[[v5:.*]] = "slicing-test-op"(%[[v1]], %[[v2]]) : (i1, i2) -> i5
+  // FWDBWD-DAG: %[[v8:.*]] = "slicing-test-op"(%[[v5]], %[[v6]]) : (i5, i6) -> i8
+  // FWDBWD-DAG: %[[v7:.*]] = "slicing-test-op"(%[[v1]], %[[v5]]) : (i1, i5) -> i7
+  // FWDBWD-NEXT: %[[v9:.*]] = "slicing-test-op"(%[[v7]], %[[v8]]) : (i7, i8) -> i9
+
+  %1 = "slicing-test-op" () : () -> i1
+
+  // FWD-NEXT: matched: %[[v2:.*]] {{.*}} forward static slice:
+  // FWD-NEXT: %[[v5:.*]] {{.*}} -> i5
+  // FWD-DAG: %[[v8:.*]] {{.*}} -> i8
+  // FWD-DAG: %[[v7:.*]] {{.*}} -> i7
+  // FWD-NEXT: %[[v9:.*]] {{.*}} -> i9
+  //
+  // BWD: matched: %[[v2:.*]] {{.*}} backward static slice:
+  //
+  // FWDBWD-NEXT: matched: %[[v2:.*]] {{.*}} static slice:
+  // FWDBWD-DAG: %[[v4:.*]] = "slicing-test-op"() : () -> i4
+  // FWDBWD-DAG: %[[v3:.*]] = "slicing-test-op"() : () -> i3
+  // FWDBWD-NEXT: %[[v6:.*]] = "slicing-test-op"(%[[v3]], %[[v4]]) : (i3, i4) -> i6
+  // FWDBWD-DAG: %[[v2:.*]] = "slicing-test-op"() : () -> i2
+  // FWDBWD-DAG: %[[v1:.*]] = "slicing-test-op"() : () -> i1
+  // FWDBWD-NEXT: %[[v5:.*]] = "slicing-test-op"(%[[v1]], %[[v2]]) : (i1, i2) -> i5
+  // FWDBWD-DAG: %[[v8:.*]] = "slicing-test-op"(%[[v5]], %[[v6]]) : (i5, i6) -> i8
+  // FWDBWD-DAG: %[[v7:.*]] = "slicing-test-op"(%[[v1]], %[[v5]]) : (i1, i5) -> i7
+  // FWDBWD-NEXT: %[[v9:.*]] = "slicing-test-op"(%[[v7]], %[[v8]]) : (i7, i8) -> i9
+
+  %2 = "slicing-test-op" () : () -> i2
+
+  // FWD-NEXT: matched: %[[v3:.*]] {{.*}} forward static slice:
+  // FWD-NEXT: %[[v6:.*]] {{.*}} -> i6
+  // FWD-NEXT: %[[v8:.*]] {{.*}} -> i8
+  // FWD-NEXT: %[[v9:.*]] {{.*}} -> i9
+  //
+  // BWD: matched: %[[v3:.*]] {{.*}} backward static slice:
+  //
+  // FWDBWD-NEXT: matched: %[[v3:.*]] {{.*}} static slice:
+  // FWDBWD-DAG: %[[v2:.*]] = "slicing-test-op"() : () -> i2
+  // FWDBWD-DAG: %[[v1:.*]] = "slicing-test-op"() : () -> i1
+  // FWDBWD-NEXT: %[[v5:.*]] = "slicing-test-op"(%[[v1]], %[[v2]]) : (i1, i2) -> i5
+  // FWDBWD-NEXT: %[[v7:.*]] = "slicing-test-op"(%[[v1]], %[[v5]]) : (i1, i5) -> i7
+  // FWDBWD-DAG: %[[v4:.*]] = "slicing-test-op"() : () -> i4
+  // FWDBWD-DAG: %[[v3:.*]] = "slicing-test-op"() : () -> i3
+  // FWDBWD-NEXT: %[[v6:.*]] = "slicing-test-op"(%[[v3]], %[[v4]]) : (i3, i4) -> i6
+  // FWDBWD-NEXT: %[[v8:.*]] = "slicing-test-op"(%[[v5]], %[[v6]]) : (i5, i6) -> i8
+  // FWDBWD-NEXT: %[[v9:.*]] = "slicing-test-op"(%[[v7]], %[[v8]]) : (i7, i8) -> i9
+
+  %3 = "slicing-test-op" () : () -> i3
+
+  // FWD-NEXT: matched: %[[v4:.*]] {{.*}} forward static slice:
+  // FWD-NEXT: %[[v6:.*]] {{.*}} -> i6
+  // FWD-NEXT: %[[v8:.*]] {{.*}} -> i8
+  // FWD-NEXT: %[[v9:.*]] {{.*}} -> i9
+  //
+  // BWD: matched: %[[v4:.*]] {{.*}} backward static slice:
+  //
+  // FWDBWD-NEXT: matched: %[[v4:.*]] {{.*}} static slice:
+  // FWDBWD-DAG: %[[v2:.*]] = "slicing-test-op"() : () -> i2
+  // FWDBWD-DAG: %[[v1:.*]] = "slicing-test-op"() : () -> i1
+  // FWDBWD-NEXT: %[[v5:.*]] = "slicing-test-op"(%[[v1]], %[[v2]]) : (i1, i2) -> i5
+  // FWDBWD-NEXT: %[[v7:.*]] = "slicing-test-op"(%[[v1]], %[[v5]]) : (i1, i5) -> i7
+  // FWDBWD-DAG: %[[v4:.*]] = "slicing-test-op"() : () -> i4
+  // FWDBWD-DAG: %[[v3:.*]] = "slicing-test-op"() : () -> i3
+  // FWDBWD-NEXT: %[[v6:.*]] = "slicing-test-op"(%[[v3]], %[[v4]]) : (i3, i4) -> i6
+  // FWDBWD-NEXT: %[[v8:.*]] = "slicing-test-op"(%[[v5]], %[[v6]]) : (i5, i6) -> i8
+  // FWDBWD-NEXT: %[[v9:.*]] = "slicing-test-op"(%[[v7]], %[[v8]]) : (i7, i8) -> i9
+
+  %4 = "slicing-test-op" () : () -> i4
+
+  // FWD-NEXT: matched: %[[v5:.*]] {{.*}} forward static slice:
+  // FWD-DAG: %[[v7:.*]] {{.*}} -> i7
+  // FWD-DAG: %[[v8:.*]] {{.*}} -> i8
+  // FWD-NEXT: %[[v9:.*]] {{.*}} -> i9
+  //
+  // BWD: matched: %[[v5:.*]] {{.*}} backward static slice:
+  // BWD-DAG: %[[v1:.*]] = "slicing-test-op"() : () -> i1
+  // BWD-DAG: %[[v2:.*]] = "slicing-test-op"() : () -> i2
+  //
+  // FWDBWD-NEXT: matched: %[[v5:.*]] {{.*}} static slice:
+  // FWDBWD-DAG: %[[v4:.*]] = "slicing-test-op"() : () -> i4
+  // FWDBWD-DAG: %[[v3:.*]] = "slicing-test-op"() : () -> i3
+  // FWDBWD-NEXT: %[[v6:.*]] = "slicing-test-op"(%[[v3]], %[[v4]]) : (i3, i4) -> i6
+  // FWDBWD-DAG: %[[v2:.*]] = "slicing-test-op"() : () -> i2
+  // FWDBWD-DAG: %[[v1:.*]] = "slicing-test-op"() : () -> i1
+  // FWDBWD-NEXT: %[[v5:.*]] = "slicing-test-op"(%[[v1]], %[[v2]]) : (i1, i2) -> i5
+  // FWDBWD-DAG: %[[v8:.*]] = "slicing-test-op"(%[[v5]], %[[v6]]) : (i5, i6) -> i8
+  // FWDBWD-DAG: %[[v7:.*]] = "slicing-test-op"(%[[v1]], %[[v5]]) : (i1, i5) -> i7
+  // FWDBWD-NEXT: %[[v9:.*]] = "slicing-test-op"(%[[v7]], %[[v8]]) : (i7, i8) -> i9
+
+  %5 = "slicing-test-op" (%1, %2) : (i1, i2) -> i5
+
+  // FWD-NEXT: matched: %[[v6:.*]] {{.*}} forward static slice:
+  // FWD-NEXT: %[[v8:.*]] {{.*}} -> i8
+  // FWD-NEXT: %[[v9:.*]] {{.*}} -> i9
+  //
+  // BWD: matched: %[[v6:.*]] {{.*}} backward static slice:
+  // BWD-DAG: %[[v3:.*]] = "slicing-test-op"() : () -> i3
+  // BWD-DAG: %[[v4:.*]] = "slicing-test-op"() : () -> i4
+  //
+  // FWDBWD-NEXT: matched: %[[v6:.*]] {{.*}} static slice:
+  // FWDBWD-DAG: %[[v2:.*]] = "slicing-test-op"() : () -> i2
+  // FWDBWD-DAG: %[[v1:.*]] = "slicing-test-op"() : () -> i1
+  // FWDBWD-NEXT: %[[v5:.*]] = "slicing-test-op"(%[[v1]], %[[v2]]) : (i1, i2) -> i5
+  // FWDBWD-NEXT: %[[v7:.*]] = "slicing-test-op"(%[[v1]], %[[v5]]) : (i1, i5) -> i7
+  // FWDBWD-DAG: %[[v4:.*]] = "slicing-test-op"() : () -> i4
+  // FWDBWD-DAG: %[[v3:.*]] = "slicing-test-op"() : () -> i3
+  // FWDBWD-NEXT: %[[v6:.*]] = "slicing-test-op"(%[[v3]], %[[v4]]) : (i3, i4) -> i6
+  // FWDBWD-NEXT: %[[v8:.*]] = "slicing-test-op"(%[[v5]], %[[v6]]) : (i5, i6) -> i8
+  // FWDBWD-NEXT: %[[v9:.*]] = "slicing-test-op"(%[[v7]], %[[v8]]) : (i7, i8) -> i9
+
+  %6 = "slicing-test-op" (%3, %4) : (i3, i4) -> i6
+
+  // FWD-NEXT: matched: %[[v7:.*]] {{.*}} forward static slice:
+  // FWD-NEXT: %[[v9:.*]] {{.*}} -> i9
+  //
+  // BWD: matched: %[[v7:.*]] {{.*}} backward static slice:
+  // BWD-DAG: %[[v1:.*]] = "slicing-test-op"() : () -> i1
+  // BWD-DAG: %[[v2:.*]] = "slicing-test-op"() : () -> i2
+  // BWD-NEXT: %[[v5:.*]] = "slicing-test-op"(%[[v1]], %[[v2]]) : (i1, i2) -> i5
+  //
+  // FWDBWD-NEXT: matched: %[[v7:.*]] {{.*}} static slice:
+  // FWDBWD-DAG: %[[v4:.*]] = "slicing-test-op"() : () -> i4
+  // FWDBWD-DAG: %[[v3:.*]] = "slicing-test-op"() : () -> i3
+  // FWDBWD-NEXT: %[[v6:.*]] = "slicing-test-op"(%[[v3]], %[[v4]]) : (i3, i4) -> i6
+  // FWDBWD-DAG: %[[v2:.*]] = "slicing-test-op"() : () -> i2
+  // FWDBWD-DAG: %[[v1:.*]] = "slicing-test-op"() : () -> i1
+  // FWDBWD: %[[v5:.*]] = "slicing-test-op"(%[[v1]], %[[v2]]) : (i1, i2) -> i5
+  // FWDBWD-DAG: %[[v8:.*]] = "slicing-test-op"(%[[v5]], %[[v6]]) : (i5, i6) -> i8
+  // FWDBWD-DAG: %[[v7:.*]] = "slicing-test-op"(%[[v1]], %[[v5]]) : (i1, i5) -> i7
+  // FWDBWD-NEXT: %[[v9:.*]] = "slicing-test-op"(%[[v7]], %[[v8]]) : (i7, i8) -> i9
+
+  %7 = "slicing-test-op" (%1, %5) : (i1, i5) -> i7
+
+  // FWD-NEXT: matched: %[[v8:.*]] {{.*}} forward static slice:
+  // FWD-NEXT: %[[v9:.*]] {{.*}} -> i9
+  //
+  // BWD: matched: %[[v8:.*]] {{.*}} backward static slice:
+  // BWD-DAG: %[[v1:.*]] = "slicing-test-op"() : () -> i1
+  // BWD-DAG: %[[v2:.*]] = "slicing-test-op"() : () -> i2
+  // BWD-NEXT: %[[v5:.*]] = "slicing-test-op"(%[[v1]], %[[v2]]) : (i1, i2) -> i5
+  // BWD-DAG: %[[v3:.*]] = "slicing-test-op"() : () -> i3
+  // BWD-DAG: %[[v4:.*]] = "slicing-test-op"() : () -> i4
+  // BWD-NEXT: %[[v6:.*]] = "slicing-test-op"(%[[v3]], %[[v4]]) : (i3, i4) -> i6
+  //
+  // FWDBWD-NEXT: matched: %[[v8:.*]] {{.*}} static slice:
+  // FWDBWD-DAG: %[[v4:.*]] = "slicing-test-op"() : () -> i4
+  // FWDBWD-DAG: %[[v3:.*]] = "slicing-test-op"() : () -> i3
+  // FWDBWD-NEXT: %[[v6:.*]] = "slicing-test-op"(%[[v3]], %[[v4]]) : (i3, i4) -> i6
+  // FWDBWD-DAG: %[[v2:.*]] = "slicing-test-op"() : () -> i2
+  // FWDBWD-DAG: %[[v1:.*]] = "slicing-test-op"() : () -> i1
+  // FWDBWD-NEXT: %[[v5:.*]] = "slicing-test-op"(%[[v1]], %[[v2]]) : (i1, i2) -> i5
+  // FWDBWD-DAG: %[[v8:.*]] = "slicing-test-op"(%[[v5]], %[[v6]]) : (i5, i6) -> i8
+  // FWDBWD-DAG: %[[v7:.*]] = "slicing-test-op"(%[[v1]], %[[v5]]) : (i1, i5) -> i7
+  // FWDBWD-NEXT: %[[v9:.*]] = "slicing-test-op"(%[[v7]], %[[v8]]) : (i7, i8) -> i9
+
+  %8 = "slicing-test-op" (%5, %6) : (i5, i6) -> i8
+
+  // FWD-NEXT: matched: %[[v9:.*]] {{.*}} forward static slice:
+  //
+  // BWD: matched: %[[v9:.*]] {{.*}} backward static slice:
+  // BWD-DAG: %[[v1:.*]] = "slicing-test-op"() : () -> i1
+  // BWD-DAG: %[[v2:.*]] = "slicing-test-op"() : () -> i2
+  // BWD-NEXT: %[[v5:.*]] = "slicing-test-op"(%[[v1]], %[[v2]]) : (i1, i2) -> i5
+  // BWD-NEXT: %[[v7:.*]] = "slicing-test-op"(%[[v1]], %[[v5]]) : (i1, i5) -> i7
+  // BWD-DAG: %[[v3:.*]] = "slicing-test-op"() : () -> i3
+  // BWD-DAG: %[[v4:.*]] = "slicing-test-op"() : () -> i4
+  // BWD-NEXT: %[[v6:.*]] = "slicing-test-op"(%[[v3]], %[[v4]]) : (i3, i4) -> i6
+  // BWD-NEXT: %[[v8:.*]] = "slicing-test-op"(%[[v5]], %[[v6]]) : (i5, i6) -> i8
+  //
+  // FWDBWD-NEXT: matched: %[[v9:.*]] {{.*}} static slice:
+  // FWDBWD-DAG: %[[v4:.*]] = "slicing-test-op"() : () -> i4
+  // FWDBWD-DAG: %[[v3:.*]] = "slicing-test-op"() : () -> i3
+  // FWDBWD-NEXT: %[[v6:.*]] = "slicing-test-op"(%[[v3]], %[[v4]]) : (i3, i4) -> i6
+  // FWDBWD-DAG: %[[v2:.*]] = "slicing-test-op"() : () -> i2
+  // FWDBWD-DAG: %[[v1:.*]] = "slicing-test-op"() : () -> i1
+  // FWDBWD-NEXT: %[[v5:.*]] = "slicing-test-op"(%[[v1]], %[[v2]]) : (i1, i2) -> i5
+  // FWDBWD-DAG: %[[v8:.*]] = "slicing-test-op"(%[[v5]], %[[v6]]) : (i5, i6) -> i8
+  // FWDBWD-DAG: %[[v7:.*]] = "slicing-test-op"(%[[v1]], %[[v5]]) : (i1, i5) -> i7
+  // FWDBWD-NEXT: %[[v9:.*]] = "slicing-test-op"(%[[v7]], %[[v8]]) : (i7, i8) -> i9
+
+  %9 = "slicing-test-op" (%7, %8) : (i7, i8) -> i9
 
   return
 }
+
+// This test dumps 2 sets of outputs: first the test outputs themselves followed
+// by the module. These labels isolate the test outputs from the module dump.
+// FWD-LABEL: slicing_test
+// BWD-LABEL: slicing_test
+// FWDBWD-LABEL: slicing_test
diff --git a/mlir/test/lib/Transforms/TestVectorizationUtils.cpp b/mlir/test/lib/Transforms/TestVectorizationUtils.cpp
index 4fd77c8..b51de41 100644
--- a/mlir/test/lib/Transforms/TestVectorizationUtils.cpp
+++ b/mlir/test/lib/Transforms/TestVectorizationUtils.cpp
@@ -149,6 +149,7 @@ static NestedPattern patternTestSlicingOps() {
 
 void VectorizerTestPass::testBackwardSlicing(llvm::raw_ostream &outs) {
   auto f = getFunction();
+  outs << "\n" << f.getName();
 
   SmallVector<NestedMatch, 8> matches;
   patternTestSlicingOps().match(f, &matches);
@@ -164,6 +165,8 @@ void VectorizerTestPass::testBackwardSlicing(llvm::raw_ostream &outs) {
 
 void VectorizerTestPass::testForwardSlicing(llvm::raw_ostream &outs) {
   auto f = getFunction();
+  outs << "\n" << f.getName();
+
   SmallVector<NestedMatch, 8> matches;
   patternTestSlicingOps().match(f, &matches);
   for (auto m : matches) {
@@ -178,6 +181,7 @@ void VectorizerTestPass::testForwardSlicing(llvm::raw_ostream &outs) {
 
 void VectorizerTestPass::testSlicing(llvm::raw_ostream &outs) {
   auto f = getFunction();
+  outs << "\n" << f.getName();
 
   SmallVector<NestedMatch, 8> matches;
   patternTestSlicingOps().match(f, &matches);
-- 
2.7.4