<p dir="ltr">Thanks James!</p>
<div class="gmail_quote">On Jun 16, 2014 9:54 AM, "James Molloy" <<a href="mailto:james.molloy@arm.com">james.molloy@arm.com</a>> wrote:<br type="attribution"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
Author: jamesm<br>
Date: Mon Jun 16 11:42:53 2014<br>
New Revision: 211037<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=211037&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=211037&view=rev</a><br>
Log:<br>
Refactor the disabling of Thumb-1 LDM/STM generation<br>
<br>
Originally I switched the LD/ST optimizer off in TargetMachine as it was previously, but Eric has suggested he'd prefer that it be short-circuited in the pass itself.<br>
<br>
No functionality change.<br>
<br>
<br>
Modified:<br>
    llvm/trunk/lib/Target/ARM/ARMLoadStoreOptimizer.cpp<br>
    llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp<br>
<br>
Modified: llvm/trunk/lib/Target/ARM/ARMLoadStoreOptimizer.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMLoadStoreOptimizer.cpp?rev=211037&r1=211036&r2=211037&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMLoadStoreOptimizer.cpp?rev=211037&r1=211036&r2=211037&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/lib/Target/ARM/ARMLoadStoreOptimizer.cpp (original)<br>
+++ llvm/trunk/lib/Target/ARM/ARMLoadStoreOptimizer.cpp Mon Jun 16 11:42:53 2014<br>
@@ -1734,6 +1734,10 @@ bool ARMLoadStoreOpt::runOnMachineFuncti<br>
   isThumb2 = AFI->isThumb2Function();<br>
   isThumb1 = AFI->isThumbFunction() && !isThumb2;<br>
<br>
+  // FIXME: Temporarily disabling for Thumb-1 due to miscompiles<br>
+  if (isThumb1)<br>
+    return false;<br>
+<br>
   bool Modified = false;<br>
   for (MachineFunction::iterator MFI = Fn.begin(), E = Fn.end(); MFI != E;<br>
        ++MFI) {<br>
<br>
Modified: llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp?rev=211037&r1=211036&r2=211037&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp?rev=211037&r1=211036&r2=211037&view=diff</a><br>

==============================================================================<br>
--- llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp (original)<br>
+++ llvm/trunk/lib/Target/ARM/ARMTargetMachine.cpp Mon Jun 16 11:42:53 2014<br>
@@ -203,8 +203,7 @@ bool ARMPassConfig::addInstSelector() {<br>
 }<br>
<br>
 bool ARMPassConfig::addPreRegAlloc() {<br>
-  // FIXME: Temporarily disabling Thumb-1 pre-RA Load/Store optimization pass<br>
-  if (getOptLevel() != CodeGenOpt::None && !getARMSubtarget().isThumb1Only())<br>
+  if (getOptLevel() != CodeGenOpt::None)<br>
     addPass(createARMLoadStoreOptimizationPass(true));<br>
   if (getOptLevel() != CodeGenOpt::None && getARMSubtarget().isCortexA9())<br>
     addPass(createMLxExpansionPass());<br>
@@ -219,11 +218,8 @@ bool ARMPassConfig::addPreRegAlloc() {<br>
<br>
 bool ARMPassConfig::addPreSched2() {<br>
   if (getOptLevel() != CodeGenOpt::None) {<br>
-    // FIXME: Temporarily disabling Thumb-1 post-RA Load/Store optimization pass<br>
-    if (!getARMSubtarget().isThumb1Only()) {<br>
-      addPass(createARMLoadStoreOptimizationPass());<br>
-      printAndVerify("After ARM load / store optimizer");<br>
-    }<br>
+    addPass(createARMLoadStoreOptimizationPass());<br>
+    printAndVerify("After ARM load / store optimizer");<br>
<br>
     if (getARMSubtarget().hasNEON())<br>
       addPass(createExecutionDependencyFixPass(&ARM::DPRRegClass));<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>