11 files changed, 25 insertions, 21 deletions
diff --git a/mlir/lib/Transforms/DmaGeneration.cpp b/mlir/lib/Transforms/DmaGeneration.cpp
index c70b218e36d..f58905353ef 100644
--- a/mlir/lib/Transforms/DmaGeneration.cpp
+++ b/mlir/lib/Transforms/DmaGeneration.cpp
@@ -34,7 +34,7 @@
 #include "llvm/Support/Debug.h"
 #include <algorithm>
 
-#define DEBUG_TYPE "dma-generate"
+#define DEBUG_TYPE "affine-dma-generate"
 
 using namespace mlir;
 using llvm::SmallMapVector;
@@ -773,4 +773,4 @@ void DmaGeneration::runOnFunction() {
 }
 
 static PassRegistration<DmaGeneration>
-    pass("dma-generate", "Generate DMAs for memory operations");
+    pass("affine-dma-generate", "Generate DMAs for memory operations");
diff --git a/mlir/lib/Transforms/LoopFusion.cpp b/mlir/lib/Transforms/LoopFusion.cpp
index a69836c8653..f8db53a3216 100644
--- a/mlir/lib/Transforms/LoopFusion.cpp
+++ b/mlir/lib/Transforms/LoopFusion.cpp
@@ -41,7 +41,7 @@
 #include <iomanip>
 #include <sstream>
 
-#define DEBUG_TYPE "loop-fusion"
+#define DEBUG_TYPE "affine-loop-fusion"
 
 using llvm::SetVector;
 
@@ -2271,4 +2271,5 @@ void LoopFusion::runOnFunction() {
         .run();
 }
 
-static PassRegistration<LoopFusion> pass("loop-fusion", "Fuse loop nests");
+static PassRegistration<LoopFusion> pass("affine-loop-fusion",
+                                         "Fuse loop nests");
diff --git a/mlir/lib/Transforms/LoopInvariantCodeMotion.cpp b/mlir/lib/Transforms/LoopInvariantCodeMotion.cpp
index 13e9cda2407..b03a3c70a17 100644
--- a/mlir/lib/Transforms/LoopInvariantCodeMotion.cpp
+++ b/mlir/lib/Transforms/LoopInvariantCodeMotion.cpp
@@ -126,5 +126,5 @@ void LoopInvariantCodeMotion::runOnFunction() {
 }
 
 static PassRegistration<LoopInvariantCodeMotion>
