Refactor RegAllocType cl option to use a custom parser

This will allow -sgpr-regalloc-npm=greedy to reuse the same parser.

Author: optimisan

llvm/include/llvm/Target/CGPassBuilderOption.h

@@ -14,6 +14,7 @@
 #ifndef LLVM_TARGET_CGPASSBUILDEROPTION_H
 #define LLVM_TARGET_CGPASSBUILDEROPTION_H
 
+#include "llvm/Support/CommandLine.h"
 #include "llvm/Target/TargetOptions.h"
 #include <optional>
 
@@ -22,6 +23,21 @@ namespace llvm {
 enum class RunOutliner { TargetDefault, AlwaysOutline, NeverOutline };
 enum class RegAllocType { Unset, Default, Basic, Fast, Greedy, PBQP };
 
+class RegAllocTypeParser : public cl::parser<RegAllocType> {
+public:
+  RegAllocTypeParser(cl::Option &O) : cl::parser<RegAllocType>(O) {}
+  void initialize() {
+    cl::parser<RegAllocType>::initialize();
+    addLiteralOption("default", RegAllocType::Default,
+                     "Default register allocator");
+    addLiteralOption("pbqp", RegAllocType::PBQP, "PBQP register allocator");
+    addLiteralOption("fast", RegAllocType::Fast, "Fast register allocator");
+    addLiteralOption("basic", RegAllocType::Basic, "Basic register allocator");
+    addLiteralOption("greedy", RegAllocType::Greedy,
+                     "Greedy register allocator");
+  }
+};
+
 // Not one-on-one but mostly corresponding to commandline options in
 // TargetPassConfig.cpp.
 struct CGPassBuilderOption {

llvm/test/tools/llc/new-pm/x86_64-regalloc-pipeline.mir

@@ -0,0 +1,6 @@
+# REQUIRES x86_64-registered-target
+# RUN: llc -mtriple=x86_64-unknown-linux-gnu -enable-new-pm -O3 -regalloc-npm=fast -print-pipeline-passes %s 2>&1 | FileCheck %s
+# RUN: llc -mtriple=x86_64-unknown-linux-gnu -enable-new-pm -O3 -regalloc-npm=greedy -print-pipeline-passes %s 2>&1 | FileCheck %s --check-prefix=CHECK-GREEDY
+
+# CHECK: regallocfast
+# CHECK-GREEDY: greedy<all>

llvm/tools/llc/NewPMDriver.cpp

@@ -48,17 +48,10 @@
 
 using namespace llvm;
 
-static cl::opt<RegAllocType> RegAlloc(
-    "regalloc-npm", cl::desc("Register allocator to use for new pass manager"),
-    cl::Hidden, cl::init(RegAllocType::Unset),
-    cl::values(
-        clEnumValN(RegAllocType::Default, "default",
-                   "Default register allocator"),
-        clEnumValN(RegAllocType::PBQP, "pbqp", "PBQP register allocator"),
-        clEnumValN(RegAllocType::Fast, "fast", "Fast register allocator"),
-        clEnumValN(RegAllocType::Basic, "basic", "Basic register allocator"),
-        clEnumValN(RegAllocType::Greedy, "greedy",
-                   "Greedy register allocator")));
+static cl::opt<RegAllocType, false, RegAllocTypeParser>
+    RegAlloc("regalloc-npm",
+             cl::desc("Register allocator to use for new pass manager"),
+             cl::Hidden, cl::init(RegAllocType::Unset));
 
 static cl::opt<bool>
     DebugPM("debug-pass-manager", cl::Hidden,