diff options
| -rw-r--r-- | lib/Target/PowerPC/PPCInstrInfo.cpp | 12 | ||||
| -rw-r--r-- | lib/Target/PowerPC/PPCTargetMachine.cpp | 8 | ||||
| -rw-r--r-- | test/CodeGen/PowerPC/ctrloop-reg.ll | 2 | ||||
| -rw-r--r-- | test/CodeGen/PowerPC/ctrloops.ll | 2 |
4 files changed, 11 insertions, 13 deletions
diff --git a/lib/Target/PowerPC/PPCInstrInfo.cpp b/lib/Target/PowerPC/PPCInstrInfo.cpp index 8b868e69ec..28b3bc1596 100644 --- a/lib/Target/PowerPC/PPCInstrInfo.cpp +++ b/lib/Target/PowerPC/PPCInstrInfo.cpp @@ -41,8 +41,8 @@ extern cl::opt<bool> DisablePPC64RS; using namespace llvm; static cl:: -opt<bool> EnableCTRLoopAnal("enable-ppc-ctrloop-analysis", cl::Hidden, - cl::desc("Enable analysis for CTR loops (experimental)")); +opt<bool> DisableCTRLoopAnal("disable-ppc-ctrloop-analysis", cl::Hidden, + cl::desc("Disable analysis for CTR loops")); PPCInstrInfo::PPCInstrInfo(PPCTargetMachine &tm) : PPCGenInstrInfo(PPC::ADJCALLSTACKDOWN, PPC::ADJCALLSTACKUP), @@ -233,7 +233,7 @@ bool PPCInstrInfo::AnalyzeBranch(MachineBasicBlock &MBB,MachineBasicBlock *&TBB, LastInst->getOpcode() == PPC::BDNZ) { if (!LastInst->getOperand(0).isMBB()) return true; - if (!EnableCTRLoopAnal) + if (DisableCTRLoopAnal) return true; TBB = LastInst->getOperand(0).getMBB(); Cond.push_back(MachineOperand::CreateImm(1)); @@ -244,7 +244,7 @@ bool PPCInstrInfo::AnalyzeBranch(MachineBasicBlock &MBB,MachineBasicBlock *&TBB, LastInst->getOpcode() == PPC::BDZ) { if (!LastInst->getOperand(0).isMBB()) return true; - if (!EnableCTRLoopAnal) + if (DisableCTRLoopAnal) return true; TBB = LastInst->getOperand(0).getMBB(); Cond.push_back(MachineOperand::CreateImm(0)); @@ -282,7 +282,7 @@ bool PPCInstrInfo::AnalyzeBranch(MachineBasicBlock &MBB,MachineBasicBlock *&TBB, if (!SecondLastInst->getOperand(0).isMBB() || !LastInst->getOperand(0).isMBB()) return true; - if (!EnableCTRLoopAnal) + if (DisableCTRLoopAnal) return true; TBB = SecondLastInst->getOperand(0).getMBB(); Cond.push_back(MachineOperand::CreateImm(1)); @@ -296,7 +296,7 @@ bool PPCInstrInfo::AnalyzeBranch(MachineBasicBlock &MBB,MachineBasicBlock *&TBB, if (!SecondLastInst->getOperand(0).isMBB() || !LastInst->getOperand(0).isMBB()) return true; - if (!EnableCTRLoopAnal) + if (DisableCTRLoopAnal) return true; TBB = SecondLastInst->getOperand(0).getMBB(); Cond.push_back(MachineOperand::CreateImm(0)); diff --git a/lib/Target/PowerPC/PPCTargetMachine.cpp b/lib/Target/PowerPC/PPCTargetMachine.cpp index bcab83c5cf..b9c703e708 100644 --- a/lib/Target/PowerPC/PPCTargetMachine.cpp +++ b/lib/Target/PowerPC/PPCTargetMachine.cpp @@ -23,8 +23,8 @@ using namespace llvm; static cl:: -opt<bool> EnableCTRLoops("enable-ppc-ctrloops", cl::Hidden, - cl::desc("Enable CTR loops for PPC")); +opt<bool> DisableCTRLoops("disable-ppc-ctrloops", cl::Hidden, + cl::desc("Disable CTR loops for PPC")); extern "C" void LLVMInitializePowerPCTarget() { // Register the targets @@ -103,9 +103,7 @@ TargetPassConfig *PPCTargetMachine::createPassConfig(PassManagerBase &PM) { } bool PPCPassConfig::addPreRegAlloc() { - // FIXME: Once this can be enabled by default, this condition should read: - // if (!DisableCTRLoops && getOptLevel() != CodeGenOpt::None) - if (EnableCTRLoops) + if (!DisableCTRLoops && getOptLevel() != CodeGenOpt::None) PM->add(createPPCCTRLoops()); return false; diff --git a/test/CodeGen/PowerPC/ctrloop-reg.ll b/test/CodeGen/PowerPC/ctrloop-reg.ll index 0746f66628..874e5712bb 100644 --- a/test/CodeGen/PowerPC/ctrloop-reg.ll +++ b/test/CodeGen/PowerPC/ctrloop-reg.ll @@ -1,7 +1,7 @@ ; ModuleID = 'bugpoint-reduced-simplified.bc' target datalayout = "E-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v128:128:128-n32:64" target triple = "powerpc64-unknown-linux-gnu" -; RUN: llc -enable-ppc-ctrloops < %s -march=ppc64 | FileCheck %s +; RUN: llc < %s -march=ppc64 | FileCheck %s %struct.ref_s.1.49.91.115.121.139.145.151.157.163.169.175.181.211 = type { %union.v.0.48.90.114.120.138.144.150.156.162.168.174.180.210, i16, i16 } %union.v.0.48.90.114.120.138.144.150.156.162.168.174.180.210 = type { i64 } diff --git a/test/CodeGen/PowerPC/ctrloops.ll b/test/CodeGen/PowerPC/ctrloops.ll index ad55fa4a23..f7bd354ce8 100644 --- a/test/CodeGen/PowerPC/ctrloops.ll +++ b/test/CodeGen/PowerPC/ctrloops.ll @@ -1,6 +1,6 @@ target datalayout = "E-p:64:64:64-i1:8:8-i8:8:8-i16:16:16-i32:32:32-i64:64:64-f32:32:32-f64:64:64-v128:128:128-n32:64" target triple = "powerpc64-unknown-freebsd10.0" -; RUN: llc -enable-ppc-ctrloops -enable-ppc-ctrloop-analysis < %s -march=ppc64 | FileCheck %s +; RUN: llc < %s -march=ppc64 | FileCheck %s @a = common global i32 0, align 4 |