remove print

Author: optimisan

llvm/include/llvm/CodeGen/MachineCycleAnalysis.h

@@ -65,7 +65,7 @@ class MachineCycleInfoPrinterPass
   explicit MachineCycleInfoPrinterPass(raw_ostream &OS) : OS(OS) {}
   PreservedAnalyses run(MachineFunction &MF,
                         MachineFunctionAnalysisManager &MFAM);
-  bool isRequired() { return true; }
+  static bool isRequired() { return true; }
 };
 
 } // end namespace llvm

llvm/lib/CodeGen/MachineCycleAnalysis.cpp

@@ -104,8 +104,6 @@ bool MachineCycleInfoPrinterLegacy::runOnMachineFunction(MachineFunction &F) {
 PreservedAnalyses
 MachineCycleInfoPrinterPass::run(MachineFunction &MF,
                                  MachineFunctionAnalysisManager &MFAM) {
-  OS << "MachineCycleInfo for function: " << MF.getName() << '\n';
-
   auto &MCI = MFAM.getResult<MachineCycleAnalysis>(MF);
   MCI.print(OS);
   return PreservedAnalyses::all();

llvm/test/CodeGen/X86/cycle-info.mir

@@ -1,10 +1,11 @@
-# RUN: llc -mtriple=x86_64-unknown-linux-gnu -run-pass=print-machine-cycles -o - %s 2>&1 | FileCheck %s
+# RUN: llc -mtriple=x86_64-unknown-linux-gnu -run-pass=print-machine-cycles -o - %s 2>&1 | FileCheck %s --check-prefixes=LEGACY,CHECK
 
-# RUN: llc -mtriple=x86_64-unknown-linux-gnu -passes="print<machine-cycles>" -o - %s 2>&1 | FileCheck %s
+# RUN: llc -mtriple=x86_64-unknown-linux-gnu -passes="machine-function(print,print<machine-cycles>)" -o - %s 2>&1 | FileCheck %s --check-prefixes=NPM,CHECK
 
 ...
 ---
-# CHECK-LABEL: MachineCycleInfo for function: empty
+# LEGACY-LABEL: MachineCycleInfo for function: empty
+# NPM-LABEL: name: empty
 name:            empty
 alignment:       16
 tracksRegLiveness: true
@@ -17,7 +18,8 @@ body:             |
 
 ...
 ---
-# CHECK-LABEL: MachineCycleInfo for function: simple
+# LEGACY-LABEL: MachineCycleInfo for function: simple
+# NPM-LABEL: name: simple
 # CHECK:           depth=1: entries(bb.1)
 name:            simple
 alignment:       16
@@ -42,7 +44,8 @@ body:             |
 
 ...
 ---
-# CHECK-LABEL: MachineCycleInfo for function: two_latches
+# LEGACY-LABEL: MachineCycleInfo for function: two_latches
+# NPM-LABEL: name: two_latches
 # CHECK:           depth=1: entries(bb.1) bb.2
 name:            two_latches
 alignment:       16
@@ -74,7 +77,8 @@ body:             |
 
 ...
 ---
-# CHECK-LABEL: MachineCycleInfo for function: nested_simple
+# LEGACY-LABEL: MachineCycleInfo for function: nested_simple
+# NPM-LABEL: name: nested_simple
 # CHECK:           depth=1: entries(bb.1) bb.3 bb.2
 # CHECK:               depth=2: entries(bb.2)
 name:            nested_simple
@@ -110,7 +114,8 @@ body:             |
 
 ...
 ---
-# CHECK-LABEL: MachineCycleInfo for function: nested_outer_latch_in_inner_loop
+# LEGACY-LABEL: MachineCycleInfo for function: nested_outer_latch_in_inner_loop
+# NPM-LABEL: name: nested_outer_latch_in_inner_loop
 # CHECK:           depth=1: entries(bb.1) bb.2 bb.3
 # CHECK:               depth=2: entries(bb.2) bb.3
 name:            nested_outer_latch_in_inner_loop
@@ -146,7 +151,8 @@ body:             |
 
 ...
 ---
-# CHECK-LABEL: MachineCycleInfo for function: sibling_loops
+# LEGACY-LABEL: MachineCycleInfo for function: sibling_loops
+# NPM-LABEL: name: sibling_loops
 # CHECK:           depth=1: entries(bb.1)
 # CHECK:           depth=1: entries(bb.2)
 name:            sibling_loops
@@ -183,7 +189,8 @@ body:             |
 
 ...
 ---
-# CHECK-LABEL: MachineCycleInfo for function: serial_loops
+# LEGACY-LABEL: MachineCycleInfo for function: serial_loops
+# NPM-LABEL: name: serial_loops
 # CHECK:           depth=1: entries(bb.2)
 # CHECK:           depth=1: entries(bb.1)
 name:            serial_loops
@@ -216,7 +223,8 @@ body:             |
 
 ...
 ---
-# CHECK-LABEL: MachineCycleInfo for function: nested_sibling_loops
+# LEGACY-LABEL: MachineCycleInfo for function: nested_sibling_loops
+# NPM-LABEL: name: nested_sibling_loops
 # CHECK:           depth=1: entries(bb.1) bb.4 bb.5 bb.3 bb.2
 # CHECK:               depth=2: entries(bb.4) bb.5
 # CHECK:               depth=2: entries(bb.2)
@@ -279,7 +287,8 @@ body:             |
 
 ...
 ---
-# CHECK-LABEL: MachineCycleInfo for function: deeper_nest
+# LEGACY-LABEL: MachineCycleInfo for function: deeper_nest
+# NPM-LABEL: name: deeper_nest
 # CHECK:           depth=1: entries(bb.1) bb.5 bb.2 bb.3 bb.4
 # CHECK:               depth=2: entries(bb.2) bb.3 bb.4
 # CHECK:                   depth=3: entries(bb.3) bb.4
@@ -326,7 +335,8 @@ body:             |
 
 ...
 ---
-# CHECK-LABEL: MachineCycleInfo for function: irreducible_basic
+# LEGACY-LABEL: MachineCycleInfo for function: irreducible_basic
+# NPM-LABEL: name: irreducible_basic
 # CHECK:           depth=1: entries(bb.2 bb.1)
 name:            irreducible_basic
 alignment:       16
@@ -362,7 +372,8 @@ body:             |
 
 ...
 ---
-# CHECK-LABEL: MachineCycleInfo for function: irreducible_mess
+# LEGACY-LABEL: MachineCycleInfo for function: irreducible_mess
+# NPM-LABEL: name: irreducible_mess
 # CHECK:           depth=1: entries(bb.2 bb.1) bb.6 bb.5 bb.3 bb.4
 # CHECK:               depth=2: entries(bb.5 bb.3 bb.1) bb.4
 # CHECK:                   depth=3: entries(bb.3 bb.1) bb.4
@@ -438,7 +449,8 @@ body:             |
 
 ...
 ---
-# CHECK-LABEL: MachineCycleInfo for function: irreducible_into_simple_cycle
+# LEGACY-LABEL: MachineCycleInfo for function: irreducible_into_simple_cycle
+# NPM-LABEL: name: irreducible_into_simple_cycle
 # CHECK:           depth=1: entries(bb.2 bb.7 bb.4) bb.6 bb.5 bb.3
 name:            irreducible_into_simple_cycle
 alignment:       16
@@ -497,7 +509,8 @@ body:             |
 
 ...
 ---
-# CHECK-LABEL: MachineCycleInfo for function: irreducible_mountain_bug
+# LEGACY-LABEL: MachineCycleInfo for function: irreducible_mountain_bug
+# NPM-LABEL: name: irreducible_mountain_bug
 # CHECK:           depth=1: entries(bb.6) bb.11 bb.10 bb.8 bb.7 bb.9 bb.12
 # CHECK:               depth=2: entries(bb.10 bb.7) bb.8 bb.9
 # CHECK:                   depth=3: entries(bb.8 bb.7) bb.9