Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions mlir/include/mlir/Tools/mlir-opt/MlirOptMain.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ enum class VerbosityLevel {
ErrorsWarningsAndRemarks
};

using RemarkFormat = enum {
enum class RemarkFormat {
REMARK_FORMAT_STDOUT,
REMARK_FORMAT_YAML,
REMARK_FORMAT_BITSTREAM,
Expand Down Expand Up @@ -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
Expand Down
21 changes: 11 additions & 10 deletions mlir/lib/Tools/mlir-opt/MlirOptMain.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down Expand Up @@ -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();
Expand All @@ -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();
Expand Down