change pass option style

Author: optimisan

llvm/include/llvm/CodeGen/MachineBlockPlacement.h

@@ -23,6 +23,11 @@ class MachineBlockPlacementPass
       : AllowTailMerge(AllowTailMerge) {}
   PreservedAnalyses run(MachineFunction &MF,
                         MachineFunctionAnalysisManager &MFAM);
+  static bool isRequired() { return true; }
+
+  void
+  printPipeline(raw_ostream &OS,
+                function_ref<StringRef(StringRef)> MapClassName2PassName) const;
 };
 
 } // namespace llvm

llvm/include/llvm/Passes/MachinePassRegistry.def

@@ -200,7 +200,7 @@ MACHINE_FUNCTION_PASS_WITH_PARAMS(
       // Default is true.
       return MachineBlockPlacementPass(AllowTailMerge);
     },
-    parseMachineBlockPlacementPassOptions, "no-tail-merge;enable-tail-merge")
+    parseMachineBlockPlacementPassOptions, "no-tail-merge;tail-merge")
 
 MACHINE_FUNCTION_PASS_WITH_PARAMS(
     "machine-sink", "MachineSinkingPass",

llvm/lib/CodeGen/MachineBlockPlacement.cpp

@@ -3544,6 +3544,14 @@ MachineBlockPlacementPass::run(MachineFunction &MF,
   return getMachineFunctionPassPreservedAnalyses();
 }
 
+void MachineBlockPlacementPass::printPipeline(
+    raw_ostream &OS,
+    function_ref<StringRef(StringRef)> MapClassName2PassName) const {
+  OS << MapClassName2PassName(name());
+  if (!AllowTailMerge)
+    OS << "<no-tail-merge>";
+}
+
 bool MachineBlockPlacement::run(MachineFunction &MF) {
 
   // Check for single-block functions and skip them.

llvm/lib/Passes/PassBuilder.cpp

@@ -1442,14 +1442,14 @@ Expected<bool> parseMachineSinkingPassOptions(StringRef Params) {
 
 Expected<bool> parseMachineBlockPlacementPassOptions(StringRef Params) {
   bool AllowTailMerge = true;
-  if (Params == "no-tail-merge")
-    AllowTailMerge = false;
-  else if (!Params.empty() && Params != "enable-tail-merge")
-    return make_error<StringError>(
-        formatv("invalid MachineBlockPlacementPass parameter '{0}' ", Params)
-            .str(),
-        inconvertibleErrorCode());
-
+  if (!Params.empty()) {
+    AllowTailMerge = !Params.consume_front("no-");
+    if (Params != "tail-merge")
+      return make_error<StringError>(
+          formatv("invalid MachineBlockPlacementPass parameter '{0}' ", Params)
+              .str(),
+          inconvertibleErrorCode());
+  }
   return AllowTailMerge;
 }
 

llvm/test/CodeGen/AMDGPU/loop_header_nopred.mir

@@ -2,7 +2,7 @@
 # RUN: llc -mtriple=amdgcn -o - -run-pass=block-placement -mcpu=gfx1010 -mattr=-inst-fwd-prefetch-bug -verify-machineinstrs %s | FileCheck -check-prefixes=GFX10 %s
 # RUN: llc -mtriple=amdgcn -o - -run-pass=block-placement -mcpu=gfx1100 -mattr=-inst-fwd-prefetch-bug -verify-machineinstrs %s | FileCheck -check-prefixes=GFX11 %s
 
-# RUN: llc -mtriple=amdgcn -o - -passes='require<profile-summary>,function(machine-function(block-placement<enable-tail-merge>))' -mcpu=gfx1100 -mattr=-inst-fwd-prefetch-bug -verify-machineinstrs %s | FileCheck -check-prefixes=GFX11 %s
+# RUN: llc -mtriple=amdgcn -o - -passes='require<profile-summary>,function(machine-function(block-placement<tail-merge>))' -mcpu=gfx1100 -mattr=-inst-fwd-prefetch-bug -verify-machineinstrs %s | FileCheck -check-prefixes=GFX11 %s
 
 # Used to fail with
 # Assertion `Out && "Header of loop has no predecessors from outside loop?"

llvm/test/tools/llc/new-pm/option-parsing.mir

@@ -0,0 +1,13 @@
+# RUN: llc -mtriple=x86_64-unknown-linux-gnu -passes="block-placement<tail-merge>,block-placement<no-tail-merge>" -print-pipeline-passes -o /dev/null %s 2>&1 | FileCheck %s --check-prefix=CHECK
+
+# RUN: not llc -mtriple=x86_64-unknown-linux-gnu -passes="block-placement<invalid-opt>" -print-pipeline-passes -o /dev/null %s 2>&1 | FileCheck %s --check-prefix=CHECK-NOT
+
+# CHECK: block-placement,block-placement<no-tail-merge>
+# CHECK-NOT: invalid MachineBlockPlacementPass parameter 'invalid-opt'
+
+---
+name: f
+body: |
+  bb.0:
+    RET 0
+...