[NFC] Rename passes for stylistic consistency. (#232)

* lower-frontend -> convert-onnx-to-krnl

* lower-all-llvm -> convert-krnl-to-llvm

* lower-krnl -> convert-krnl-to-affine

* Name fix.

src/Conversion/CMakeLists.txt

@@ -1 +1,3 @@
 add_subdirectory(ONNXToKrnl)
+add_subdirectory(KrnlToLLVM)
+add_subdirectory(KrnlToAffine)

src/Conversion/KrnlToAffine/CMakeLists.txt

@@ -0,0 +1,11 @@
+add_library(OMKrnlToAffine
+        KrnlToAffine.cpp)
+target_include_directories(OMKrnlToAffine
+        PRIVATE
+        ${ONNX_MLIR_SRC_ROOT}
+        ${ONNX_MLIR_BIN_ROOT}
+        ${ONNX_MLIR_SRC_ROOT})
+# Header dependencies
+add_dependencies(OMKrnlToAffine OMKrnlOpsInc)
+# Linking dependencies
+add_dependencies(OMKrnlToAffine OMKrnlOps)

src/Conversion/KrnlToAffine/KrnlToAffine.cpp

@@ -106,15 +106,15 @@ void lowerIterateOp(KrnlIterateOp &iterateOp, OpBuilder &builder,
 }
 
 //===----------------------------------------------------------------------===//
-// KrnlToAffineLoweringPass
+// ConvertKrnlToAffinePass
 //===----------------------------------------------------------------------===//
 
 /// This is a partial lowering to affine loops of the krnl dialect operations.
 /// At this stage the dialect will contain standard operations as well like
 /// add and multiply, this pass will leave these operations intact.
 namespace {
-struct KrnlToAffineLoweringPass
+struct ConvertKrnlToAffinePass
-    : public PassWrapper<KrnlToAffineLoweringPass, FunctionPass> {
+    : public PassWrapper<ConvertKrnlToAffinePass, FunctionPass> {
   void runOnFunction() final;
 };
 } // end anonymous namespace.
@@ -211,7 +211,7 @@ LogicalResult interpretOperation(Operation *op, OpBuilder &builder,
   return success();
 }
 
-void KrnlToAffineLoweringPass::runOnFunction() {
+void ConvertKrnlToAffinePass::runOnFunction() {
   OpBuilder builder(&getContext());
   mlir::Operation *funcOp = getFunction();
 
@@ -243,6 +243,6 @@ void KrnlToAffineLoweringPass::runOnFunction() {
 }
 } // namespace
 
-std::unique_ptr<Pass> mlir::createLowerKrnlPass() {
+std::unique_ptr<Pass> mlir::createConvertKrnlToAffinePass() {
-  return std::make_unique<KrnlToAffineLoweringPass>();
+  return std::make_unique<ConvertKrnlToAffinePass>();
 }

src/Conversion/KrnlToLLVM/CMakeLists.txt

@@ -0,0 +1,15 @@
+add_library(OMKrnlToLLVM
+        KrnlToLLVM.cpp)
+target_include_directories(OMKrnlToLLVM
+        PRIVATE
+        ${ONNX_MLIR_SRC_ROOT}
+        ${ONNX_MLIR_BIN_ROOT}
+        ${ONNX_MLIR_SRC_ROOT})
+
+# Header dependencies
+add_dependencies(OMKrnlToLLVM OMKrnlOpsInc OMONNXOpsInc)
+# Linking dependencies
+add_dependencies(OMKrnlToLLVM OMKrnlOps OMONNXOps)
+
+target_link_libraries(OMKrnlToLLVM
+        onnx)

src/Conversion/KrnlToLLVM/KrnlToLLVM.cpp

@@ -865,13 +865,13 @@ private:
 //===----------------------------------------------------------------------===//
 
 namespace {
-struct KrnlToLLVMLoweringPass
+struct ConvertKrlnToLLVMPass
-    : public PassWrapper<KrnlToLLVMLoweringPass, OperationPass<ModuleOp>> {
+    : public PassWrapper<ConvertKrlnToLLVMPass, OperationPass<ModuleOp>> {
   void runOnOperation() final;
 };
 } // end anonymous namespace
 
-void KrnlToLLVMLoweringPass::runOnOperation() {
+void ConvertKrlnToLLVMPass::runOnOperation() {
   // Define the target for this lowering i.e. the LLVM dialect.
   ConversionTarget target(getContext());
   target.addLegalDialect<LLVM::LLVMDialect>();
@@ -905,6 +905,6 @@ void KrnlToLLVMLoweringPass::runOnOperation() {
 }
 
 /// Create the pass for lowering `Krnl`, `Affine` and `Std` dialects to LLVM.
-std::unique_ptr<mlir::Pass> mlir::createKrnlLowerToLLVMPass() {
+std::unique_ptr<mlir::Pass> mlir::createConvertKrnlToLLVMPass() {
-  return std::make_unique<KrnlToLLVMLoweringPass>();
+  return std::make_unique<ConvertKrlnToLLVMPass>();
 }

src/InitOMPasses.hpp

@@ -48,12 +48,13 @@ void initOMPasses() {
         return mlir::createKrnlBundleMemoryPoolsPass();
       });
 
-  mlir::registerPass(
+  mlir::registerPass("convert-krnl-to-affine", "Lower Krnl dialect.",
-      "lower-krnl", "Lower Krnl dialect.", []() -> std::unique_ptr<mlir::Pass> {
+      []() -> std::unique_ptr<mlir::Pass> {
-        return mlir::createLowerKrnlPass();
+        return mlir::createConvertKrnlToAffinePass();
       });
 
-  mlir::registerPass("lower-frontend", "Lower frontend ops to Krnl dialect.",
+  mlir::registerPass("convert-onnx-to-krnl",
+      "Lower frontend ops to Krnl dialect.",
       []() -> std::unique_ptr<mlir::Pass> {
         return mlir::createLowerToKrnlPass();
       });
@@ -64,10 +65,10 @@ void initOMPasses() {
         return mlir::createElideConstGlobalValuePass();
       });
 
-  mlir::registerPass("lower-all-llvm",
+  mlir::registerPass("convert-krnl-to-llvm",
       "Lower the Krnl Affine and Std dialects to LLVM.",
       []() -> std::unique_ptr<mlir::Pass> {
-        return mlir::createKrnlLowerToLLVMPass();
+        return mlir::createConvertKrnlToLLVMPass();
       });
 
   mlir::registerPass("pack-krnl-constants",

src/MainUtils.cpp

@@ -397,7 +397,7 @@ void addONNXToKrnlPasses(mlir::PassManager &pm) {
 }
 
 void addKrnlToAffinePasses(mlir::PassManager &pm) {
-  pm.addPass(mlir::createLowerKrnlPass());
+  pm.addPass(mlir::createConvertKrnlToAffinePass());
   // Fuse loops in Affine dialect.
   //  pm.addPass(mlir::createLoopFusionPass());
 }
@@ -405,7 +405,7 @@ void addKrnlToAffinePasses(mlir::PassManager &pm) {
 void addKrnlToLLVMPasses(mlir::PassManager &pm) {
   pm.addPass(mlir::createLowerAffinePass());
   pm.addPass(mlir::createLowerToCFGPass());
-  pm.addPass(mlir::createKrnlLowerToLLVMPass());
+  pm.addPass(mlir::createConvertKrnlToLLVMPass());
   pm.addPass(mlir::createCanonicalizerPass());
 }
 

src/Pass/Passes.hpp

@@ -38,13 +38,13 @@ std::unique_ptr<Pass> createKrnlBundleMemoryPoolsPass();
 std::unique_ptr<Pass> createLowerToKrnlPass();
 
 /// Pass for lowering frontend dialects to Krnl IR dialect.
-std::unique_ptr<Pass> createLowerKrnlPass();
+std::unique_ptr<Pass> createConvertKrnlToAffinePass();
 
 /// Pass for eliding the values of global Krnl operations.
 std::unique_ptr<Pass> createElideConstGlobalValuePass();
 
 /// Pass for lowering Krnl dialect to LLVM dialect.
-std::unique_ptr<Pass> createKrnlLowerToLLVMPass();
+std::unique_ptr<Pass> createConvertKrnlToLLVMPass();
 
 /// Pass for packing Krnl global constants.
 std::unique_ptr<Pass> createPackKrnlGlobalConstantsPass();

src/Transform/CMakeLists.txt

@@ -1,31 +1,3 @@
-add_library(OMKrnlToAffine
-        LowerKrnl.cpp)
-target_include_directories(OMKrnlToAffine
-        PRIVATE
-        ${ONNX_MLIR_SRC_ROOT}
-        ${ONNX_MLIR_BIN_ROOT}
-        ${ONNX_MLIR_SRC_ROOT})
-# Header dependencies
-add_dependencies(OMKrnlToAffine OMKrnlOpsInc)
-# Linking dependencies
-add_dependencies(OMKrnlToAffine OMKrnlOps)
-
-add_library(OMKrnlToLLVM
-        LowerToLLVM.cpp)
-target_include_directories(OMKrnlToLLVM
-        PRIVATE
-        ${ONNX_MLIR_SRC_ROOT}
-        ${ONNX_MLIR_BIN_ROOT}
-        ${ONNX_MLIR_SRC_ROOT})
-
-# Header dependencies
-add_dependencies(OMKrnlToLLVM OMKrnlOpsInc OMONNXOpsInc)
-# Linking dependencies
-add_dependencies(OMKrnlToLLVM OMKrnlOps OMONNXOps)
-
-target_link_libraries(OMKrnlToLLVM
-        onnx)
-
 add_library(OMElideKrnlGlobalConstants
         ElideKrnlGlobalConstants.cpp
         ElideKrnlGlobalConstants.hpp)

test/mlir/conversion/krnl_to_affine.mlir

@@ -1,4 +1,4 @@
-// RUN: onnx-mlir-opt --lower-krnl %s -split-input-file | FileCheck %s
+// RUN: onnx-mlir-opt --convert-krnl-to-affine %s -split-input-file | FileCheck %s
 
 func @test_lower_degenerate_iterate(%arg0: memref<f32>) -> memref<f32> {
   %0 = alloc() : memref<f32>

test/mlir/krnl/block.mlir

@@ -1,4 +1,4 @@
-// RUN: onnx-mlir-opt --lower-krnl %s -split-input-file | FileCheck %s
+// RUN: onnx-mlir-opt --convert-krnl-to-affine %s -split-input-file | FileCheck %s
 
 // CHECK-DAG: #{{.*}} = affine_map<(d0) -> (d0)>
 // CHECK-DAG: #{{.*}} = affine_map<(d0) -> (d0 + 2)>

test/mlir/krnl/constant.mlir

@@ -1,4 +1,4 @@
-// RUN: onnx-mlir-opt --shape-inference --lower-frontend --lower-krnl --lower-all-llvm %s -split-input-file | FileCheck %s
+// RUN: onnx-mlir-opt --shape-inference --convert-onnx-to-krnl --convert-krnl-to-affine --convert-krnl-to-llvm %s -split-input-file | FileCheck %s
 
 // -----
 

test/mlir/krnl/krnl_getref_lowering.mlir

@@ -1,4 +1,4 @@
-// RUN: onnx-mlir-opt --lower-krnl --lower-all-llvm %s -split-input-file | FileCheck %s
+// RUN: onnx-mlir-opt --convert-krnl-to-affine --convert-krnl-to-llvm %s -split-input-file | FileCheck %s
 
 func @test_getref_lowering(%arg0: memref<2x2xf32>) -> memref<2x2xf32> {
   %c13_i64 = constant 13 : i64

test/mlir/krnl/memory_pool.mlir

@@ -1,4 +1,4 @@
-// RUN: onnx-mlir-opt --shape-inference --lower-frontend --enable-memory-pool --lower-krnl --lower-all-llvm %s -split-input-file | FileCheck %s
+// RUN: onnx-mlir-opt --shape-inference --convert-onnx-to-krnl --enable-memory-pool --convert-krnl-to-affine --convert-krnl-to-llvm %s -split-input-file | FileCheck %s
 
 func @test_memory_pool(%arg0: tensor<10x10xf32>) -> tensor<10x10xf32> {
   %0 = "onnx.Add"(%arg0, %arg0) : (tensor<10x10xf32>, tensor<10x10xf32>) -> tensor<10x10xf32>

test/mlir/krnl/permute.mlir

@@ -1,4 +1,4 @@
-// RUN: onnx-mlir-opt --lower-krnl %s -split-input-file | FileCheck %s
+// RUN: onnx-mlir-opt --convert-krnl-to-affine %s -split-input-file | FileCheck %s
 
 func @simple_permute() {
   %ii, %jj = krnl.define_loops 2

test/mlir/krnl/reshape.mlir

@@ -1,4 +1,4 @@
-// RUN: onnx-mlir-opt --shape-inference --lower-frontend --lower-krnl --lower-all-llvm %s -split-input-file | FileCheck %s
+// RUN: onnx-mlir-opt --shape-inference --convert-onnx-to-krnl --convert-krnl-to-affine --convert-krnl-to-llvm %s -split-input-file | FileCheck %s
 
 // -----
 

test/mlir/krnl/unroll.mlir

@@ -1,4 +1,4 @@
-// RUN: onnx-mlir-opt --lower-krnl %s -split-input-file | FileCheck %s
+// RUN: onnx-mlir-opt --convert-krnl-to-affine %s -split-input-file | FileCheck %s
 
 func @simple_unroll() {
   %ii = krnl.define_loops 1

test/mlir/onnx/onnx_bundle_memory_pool.mlir

@@ -1,4 +1,4 @@
-// RUN: onnx-mlir-opt --shape-inference --lower-frontend --enable-memory-pool --bundle-memory-pools --canonicalize %s -split-input-file | FileCheck %s
+// RUN: onnx-mlir-opt --shape-inference --convert-onnx-to-krnl --enable-memory-pool --bundle-memory-pools --canonicalize %s -split-input-file | FileCheck %s
 
 func @test_bundle_memory_pool(%arg0: tensor<10x10xf32>, %arg1: tensor<10x20xf32>) -> tensor<10x20xf32> {
   %0 = "onnx.Add"(%arg0, %arg0) : (tensor<10x10xf32>, tensor<10x10xf32>) -> tensor<10x10xf32>

test/mlir/onnx/onnx_enable_memory_pool.mlir

@@ -1,4 +1,4 @@
-// RUN: onnx-mlir-opt --shape-inference --lower-frontend --enable-memory-pool %s -split-input-file | FileCheck %s
+// RUN: onnx-mlir-opt --shape-inference --convert-onnx-to-krnl --enable-memory-pool %s -split-input-file | FileCheck %s
 
 /// One intermediate value to allocate in the memory pool.
 func @test_enable_memory_pool(%arg0: tensor<10x10xf32>) -> tensor<10x10xf32> {

test/mlir/onnx/onnx_lowering.mlir

@@ -1,4 +1,4 @@
-// RUN: onnx-mlir-opt --shape-inference --lower-frontend %s -split-input-file | FileCheck %s
+// RUN: onnx-mlir-opt --shape-inference --convert-onnx-to-krnl %s -split-input-file | FileCheck %s
 
 // ----
 

test/mlir/onnx/onnx_lowering_with_dealloc.mlir

@@ -1,4 +1,4 @@
-// RUN: onnx-mlir-opt --shape-inference --lower-frontend %s -split-input-file | FileCheck %s
+// RUN: onnx-mlir-opt --shape-inference --convert-onnx-to-krnl %s -split-input-file | FileCheck %s
 
 // -----