commit dd88044c3dbe36c412395238eb88cc05359bf541
author Mehdi Amini <joker.eph@gmail.com> Tue Sep 16 12:34:43 2025 +0200
committer Copybara-Service <copybara-worker@google.com> Tue Sep 16 03:35:48 2025 -0700
tree e9c3423fb37f0e569a93c795bb2318ddffd054a0
parent 018c61f146b448b2a1f096e8fe80e74e82b532c2

[MLIR] Turn `RemarkFormat` into an enum class (NFC) (#158733)

This is fixing a gcc warning and aligning with the other enums in the
file.

GitOrigin-RevId: 7936b6f1133516c427c478104606d9276da6f81b

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

diff --git a/include/mlir/Tools/mlir-opt/MlirOptMain.h b/include/mlir/Tools/mlir-opt/MlirOptMain.h
index 7b83f10..0fbe15f 100644
--- a/include/mlir/Tools/mlir-opt/MlirOptMain.h
+++ b/include/mlir/Tools/mlir-opt/MlirOptMain.h
@@ -38,7 +38,7 @@
   ErrorsWarningsAndRemarks
 };
 
-using RemarkFormat = enum {
+enum class RemarkFormat {
   REMARK_FORMAT_STDOUT,
   REMARK_FORMAT_YAML,
   REMARK_FORMAT_BITSTREAM,
@@ -264,7 +264,7 @@
   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

lib/Tools/mlir-opt/MlirOptMain.cpp

diff --git a/lib/Tools/mlir-opt/MlirOptMain.cpp b/lib/Tools/mlir-opt/MlirOptMain.cpp
index 4f3b2ed..30fd384 100644
--- a/lib/Tools/mlir-opt/MlirOptMain.cpp
+++ b/lib/Tools/mlir-opt/MlirOptMain.cpp
@@ -216,13 +216,14 @@
         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 @@
   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 @@
     break;
   }
 
-  case REMARK_FORMAT_BITSTREAM: {
+  case RemarkFormat::REMARK_FORMAT_BITSTREAM: {
     std::string file = config.getRemarksOutputFile().empty()
                            ? "mlir-remarks.bitstream"
                            : config.getRemarksOutputFile();