rename mlir.passmanager.Pass to mlir.passes.Pass

Author: PragmaTwice

mlir/lib/Bindings/Python/MainModule.cpp

@@ -136,8 +136,10 @@ NB_MODULE(_mlir, m) {
   populateRewriteSubmodule(rewriteModule);
 
   // Define and populate PassManager submodule.
-  auto passModule =
+  auto passManagerModule =
       m.def_submodule("passmanager", "MLIR Pass Management Bindings");
-  populatePassManagerSubmodule(passModule);
-  populatePassSubmodule(passModule);
+  populatePassManagerSubmodule(passManagerModule);
+  auto passesModule =
+      m.def_submodule("passes", "MLIR Pass Infrastructure Bindings");
+  populatePassSubmodule(passesModule);
 }

mlir/lib/Bindings/Python/Pass.cpp

@@ -26,7 +26,7 @@ namespace {
 // A base class for defining passes in Python
 // Users are expected to subclass this and implement the `run` method, e.g.
 // ```
-// class MyPass(mlir.passmanager.Pass):
+// class MyPass(Pass):
 //   def __init__(self):
 //     super().__init__("MyPass", ..)
 //     # other init stuff..

mlir/python/CMakeLists.txt

@@ -20,6 +20,7 @@ declare_mlir_python_sources(MLIRPythonSources.Core.Python
   SOURCES
     _mlir_libs/__init__.py
     ir.py
+    passes.py
     passmanager.py
     rewrite.py
     dialects/_ods_common.py

mlir/python/mlir/passes.py

@@ -0,0 +1,5 @@
+#  Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+#  See https://llvm.org/LICENSE.txt for license information.
+#  SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+from ._mlir_libs._mlir.passes import *

mlir/test/python/pass.py

@@ -3,6 +3,7 @@
 import gc, sys
 from mlir.ir import *
 from mlir.passmanager import *
+from mlir.passes import *
 from mlir.dialects.builtin import ModuleOp
 from mlir.dialects import pdl
 from mlir.rewrite import *
@@ -51,13 +52,13 @@ def rew():
 def testCustomPass():
     with Context():
         pdl_module = make_pdl_module()
+        frozen = PDLModule(pdl_module).freeze()
 
         class CustomPass(Pass):
             def __init__(self):
                 super().__init__("CustomPass", op_name="builtin.module")
 
             def run(self, m):
-                frozen = PDLModule(pdl_module).freeze()
                 apply_patterns_and_fold_greedily_with_op(m, frozen)
 
         module = ModuleOp.parse(