Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion mlir/include/mlir-c/Pass.h
Original file line number Diff line number Diff line change
Expand Up @@ -75,10 +75,13 @@ MLIR_CAPI_EXPORTED MlirLogicalResult
mlirPassManagerRunOnOp(MlirPassManager passManager, MlirOperation op);

/// Enable IR printing.
/// The treePrintingPath argument is an optional path to a directory
/// where the dumps will be produced. If it isn't provided then dumps
/// are produced to stderr.
MLIR_CAPI_EXPORTED void mlirPassManagerEnableIRPrinting(
MlirPassManager passManager, bool printBeforeAll, bool printAfterAll,
bool printModuleScope, bool printAfterOnlyOnChange,
bool printAfterOnlyOnFailure);
bool printAfterOnlyOnFailure, MlirStringRef treePrintingPath);
Comment on lines 82 to +84
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Random: I'd consider having a PassManagerPrintConfig object to make for a shorter and more stable API.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can give it a try in a subsequent PR.

Do you mean it as a C API thing? A Python API thing? Both?


/// Enable / disable verify-each.
MLIR_CAPI_EXPORTED void
Expand Down
11 changes: 9 additions & 2 deletions mlir/lib/Bindings/Python/Pass.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,21 @@ void mlir::python::populatePassManagerSubmodule(py::module &m) {
"enable_ir_printing",
[](PyPassManager &passManager, bool printBeforeAll,
bool printAfterAll, bool printModuleScope, bool printAfterChange,
bool printAfterFailure) {
bool printAfterFailure,
std::optional<std::string> optionalTreePrintingPath) {
std::string treePrintingPath = "";
if (optionalTreePrintingPath.has_value())
treePrintingPath = optionalTreePrintingPath.value();
mlirPassManagerEnableIRPrinting(
passManager.get(), printBeforeAll, printAfterAll,
printModuleScope, printAfterChange, printAfterFailure);
printModuleScope, printAfterChange, printAfterFailure,
mlirStringRefCreate(treePrintingPath.data(),
treePrintingPath.size()));
},
"print_before_all"_a = false, "print_after_all"_a = true,
"print_module_scope"_a = false, "print_after_change"_a = false,
"print_after_failure"_a = false,
"tree_printing_dir_path"_a = py::none(),
"Enable IR printing, default as mlir-print-ir-after-all.")
.def(
"enable_verifier",
Expand Down
18 changes: 13 additions & 5 deletions mlir/lib/CAPI/IR/Pass.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,25 @@ void mlirPassManagerEnableIRPrinting(MlirPassManager passManager,
bool printBeforeAll, bool printAfterAll,
bool printModuleScope,
bool printAfterOnlyOnChange,
bool printAfterOnlyOnFailure) {
bool printAfterOnlyOnFailure,
MlirStringRef treePrintingPath) {
auto shouldPrintBeforePass = [printBeforeAll](Pass *, Operation *) {
return printBeforeAll;
};
auto shouldPrintAfterPass = [printAfterAll](Pass *, Operation *) {
return printAfterAll;
};
return unwrap(passManager)
->enableIRPrinting(shouldPrintBeforePass, shouldPrintAfterPass,
printModuleScope, printAfterOnlyOnChange,
printAfterOnlyOnFailure);
if (unwrap(treePrintingPath).empty())
return unwrap(passManager)
->enableIRPrinting(shouldPrintBeforePass, shouldPrintAfterPass,
printModuleScope, printAfterOnlyOnChange,
printAfterOnlyOnFailure);

unwrap(passManager)
->enableIRPrintingToFileTree(shouldPrintBeforePass, shouldPrintAfterPass,
printModuleScope, printAfterOnlyOnChange,
printAfterOnlyOnFailure,
unwrap(treePrintingPath));
}

void mlirPassManagerEnableVerifier(MlirPassManager passManager, bool enable) {
Expand Down
44 changes: 43 additions & 1 deletion mlir/test/python/pass_manager.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# RUN: %PYTHON %s 2>&1 | FileCheck %s

import gc, sys
import gc, os, sys, tempfile
from mlir.ir import *
from mlir.passmanager import *
from mlir.dialects.func import FuncOp
Expand Down Expand Up @@ -340,3 +340,45 @@ def testPrintIrBeforeAndAfterAll():
# CHECK: }
# CHECK: }
pm.run(module)


# CHECK-LABEL: TEST: testPrintIrTree
@run
def testPrintIrTree():
with Context() as ctx:
module = ModuleOp.parse(
"""
module {
func.func @main() {
%0 = arith.constant 10
return
}
}
"""
)
pm = PassManager.parse("builtin.module(canonicalize)")
ctx.enable_multithreading(False)
pm.enable_ir_printing()
# CHECK-LABEL: // Tree printing begin
# CHECK: \-- builtin_module_no-symbol-name
# CHECK: \-- 0_canonicalize.mlir
# CHECK-LABEL: // Tree printing end
pm.run(module)
log("// Tree printing begin")
with tempfile.TemporaryDirectory() as temp_dir:
pm.enable_ir_printing(tree_printing_dir_path=temp_dir)
pm.run(module)

def print_file_tree(directory, prefix=""):
entries = sorted(os.listdir(directory))
for i, entry in enumerate(entries):
path = os.path.join(directory, entry)
connector = "\-- " if i == len(entries) - 1 else "|-- "
log(f"{prefix}{connector}{entry}")
if os.path.isdir(path):
print_file_tree(
path, prefix + (" " if i == len(entries) - 1 else "│ ")
)

print_file_tree(temp_dir)
log("// Tree printing end")
Loading