#include <algorithm>
#include <deque>
#include <map>
-#include <vector>
using namespace llvm;
//===----------------------------------------------------------------------===//
namespace llvm {
template <> struct DenseMapKeyInfo<Expression> {
- static inline Expression getEmptyKey() { return Expression(Expression::EMPTY); }
- static inline Expression getTombstoneKey() { return Expression(Expression::TOMBSTONE); }
+ static inline Expression getEmptyKey() {
+ return Expression(Expression::EMPTY);
+ }
+
+ static inline Expression getTombstoneKey() {
+ return Expression(Expression::TOMBSTONE);
+ }
static unsigned getHashValue(const Expression e) {
unsigned hash = e.opcode;
(unsigned)((uintptr_t)e.type >> 9) +
hash * 37;
- for (SmallVector<uint32_t, 4>::const_iterator I = e.varargs.begin(), E = e.varargs.end();
- I != E; ++I)
+ for (SmallVector<uint32_t, 4>::const_iterator I = e.varargs.begin(),
+ E = e.varargs.end(); I != E; ++I)
hash = *I + hash * 37;
return hash;
e.secondVN = 0;
e.thirdVN = 0;
e.type = G->getType();
- e.opcode = Expression::SELECT;
+ e.opcode = Expression::GEP;
for (GetElementPtrInst::op_iterator I = G->idx_begin(), E = G->idx_end();
I != E; ++I)
private:
ValueTable VN;
- std::vector<Instruction*> createdExpressions;
+ SmallVector<Instruction*, 8> createdExpressions;
DenseMap<BasicBlock*, ValueNumberedSet> availableOut;
DenseMap<BasicBlock*, ValueNumberedSet> anticipatedIn;
BasicBlock* succ, ValueNumberedSet& out) ;
void topo_sort(ValueNumberedSet& set,
- std::vector<Value*>& vec) ;
+ SmallVector<Value*, 8>& vec) ;
void cleanup() ;
bool elimination() ;
ValueNumberedSet& currAvail,
ValueNumberedSet& currPhis,
ValueNumberedSet& currExps,
- SmallPtrSet<Value*, 16>& currTemps) ;
+ SmallPtrSet<Value*, 16>& currTemps);
bool buildsets_anticout(BasicBlock* BB,
ValueNumberedSet& anticOut,
- SmallPtrSet<BasicBlock*, 8>& visited) ;
+ SmallPtrSet<BasicBlock*, 8>& visited);
unsigned buildsets_anticin(BasicBlock* BB,
ValueNumberedSet& anticOut,
ValueNumberedSet& currExps,
SmallPtrSet<Value*, 16>& currTemps,
- SmallPtrSet<BasicBlock*, 8>& visited) ;
+ SmallPtrSet<BasicBlock*, 8>& visited);
void buildsets(Function& F) ;
void insertion_pre(Value* e, BasicBlock* BB,
- std::map<BasicBlock*, Value*>& avail,
- std::map<BasicBlock*,ValueNumberedSet>& new_set) ;
- unsigned insertion_mergepoint(std::vector<Value*>& workList,
+ DenseMap<BasicBlock*, Value*>& avail,
+ std::map<BasicBlock*,ValueNumberedSet>& new_set);
+ unsigned insertion_mergepoint(SmallVector<Value*, 8>& workList,
df_iterator<DomTreeNode*>& D,
- std::map<BasicBlock*, ValueNumberedSet>& new_set) ;
+ std::map<BasicBlock*, ValueNumberedSet>& new_set);
bool insertion(Function& F) ;
};
FunctionPass *llvm::createGVNPREPass() { return new GVNPRE(); }
static RegisterPass<GVNPRE> X("gvnpre",
- "Global Value Numbering/Partial Redundancy Elimination");
+ "Global Value Numbering/Partial Redundancy Elimination");
STATISTIC(NumInsertedVals, "Number of values inserted");
/// val_replace - Insert a value into a set, replacing any values already in
/// the set that have the same value number
void GVNPRE::val_replace(ValueNumberedSet& s, Value* v) {
+ if (s.count(v)) return;
+
uint32_t num = VN.lookup(v);
Value* leader = find_leader(s, num);
if (leader != 0)
return 0;
bool changed_idx = false;
- std::vector<Value*> newIdx;
+ SmallVector<Value*, 4> newIdx;
for (GetElementPtrInst::op_iterator I = U->idx_begin(), E = U->idx_end();
I != E; ++I)
if (isa<Instruction>(*I)) {
/// themselves in the set, as well as all values that depend on invokes (see
/// above)
void GVNPRE::clean(ValueNumberedSet& set) {
- std::vector<Value*> worklist;
+ SmallVector<Value*, 8> worklist;
worklist.reserve(set.size());
topo_sort(set, worklist);
/// topo_sort - Given a set of values, sort them by topological
/// order into the provided vector.
-void GVNPRE::topo_sort(ValueNumberedSet& set, std::vector<Value*>& vec) {
+void GVNPRE::topo_sort(ValueNumberedSet& set, SmallVector<Value*, 8>& vec) {
SmallPtrSet<Value*, 16> visited;
- std::vector<Value*> stack;
+ SmallVector<Value*, 8> stack;
for (ValueNumberedSet::iterator I = set.begin(), E = set.end();
I != E; ++I) {
if (visited.count(*I) == 0)
bool GVNPRE::elimination() {
bool changed_function = false;
- std::vector<std::pair<Instruction*, Value*> > replace;
- std::vector<Instruction*> erase;
+ SmallVector<std::pair<Instruction*, Value*>, 8> replace;
+ SmallVector<Instruction*, 8> erase;
DominatorTree& DT = getAnalysis<DominatorTree>();
isa<ExtractElementInst>(BI) || isa<SelectInst>(BI) ||
isa<CastInst>(BI) || isa<GetElementPtrInst>(BI)) {
- if (availableOut[BB].test(VN.lookup(BI)) && !availableOut[BB].count(BI)) {
+ if (availableOut[BB].test(VN.lookup(BI)) &&
+ !availableOut[BB].count(BI)) {
Value *leader = find_leader(availableOut[BB], VN.lookup(BI));
if (Instruction* Instr = dyn_cast<Instruction>(leader))
if (Instr->getParent() != 0 && Instr != BI) {
changed_function = true;
}
- for (std::vector<Instruction*>::iterator I = erase.begin(), E = erase.end();
- I != E; ++I)
+ for (SmallVector<Instruction*, 8>::iterator I = erase.begin(),
+ E = erase.end(); I != E; ++I)
(*I)->eraseFromParent();
return changed_function;
BasicBlock* currSucc = BB->getTerminator()->getSuccessor(i);
ValueNumberedSet& succAnticIn = anticipatedIn[currSucc];
- std::vector<Value*> temp;
+ SmallVector<Value*, 16> temp;
for (ValueNumberedSet::iterator I = anticOut.begin(),
E = anticOut.end(); I != E; ++I)
if (!succAnticIn.test(VN.lookup(*I)))
temp.push_back(*I);
- for (std::vector<Value*>::iterator I = temp.begin(), E = temp.end();
+ for (SmallVector<Value*, 16>::iterator I = temp.begin(), E = temp.end();
I != E; ++I) {
anticOut.erase(*I);
anticOut.reset(VN.lookup(*I));
/// by inserting appropriate values into the predecessors and a phi node in
/// the main block
void GVNPRE::insertion_pre(Value* e, BasicBlock* BB,
- std::map<BasicBlock*, Value*>& avail,
+ DenseMap<BasicBlock*, Value*>& avail,
std::map<BasicBlock*, ValueNumberedSet>& new_sets) {
for (pred_iterator PI = pred_begin(BB), PE = pred_end(BB); PI != PE; ++PI) {
Value* e2 = avail[*PI];
}
// Vararg operators
- std::vector<Value*> sVarargs;
+ SmallVector<Value*, 4> sVarargs;
if (GetElementPtrInst* G = dyn_cast<GetElementPtrInst>(U)) {
for (GetElementPtrInst::op_iterator OI = G->idx_begin(),
OE = G->idx_end(); OI != OE; ++OI) {
val_replace(new_sets[*PI], newVal);
predAvail.set(VN.lookup(newVal));
- std::map<BasicBlock*, Value*>::iterator av = avail.find(*PI);
+ DenseMap<BasicBlock*, Value*>::iterator av = avail.find(*PI);
if (av != avail.end())
avail.erase(av);
avail.insert(std::make_pair(*PI, newVal));
/// insertion_mergepoint - When walking the dom tree, check at each merge
/// block for the possibility of a partial redundancy. If present, eliminate it
-unsigned GVNPRE::insertion_mergepoint(std::vector<Value*>& workList,
+unsigned GVNPRE::insertion_mergepoint(SmallVector<Value*, 8>& workList,
df_iterator<DomTreeNode*>& D,
std::map<BasicBlock*, ValueNumberedSet >& new_sets) {
bool changed_function = false;
if (availableOut[D->getIDom()->getBlock()].test(VN.lookup(e)))
continue;
- std::map<BasicBlock*, Value*> avail;
+ DenseMap<BasicBlock*, Value*> avail;
bool by_some = false;
bool all_same = true;
Value * first_s = 0;
Value *e3 = find_leader(availableOut[*PI], VN.lookup(e2));
if (e3 == 0) {
- std::map<BasicBlock*, Value*>::iterator av = avail.find(*PI);
+ DenseMap<BasicBlock*, Value*>::iterator av = avail.find(*PI);
if (av != avail.end())
avail.erase(av);
avail.insert(std::make_pair(*PI, e2));
all_same = false;
} else {
- std::map<BasicBlock*, Value*>::iterator av = avail.find(*PI);
+ DenseMap<BasicBlock*, Value*>::iterator av = avail.find(*PI);
if (av != avail.end())
avail.erase(av);
avail.insert(std::make_pair(*PI, e3));
// If there is more than one predecessor...
if (pred_begin(BB) != pred_end(BB) && ++pred_begin(BB) != pred_end(BB)) {
- std::vector<Value*> workList;
+ SmallVector<Value*, 8> workList;
workList.reserve(anticIn.size());
topo_sort(anticIn, workList);
projects / oota-llvm.git / blobdiff