Skip to content

Commit 7936b6f

Browse files
authored
[MLIR] Turn RemarkFormat into an enum class (NFC) (#158733)
This is fixing a gcc warning and aligning with the other enums in the file.
1 parent eb624dc commit 7936b6f

File tree

2 files changed

+13
-12
lines changed

2 files changed

+13
-12
lines changed

mlir/include/mlir/Tools/mlir-opt/MlirOptMain.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ enum class VerbosityLevel {
3838
ErrorsWarningsAndRemarks
3939
};
4040

41-
using RemarkFormat = enum {
41+
enum class RemarkFormat {
4242
REMARK_FORMAT_STDOUT,
4343
REMARK_FORMAT_YAML,
4444
REMARK_FORMAT_BITSTREAM,
@@ -264,7 +264,7 @@ class MlirOptMainConfig {
264264
bool allowUnregisteredDialectsFlag = false;
265265

266266
/// Remark format
267-
RemarkFormat remarkFormatFlag = REMARK_FORMAT_STDOUT;
267+
RemarkFormat remarkFormatFlag = RemarkFormat::REMARK_FORMAT_STDOUT;
268268
/// Remark file to output to
269269
std::string remarksOutputFileFlag = "";
270270
/// Remark filters

mlir/lib/Tools/mlir-opt/MlirOptMain.cpp

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -216,13 +216,14 @@ struct MlirOptMainConfigCLOptions : public MlirOptMainConfig {
216216
llvm::cl::desc("Specify the format for remark output."),
217217
cl::location(remarkFormatFlag),
218218
llvm::cl::value_desc("format"),
219-
llvm::cl::init(REMARK_FORMAT_STDOUT),
220-
llvm::cl::values(
221-
clEnumValN(REMARK_FORMAT_STDOUT, "emitRemark",
222-
"Print as emitRemark to command-line"),
223-
clEnumValN(REMARK_FORMAT_YAML, "yaml", "Print yaml file"),
224-
clEnumValN(REMARK_FORMAT_BITSTREAM, "bitstream",
225-
"Print bitstream file")),
219+
llvm::cl::init(RemarkFormat::REMARK_FORMAT_STDOUT),
220+
llvm::cl::values(clEnumValN(RemarkFormat::REMARK_FORMAT_STDOUT,
221+
"emitRemark",
222+
"Print as emitRemark to command-line"),
223+
clEnumValN(RemarkFormat::REMARK_FORMAT_YAML, "yaml",
224+
"Print yaml file"),
225+
clEnumValN(RemarkFormat::REMARK_FORMAT_BITSTREAM,
226+
"bitstream", "Print bitstream file")),
226227
llvm::cl::cat(remarkCategory)};
227228

228229
static cl::opt<std::string, /*ExternalStorage=*/true> remarksAll(
@@ -525,13 +526,13 @@ performActions(raw_ostream &os,
525526
mlir::MLIRContext &ctx = *context;
526527

527528
switch (config.getRemarkFormat()) {
528-
case REMARK_FORMAT_STDOUT:
529+
case RemarkFormat::REMARK_FORMAT_STDOUT:
529530
if (failed(mlir::remark::enableOptimizationRemarks(
530531
ctx, nullptr, cats, true /*printAsEmitRemarks*/)))
531532
return failure();
532533
break;
533534

534-
case REMARK_FORMAT_YAML: {
535+
case RemarkFormat::REMARK_FORMAT_YAML: {
535536
std::string file = config.getRemarksOutputFile().empty()
536537
? "mlir-remarks.yaml"
537538
: config.getRemarksOutputFile();
@@ -541,7 +542,7 @@ performActions(raw_ostream &os,
541542
break;
542543
}
543544

544-
case REMARK_FORMAT_BITSTREAM: {
545+
case RemarkFormat::REMARK_FORMAT_BITSTREAM: {
545546
std::string file = config.getRemarksOutputFile().empty()
546547
? "mlir-remarks.bitstream"
547548
: config.getRemarksOutputFile();

0 commit comments

Comments
 (0)