]> granicus.if.org Git - llvm/commitdiff
Revert "[PowerPC] Add initialization for some ppc passes"
authorEric Christopher <echristo@gmail.com>
Fri, 12 Apr 2019 07:16:58 +0000 (07:16 +0000)
committerEric Christopher <echristo@gmail.com>
Fri, 12 Apr 2019 07:16:58 +0000 (07:16 +0000)
This reverts commit 6f8f98ce8de7c0e4ebd7fa2e1fd9507fe8d1c317 as it
is breaking nearly every bot.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@358260 91177308-0d34-0410-b5e6-96231b3b80d8

15 files changed:
lib/Target/PowerPC/PPC.h
lib/Target/PowerPC/PPCBranchCoalescing.cpp
lib/Target/PowerPC/PPCBranchSelector.cpp
lib/Target/PowerPC/PPCCTRLoops.cpp
lib/Target/PowerPC/PPCEarlyReturn.cpp
lib/Target/PowerPC/PPCLoopPreIncPrep.cpp
lib/Target/PowerPC/PPCQPXLoadSplat.cpp
lib/Target/PowerPC/PPCReduceCRLogicals.cpp
lib/Target/PowerPC/PPCTLSDynamicCall.cpp
lib/Target/PowerPC/PPCTOCRegDeps.cpp
lib/Target/PowerPC/PPCTargetMachine.cpp
lib/Target/PowerPC/PPCVSXCopy.cpp
lib/Target/PowerPC/PPCVSXSwapRemoval.cpp
test/CodeGen/PowerPC/ppc-passname-assert.ll [deleted file]
test/CodeGen/PowerPC/ppc-passname.ll [deleted file]

index 1f6f96de81665a961b870739fd0baa618aa02c76..85df85e0c49e0de9a2b6824ae47ae5e584ef491d 100644 (file)
@@ -56,26 +56,12 @@ namespace llvm {
                                          MCOperand &OutMO, AsmPrinter &AP,
                                          bool isDarwin);
 
-  void initializePPCCTRLoopsPass(PassRegistry&);
-#ifndef NDEBUG
-  void initializePPCCTRLoopsVerifyPass(PassRegistry&);
-#endif
-  void initializePPCLoopPreIncPrepPass(PassRegistry&);
-  void initializePPCTOCRegDepsPass(PassRegistry&);
-  void initializePPCEarlyReturnPass(PassRegistry&);
-  void initializePPCVSXCopyPass(PassRegistry&);
   void initializePPCVSXFMAMutatePass(PassRegistry&);
-  void initializePPCVSXSwapRemovalPass(PassRegistry&);
-  void initializePPCReduceCRLogicalsPass(PassRegistry&);
-  void initializePPCBSelPass(PassRegistry&);
-  void initializePPCBranchCoalescingPass(PassRegistry&);
-  void initializePPCQPXLoadSplatPass(PassRegistry&);
   void initializePPCBoolRetToIntPass(PassRegistry&);
   void initializePPCExpandISELPass(PassRegistry &);
   void initializePPCPreEmitPeepholePass(PassRegistry &);
   void initializePPCTLSDynamicCallPass(PassRegistry &);
   void initializePPCMIPeepholePass(PassRegistry&);
