Improve ext/trunc patterns on PPC64.

[oota-llvm.git] / lib / Target / PowerPC / PPCTargetMachine.cpp

diff --git a/lib/Target/PowerPC/PPCTargetMachine.cpp b/lib/Target/PowerPC/PPCTargetMachine.cpp
index bcab83c5cf3c1daca94bff4d850cb0a6231ead23..d7a808855bbb4f50640857363b862c690a735e0e 100644 (file)
--- 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
@@ -93,19 +93,11 @@ public:
 } // namespace
 
 TargetPassConfig *PPCTargetMachine::createPassConfig(PassManagerBase &PM) {
-  TargetPassConfig *PassConfig = new PPCPassConfig(this, PM);
-
-  // Override this for PowerPC.  Tail merging happily breaks up instruction issue
-  // groups, which typically degrades performance.
-  PassConfig->setEnableTailMerge(false);
-
-  return PassConfig;
+  return new PPCPassConfig(this, 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;