[mlir:bufferization] Make LayoutMapOption CL args enums.
#132121
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This PR changes the type of the command-line arguments representing `LayoutMapOption` from `std::string` to the enum with the same name. This allows for checking the values of programmable usages of the corresponding options at compile time.
Member
|
@llvm/pr-subscribers-mlir-bufferization Author: Ingo Müller (ingomueller-net) ChangesThis PR changes the type of the command-line arguments representing Full diff: https://github.com/llvm/llvm-project/pull/132121.diff 3 Files Affected:
diff --git a/mlir/include/mlir/Dialect/Bufferization/Transforms/Passes.h b/mlir/include/mlir/Dialect/Bufferization/Transforms/Passes.h
index 493180cd54e5b..a8cc37a103f04 100644
--- a/mlir/include/mlir/Dialect/Bufferization/Transforms/Passes.h
+++ b/mlir/include/mlir/Dialect/Bufferization/Transforms/Passes.h
@@ -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"
diff --git a/mlir/include/mlir/Dialect/Bufferization/Transforms/Passes.td b/mlir/include/mlir/Dialect/Bufferization/Transforms/Passes.td
index 3bbb8b02c644e..f53f569070f09 100644
--- a/mlir/include/mlir/Dialect/Bufferization/Transforms/Passes.td
+++ b/mlir/include/mlir/Dialect/Bufferization/Transforms/Passes.td
@@ -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 = [{
@@ -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 "
@@ -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.">,
diff --git a/mlir/lib/Dialect/Bufferization/Transforms/Bufferize.cpp b/mlir/lib/Dialect/Bufferization/Transforms/Bufferize.cpp
index c0e3fca428376..e97b34b20ff72 100644
--- a/mlir/lib/Dialect/Bufferization/Transforms/Bufferize.cpp
+++ b/mlir/lib/Dialect/Bufferization/Transforms/Bufferize.cpp
@@ -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")
@@ -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())
@@ -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 "
|
Member
|
@llvm/pr-subscribers-mlir Author: Ingo Müller (ingomueller-net) ChangesThis PR changes the type of the command-line arguments representing Full diff: https://github.com/llvm/llvm-project/pull/132121.diff 3 Files Affected:
diff --git a/mlir/include/mlir/Dialect/Bufferization/Transforms/Passes.h b/mlir/include/mlir/Dialect/Bufferization/Transforms/Passes.h
index 493180cd54e5b..a8cc37a103f04 100644
--- a/mlir/include/mlir/Dialect/Bufferization/Transforms/Passes.h
+++ b/mlir/include/mlir/Dialect/Bufferization/Transforms/Passes.h
@@ -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"
diff --git a/mlir/include/mlir/Dialect/Bufferization/Transforms/Passes.td b/mlir/include/mlir/Dialect/Bufferization/Transforms/Passes.td
index 3bbb8b02c644e..f53f569070f09 100644
--- a/mlir/include/mlir/Dialect/Bufferization/Transforms/Passes.td
+++ b/mlir/include/mlir/Dialect/Bufferization/Transforms/Passes.td
@@ -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 = [{
@@ -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 "
@@ -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.">,
diff --git a/mlir/lib/Dialect/Bufferization/Transforms/Bufferize.cpp b/mlir/lib/Dialect/Bufferization/Transforms/Bufferize.cpp
index c0e3fca428376..e97b34b20ff72 100644
--- a/mlir/lib/Dialect/Bufferization/Transforms/Bufferize.cpp
+++ b/mlir/lib/Dialect/Bufferization/Transforms/Bufferize.cpp
@@ -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")
@@ -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())
@@ -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 "
|
Contributor
Author
|
I believe that this has been suggested here. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR changes the type of the command-line arguments representing
LayoutMapOptionfromstd::stringto the enum with the same name. This allows for checking the values of programmable usages of the corresponding options at compile time.