[Mlir-commits] [mlir] 9289604 - [MLIR] Use cached symbol tables in `getFuncOpsOrderedByCalls` (#141967)
llvmlistbot at llvm.org
llvmlistbot at llvm.org
Tue Jun 3 02:29:05 PDT 2025
Author: Michele Scuttari
Date: 2025-06-03T11:29:02+02:00
New Revision: 9289604cf6690faa31527055ea6238c0bbf9453a
URL: https://github.com/llvm/llvm-project/commit/9289604cf6690faa31527055ea6238c0bbf9453a
DIFF: https://github.com/llvm/llvm-project/commit/9289604cf6690faa31527055ea6238c0bbf9453a.diff
LOG: [MLIR] Use cached symbol tables in `getFuncOpsOrderedByCalls` (#141967)
Address TODO regarding the recomputation of symbol tables. The signature of the `getFuncOpsOrderedByCalls` function is modified to receive the collection of cached symbol tables.
Added:
Modified:
mlir/lib/Dialect/Bufferization/Transforms/OneShotModuleBufferize.cpp
Removed:
################################################################################
diff --git a/mlir/lib/Dialect/Bufferization/Transforms/OneShotModuleBufferize.cpp b/mlir/lib/Dialect/Bufferization/Transforms/OneShotModuleBufferize.cpp
index dee2af8271ce8..fc6424a25ac70 100644
--- a/mlir/lib/Dialect/Bufferization/Transforms/OneShotModuleBufferize.cpp
+++ b/mlir/lib/Dialect/Bufferization/Transforms/OneShotModuleBufferize.cpp
@@ -310,21 +310,19 @@ static bool hasTensorSignature(func::FuncOp funcOp) {
/// any func::CallOp.
static LogicalResult getFuncOpsOrderedByCalls(
ModuleOp moduleOp, SmallVectorImpl<func::FuncOp> &orderedFuncOps,
- SmallVectorImpl<func::FuncOp> &remainingFuncOps, FuncCallerMap &callerMap) {
+ SmallVectorImpl<func::FuncOp> &remainingFuncOps, FuncCallerMap &callerMap,
+ SymbolTableCollection &symbolTables) {
// For each FuncOp, the set of functions called by it (i.e. the union of
// symbols of all nested func::CallOp).
DenseMap<func::FuncOp, DenseSet<func::FuncOp>> calledBy;
// For each FuncOp, the number of func::CallOp it contains.
DenseMap<func::FuncOp, unsigned> numberCallOpsContainedInFuncOp;
- // TODO Avoid recomputing the symbol tables every time.
- mlir::SymbolTableCollection symbolTable;
-
for (func::FuncOp funcOp : moduleOp.getOps<func::FuncOp>()) {
// Collect function calls and populate the caller map.
numberCallOpsContainedInFuncOp[funcOp] = 0;
WalkResult res = funcOp.walk([&](func::CallOp callOp) -> WalkResult {
- func::FuncOp calledFunction = getCalledFunction(callOp, symbolTable);
+ func::FuncOp calledFunction = getCalledFunction(callOp, symbolTables);
assert(calledFunction && "could not retrieved called func::FuncOp");
// If the called function does not have any tensors in its signature, then
// it is not necessary to bufferize the callee before the caller.
@@ -458,7 +456,8 @@ mlir::bufferization::analyzeModuleOp(ModuleOp moduleOp,
FuncCallerMap callerMap;
if (failed(getFuncOpsOrderedByCalls(moduleOp, orderedFuncOps,
- remainingFuncOps, callerMap)))
+ remainingFuncOps, callerMap,
+ funcState.symbolTables)))
return failure();
// Analyze functions in order. Starting with functions that are not calling
@@ -534,7 +533,8 @@ LogicalResult mlir::bufferization::bufferizeModuleOp(
// each other recursively are bufferized in an unspecified order at the end.
// We may use unnecessarily "complex" (in terms of layout map) buffer types.
if (failed(getFuncOpsOrderedByCalls(moduleOp, orderedFuncOps,
- remainingFuncOps, callerMap)))
+ remainingFuncOps, callerMap,
+ state.getSymbolTables())))
return failure();
llvm::append_range(orderedFuncOps, remainingFuncOps);
More information about the Mlir-commits
mailing list