PeepholeOptimizer: Make DEBUG_TYPE match pass name

[arsenm]

ping

[bkramer]

This is fine, but the commit message is the wrong way round.

[arsenm]

r274874

lib/CodeGen/PeepholeOptimizer.cpp

public:
     /// Then, after each successful call to getNextSource, this is the
     /// register of the last source.
     unsigned getReg() const { return Reg; }
   };
 }
 
 char PeepholeOptimizer::ID = 0;
 char &llvm::PeepholeOptimizerID = PeepholeOptimizer::ID;
-INITIALIZE_PASS_BEGIN(PeepholeOptimizer, "peephole-opts",
+INITIALIZE_PASS_BEGIN(PeepholeOptimizer, DEBUG_TYPE,
                 "Peephole Optimizations", false, false)
 INITIALIZE_PASS_DEPENDENCY(MachineDominatorTree)
-INITIALIZE_PASS_END(PeepholeOptimizer, "peephole-opts",
+INITIALIZE_PASS_END(PeepholeOptimizer, DEBUG_TYPE,
                 "Peephole Optimizations", false, false)
 
 /// If instruction is a copy-like instruction, i.e. it reads a single register
 /// and writes a single register and it does not modify the source, and if the
 /// source value is preserved as a sub-register of the result, then replace all
 /// reachable uses of the source with the subreg of the result.
 ///
 /// Do not generate an EXTRACT that is used only in a debug use, as this changes

test/CodeGen/AArch64/arm64-regress-opt-cmp.mir

 # RUN: rm -f %S/arm64-regress-opt-cmp.s
-# RUN: llc -mtriple=aarch64-linux-gnu -run-pass peephole-opts -o - %s 2>&1 | FileCheck %s
+# RUN: llc -mtriple=aarch64-linux-gnu -run-pass peephole-opt -o - %s 2>&1 | FileCheck %s
 # CHECK: %1 = ANDWri {{.*}}
 # CHECK-NEXT: %wzr = SUBSWri {{.*}}
 --- |
   define i32 @test01() nounwind {
   entry:
     %0 = select i1 true, i32 1, i32 0
     %1 = and i32 %0, 65535
     %2 = icmp ugt i32 %1, 0

test/CodeGen/MIR/ARM/imm-peephole-arm.mir

-# RUN: llc -run-pass=peephole-opts %s -o /dev/null 2>&1 | FileCheck %s
+# RUN: llc -run-pass=peephole-opt %s -o /dev/null 2>&1 | FileCheck %s
 
 # CHECK: [[IN:%.*]] = COPY %r0
 # CHECK: [[SUM1TMP:%.*]] = ADDri [[IN]], 133
 # CHECK: [[SUM1:%.*]] = ADDri killed [[SUM1TMP]], 25600
 
 # CHECK: [[SUM2TMP:%.*]] = SUBri [[IN]], 133
 # CHECK: [[SUM2:%.*]] = SUBri killed [[SUM2TMP]], 25600
 

test/CodeGen/MIR/ARM/imm-peephole-thumb.mir

-# RUN: llc -run-pass=peephole-opts %s -o /dev/null 2>&1 | FileCheck %s
+# RUN: llc -run-pass=peephole-opt %s -o /dev/null 2>&1 | FileCheck %s
 
 # CHECK: [[IN:%.*]] = COPY %r0
 # CHECK: [[SUM1TMP:%.*]] = t2ADDri [[IN]], 25600
 # CHECK: [[SUM1:%.*]] = t2ADDri killed [[SUM1TMP]], 133
 
 # CHECK: [[SUM2TMP:%.*]] = t2SUBri [[IN]], 25600
 # CHECK: [[SUM2:%.*]] = t2SUBri killed [[SUM2TMP]], 133
 

test/CodeGen/MIR/Generic/multiRunPass.mir

-# RUN: llc -run-pass expand-isel-pseudos  -run-pass peephole-opts -debug-pass=Arguments -o /dev/null %s 2>&1 | FileCheck %s --check-prefix=CHECK --check-prefix=PSEUDO_PEEPHOLE
-# RUN: llc -run-pass expand-isel-pseudos,peephole-opts -debug-pass=Arguments -o /dev/null %s 2>&1 | FileCheck %s --check-prefix=CHECK --check-prefix=PSEUDO_PEEPHOLE
-# RUN: llc -run-pass peephole-opts -run-pass expand-isel-pseudos -debug-pass=Arguments -o /dev/null %s 2>&1 | FileCheck %s --check-prefix=CHECK --check-prefix=PEEPHOLE_PSEUDO
-# RUN: llc -run-pass peephole-opts,expand-isel-pseudos -debug-pass=Arguments -o /dev/null %s 2>&1 | FileCheck %s --check-prefix=CHECK --check-prefix=PEEPHOLE_PSEUDO
+# RUN: llc -run-pass expand-isel-pseudos  -run-pass peephole-opt -debug-pass=Arguments -o /dev/null %s 2>&1 | FileCheck %s --check-prefix=CHECK --check-prefix=PSEUDO_PEEPHOLE
+# RUN: llc -run-pass expand-isel-pseudos,peephole-opt -debug-pass=Arguments -o /dev/null %s 2>&1 | FileCheck %s --check-prefix=CHECK --check-prefix=PSEUDO_PEEPHOLE
+# RUN: llc -run-pass peephole-opt -run-pass expand-isel-pseudos -debug-pass=Arguments -o /dev/null %s 2>&1 | FileCheck %s --check-prefix=CHECK --check-prefix=PEEPHOLE_PSEUDO
+# RUN: llc -run-pass peephole-opt,expand-isel-pseudos -debug-pass=Arguments -o /dev/null %s 2>&1 | FileCheck %s --check-prefix=CHECK --check-prefix=PEEPHOLE_PSEUDO
 # REQUIRES: asserts
 
 # This test ensures that the command line accepts
 # several run passes on the same command line and
 # actually create the proper pipeline for it.
-# PSEUDO_PEEPHOLE: -expand-isel-pseudos -peephole-opts
-# PEEPHOLE_PSEUDO: -peephole-opts -expand-isel-pseudos
+# PSEUDO_PEEPHOLE: -expand-isel-pseudos -peephole-opt
+# PEEPHOLE_PSEUDO: -peephole-opt -expand-isel-pseudos
 
 # Make sure there are no other passes happening after what we asked.
 # CHECK-NEXT: --- |
 ---
 # CHECK: name: foo
 name: foo
 body: |
   bb.0:
 ...

test/CodeGen/PowerPC/opt-cmp-inst-cr0-live.ll

-; RUN: llc -print-before=peephole-opts -print-after=peephole-opts -mtriple=powerpc64-unknown-linux-gnu -o /dev/null 2>&1 < %s | FileCheck %s
+; RUN: llc -print-before=peephole-opt -print-after=peephole-opt -mtriple=powerpc64-unknown-linux-gnu -o /dev/null 2>&1 < %s | FileCheck %s
 
 define signext i32 @fn1(i32 %baz) {
   %1 = mul nsw i32 %baz, 208
   %2 = zext i32 %1 to i64
   %3 = shl i64 %2, 48
   %4 = ashr exact i64 %3, 48
 ; CHECK: ANDIo8 {{[^,]+}}, 65520, %CR0<imp-def,dead>;
 ; CHECK: CMPLDI

test/CodeGen/PowerPC/opt-sub-inst-cr0-live.mir

-# RUN: llc -start-after=machine-sink -stop-after=peephole-opts -mtriple=powerpc64-unknown-linux-gnu -o /dev/null %s 2>&1 | FileCheck %s
+# RUN: llc -start-after=machine-sink -stop-after=peephole-opt -mtriple=powerpc64-unknown-linux-gnu -o /dev/null %s 2>&1 | FileCheck %s
 
 --- |
   ; ModuleID = '<stdin>'
   source_filename = "<stdin>"
   target datalayout = "E-m:e-i64:64-n32:64"
   target triple = "powerpc64-unknown-linux-gnu"
 
   ; Function Attrs: nounwind readnone