Skip to content

[mlir:bufferization] Make LayoutMapOption CL args enums. #132121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 20, 2025
Merged

[mlir:bufferization] Make LayoutMapOption CL args enums. #132121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions mlir/include/mlir/Dialect/Bufferization/Transforms/Passes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
#define MLIR_DIALECT_BUFFERIZATION_TRANSFORMS_PASSES_H

#include "mlir/Dialect/Bufferization/IR/BufferDeallocationOpInterface.h"
#include "mlir/Dialect/Bufferization/IR/BufferizableOpInterface.h"
#include "mlir/Dialect/MemRef/IR/MemRef.h"
#include "mlir/Pass/Pass.h"

Expand Down
23 changes: 17 additions & 6 deletions mlir/include/mlir/Dialect/Bufferization/Transforms/Passes.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,6 +284,15 @@ def EmptyTensorToAllocTensorPass : Pass<"empty-tensor-to-alloc-tensor"> {
let dependentDialects = ["tensor::TensorDialect"];
}

def layoutMapClValues {
string values = [{
::llvm::cl::values(
clEnumValN(LayoutMapOption::InferLayoutMap, "infer-layout-map", ""),
clEnumValN(LayoutMapOption::IdentityLayoutMap, "identity-layout-map", ""),
clEnumValN(LayoutMapOption::FullyDynamicLayoutMap, "fully-dynamic-layout-map", "")
)}];
}

def OneShotBufferizePass : Pass<"one-shot-bufferize", "ModuleOp"> {
let summary = "One-Shot Bufferize";
let description = [{
Expand Down Expand Up @@ -424,9 +433,10 @@ def OneShotBufferizePass : Pass<"one-shot-bufferize", "ModuleOp"> {
"Skip analysis of functions with these symbol names."
"Set copyBeforeWrite to true when bufferizing them.">,
Option<"functionBoundaryTypeConversion",
"function-boundary-type-conversion", "std::string",
/*default=*/"\"infer-layout-map\"",
"Controls layout maps when bufferizing function signatures.">,
"function-boundary-type-conversion", "LayoutMapOption",
/*default=*/"LayoutMapOption::InferLayoutMap",
"Controls layout maps when bufferizing function signatures.",
layoutMapClValues.values>,
Option<"mustInferMemorySpace", "must-infer-memory-space", "bool",
/*default=*/"false",
"The memory space of an memref types must always be inferred. If "
Expand All @@ -444,9 +454,10 @@ def OneShotBufferizePass : Pass<"one-shot-bufferize", "ModuleOp"> {
/*default=*/"false",
"Test only: Annotate IR with RaW conflicts. Requires "
"test-analysis-only.">,
Option<"unknownTypeConversion", "unknown-type-conversion", "std::string",
/*default=*/"\"fully-dynamic-layout-map\"",
"Controls layout maps for non-inferrable memref types.">,
Option<"unknownTypeConversion", "unknown-type-conversion", "LayoutMapOption",
/*default=*/"LayoutMapOption::FullyDynamicLayoutMap",
"Controls layout maps for non-inferrable memref types.",
layoutMapClValues.values>,
Option<"bufferAlignment", "buffer-alignment", "uint64_t",
/*default=*/"64",
"Sets the alignment of newly allocated buffers.">,
Expand Down
16 changes: 2 additions & 14 deletions mlir/lib/Dialect/Bufferization/Transforms/Bufferize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,6 @@ using namespace mlir::bufferization;

namespace {

static LayoutMapOption parseLayoutMapOption(const std::string &s) {
if (s == "fully-dynamic-layout-map")
return LayoutMapOption::FullyDynamicLayoutMap;
if (s == "identity-layout-map")
return LayoutMapOption::IdentityLayoutMap;
if (s == "infer-layout-map")
return LayoutMapOption::InferLayoutMap;
llvm_unreachable("invalid layout map option");
}

static OneShotBufferizationOptions::AnalysisHeuristic
parseHeuristicOption(const std::string &s) {
if (s == "bottom-up")
Expand Down Expand Up @@ -83,8 +73,7 @@ struct OneShotBufferizePass
opt.analysisHeuristic = parseHeuristicOption(analysisHeuristic);
opt.copyBeforeWrite = copyBeforeWrite;
opt.dumpAliasSets = dumpAliasSets;
opt.setFunctionBoundaryTypeConversion(
parseLayoutMapOption(functionBoundaryTypeConversion));
opt.setFunctionBoundaryTypeConversion(functionBoundaryTypeConversion);

if (mustInferMemorySpace && useEncodingForMemorySpace) {
emitError(getOperation()->getLoc())
Expand Down Expand Up @@ -118,8 +107,7 @@ struct OneShotBufferizePass
opt.noAnalysisFuncFilter = noAnalysisFuncFilter;

// Configure type converter.
LayoutMapOption unknownTypeConversionOption =
parseLayoutMapOption(unknownTypeConversion);
LayoutMapOption unknownTypeConversionOption = unknownTypeConversion;
if (unknownTypeConversionOption == LayoutMapOption::InferLayoutMap) {
emitError(UnknownLoc::get(&getContext()),
"Invalid option: 'infer-layout-map' is not a valid value for "
Expand Down