rename -memref-dependence-check to -test-memref-dependence-check since it

    generates remarks for testing, it isn't itself a transformation.

    While there, upgrade its diagnostic emission to use the streaming interface.

    Prune some unnecessary #includes.

--

PiperOrigin-RevId: 247768062

diff --git a/mlir/include/mlir/Analysis/Passes.h b/mlir/include/mlir/Analysis/Passes.h
index a3093a9..4790f6b 100644 (file)
--- a/mlir/include/mlir/Analysis/Passes.h
+++ b/mlir/include/mlir/Analysis/Passes.h
@@ -33,7 +33,7 @@ class FunctionPassBase;
 FunctionPassBase *createMemRefBoundCheckPass();
 
 /// Creates a pass to check memref access dependences in an ML Function.
-FunctionPassBase *createMemRefDependenceCheckPass();
+FunctionPassBase *createTestMemRefDependenceCheckPass();
 
 /// Creates a pass to test parallelism detection; emits note for parallel loops.
 FunctionPassBase *createParallelismDetectionTestPass();

diff --git a/mlir/lib/Analysis/MemRefDependenceCheck.cpp b/mlir/lib/Analysis/TestMemRefDependenceCheck.cpp
similarity index 85%
rename from mlir/lib/Analysis/MemRefDependenceCheck.cpp
rename to mlir/lib/Analysis/TestMemRefDependenceCheck.cpp
index 7901710..4005871 100644 (file)
--- a/mlir/lib/Analysis/MemRefDependenceCheck.cpp
+++ b/mlir/lib/Analysis/TestMemRefDependenceCheck.cpp
@@ -1,4 +1,4 @@
-//===- MemRefDependenceCheck.cpp - MemRef DependenceCheck Class -*- C++ -*-===//
+//===- TestMemRefDependenceCheck.cpp - Test dep analysis ------------------===//
 //
 // Copyright 2019 The MLIR Authors.
 //
@@ -28,7 +28,7 @@
 #include "mlir/StandardOps/Ops.h"
 #include "llvm/Support/Debug.h"
 
-#define DEBUG_TYPE "memref-dependence-check"
+#define DEBUG_TYPE "test-memref-dependence-check"
 
 using namespace mlir;
 
@@ -36,15 +36,16 @@ namespace {
 
 // TODO(andydavis) Add common surrounding loop depth-wise dependence checks.
 /// Checks dependences between all pairs of memref accesses in a Function.
-struct MemRefDependenceCheck : public FunctionPass<MemRefDependenceCheck> {
+struct TestMemRefDependenceCheck
+    : public FunctionPass<TestMemRefDependenceCheck> {
   SmallVector<Operation *, 4> loadsAndStores;
   void runOnFunction() override;
 };
 
 } // end anonymous namespace
 
-FunctionPassBase *mlir::createMemRefDependenceCheckPass() {
-  return new MemRefDependenceCheck();
+FunctionPassBase *mlir::createTestMemRefDependenceCheckPass() {
+  return new TestMemRefDependenceCheck();
 }
 
 // Returns a result string which represents the direction vector (if there was
@@ -98,11 +99,10 @@ static void checkDependences(ArrayRef<Operation *> loadsAndStores) {
         // TODO(andydavis) Print dependence type (i.e. RAW, etc) and print
         // distance vectors as: ([2, 3], [0, 10]). Also, shorten distance
         // vectors from ([1, 1], [3, 3]) to (1, 3).
-        srcOpInst->emitRemark(
-            "dependence from " + Twine(i) + " to " + Twine(j) + " at depth " +
-            Twine(d) + " = " +
-            getDirectionVectorStr(ret, numCommonLoops, d, dependenceComponents)
-                .c_str());
+        srcOpInst->emitRemark("dependence from ")
+            << i << " to " << j << " at depth " << d << " = "
+            << getDirectionVectorStr(ret, numCommonLoops, d,
+                                     dependenceComponents);
       }
     }
   }
@@ -110,7 +110,7 @@ static void checkDependences(ArrayRef<Operation *> loadsAndStores) {
 
 // Walks the Function 'f' adding load and store ops to 'loadsAndStores'.
 // Runs pair-wise dependence checks.
-void MemRefDependenceCheck::runOnFunction() {
+void TestMemRefDependenceCheck::runOnFunction() {
   // Collect the loads and stores within the function.
   loadsAndStores.clear();
   getFunction().walk([&](Operation *op) {
@@ -121,6 +121,6 @@ void MemRefDependenceCheck::runOnFunction() {
   checkDependences(loadsAndStores);
 }
 
-static PassRegistration<MemRefDependenceCheck>
-    pass("memref-dependence-check",
+static PassRegistration<TestMemRefDependenceCheck>
+    pass("test-memref-dependence-check",
          "Checks dependences between all pairs of memref accesses.");

diff --git a/mlir/lib/Transforms/SimplifyAffineStructures.cpp b/mlir/lib/Transforms/SimplifyAffineStructures.cpp
index a8efee7..3b6c231 100644 (file)
--- a/mlir/lib/Transforms/SimplifyAffineStructures.cpp
+++ b/mlir/lib/Transforms/SimplifyAffineStructures.cpp
@@ -1,4 +1,4 @@
-//===- SimplifyAffineStructures.cpp - ---------------------------*- C++ -*-===//
+//===- SimplifyAffineStructures.cpp ---------------------------------------===//
 //
 // Copyright 2019 The MLIR Authors.
 //

diff --git a/mlir/test/Transforms/memref-dependence-check.mlir b/mlir/test/Transforms/memref-dependence-check.mlir
index 0322059..d37a58e 100644 (file)
--- a/mlir/test/Transforms/memref-dependence-check.mlir
+++ b/mlir/test/Transforms/memref-dependence-check.mlir
@@ -1,4 +1,4 @@
-// RUN: mlir-opt %s -memref-dependence-check  -split-input-file -verify | FileCheck %s
+// RUN: mlir-opt %s -test-memref-dependence-check  -split-input-file -verify | FileCheck %s
 
 // -----