-
   extern char &PPCVSXFMAMutateID;
 
   namespace PPCII {
index 5e9a661f8f0b118a122683ac21628470b631b655..58f80bd46dc3c76e81164d229e703ce284064323 100644 (file)
@@ -33,6 +33,10 @@ STATISTIC(NumBlocksCoalesced, "Number of blocks coalesced");
 STATISTIC(NumPHINotMoved, "Number of PHI Nodes that cannot be merged");
 STATISTIC(NumBlocksNotCoalesced, "Number of blocks not coalesced");
 
+namespace llvm {
+    void initializePPCBranchCoalescingPass(PassRegistry&);
+}
+
 //===----------------------------------------------------------------------===//
 //                               PPCBranchCoalescing
 //===----------------------------------------------------------------------===//
index 793d690baec3bec6b118960ba2d3a6f7025b3483..fcef3df5072df5b2a679c9ac027a619df33f7dcf 100644 (file)
@@ -32,6 +32,10 @@ using namespace llvm;
 
 STATISTIC(NumExpanded, "Number of branches expanded to long format");
 
+namespace llvm {
+  void initializePPCBSelPass(PassRegistry&);
+}
+
 namespace {
   struct PPCBSel : public MachineFunctionPass {
     static char ID;
index 3c24af1df97325fb4ef1728fc59183e8e745ea41..526e06aeb2a5e4c8feb04d0a1542620ad5217d2d 100644 (file)
@@ -80,6 +80,13 @@ SmallCTRLoopThreshold("min-ctr-loop-threshold", cl::init(4), cl::Hidden,
 
 STATISTIC(NumCTRLoops, "Number of loops converted to CTR loops");
 
+namespace llvm {
+  void initializePPCCTRLoopsPass(PassRegistry&);
+#ifndef NDEBUG
+  void initializePPCCTRLoopsVerifyPass(PassRegistry&);
+#endif
+}
+
 namespace {
   struct PPCCTRLoops : public FunctionPass {
 
index 6c08bcde1b3e0d0c46c9a5b87e7289f5c9ba48ec..8cc973a9ff4b950c23db5afdc67b0fa0fb92b944 100644 (file)
@@ -36,6 +36,10 @@ using namespace llvm;
 STATISTIC(NumBCLR, "Number of early conditional returns");
 STATISTIC(NumBLR,  "Number of early returns");
 
+namespace llvm {
+  void initializePPCEarlyReturnPass(PassRegistry&);
+}
+
 namespace {
   // PPCEarlyReturn pass - For simple functions without epilogue code, move
   // returns up, and create conditional returns, to avoid unnecessary
index 9689e8c590aeed63894f858114d642621968b19a..264dbbdc84e1e5540d088acac5a544381944f1a9 100644 (file)
@@ -64,6 +64,12 @@ static cl::opt<unsigned> MaxVars("ppc-preinc-prep-max-vars",
 
 STATISTIC(PHINodeAlreadyExists, "PHI node already in pre-increment form");
 
+namespace llvm {
+
+  void initializePPCLoopPreIncPrepPass(PassRegistry&);
+
+} // end namespace llvm
+
 namespace {
 
   class PPCLoopPreIncPrep : public FunctionPass {
index 3a83cc27439c3eb41976649d5e583ff0f3a76235..e0faae057c2225be67d078810ac21b0569e653b0 100644 (file)
@@ -30,6 +30,10 @@ using namespace llvm;
 
 STATISTIC(NumSimplified, "Number of QPX load splats simplified");
 
+namespace llvm {
+  void initializePPCQPXLoadSplatPass(PassRegistry&);
+}
+
 namespace {
   struct PPCQPXLoadSplat : public MachineFunctionPass {
     static char ID;
index 45f8907a08e1777b013d7acd6e4b7e55c327091b..e4f6579f9bd7b64b9a811c70a2f60424c341d5a5 100644 (file)
@@ -48,6 +48,10 @@ STATISTIC(NumNotSplitChainCopies,
 STATISTIC(NumNotSplitWrongOpcode,
           "Number of blocks not split due to the wrong opcode.");
 
+namespace llvm {
+  void initializePPCReduceCRLogicalsPass(PassRegistry&);
+}
+
 /// Given a basic block \p Successor that potentially contains PHIs, this
 /// function will look for any incoming values in the PHIs that are supposed to
 /// be coming from \p OrigMBB but whose definition is actually in \p NewMBB.
index fb826c4a32f1a30683a2b154131f9ea3623bba7f..657ec4af4be97017055e24a569845c84805f46be 100644 (file)
@@ -34,6 +34,10 @@ using namespace llvm;
 
 #define DEBUG_TYPE "ppc-tls-dynamic-call"
 
+namespace llvm {
+  void initializePPCTLSDynamicCallPass(PassRegistry&);
+}
+
 namespace {
   struct PPCTLSDynamicCall : public MachineFunctionPass {
     static char ID;
index 3eb0569fb9556a3b39a7ec60483b74225613ac55..5e45d643d69fca2d5840ebaf563ea7639947f612 100644 (file)
@@ -82,6 +82,10 @@ using namespace llvm;
 
 #define DEBUG_TYPE "ppc-toc-reg-deps"
 
+namespace llvm {
+  void initializePPCTOCRegDepsPass(PassRegistry&);
+}
+
 namespace {
   // PPCTOCRegDeps pass - For simple functions without epilogue code, move
   // returns up, and create conditional returns, to avoid unnecessary
index d45a6e555b73a41c72a8df08e5b7934950c5e1df..444a3a587a40c63b8fd7e6b04390b1c204c96caa 100644 (file)
@@ -100,20 +100,6 @@ extern "C" void LLVMInitializePowerPCTarget() {
   RegisterTargetMachine<PPCTargetMachine> C(getThePPC64LETarget());
 
   PassRegistry &PR = *PassRegistry::getPassRegistry();
-  initializePPCCTRLoopsPass(PR);
-#ifndef NDEBUG
-  initializePPCCTRLoopsVerifyPass(PR);
-#endif
-  initializePPCLoopPreIncPrepPass(PR);
-  initializePPCTOCRegDepsPass(PR);
-  initializePPCEarlyReturnPass(PR);
-  initializePPCVSXCopyPass(PR);
-  initializePPCVSXFMAMutatePass(PR);
-  initializePPCVSXSwapRemovalPass(PR);
-  initializePPCReduceCRLogicalsPass(PR);
-  initializePPCBSelPass(PR);
-  initializePPCBranchCoalescingPass(PR);
-  initializePPCQPXLoadSplatPass(PR);
   initializePPCBoolRetToIntPass(PR);
   initializePPCExpandISELPass(PR);
   initializePPCPreEmitPeepholePass(PR);
index 719ed7b638782ee42d49a972f6b1487aed016d87..f7c3387cc8bc00b6829943ecf6ff0bd547de0a32 100644 (file)
@@ -36,6 +36,10 @@ using namespace llvm;
 
 #define DEBUG_TYPE "ppc-vsx-copy"
 
+namespace llvm {
+  void initializePPCVSXCopyPass(PassRegistry&);
+}
+
 namespace {
   // PPCVSXCopy pass - For copies between VSX registers and non-VSX registers
   // (Altivec and scalar floating-point registers), we need to transform the
index b1ddbb6b837ca56211ab2f7d445a356c96beb154..4e01e77c624fedc5c75eb7c7b29c9dd2efb55763 100644 (file)
@@ -59,6 +59,10 @@ using namespace llvm;
 
 #define DEBUG_TYPE "ppc-vsx-swaps"
 
+namespace llvm {
+  void initializePPCVSXSwapRemovalPass(PassRegistry&);
+}
+
 namespace {
 
 // A PPCVSXSwapEntry is created for each machine instruction that
diff --git a/test/CodeGen/PowerPC/ppc-passname-assert.ll b/test/CodeGen/PowerPC/ppc-passname-assert.ll
deleted file mode 100644 (file)
index 428c7ed..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-; REQUIRES: asserts
-
-; Test pass name: ppc-ctr-loops-verify.
-; RUN: llc < %s -debug-pass=Structure -stop-before=ppc-ctr-loops-verify -o /dev/null 2>&1 | FileCheck %s -check-prefix=STOP-BEFORE-CTR-LOOPS-VERIFY
-; STOP-BEFORE-CTR-LOOPS-VERIFY-NOT: -ppc-ctr-loops-verify
-; STOP-BEFORE-CTR-LOOPS-VERIFY-NOT: "ppc-ctr-loops-verify" pass is not registered.
-; STOP-BEFORE-CTR-LOOPS-VERIFY-NOT: PowerPC CTR Loops Verify
-
-; RUN: llc < %s -debug-pass=Structure -stop-after=ppc-ctr-loops-verify -o /dev/null 2>&1 | FileCheck %s -check-prefix=STOP-AFTER-CTR-LOOPS-VERIFY
-; STOP-AFTER-CTR-LOOPS-VERIFY: -ppc-ctr-loops-verify
-; STOP-AFTER-CTR-LOOPS-VERIFY-NOT: "ppc-ctr-loops-verify" pass is not registered.
-; STOP-AFTER-CTR-LOOPS-VERIFY: PowerPC CTR Loops Verify
diff --git a/test/CodeGen/PowerPC/ppc-passname.ll b/test/CodeGen/PowerPC/ppc-passname.ll
deleted file mode 100644 (file)
index c9a61df..0000000
+++ /dev/null
@@ -1,130 +0,0 @@
-; Test pass name: ppc-ctr-loops.
-; RUN: llc < %s -debug-pass=Structure -stop-before=ppc-ctr-loops -o /dev/null 2>&1 | FileCheck %s -check-prefix=STOP-BEFORE-CTR-LOOPS
-; STOP-BEFORE-CTR-LOOPS-NOT: -ppc-ctr-loops
-; STOP-BEFORE-CTR-LOOPS-NOT: "ppc-ctr-loops" pass is not registered.
-; STOP-BEFORE-CTR-LOOPS-NOT: PowerPC CTR Loops 
-
-; RUN: llc < %s -debug-pass=Structure -stop-after=ppc-ctr-loops -o /dev/null 2>&1 | FileCheck %s -check-prefix=STOP-AFTER-CTR-LOOPS
-; STOP-AFTER-CTR-LOOPS: -ppc-ctr-loops
-; STOP-AFTER-CTR-LOOPS-NOT: "ppc-ctr-loops" pass is not registered.
-; STOP-AFTER-CTR-LOOPS: PowerPC CTR Loops 
-
-
-; Test pass name: ppc-loop-preinc-prep.
-; RUN: llc < %s -debug-pass=Structure -stop-before=ppc-loop-preinc-prep -o /dev/null 2>&1 | FileCheck %s -check-prefix=STOP-BEFORE-LOOP-PREINC-PREP
-; STOP-BEFORE-LOOP-PREINC-PREP-NOT: -ppc-loop-preinc-prep
-; STOP-BEFORE-LOOP-PREINC-PREP-NOT: "ppc-loop-preinc-prep" pass is not registered.
-; STOP-BEFORE-LOOP-PREINC-PREP-NOT: Prepare loop for pre-inc. addressing modes
-
-; RUN: llc < %s -debug-pass=Structure -stop-after=ppc-loop-preinc-prep -o /dev/null 2>&1 | FileCheck %s -check-prefix=STOP-AFTER-LOOP-PREINC-PREP
-; STOP-AFTER-LOOP-PREINC-PREP: -ppc-loop-preinc-prep
-; STOP-AFTER-LOOP-PREINC-PREP-NOT: "ppc-loop-preinc-prep" pass is not registered.
-; STOP-AFTER-LOOP-PREINC-PREP: Prepare loop for pre-inc. addressing modes
-
-
-; Test pass name: ppc-toc-reg-deps.
-; RUN: llc < %s -debug-pass=Structure -stop-before=ppc-toc-reg-deps -o /dev/null 2>&1 | FileCheck %s -check-prefix=STOP-BEFORE-TOC-REG-DEPS
-; STOP-BEFORE-TOC-REG-DEPS-NOT: -ppc-toc-reg-deps
-; STOP-BEFORE-TOC-REG-DEPS-NOT: "ppc-toc-reg-deps" pass is not registered.
-; STOP-BEFORE-TOC-REG-DEPS-NOT: PowerPC TOC Register Dependencies
-
-; RUN: llc < %s -debug-pass=Structure -stop-after=ppc-toc-reg-deps -o /dev/null 2>&1 | FileCheck %s -check-prefix=STOP-AFTER-TOC-REG-DEPS
-; STOP-AFTER-TOC-REG-DEPS: -ppc-toc-reg-deps
-; STOP-AFTER-TOC-REG-DEPS-NOT: "ppc-toc-reg-deps" pass is not registered.
-; STOP-AFTER-TOC-REG-DEPS: PowerPC TOC Register Dependencies
-
-
-; Test pass name: ppc-vsx-copy.
-; RUN: llc < %s -debug-pass=Structure -stop-before=ppc-vsx-copy -o /dev/null 2>&1 | FileCheck %s -check-prefix=STOP-BEFORE-VSX-COPY
-; STOP-BEFORE-VSX-COPY-NOT: -ppc-vsx-copy
-; STOP-BEFORE-VSX-COPY-NOT: "ppc-vsx-copy" pass is not registered.
-; STOP-BEFORE-VSX-COPY-NOT: PowerPC VSX Copy Legalization
-
-; RUN: llc < %s -debug-pass=Structure -stop-after=ppc-vsx-copy -o /dev/null 2>&1 | FileCheck %s -check-prefix=STOP-AFTER-VSX-COPY
-; STOP-AFTER-VSX-COPY: -ppc-vsx-copy
-; STOP-AFTER-VSX-COPY-NOT: "ppc-vsx-copy" pass is not registered.
-; STOP-AFTER-VSX-COPY: PowerPC VSX Copy Legalization
-
-
-; Test pass name: ppc-early-ret.
-; RUN: llc < %s -debug-pass=Structure -stop-before=ppc-early-ret -o /dev/null 2>&1 | FileCheck %s -check-prefix=STOP-BEFORE-EARLY-RET
-; STOP-BEFORE-EARLY-RET-NOT: -ppc-early-ret
-; STOP-BEFORE-EARLY-RET-NOT: "ppc-early-ret" pass is not registered.
-; STOP-BEFORE-EARLY-RET-NOT: PowerPC Early-Return Creation
-
-; RUN: llc < %s -debug-pass=Structure -stop-after=ppc-early-ret -o /dev/null 2>&1 | FileCheck %s -check-prefix=STOP-AFTER-EARLY-RET
-; STOP-AFTER-EARLY-RET: -ppc-early-ret
-; STOP-AFTER-ERALY-RET-NOT: "ppc-early-ret" pass is not registered.
-; STOP-AFTER-EARLY-RET: PowerPC Early-Return Creation
-
-
-; Test pass name: ppc-vsx-fma-mutate.
-; RUN: llc < %s -debug-pass=Structure -stop-before=ppc-vsx-fma-mutate -o /dev/null 2>&1 | FileCheck %s -check-prefix=STOP-BEFORE-VSX-FMA-MUTATE
-; STOP-BEFORE-VSX-FMA-MUTATE-NOT: -ppc-vsx-fma-mutate
-; STOP-BEFORE-VSX-FMA-MUTATE-NOT: "ppc-vsx-fma-mutate" pass is not registered.
-; STOP-BEFORE-VSX-FMA-MUTATE-NOT: PowerPC VSX FMA Mutation
-
-; RUN: llc < %s -debug-pass=Structure -stop-after=ppc-vsx-fma-mutate -o /dev/null 2>&1 | FileCheck %s -check-prefix=STOP-AFTER-VSX-FMA-MUTATE
-; STOP-AFTER-VSX-FMA-MUTATE: -ppc-vsx-fma-mutate
-; STOP-AFTER-VSX-FMA-MUTATE-NOT: "ppc-vsx-fma-mutate" pass is not registered.
-; STOP-AFTER-VSX-FMA-MUTATE: PowerPC VSX FMA Mutation
-
-
-; Test pass name: ppc-vsx-swaps.
-; RUN: llc < %s -debug-pass=Structure -stop-before=ppc-vsx-swaps -o /dev/null 2>&1 | FileCheck %s -check-prefix=STOP-BEFORE-VSX-SWAPS
-; STOP-BEFORE-VSX-SWAPS-NOT: -ppc-vsx-swaps
-; STOP-BEFORE-VSX-SWAPS-NOT: "ppc-vsx-swaps" pass is not registered.
-; STOP-BEFORE-VSX-SWAPS-NOT: PowerPC VSX Swap Removal
-
-; RUN: llc < %s -debug-pass=Structure -stop-after=ppc-vsx-swaps -o /dev/null 2>&1 | FileCheck %s -check-prefix=STOP-AFTER-VSX-SWAPS
-; STOP-AFTER-VSX-SWAPS: -ppc-vsx-swaps
-; STOP-AFTER-VSX-SWAPS-NOT: "ppc-vsx-swaps" pass is not registered.
-; STOP-AFTER-VSX-SWAPS: PowerPC VSX Swap Removal
-
-
-; Test pass name: ppc-reduce-cr-ops.
-; RUN: llc -ppc-reduce-cr-logicals < %s -debug-pass=Structure -stop-before=ppc-reduce-cr-ops -o /dev/null 2>&1 | FileCheck %s -check-prefix=STOP-BEFORE-REDUCE-CR-OPS
-; STOP-BEFORE-REDUCE-CR-OPS-NOT: -ppc-reduce-cr-ops
-; STOP-BEFORE-REDUCE-CR-OPS-NOT: "ppc-reduce-cr-ops" pass is not registered.
-; STOP-BEFORE-REDUCE-CR-OPS-NOT: PowerPC Reduce CR logical Operation
-
-; RUN: llc -ppc-reduce-cr-logicals < %s -debug-pass=Structure -stop-after=ppc-reduce-cr-ops -o /dev/null 2>&1 | FileCheck %s -check-prefix=STOP-AFTER-REDUCE-CR-OPS
-; STOP-AFTER-REDUCE-CR-OPS: -ppc-reduce-cr-ops
-; STOP-AFTER-REDUCE-CR-OPS-NOT: "ppc-reduce-cr-ops" pass is not registered.
-; STOP-AFTER-REDUCE-CR-OPS: PowerPC Reduce CR logical Operation
-
-
-; Test pass name: ppc-branch-select.
-; RUN: llc < %s -debug-pass=Structure -stop-before=ppc-branch-select -o /dev/null 2>&1 | FileCheck %s -check-prefix=STOP-BEFORE-BRANCH-SELECT
-; STOP-BEFORE-BRANCH-SELECT-NOT: -ppc-branch-select
-; STOP-BEFORE-BRANCH-SELECT-NOT: "ppc-branch-select" pass is not registered.
-; STOP-BEFORE-BRANCH-SELECT-NOT: PowerPC Branch Selector
-
-; RUN: llc < %s -debug-pass=Structure -stop-after=ppc-branch-select -o /dev/null 2>&1 | FileCheck %s -check-prefix=STOP-AFTER-BRANCH-SELECT
-; STOP-AFTER-BRANCH-SELECT: -ppc-branch-select
-; STOP-AFTER-BRANCH-SELECT-NOT: "ppc-branch-select" pass is not registered.
-; STOP-AFTER-BRANCH-SELECT: PowerPC Branch Selector
-
-
-; Test pass name: ppc-branch-coalescing.
-; RUN: llc -enable-ppc-branch-coalesce < %s -debug-pass=Structure -stop-before=ppc-branch-coalescing -o /dev/null 2>&1 | FileCheck %s -check-prefix=STOP-BEFORE-BRANCH-COALESCING
-; STOP-BEFORE-BRANCH-COALESCING-NOT: -ppc-branch-coalescing
-; STOP-BEFORE-BRANCH-COALESCING-NOT: "ppc-branch-coalescing" pass is not registered.
-; STOP-BEFORE-BRANCH-COALESCING-NOT: Branch Coalescing 
-
-; RUN: llc -enable-ppc-branch-coalesce < %s -debug-pass=Structure -stop-after=ppc-branch-coalescing -o /dev/null 2>&1 | FileCheck %s -check-prefix=STOP-AFTER-BRANCH-COALESCING
-; STOP-AFTER-BRANCH-COALESCING: -ppc-branch-coalescing
-; STOP-AFTER-BRANCH-COALESCING-NOT: "ppc-branch-coalescing" pass is not registered.
-; STOP-AFTER-BRANCH-COALESCING: Branch Coalescing 
-
-
-; Test pass name: ppc-qpx-load-splat.
-; RUN: llc < %s -debug-pass=Structure -stop-before=ppc-qpx-load-splat -o /dev/null 2>&1 | FileCheck %s -check-prefix=STOP-BEFORE-QPX-LOAD-SPLAT
-; STOP-BEFORE-QPX-LOAD-SPLAT-NOT: -ppc-qpx-load-splat
-; STOP-BEFORE-QPX-LOAD-SPLAT-NOT: "ppc-qpx-load-splat" pass is not registered.
-; STOP-BEFORE-QPX-LOAD-SPLAT-NOT: PowerPC QPX Load Splat Simplification
-
-; RUN: llc < %s -debug-pass=Structure -stop-after=ppc-qpx-load-splat -o /dev/null 2>&1 | FileCheck %s -check-prefix=STOP-AFTER-QPX-LOAD-SPLAT
-; STOP-AFTER-QPX-LOAD-SPLAT: -ppc-qpx-load-splat
-; STOP-AFTER-QPX-LOAD-SPLAT-NOT: "ppc-qpx-load-splat" pass is not registered.
-; STOP-AFTER-QPX-LOAD-SPLAT: PowerPC QPX Load Splat Simplification