projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reapply r110396, with fixes to appease the Linux buildbot gods.
[oota-llvm.git]
/
lib
/
Transforms
/
Utils
/
Mem2Reg.cpp
diff --git
a/lib/Transforms/Utils/Mem2Reg.cpp
b/lib/Transforms/Utils/Mem2Reg.cpp
index 39400e72adccc548e0d5e6d97f9adf83701e2097..13dda65a6b088e3158fa4f9de8cb17ebe32cd2e7 100644
(file)
--- a/
lib/Transforms/Utils/Mem2Reg.cpp
+++ b/
lib/Transforms/Utils/Mem2Reg.cpp
@@
-1,10
+1,10
@@
//===- Mem2Reg.cpp - The -mem2reg pass, a wrapper around the Utils lib ----===//
//===- Mem2Reg.cpp - The -mem2reg pass, a wrapper around the Utils lib ----===//
-//
+//
// The LLVM Compiler Infrastructure
//
// The LLVM Compiler Infrastructure
//
-// This file
was developed by the LLVM research group and is distributed under
-//
the University of Illinois Open Source
License. See LICENSE.TXT for details.
-//
+// This file
is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
//===----------------------------------------------------------------------===//
//
// This pass is a simple pass wrapper around the PromoteMemToReg function call
//===----------------------------------------------------------------------===//
//
// This pass is a simple pass wrapper around the PromoteMemToReg function call
@@
-12,19
+12,23
@@
//
//===----------------------------------------------------------------------===//
//
//===----------------------------------------------------------------------===//
+#define DEBUG_TYPE "mem2reg"
#include "llvm/Transforms/Scalar.h"
#include "llvm/Transforms/Utils/PromoteMemToReg.h"
#include "llvm/Transforms/Scalar.h"
#include "llvm/Transforms/Utils/PromoteMemToReg.h"
+#include "llvm/Transforms/Utils/UnifyFunctionExitNodes.h"
#include "llvm/Analysis/Dominators.h"
#include "llvm/Instructions.h"
#include "llvm/Function.h"
#include "llvm/Analysis/Dominators.h"
#include "llvm/Instructions.h"
#include "llvm/Function.h"
-#include "llvm/Target/TargetData.h"
#include "llvm/ADT/Statistic.h"
using namespace llvm;
#include "llvm/ADT/Statistic.h"
using namespace llvm;
-namespace {
- Statistic<> NumPromoted("mem2reg", "Number of alloca's promoted");
+STATISTIC(NumPromoted, "Number of alloca's promoted");
+namespace {
struct PromotePass : public FunctionPass {
struct PromotePass : public FunctionPass {
+ static char ID; // Pass identification, replacement for typeid
+ PromotePass() : FunctionPass(ID) {}
+
// runOnFunction - To run this pass, first we calculate the alloca
// instructions that are safe for promotion, then we promote each one.
//
// runOnFunction - To run this pass, first we calculate the alloca
// instructions that are safe for promotion, then we promote each one.
//
@@
-35,25
+39,28
@@
namespace {
virtual void getAnalysisUsage(AnalysisUsage &AU) const {
AU.addRequired<DominatorTree>();
AU.addRequired<DominanceFrontier>();
virtual void getAnalysisUsage(AnalysisUsage &AU) const {
AU.addRequired<DominatorTree>();
AU.addRequired<DominanceFrontier>();
- AU.addRequired<TargetData>();
AU.setPreservesCFG();
AU.setPreservesCFG();
+ // This is a cluster of orthogonal Transforms
+ AU.addPreserved<UnifyFunctionExitNodes>();
+ AU.addPreservedID(LowerSwitchID);
+ AU.addPreservedID(LowerInvokePassID);
}
};
}
};
-
- RegisterOpt<PromotePass> X("mem2reg", "Promote Memory to Register");
} // end of anonymous namespace
} // end of anonymous namespace
+char PromotePass::ID = 0;
+static RegisterPass<PromotePass> X("mem2reg", "Promote Memory to Register");
+
bool PromotePass::runOnFunction(Function &F) {
std::vector<AllocaInst*> Allocas;
bool PromotePass::runOnFunction(Function &F) {
std::vector<AllocaInst*> Allocas;
- const TargetData &TD = getAnalysis<TargetData>();
BasicBlock &BB = F.getEntryBlock(); // Get the entry node for the function
bool Changed = false;
BasicBlock &BB = F.getEntryBlock(); // Get the entry node for the function
bool Changed = false;
- DominatorTree
&DT = getAnalysis<DominatorTree>();
+ DominatorTree &DT = getAnalysis<DominatorTree>();
DominanceFrontier &DF = getAnalysis<DominanceFrontier>();
DominanceFrontier &DF = getAnalysis<DominanceFrontier>();
-
+
while (1) {
Allocas.clear();
while (1) {
Allocas.clear();
@@
-61,12
+68,12
@@
bool PromotePass::runOnFunction(Function &F) {
// the entry node
for (BasicBlock::iterator I = BB.begin(), E = --BB.end(); I != E; ++I)
if (AllocaInst *AI = dyn_cast<AllocaInst>(I)) // Is it an alloca?
// the entry node
for (BasicBlock::iterator I = BB.begin(), E = --BB.end(); I != E; ++I)
if (AllocaInst *AI = dyn_cast<AllocaInst>(I)) // Is it an alloca?
- if (isAllocaPromotable(AI
, TD
))
+ if (isAllocaPromotable(AI))
Allocas.push_back(AI);
if (Allocas.empty()) break;
Allocas.push_back(AI);
if (Allocas.empty()) break;
- PromoteMemToReg(Allocas, DT, DF
, TD
);
+ PromoteMemToReg(Allocas, DT, DF);
NumPromoted += Allocas.size();
Changed = true;
}
NumPromoted += Allocas.size();
Changed = true;
}
@@
-74,9
+81,10
@@
bool PromotePass::runOnFunction(Function &F) {
return Changed;
}
return Changed;
}
+// Publically exposed interface to pass...
+char &llvm::PromoteMemoryToRegisterID = PromotePass::ID;
// createPromoteMemoryToRegister - Provide an entry point to create this pass.
//
// createPromoteMemoryToRegister - Provide an entry point to create this pass.
//
-
Pass *llvm::createPromoteMemoryToRegister
() {
+
FunctionPass *llvm::createPromoteMemoryToRegisterPass
() {
return new PromotePass();
}
return new PromotePass();
}
-