Updated code from trunk.

llvm-svn: 12498

Author: John Criswell

llvm/include/llvm/Transforms/Utils/FunctionUtils.h

@@ -14,23 +14,26 @@
 #ifndef LLVM_TRANSFORMS_UTILS_FUNCTION_H
 #define LLVM_TRANSFORMS_UTILS_FUNCTION_H
 
-namespace llvm {
-
-class Function;
-class Loop;
-
-/// ExtractCodeRegion - rip out a sequence of basic blocks into a new function
-///
-Function* ExtractCodeRegion(const std::vector<BasicBlock*> &code);
-
-/// ExtractLoop - rip out a natural loop into a new function
-///
-Function* ExtractLoop(Loop *L);
-
-/// ExtractBasicBlock - rip out a basic block into a new function
-///
-Function* ExtractBasicBlock(BasicBlock *BB);
+#include <vector>
 
+namespace llvm {
+  class BasicBlock;
+  class DominatorSet;
+  class Function;
+  class Loop;
+  
+  /// ExtractCodeRegion - rip out a sequence of basic blocks into a new function
+  ///
+  Function* ExtractCodeRegion(DominatorSet &DS,
+                              const std::vector<BasicBlock*> &code);
+
+  /// ExtractLoop - rip out a natural loop into a new function
+  ///
+  Function* ExtractLoop(DominatorSet &DS, Loop *L);
+
+  /// ExtractBasicBlock - rip out a basic block into a new function
+  ///
+  Function* ExtractBasicBlock(BasicBlock *BB);
 }
 
 #endif

llvm/lib/Target/X86/InstSelectSimple.cpp

@@ -1422,6 +1422,8 @@ static bool isSafeToFoldLoadIntoInstruction(LoadInst &LI, Instruction &User) {
   // really use alias analysis here, but for now we just do something simple.
   for (++It; It != BasicBlock::iterator(&User); ++It) {
     switch (It->getOpcode()) {
+    case Instruction::Malloc:
+    case Instruction::Free:
     case Instruction::Store:
     case Instruction::Call:
     case Instruction::Invoke:

llvm/lib/Transforms/IPO/LoopExtractor.cpp

@@ -18,12 +18,16 @@
 #include "llvm/iTerminators.h"
 #include "llvm/Module.h"
 #include "llvm/Pass.h"
+#include "llvm/Analysis/Dominators.h"
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/Transforms/Scalar.h"
 #include "llvm/Transforms/Utils/FunctionUtils.h"
+#include "Support/Statistic.h"
 using namespace llvm;
 
 namespace {
+  Statistic<> NumExtracted("loop-extract", "Number of loops extracted");
+  
   // FIXME: This is not a function pass, but the PassManager doesn't allow
   // Module passes to require FunctionPasses, so we can't get loop info if we're
   // not a function pass.
@@ -35,8 +39,10 @@ namespace {
     virtual bool runOnFunction(Function &F);
 
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
-      AU.addRequired<LoopInfo>();
+      AU.addRequiredID(BreakCriticalEdgesID);
       AU.addRequiredID(LoopSimplifyID);
+      AU.addRequired<DominatorSet>();
+      AU.addRequired<LoopInfo>();
     }
   };
 
@@ -59,14 +65,17 @@ bool LoopExtractor::runOnFunction(Function &F) {
   if (LI.begin() == LI.end())
     return false;
 
+  DominatorSet &DS = getAnalysis<DominatorSet>();
+
   // If there is more than one top-level loop in this function, extract all of
   // the loops.
   bool Changed = false;
   if (LI.end()-LI.begin() > 1) {
     for (LoopInfo::iterator i = LI.begin(), e = LI.end(); i != e; ++i) {
       if (NumLoops == 0) return Changed;
       --NumLoops;
-      Changed |= (ExtractLoop(*i) != 0);
+      Changed |= ExtractLoop(DS, *i) != 0;
+      ++NumExtracted;
     }
   } else {
     // Otherwise there is exactly one top-level loop.  If this function is more
@@ -93,7 +102,8 @@ bool LoopExtractor::runOnFunction(Function &F) {
     if (ShouldExtractLoop) {
       if (NumLoops == 0) return Changed;
       --NumLoops;
-      Changed |= (ExtractLoop(TLL) != 0);
+      Changed |= ExtractLoop(DS, TLL) != 0;
+      ++NumExtracted;
     } else {
       // Okay, this function is a minimal container around the specified loop.
       // If we extract the loop, we will continue to just keep extracting it
@@ -102,7 +112,8 @@ bool LoopExtractor::runOnFunction(Function &F) {
       for (Loop::iterator i = TLL->begin(), e = TLL->end(); i != e; ++i) {
         if (NumLoops == 0) return Changed;
         --NumLoops;
-        Changed |= (ExtractLoop(*i) != 0);
+        Changed |= ExtractLoop(DS, *i) != 0;
+        ++NumExtracted;
       }
     }
   }