[MLIR] Turn RemarkFormat into an enum class (NFC)
#158733
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 is fixing a gcc warning and aligning with the other enums in the file.
|
@llvm/pr-subscribers-mlir Author: Mehdi Amini (joker-eph) ChangesThis is fixing a gcc warning and aligning with the other enums in the file. Full diff: https://github.com/llvm/llvm-project/pull/158733.diff 2 Files Affected:
diff --git a/mlir/include/mlir/Tools/mlir-opt/MlirOptMain.h b/mlir/include/mlir/Tools/mlir-opt/MlirOptMain.h
index 7b83f10573645..0fbe15fa2e0db 100644
--- a/mlir/include/mlir/Tools/mlir-opt/MlirOptMain.h
+++ b/mlir/include/mlir/Tools/mlir-opt/MlirOptMain.h
@@ -38,7 +38,7 @@ enum class VerbosityLevel {
ErrorsWarningsAndRemarks
};
-using RemarkFormat = enum {
+enum class RemarkFormat {
REMARK_FORMAT_STDOUT,
REMARK_FORMAT_YAML,
REMARK_FORMAT_BITSTREAM,
@@ -264,7 +264,7 @@ class MlirOptMainConfig {
bool allowUnregisteredDialectsFlag = false;
/// Remark format
- RemarkFormat remarkFormatFlag = REMARK_FORMAT_STDOUT;
+ RemarkFormat remarkFormatFlag = RemarkFormat::REMARK_FORMAT_STDOUT;
/// Remark file to output to
std::string remarksOutputFileFlag = "";
/// Remark filters
diff --git a/mlir/lib/Tools/mlir-opt/MlirOptMain.cpp b/mlir/lib/Tools/mlir-opt/MlirOptMain.cpp
index 4f3b2eda7e69b..30fd384f3977c 100644
--- a/mlir/lib/Tools/mlir-opt/MlirOptMain.cpp
+++ b/mlir/lib/Tools/mlir-opt/MlirOptMain.cpp
@@ -216,13 +216,14 @@ struct MlirOptMainConfigCLOptions : public MlirOptMainConfig {
llvm::cl::desc("Specify the format for remark output."),
cl::location(remarkFormatFlag),
llvm::cl::value_desc("format"),
- llvm::cl::init(REMARK_FORMAT_STDOUT),
- llvm::cl::values(
- clEnumValN(REMARK_FORMAT_STDOUT, "emitRemark",
- "Print as emitRemark to command-line"),
- clEnumValN(REMARK_FORMAT_YAML, "yaml", "Print yaml file"),
- clEnumValN(REMARK_FORMAT_BITSTREAM, "bitstream",
- "Print bitstream file")),
+ llvm::cl::init(RemarkFormat::REMARK_FORMAT_STDOUT),
+ llvm::cl::values(clEnumValN(RemarkFormat::REMARK_FORMAT_STDOUT,
+ "emitRemark",
+ "Print as emitRemark to command-line"),
+ clEnumValN(RemarkFormat::REMARK_FORMAT_YAML, "yaml",
+ "Print yaml file"),
+ clEnumValN(RemarkFormat::REMARK_FORMAT_BITSTREAM,
+ "bitstream", "Print bitstream file")),
llvm::cl::cat(remarkCategory)};
static cl::opt<std::string, /*ExternalStorage=*/true> remarksAll(
@@ -525,13 +526,13 @@ performActions(raw_ostream &os,
mlir::MLIRContext &ctx = *context;
switch (config.getRemarkFormat()) {
- case REMARK_FORMAT_STDOUT:
+ case RemarkFormat::REMARK_FORMAT_STDOUT:
if (failed(mlir::remark::enableOptimizationRemarks(
ctx, nullptr, cats, true /*printAsEmitRemarks*/)))
return failure();
break;
- case REMARK_FORMAT_YAML: {
+ case RemarkFormat::REMARK_FORMAT_YAML: {
std::string file = config.getRemarksOutputFile().empty()
? "mlir-remarks.yaml"
: config.getRemarksOutputFile();
@@ -541,7 +542,7 @@ performActions(raw_ostream &os,
break;
}
- case REMARK_FORMAT_BITSTREAM: {
+ case RemarkFormat::REMARK_FORMAT_BITSTREAM: {
std::string file = config.getRemarksOutputFile().empty()
? "mlir-remarks.bitstream"
: config.getRemarksOutputFile();
|
|
@llvm/pr-subscribers-mlir-core Author: Mehdi Amini (joker-eph) ChangesThis is fixing a gcc warning and aligning with the other enums in the file. Full diff: https://github.com/llvm/llvm-project/pull/158733.diff 2 Files Affected:
diff --git a/mlir/include/mlir/Tools/mlir-opt/MlirOptMain.h b/mlir/include/mlir/Tools/mlir-opt/MlirOptMain.h
index 7b83f10573645..0fbe15fa2e0db 100644
--- a/mlir/include/mlir/Tools/mlir-opt/MlirOptMain.h
+++ b/mlir/include/mlir/Tools/mlir-opt/MlirOptMain.h
@@ -38,7 +38,7 @@ enum class VerbosityLevel {
ErrorsWarningsAndRemarks
};
-using RemarkFormat = enum {
+enum class RemarkFormat {
REMARK_FORMAT_STDOUT,
REMARK_FORMAT_YAML,
REMARK_FORMAT_BITSTREAM,
@@ -264,7 +264,7 @@ class MlirOptMainConfig {
bool allowUnregisteredDialectsFlag = false;
/// Remark format
- RemarkFormat remarkFormatFlag = REMARK_FORMAT_STDOUT;
+ RemarkFormat remarkFormatFlag = RemarkFormat::REMARK_FORMAT_STDOUT;
/// Remark file to output to
std::string remarksOutputFileFlag = "";
/// Remark filters
diff --git a/mlir/lib/Tools/mlir-opt/MlirOptMain.cpp b/mlir/lib/Tools/mlir-opt/MlirOptMain.cpp
index 4f3b2eda7e69b..30fd384f3977c 100644
--- a/mlir/lib/Tools/mlir-opt/MlirOptMain.cpp
+++ b/mlir/lib/Tools/mlir-opt/MlirOptMain.cpp
@@ -216,13 +216,14 @@ struct MlirOptMainConfigCLOptions : public MlirOptMainConfig {
llvm::cl::desc("Specify the format for remark output."),
cl::location(remarkFormatFlag),
llvm::cl::value_desc("format"),
- llvm::cl::init(REMARK_FORMAT_STDOUT),
- llvm::cl::values(
- clEnumValN(REMARK_FORMAT_STDOUT, "emitRemark",
- "Print as emitRemark to command-line"),
- clEnumValN(REMARK_FORMAT_YAML, "yaml", "Print yaml file"),
- clEnumValN(REMARK_FORMAT_BITSTREAM, "bitstream",
- "Print bitstream file")),
+ llvm::cl::init(RemarkFormat::REMARK_FORMAT_STDOUT),
+ llvm::cl::values(clEnumValN(RemarkFormat::REMARK_FORMAT_STDOUT,
+ "emitRemark",
+ "Print as emitRemark to command-line"),
+ clEnumValN(RemarkFormat::REMARK_FORMAT_YAML, "yaml",
+ "Print yaml file"),
+ clEnumValN(RemarkFormat::REMARK_FORMAT_BITSTREAM,
+ "bitstream", "Print bitstream file")),
llvm::cl::cat(remarkCategory)};
static cl::opt<std::string, /*ExternalStorage=*/true> remarksAll(
@@ -525,13 +526,13 @@ performActions(raw_ostream &os,
mlir::MLIRContext &ctx = *context;
switch (config.getRemarkFormat()) {
- case REMARK_FORMAT_STDOUT:
+ case RemarkFormat::REMARK_FORMAT_STDOUT:
if (failed(mlir::remark::enableOptimizationRemarks(
ctx, nullptr, cats, true /*printAsEmitRemarks*/)))
return failure();
break;
- case REMARK_FORMAT_YAML: {
+ case RemarkFormat::REMARK_FORMAT_YAML: {
std::string file = config.getRemarksOutputFile().empty()
? "mlir-remarks.yaml"
: config.getRemarksOutputFile();
@@ -541,7 +542,7 @@ performActions(raw_ostream &os,
break;
}
- case REMARK_FORMAT_BITSTREAM: {
+ case RemarkFormat::REMARK_FORMAT_BITSTREAM: {
std::string file = config.getRemarksOutputFile().empty()
? "mlir-remarks.bitstream"
: config.getRemarksOutputFile();
|
grypp
approved these changes
Sep 16, 2025
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 is fixing a gcc warning and aligning with the other enums in the file.