-    pass("loop-invariant-code-motion",
+    pass("affine-loop-invariant-code-motion",
          "Hoist loop invariant instructions outside of the loop");
diff --git a/mlir/lib/Transforms/LoopTiling.cpp b/mlir/lib/Transforms/LoopTiling.cpp
index 11f2468b1a9..4eb1ce22008 100644
--- a/mlir/lib/Transforms/LoopTiling.cpp
+++ b/mlir/lib/Transforms/LoopTiling.cpp
@@ -36,7 +36,7 @@
 
 using namespace mlir;
 
-#define DEBUG_TYPE "loop-tile"
+#define DEBUG_TYPE "affine-loop-tile"
 
 static llvm::cl::OptionCategory clOptionsCategory(DEBUG_TYPE " options");
 
@@ -413,4 +413,4 @@ void LoopTiling::runOnFunction() {
 constexpr unsigned LoopTiling::kDefaultTileSize;
 constexpr uint64_t LoopTiling::kDefaultCacheMemCapacity;
 
-static PassRegistration<LoopTiling> pass("loop-tile", "Tile loop nests");
+static PassRegistration<LoopTiling> pass("affine-loop-tile", "Tile loop nests");
diff --git a/mlir/lib/Transforms/LoopUnroll.cpp b/mlir/lib/Transforms/LoopUnroll.cpp
index 1e92ebec655..236ef81ebd2 100644
--- a/mlir/lib/Transforms/LoopUnroll.cpp
+++ b/mlir/lib/Transforms/LoopUnroll.cpp
@@ -34,7 +34,7 @@
 
 using namespace mlir;
 
-#define DEBUG_TYPE "loop-unroll"
+#define DEBUG_TYPE "affine-loop-unroll"
 
 static llvm::cl::OptionCategory clOptionsCategory(DEBUG_TYPE " options");
 
@@ -188,4 +188,4 @@ FunctionPassBase *mlir::createLoopUnrollPass(
       unrollFull == -1 ? None : Optional<bool>(unrollFull), getUnrollFactor);
 }
 
-static PassRegistration<LoopUnroll> pass("loop-unroll", "Unroll loops");
+static PassRegistration<LoopUnroll> pass("affine-loop-unroll", "Unroll loops");
diff --git a/mlir/lib/Transforms/LoopUnrollAndJam.cpp b/mlir/lib/Transforms/LoopUnrollAndJam.cpp
index a3a24f6c0f7..366a7ede5eb 100644
--- a/mlir/lib/Transforms/LoopUnrollAndJam.cpp
+++ b/mlir/lib/Transforms/LoopUnrollAndJam.cpp
@@ -56,7 +56,7 @@
 
 using namespace mlir;
 
-#define DEBUG_TYPE "loop-unroll-jam"
+#define DEBUG_TYPE "affine-loop-unroll-jam"
 
 static llvm::cl::OptionCategory clOptionsCategory(DEBUG_TYPE " options");
 
@@ -240,5 +240,5 @@ LogicalResult mlir::loopUnrollJamByFactor(AffineForOp forOp,
   return success();
 }
 
-static PassRegistration<LoopUnrollAndJam> pass("loop-unroll-jam",
+static PassRegistration<LoopUnrollAndJam> pass("affine-loop-unroll-jam",
                                                "Unroll and jam loops");
diff --git a/mlir/lib/Transforms/LowerVectorTransfers.cpp b/mlir/lib/Transforms/LowerVectorTransfers.cpp
index a1048b763e0..f0990e47313 100644
--- a/mlir/lib/Transforms/LowerVectorTransfers.cpp
+++ b/mlir/lib/Transforms/LowerVectorTransfers.cpp
@@ -85,7 +85,7 @@
 
 using namespace mlir;
 
-#define DEBUG_TYPE "lower-vector-transfers"
+#define DEBUG_TYPE "affine-lower-vector-transfers"
 
 namespace {
 
@@ -380,5 +380,6 @@ FunctionPassBase *mlir::createLowerVectorTransfersPass() {
 }
 
 static PassRegistration<LowerVectorTransfersPass>
-    pass("lower-vector-transfers", "Materializes vector transfer ops to a "
-                                   "proper abstraction for the hardware");
+    pass("affine-lower-vector-transfers",
+         "Materializes vector transfer ops to a "
+         "proper abstraction for the hardware");
diff --git a/mlir/lib/Transforms/MaterializeVectors.cpp b/mlir/lib/Transforms/MaterializeVectors.cpp
index 76dbdafb08d..2f06a9aa3bf 100644
--- a/mlir/lib/Transforms/MaterializeVectors.cpp
+++ b/mlir/lib/Transforms/MaterializeVectors.cpp
@@ -772,7 +772,8 @@ mlir::createMaterializeVectorsPass(llvm::ArrayRef<int64_t> vectorSize) {
 }
 
 static PassRegistration<MaterializeVectorsPass>
-    pass("materialize-vectors", "Materializes super-vectors to vectors of the "
-                                "proper size for the hardware");
+    pass("affine-materialize-vectors",
+         "Materializes super-vectors to vectors of the "
+         "proper size for the hardware");
 
 #undef DEBUG_TYPE
diff --git a/mlir/lib/Transforms/PipelineDataTransfer.cpp b/mlir/lib/Transforms/PipelineDataTransfer.cpp
index 0ad24e6a711..66fbf4a1306 100644
--- a/mlir/lib/Transforms/PipelineDataTransfer.cpp
+++ b/mlir/lib/Transforms/PipelineDataTransfer.cpp
@@ -32,7 +32,7 @@
 #include "mlir/Transforms/Utils.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/Support/Debug.h"
-#define DEBUG_TYPE "pipeline-data-transfer"
+#define DEBUG_TYPE "affine-pipeline-data-transfer"
 
 using namespace mlir;
 
@@ -379,6 +379,6 @@ void PipelineDataTransfer::runOnAffineForOp(AffineForOp forOp) {
 }
 
 static PassRegistration<PipelineDataTransfer> pass(
-    "pipeline-data-transfer",
+    "affine-pipeline-data-transfer",
     "Pipeline non-blocking data transfers between explicitly managed levels of "
     "the memory hierarchy");
diff --git a/mlir/lib/Transforms/Vectorization/VectorizerTestPass.cpp b/mlir/lib/Transforms/Vectorization/VectorizerTestPass.cpp
index b8640f05590..ecb391c1dbc 100644
--- a/mlir/lib/Transforms/Vectorization/VectorizerTestPass.cpp
+++ b/mlir/lib/Transforms/Vectorization/VectorizerTestPass.cpp
@@ -36,7 +36,7 @@
 #include "llvm/Support/CommandLine.h"
 #include "llvm/Support/Debug.h"
 
-#define DEBUG_TYPE "vectorizer-test"
+#define DEBUG_TYPE "affine-vectorizer-test"
 
 using namespace mlir;
 
@@ -306,6 +306,7 @@ FunctionPassBase *mlir::createVectorizerTestPass() {
 }
 
 static PassRegistration<VectorizerTestPass>
-    pass("vectorizer-test", "Tests vectorizer standalone functionality.");
+    pass("affine-vectorizer-test",
+         "Tests vectorizer standalone functionality.");
 
 #undef DEBUG_TYPE
diff --git a/mlir/lib/Transforms/Vectorize.cpp b/mlir/lib/Transforms/Vectorize.cpp
index d36dca8eca9..e135e95f30a 100644
--- a/mlir/lib/Transforms/Vectorize.cpp
+++ b/mlir/lib/Transforms/Vectorize.cpp
@@ -1262,5 +1262,5 @@ mlir::createVectorizePass(llvm::ArrayRef<int64_t> virtualVectorSize) {
 }
 
 static PassRegistration<Vectorize>
-    pass("vectorize",
+    pass("affine-vectorize",
          "Vectorize to a target independent n-D vector abstraction");