[llvm-commits] [llvm] r138536 - /llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp

[Evan Cheng]

Author: evancheng
Date: Wed Aug 24 20:00:36 2011
New Revision: 138536

URL: http://llvm.org/viewvc/llvm-project?rev=138536&view=rev
Log:
Add a command line option to disable global merge pass.

Modified:
    llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp

Modified: llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp?rev=138536&r1=138535&r2=138536&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp Wed Aug 24 20:00:36 2011
@@ -21,6 +21,11 @@
 #include "llvm/Target/TargetOptions.h"
 using namespace llvm;
 
+static cl::opt<bool>
+EnableGlobalMerge("global-merge",
+                  cl::desc("Enable global merge pass"),
+                  cl::init(true));
+
 extern "C" void LLVMInitializeARMTarget() {
   // Register the target.
   RegisterTargetMachine<ARMTargetMachine> X(TheARMTarget);
@@ -83,7 +88,7 @@
 
 bool ARMBaseTargetMachine::addPreISel(PassManagerBase &PM,
                                       CodeGenOpt::Level OptLevel) {
-  if (OptLevel != CodeGenOpt::None)
+  if (OptLevel != CodeGenOpt::None && EnableGlobalMerge)
     PM.add(createARMGlobalMergePass(getTargetLowering()));
 
   return false;