#include "llvm/Transforms/Scalar.h"
#include "llvm/Instructions.h"
#include "llvm/Function.h"
+#include "llvm/DerivedTypes.h"
#include "llvm/Analysis/Dominators.h"
-#include "llvm/Analysis/PostDominators.h"
#include "llvm/ADT/BitVector.h"
#include "llvm/ADT/DenseMap.h"
#include "llvm/ADT/DepthFirstIterator.h"
+#include "llvm/ADT/PostOrderIterator.h"
#include "llvm/ADT/SmallPtrSet.h"
#include "llvm/ADT/Statistic.h"
+#include "llvm/Transforms/Utils/UnifyFunctionExitNodes.h"
#include "llvm/Support/CFG.h"
#include "llvm/Support/Compiler.h"
#include "llvm/Support/Debug.h"
ICMPSGT, ICMPSGE, ICMPSLT, ICMPSLE, FCMPOEQ,
FCMPOGT, FCMPOGE, FCMPOLT, FCMPOLE, FCMPONE,
FCMPORD, FCMPUNO, FCMPUEQ, FCMPUGT, FCMPUGE,
- FCMPULT, FCMPULE, FCMPUNE };
+ FCMPULT, FCMPULE, FCMPUNE, EXTRACT, INSERT,
+ SHUFFLE, SELECT, TRUNC, ZEXT, SEXT, FPTOUI,
+ FPTOSI, UITOFP, SITOFP, FPTRUNC, FPEXT,
+ PTRTOINT, INTTOPTR, BITCAST, GEP};
ExpressionOpcode opcode;
- uint32_t leftVN;
- uint32_t rightVN;
+ const Type* type;
+ uint32_t firstVN;
+ uint32_t secondVN;
+ uint32_t thirdVN;
+ std::vector<uint32_t> varargs;
bool operator< (const Expression& other) const {
if (opcode < other.opcode)
return true;
else if (opcode > other.opcode)
return false;
- else if (leftVN < other.leftVN)
+ else if (type < other.type)
return true;
- else if (leftVN > other.leftVN)
+ else if (type > other.type)
return false;
- else if (rightVN < other.rightVN)
+ else if (firstVN < other.firstVN)
return true;
- else if (rightVN > other.rightVN)
+ else if (firstVN > other.firstVN)
return false;
- else
+ else if (secondVN < other.secondVN)
+ return true;
+ else if (secondVN > other.secondVN)
+ return false;
+ else if (thirdVN < other.thirdVN)
+ return true;
+ else if (thirdVN > other.thirdVN)
+ return false;
+ else {
+ if (varargs.size() < other.varargs.size())
+ return true;
+ else if (varargs.size() > other.varargs.size())
+ return false;
+
+ for (size_t i = 0; i < varargs.size(); ++i)
+ if (varargs[i] < other.varargs[i])
+ return true;
+ else if (varargs[i] > other.varargs[i])
+ return false;
+
return false;
+ }
}
};
DenseMap<Value*, uint32_t> valueNumbering;
std::map<Expression, uint32_t> expressionNumbering;
- std::set<Expression> maximalExpressions;
- SmallPtrSet<Value*, 32> maximalValues;
-
uint32_t nextValueNumber;
Expression::ExpressionOpcode getOpcode(BinaryOperator* BO);
Expression::ExpressionOpcode getOpcode(CmpInst* C);
+ Expression::ExpressionOpcode getOpcode(CastInst* C);
Expression create_expression(BinaryOperator* BO);
Expression create_expression(CmpInst* C);
+ Expression create_expression(ShuffleVectorInst* V);
+ Expression create_expression(ExtractElementInst* C);
+ Expression create_expression(InsertElementInst* V);
+ Expression create_expression(SelectInst* V);
+ Expression create_expression(CastInst* C);
+ Expression create_expression(GetElementPtrInst* G);
public:
ValueTable() { nextValueNumber = 1; }
uint32_t lookup_or_add(Value* V);
- uint32_t lookup(Value* V);
+ uint32_t lookup(Value* V) const;
void add(Value* V, uint32_t num);
void clear();
- std::set<Expression>& getMaximalExpressions() {
- return maximalExpressions;
-
- }
- SmallPtrSet<Value*, 32>& getMaximalValues() { return maximalValues; }
void erase(Value* v);
unsigned size();
};
}
}
+ValueTable::Expression::ExpressionOpcode
+ ValueTable::getOpcode(CastInst* C) {
+ switch(C->getOpcode()) {
+ case Instruction::Trunc:
+ return Expression::TRUNC;
+ case Instruction::ZExt:
+ return Expression::ZEXT;
+ case Instruction::SExt:
+ return Expression::SEXT;
+ case Instruction::FPToUI:
+ return Expression::FPTOUI;
+ case Instruction::FPToSI:
+ return Expression::FPTOSI;
+ case Instruction::UIToFP:
+ return Expression::UITOFP;
+ case Instruction::SIToFP:
+ return Expression::SITOFP;
+ case Instruction::FPTrunc:
+ return Expression::FPTRUNC;
+ case Instruction::FPExt:
+ return Expression::FPEXT;
+ case Instruction::PtrToInt:
+ return Expression::PTRTOINT;
+ case Instruction::IntToPtr:
+ return Expression::INTTOPTR;
+ case Instruction::BitCast:
+ return Expression::BITCAST;
+
+ // THIS SHOULD NEVER HAPPEN
+ default:
+ assert(0 && "Cast operator with unknown opcode?");
+ return Expression::BITCAST;
+ }
+}
+
ValueTable::Expression ValueTable::create_expression(BinaryOperator* BO) {
Expression e;
- e.leftVN = lookup_or_add(BO->getOperand(0));
- e.rightVN = lookup_or_add(BO->getOperand(1));
+ e.firstVN = lookup_or_add(BO->getOperand(0));
+ e.secondVN = lookup_or_add(BO->getOperand(1));
+ e.thirdVN = 0;
+ e.type = BO->getType();
e.opcode = getOpcode(BO);
- maximalExpressions.insert(e);
-
return e;
}
ValueTable::Expression ValueTable::create_expression(CmpInst* C) {
Expression e;
- e.leftVN = lookup_or_add(C->getOperand(0));
- e.rightVN = lookup_or_add(C->getOperand(1));
+ e.firstVN = lookup_or_add(C->getOperand(0));
+ e.secondVN = lookup_or_add(C->getOperand(1));
+ e.thirdVN = 0;
+ e.type = C->getType();
e.opcode = getOpcode(C);
- maximalExpressions.insert(e);
+ return e;
+}
+
+ValueTable::Expression ValueTable::create_expression(CastInst* C) {
+ Expression e;
+
+ e.firstVN = lookup_or_add(C->getOperand(0));
+ e.secondVN = 0;
+ e.thirdVN = 0;
+ e.type = C->getType();
+ e.opcode = getOpcode(C);
+
+ return e;
+}
+
+ValueTable::Expression ValueTable::create_expression(ShuffleVectorInst* S) {
+ Expression e;
+
+ e.firstVN = lookup_or_add(S->getOperand(0));
+ e.secondVN = lookup_or_add(S->getOperand(1));
+ e.thirdVN = lookup_or_add(S->getOperand(2));
+ e.type = S->getType();
+ e.opcode = Expression::SHUFFLE;
+
+ return e;
+}
+
+ValueTable::Expression ValueTable::create_expression(ExtractElementInst* E) {
+ Expression e;
+
+ e.firstVN = lookup_or_add(E->getOperand(0));
+ e.secondVN = lookup_or_add(E->getOperand(1));
+ e.thirdVN = 0;
+ e.type = E->getType();
+ e.opcode = Expression::EXTRACT;
+
+ return e;
+}
+
+ValueTable::Expression ValueTable::create_expression(InsertElementInst* I) {
+ Expression e;
+
+ e.firstVN = lookup_or_add(I->getOperand(0));
+ e.secondVN = lookup_or_add(I->getOperand(1));
+ e.thirdVN = lookup_or_add(I->getOperand(2));
+ e.type = I->getType();
+ e.opcode = Expression::INSERT;
+
+ return e;
+}
+
+ValueTable::Expression ValueTable::create_expression(SelectInst* I) {
+ Expression e;
+
+ e.firstVN = lookup_or_add(I->getCondition());
+ e.secondVN = lookup_or_add(I->getTrueValue());
+ e.thirdVN = lookup_or_add(I->getFalseValue());
+ e.type = I->getType();
+ e.opcode = Expression::SELECT;
+
+ return e;
+}
+
+ValueTable::Expression ValueTable::create_expression(GetElementPtrInst* G) {
+ Expression e;
+
+ e.firstVN = lookup_or_add(G->getPointerOperand());
+ e.secondVN = 0;
+ e.thirdVN = 0;
+ e.type = G->getType();
+ e.opcode = Expression::SELECT;
+
+ for (GetElementPtrInst::op_iterator I = G->idx_begin(), E = G->idx_end();
+ I != E; ++I)
+ e.varargs.push_back(lookup_or_add(*I));
return e;
}
/// lookup_or_add - Returns the value number for the specified value, assigning
/// it a new number if it did not have one before.
uint32_t ValueTable::lookup_or_add(Value* V) {
- maximalValues.insert(V);
-
DenseMap<Value*, uint32_t>::iterator VI = valueNumbering.find(V);
if (VI != valueNumbering.end())
return VI->second;
} else if (CmpInst* C = dyn_cast<CmpInst>(V)) {
Expression e = create_expression(C);
+ std::map<Expression, uint32_t>::iterator EI = expressionNumbering.find(e);
+ if (EI != expressionNumbering.end()) {
+ valueNumbering.insert(std::make_pair(V, EI->second));
+ return EI->second;
+ } else {
+ expressionNumbering.insert(std::make_pair(e, nextValueNumber));
+ valueNumbering.insert(std::make_pair(V, nextValueNumber));
+
+ return nextValueNumber++;
+ }
+ } else if (ShuffleVectorInst* U = dyn_cast<ShuffleVectorInst>(V)) {
+ Expression e = create_expression(U);
+
+ std::map<Expression, uint32_t>::iterator EI = expressionNumbering.find(e);
+ if (EI != expressionNumbering.end()) {
+ valueNumbering.insert(std::make_pair(V, EI->second));
+ return EI->second;
+ } else {
+ expressionNumbering.insert(std::make_pair(e, nextValueNumber));
+ valueNumbering.insert(std::make_pair(V, nextValueNumber));
+
+ return nextValueNumber++;
+ }
+ } else if (ExtractElementInst* U = dyn_cast<ExtractElementInst>(V)) {
+ Expression e = create_expression(U);
+
+ std::map<Expression, uint32_t>::iterator EI = expressionNumbering.find(e);
+ if (EI != expressionNumbering.end()) {
+ valueNumbering.insert(std::make_pair(V, EI->second));
+ return EI->second;
+ } else {
+ expressionNumbering.insert(std::make_pair(e, nextValueNumber));
+ valueNumbering.insert(std::make_pair(V, nextValueNumber));
+
+ return nextValueNumber++;
+ }
+ } else if (InsertElementInst* U = dyn_cast<InsertElementInst>(V)) {
+ Expression e = create_expression(U);
+
+ std::map<Expression, uint32_t>::iterator EI = expressionNumbering.find(e);
+ if (EI != expressionNumbering.end()) {
+ valueNumbering.insert(std::make_pair(V, EI->second));
+ return EI->second;
+ } else {
+ expressionNumbering.insert(std::make_pair(e, nextValueNumber));
+ valueNumbering.insert(std::make_pair(V, nextValueNumber));
+
+ return nextValueNumber++;
+ }
+ } else if (SelectInst* U = dyn_cast<SelectInst>(V)) {
+ Expression e = create_expression(U);
+
+ std::map<Expression, uint32_t>::iterator EI = expressionNumbering.find(e);
+ if (EI != expressionNumbering.end()) {
+ valueNumbering.insert(std::make_pair(V, EI->second));
+ return EI->second;
+ } else {
+ expressionNumbering.insert(std::make_pair(e, nextValueNumber));
+ valueNumbering.insert(std::make_pair(V, nextValueNumber));
+
+ return nextValueNumber++;
+ }
+ } else if (CastInst* U = dyn_cast<CastInst>(V)) {
+ Expression e = create_expression(U);
+
+ std::map<Expression, uint32_t>::iterator EI = expressionNumbering.find(e);
+ if (EI != expressionNumbering.end()) {
+ valueNumbering.insert(std::make_pair(V, EI->second));
+ return EI->second;
+ } else {
+ expressionNumbering.insert(std::make_pair(e, nextValueNumber));
+ valueNumbering.insert(std::make_pair(V, nextValueNumber));
+
+ return nextValueNumber++;
+ }
+ } else if (GetElementPtrInst* U = dyn_cast<GetElementPtrInst>(V)) {
+ Expression e = create_expression(U);
+
std::map<Expression, uint32_t>::iterator EI = expressionNumbering.find(e);
if (EI != expressionNumbering.end()) {
valueNumbering.insert(std::make_pair(V, EI->second));
/// lookup - Returns the value number of the specified value. Fails if
/// the value has not yet been numbered.
-uint32_t ValueTable::lookup(Value* V) {
+uint32_t ValueTable::lookup(Value* V) const {
DenseMap<Value*, uint32_t>::iterator VI = valueNumbering.find(V);
if (VI != valueNumbering.end())
return VI->second;
valueNumbering.insert(std::make_pair(V, num));
}
-/// clear - Remove all entries from the ValueTable and the maximal sets
+/// clear - Remove all entries from the ValueTable
void ValueTable::clear() {
valueNumbering.clear();
expressionNumbering.clear();
- maximalExpressions.clear();
- maximalValues.clear();
nextValueNumber = 1;
}
-/// erase - Remove a value from the value numbering and maximal sets
+/// erase - Remove a value from the value numbering
void ValueTable::erase(Value* V) {
- maximalValues.erase(V);
valueNumbering.erase(V);
- if (BinaryOperator* BO = dyn_cast<BinaryOperator>(V))
- maximalExpressions.erase(create_expression(BO));
- else if (CmpInst* C = dyn_cast<CmpInst>(V))
- maximalExpressions.erase(create_expression(C));
}
/// size - Return the number of assigned value numbers
ValueTable VN;
std::vector<Instruction*> createdExpressions;
- std::map<BasicBlock*, SmallPtrSet<Value*, 32> > availableOut;
- std::map<BasicBlock*, SmallPtrSet<Value*, 32> > anticipatedIn;
+ std::map<BasicBlock*, SmallPtrSet<Value*, 16> > availableOut;
+ std::map<BasicBlock*, SmallPtrSet<Value*, 16> > anticipatedIn;
+ std::map<BasicBlock*, SmallPtrSet<Value*, 16> > generatedPhis;
// This transformation requires dominator postdominator info
virtual void getAnalysisUsage(AnalysisUsage &AU) const {
AU.setPreservesCFG();
+ AU.addRequiredID(BreakCriticalEdgesID);
+ AU.addRequired<UnifyFunctionExitNodes>();
AU.addRequired<DominatorTree>();
- AU.addRequired<PostDominatorTree>();
}
// Helper fuctions
// FIXME: eliminate or document these better
- void dump(const SmallPtrSet<Value*, 32>& s) const;
- void clean(SmallPtrSet<Value*, 32>& set);
- Value* find_leader(SmallPtrSet<Value*, 32>& vals,
+ void dump(const SmallPtrSet<Value*, 16>& s) const;
+ void clean(SmallPtrSet<Value*, 16>& set, BitVector& presentInSet);
+ Value* find_leader(SmallPtrSet<Value*, 16>& vals,
uint32_t v);
Value* phi_translate(Value* V, BasicBlock* pred, BasicBlock* succ);
- void phi_translate_set(SmallPtrSet<Value*, 32>& anticIn, BasicBlock* pred,
- BasicBlock* succ, SmallPtrSet<Value*, 32>& out);
+ void phi_translate_set(SmallPtrSet<Value*, 16>& anticIn, BasicBlock* pred,
+ BasicBlock* succ, SmallPtrSet<Value*, 16>& out);
- void topo_sort(SmallPtrSet<Value*, 32>& set,
+ void topo_sort(SmallPtrSet<Value*, 16>& set,
std::vector<Value*>& vec);
void cleanup();
bool elimination();
- void val_insert(SmallPtrSet<Value*, 32>& s, Value* v);
- void val_replace(SmallPtrSet<Value*, 32>& s, Value* v);
+ void val_insert(SmallPtrSet<Value*, 16>& s, Value* v);
+ void val_replace(SmallPtrSet<Value*, 16>& s, Value* v);
bool dependsOnInvoke(Value* V);
void buildsets_availout(BasicBlock::iterator I,
- SmallPtrSet<Value*, 32>& currAvail,
- SmallPtrSet<PHINode*, 32>& currPhis,
- SmallPtrSet<Value*, 32>& currExps,
- SmallPtrSet<Value*, 32>& currTemps,
+ SmallPtrSet<Value*, 16>& currAvail,
+ SmallPtrSet<Value*, 16>& currPhis,
+ SmallPtrSet<Value*, 16>& currExps,
+ SmallPtrSet<Value*, 16>& currTemps,
BitVector& availNumbers,
BitVector& expNumbers);
bool buildsets_anticout(BasicBlock* BB,
- SmallPtrSet<Value*, 32>& anticOut,
+ SmallPtrSet<Value*, 16>& anticOut,
std::set<BasicBlock*>& visited);
unsigned buildsets_anticin(BasicBlock* BB,
- SmallPtrSet<Value*, 32>& anticOut,
- SmallPtrSet<Value*, 32>& currExps,
- SmallPtrSet<Value*, 32>& currTemps,
+ SmallPtrSet<Value*, 16>& anticOut,
+ SmallPtrSet<Value*, 16>& currExps,
+ SmallPtrSet<Value*, 16>& currTemps,
std::set<BasicBlock*>& visited);
- unsigned buildsets(Function& F);
+ void buildsets(Function& F);
void insertion_pre(Value* e, BasicBlock* BB,
std::map<BasicBlock*, Value*>& avail,
- SmallPtrSet<Value*, 32>& new_set);
+ std::map<BasicBlock*, SmallPtrSet<Value*, 16> >& new_set);
unsigned insertion_mergepoint(std::vector<Value*>& workList,
df_iterator<DomTreeNode*>& D,
- SmallPtrSet<Value*, 32>& new_set);
+ std::map<BasicBlock*, SmallPtrSet<Value*, 16> >& new_set);
bool insertion(Function& F);
};
/// find_leader - Given a set and a value number, return the first
/// element of the set with that value number, or 0 if no such element
/// is present
-Value* GVNPRE::find_leader(SmallPtrSet<Value*, 32>& vals, uint32_t v) {
- for (SmallPtrSet<Value*, 32>::iterator I = vals.begin(), E = vals.end();
+Value* GVNPRE::find_leader(SmallPtrSet<Value*, 16>& vals, uint32_t v) {
+ for (SmallPtrSet<Value*, 16>::iterator I = vals.begin(), E = vals.end();
I != E; ++I)
if (v == VN.lookup(*I))
return *I;
/// val_insert - Insert a value into a set only if there is not a value
/// with the same value number already in the set
-void GVNPRE::val_insert(SmallPtrSet<Value*, 32>& s, Value* v) {
+void GVNPRE::val_insert(SmallPtrSet<Value*, 16>& s, Value* v) {
uint32_t num = VN.lookup(v);
Value* leader = find_leader(s, num);
if (leader == 0)
/// 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(SmallPtrSet<Value*, 32>& s, Value* v) {
+void GVNPRE::val_replace(SmallPtrSet<Value*, 16>& s, Value* v) {
uint32_t num = VN.lookup(v);
Value* leader = find_leader(s, num);
while (leader != 0) {
if (V == 0)
return 0;
- if (BinaryOperator* BO = dyn_cast<BinaryOperator>(V)) {
+ // Unary Operations
+ if (CastInst* U = dyn_cast<CastInst>(V)) {
+ Value* newOp1 = 0;
+ if (isa<Instruction>(U->getOperand(0)))
+ newOp1 = phi_translate(U->getOperand(0), pred, succ);
+ else
+ newOp1 = U->getOperand(0);
+
+ if (newOp1 == 0)
+ return 0;
+
+ if (newOp1 != U->getOperand(0)) {
+ Instruction* newVal = 0;
+ if (CastInst* C = dyn_cast<CastInst>(U))
+ newVal = CastInst::create(C->getOpcode(),
+ newOp1, C->getType(),
+ C->getName()+".expr");
+
+ uint32_t v = VN.lookup_or_add(newVal);
+
+ Value* leader = find_leader(availableOut[pred], v);
+ if (leader == 0) {
+ createdExpressions.push_back(newVal);
+ return newVal;
+ } else {
+ VN.erase(newVal);
+ delete newVal;
+ return leader;
+ }
+ }
+
+ // Binary Operations
+ } if (isa<BinaryOperator>(V) || isa<CmpInst>(V) ||
+ isa<ExtractElementInst>(V)) {
+ User* U = cast<User>(V);
+
Value* newOp1 = 0;
- if (isa<Instruction>(BO->getOperand(0)))
- newOp1 = phi_translate(find_leader(anticipatedIn[succ],
- VN.lookup(BO->getOperand(0))),
- pred, succ);
+ if (isa<Instruction>(U->getOperand(0)))
+ newOp1 = phi_translate(U->getOperand(0), pred, succ);
else
- newOp1 = BO->getOperand(0);
+ newOp1 = U->getOperand(0);
if (newOp1 == 0)
return 0;
Value* newOp2 = 0;
- if (isa<Instruction>(BO->getOperand(1)))
- newOp2 = phi_translate(find_leader(anticipatedIn[succ],
- VN.lookup(BO->getOperand(1))),
- pred, succ);
+ if (isa<Instruction>(U->getOperand(1)))
+ newOp2 = phi_translate(U->getOperand(1), pred, succ);
else
- newOp2 = BO->getOperand(1);
+ newOp2 = U->getOperand(1);
if (newOp2 == 0)
return 0;
- if (newOp1 != BO->getOperand(0) || newOp2 != BO->getOperand(1)) {
- Instruction* newVal = BinaryOperator::create(BO->getOpcode(),
- newOp1, newOp2,
- BO->getName()+".expr");
+ if (newOp1 != U->getOperand(0) || newOp2 != U->getOperand(1)) {
+ Instruction* newVal = 0;
+ if (BinaryOperator* BO = dyn_cast<BinaryOperator>(U))
+ newVal = BinaryOperator::create(BO->getOpcode(),
+ newOp1, newOp2,
+ BO->getName()+".expr");
+ else if (CmpInst* C = dyn_cast<CmpInst>(U))
+ newVal = CmpInst::create(C->getOpcode(),
+ C->getPredicate(),
+ newOp1, newOp2,
+ C->getName()+".expr");
+ else if (ExtractElementInst* E = dyn_cast<ExtractElementInst>(U))
+ newVal = new ExtractElementInst(newOp1, newOp2, E->getName()+".expr");
uint32_t v = VN.lookup_or_add(newVal);
return leader;
}
}
- } else if (PHINode* P = dyn_cast<PHINode>(V)) {
- if (P->getParent() == succ)
- return P->getIncomingValueForBlock(pred);
- } else if (CmpInst* C = dyn_cast<CmpInst>(V)) {
+
+ // Ternary Operations
+ } else if (isa<ShuffleVectorInst>(V) || isa<InsertElementInst>(V) ||
+ isa<SelectInst>(V)) {
+ User* U = cast<User>(V);
+
Value* newOp1 = 0;
- if (isa<Instruction>(C->getOperand(0)))
- newOp1 = phi_translate(find_leader(anticipatedIn[succ],
- VN.lookup(C->getOperand(0))),
- pred, succ);
+ if (isa<Instruction>(U->getOperand(0)))
+ newOp1 = phi_translate(U->getOperand(0), pred, succ);
else
- newOp1 = C->getOperand(0);
+ newOp1 = U->getOperand(0);
if (newOp1 == 0)
return 0;
Value* newOp2 = 0;
- if (isa<Instruction>(C->getOperand(1)))
- newOp2 = phi_translate(find_leader(anticipatedIn[succ],
- VN.lookup(C->getOperand(1))),
- pred, succ);
+ if (isa<Instruction>(U->getOperand(1)))
+ newOp2 = phi_translate(U->getOperand(1), pred, succ);
else
- newOp2 = C->getOperand(1);
-
+ newOp2 = U->getOperand(1);
+
if (newOp2 == 0)
return 0;
- if (newOp1 != C->getOperand(0) || newOp2 != C->getOperand(1)) {
- Instruction* newVal = CmpInst::create(C->getOpcode(),
- C->getPredicate(),
- newOp1, newOp2,
- C->getName()+".expr");
+ Value* newOp3 = 0;
+ if (isa<Instruction>(U->getOperand(2)))
+ newOp3 = phi_translate(U->getOperand(2), pred, succ);
+ else
+ newOp3 = U->getOperand(2);
+
+ if (newOp3 == 0)
+ return 0;
+
+ if (newOp1 != U->getOperand(0) ||
+ newOp2 != U->getOperand(1) ||
+ newOp3 != U->getOperand(2)) {
+ Instruction* newVal = 0;
+ if (ShuffleVectorInst* S = dyn_cast<ShuffleVectorInst>(U))
+ newVal = new ShuffleVectorInst(newOp1, newOp2, newOp3,
+ S->getName()+".expr");
+ else if (InsertElementInst* I = dyn_cast<InsertElementInst>(U))
+ newVal = new InsertElementInst(newOp1, newOp2, newOp3,
+ I->getName()+".expr");
+ else if (SelectInst* I = dyn_cast<SelectInst>(U))
+ newVal = new SelectInst(newOp1, newOp2, newOp3, I->getName()+".expr");
uint32_t v = VN.lookup_or_add(newVal);
-
+
Value* leader = find_leader(availableOut[pred], v);
if (leader == 0) {
createdExpressions.push_back(newVal);
return leader;
}
}
+
+ // Varargs operators
+ } else if (GetElementPtrInst* U = dyn_cast<GetElementPtrInst>(V)) {
+ Value* newOp1 = 0;
+ if (isa<Instruction>(U->getPointerOperand()))
+ newOp1 = phi_translate(U->getPointerOperand(), pred, succ);
+ else
+ newOp1 = U->getPointerOperand();
+
+ if (newOp1 == 0)
+ return 0;
+
+ bool changed_idx = false;
+ std::vector<Value*> newIdx;
+ for (GetElementPtrInst::op_iterator I = U->idx_begin(), E = U->idx_end();
+ I != E; ++I)
+ if (isa<Instruction>(*I)) {
+ Value* newVal = phi_translate(*I, pred, succ);
+ newIdx.push_back(newVal);
+ if (newVal != *I)
+ changed_idx = true;
+ } else {
+ newIdx.push_back(*I);
+ }
+
+ if (newOp1 != U->getPointerOperand() || changed_idx) {
+ Instruction* newVal = new GetElementPtrInst(newOp1,
+ &newIdx[0], newIdx.size(),
+ U->getName()+".expr");
+
+ uint32_t v = VN.lookup_or_add(newVal);
+
+ Value* leader = find_leader(availableOut[pred], v);
+ if (leader == 0) {
+ createdExpressions.push_back(newVal);
+ return newVal;
+ } else {
+ VN.erase(newVal);
+ delete newVal;
+ return leader;
+ }
+ }
+
+ // PHI Nodes
+ } else if (PHINode* P = dyn_cast<PHINode>(V)) {
+ if (P->getParent() == succ)
+ return P->getIncomingValueForBlock(pred);
}
return V;
}
/// phi_translate_set - Perform phi translation on every element of a set
-void GVNPRE::phi_translate_set(SmallPtrSet<Value*, 32>& anticIn,
+void GVNPRE::phi_translate_set(SmallPtrSet<Value*, 16>& anticIn,
BasicBlock* pred, BasicBlock* succ,
- SmallPtrSet<Value*, 32>& out) {
- for (SmallPtrSet<Value*, 32>::iterator I = anticIn.begin(),
+ SmallPtrSet<Value*, 16>& out) {
+ for (SmallPtrSet<Value*, 16>::iterator I = anticIn.begin(),
E = anticIn.end(); I != E; ++I) {
Value* V = phi_translate(*I, pred, succ);
if (V != 0)
/// clean - Remove all non-opaque values from the set whose operands are not
/// themselves in the set, as well as all values that depend on invokes (see
/// above)
-void GVNPRE::clean(SmallPtrSet<Value*, 32>& set) {
+void GVNPRE::clean(SmallPtrSet<Value*, 16>& set, BitVector& presentInSet) {
std::vector<Value*> worklist;
worklist.reserve(set.size());
topo_sort(set, worklist);
for (unsigned i = 0; i < worklist.size(); ++i) {
Value* v = worklist[i];
- if (BinaryOperator* BO = dyn_cast<BinaryOperator>(v)) {
- bool lhsValid = !isa<Instruction>(BO->getOperand(0));
- if (!lhsValid)
- for (SmallPtrSet<Value*, 32>::iterator I = set.begin(), E = set.end();
- I != E; ++I)
- if (VN.lookup(*I) == VN.lookup(BO->getOperand(0))) {
- lhsValid = true;
- break;
- }
+ // Handle unary ops
+ if (CastInst* U = dyn_cast<CastInst>(v)) {
+ bool lhsValid = !isa<Instruction>(U->getOperand(0));
+ lhsValid |= presentInSet.test(VN.lookup(U->getOperand(0)));
if (lhsValid)
- lhsValid = !dependsOnInvoke(BO->getOperand(0));
-
- bool rhsValid = !isa<Instruction>(BO->getOperand(1));
- if (!rhsValid)
- for (SmallPtrSet<Value*, 32>::iterator I = set.begin(), E = set.end();
- I != E; ++I)
- if (VN.lookup(*I) == VN.lookup(BO->getOperand(1))) {
- rhsValid = true;
- break;
- }
+ lhsValid = !dependsOnInvoke(U->getOperand(0));
+
+ if (!lhsValid) {
+ set.erase(U);
+ presentInSet.flip(VN.lookup(U));
+ }
+
+ // Handle binary ops
+ } else if (isa<BinaryOperator>(v) || isa<CmpInst>(v) ||
+ isa<ExtractElementInst>(v)) {
+ User* U = cast<User>(v);
+
+ bool lhsValid = !isa<Instruction>(U->getOperand(0));
+ lhsValid |= presentInSet.test(VN.lookup(U->getOperand(0)));
+ if (lhsValid)
+ lhsValid = !dependsOnInvoke(U->getOperand(0));
+
+ bool rhsValid = !isa<Instruction>(U->getOperand(1));
+ rhsValid |= presentInSet.test(VN.lookup(U->getOperand(1)));
if (rhsValid)
- rhsValid = !dependsOnInvoke(BO->getOperand(1));
+ rhsValid = !dependsOnInvoke(U->getOperand(1));
- if (!lhsValid || !rhsValid)
- set.erase(BO);
- } else if (CmpInst* C = dyn_cast<CmpInst>(v)) {
- bool lhsValid = !isa<Instruction>(C->getOperand(0));
- if (!lhsValid)
- for (SmallPtrSet<Value*, 32>::iterator I = set.begin(), E = set.end();
- I != E; ++I)
- if (VN.lookup(*I) == VN.lookup(C->getOperand(0))) {
- lhsValid = true;
- break;
- }
+ if (!lhsValid || !rhsValid) {
+ set.erase(U);
+ presentInSet.flip(VN.lookup(U));
+ }
+
+ // Handle ternary ops
+ } else if (isa<ShuffleVectorInst>(v) || isa<InsertElementInst>(v) ||
+ isa<SelectInst>(v)) {
+ User* U = cast<User>(v);
+
+ bool lhsValid = !isa<Instruction>(U->getOperand(0));
+ lhsValid |= presentInSet.test(VN.lookup(U->getOperand(0)));
if (lhsValid)
- lhsValid = !dependsOnInvoke(C->getOperand(0));
+ lhsValid = !dependsOnInvoke(U->getOperand(0));
+
+ bool rhsValid = !isa<Instruction>(U->getOperand(1));
+ rhsValid |= presentInSet.test(VN.lookup(U->getOperand(1)));
+ if (rhsValid)
+ rhsValid = !dependsOnInvoke(U->getOperand(1));
+
+ bool thirdValid = !isa<Instruction>(U->getOperand(2));
+ thirdValid |= presentInSet.test(VN.lookup(U->getOperand(2)));
+ if (thirdValid)
+ thirdValid = !dependsOnInvoke(U->getOperand(2));
+
+ if (!lhsValid || !rhsValid || !thirdValid) {
+ set.erase(U);
+ presentInSet.flip(VN.lookup(U));
+ }
+
+ // Handle varargs ops
+ } else if (GetElementPtrInst* U = dyn_cast<GetElementPtrInst>(v)) {
+ bool ptrValid = !isa<Instruction>(U->getPointerOperand());
+ ptrValid |= presentInSet.test(VN.lookup(U->getPointerOperand()));
+ if (ptrValid)
+ ptrValid = !dependsOnInvoke(U->getPointerOperand());
- bool rhsValid = !isa<Instruction>(C->getOperand(1));
- if (!rhsValid)
- for (SmallPtrSet<Value*, 32>::iterator I = set.begin(), E = set.end();
+ bool varValid = true;
+ for (GetElementPtrInst::op_iterator I = U->idx_begin(), E = U->idx_end();
I != E; ++I)
- if (VN.lookup(*I) == VN.lookup(C->getOperand(1))) {
- rhsValid = true;
- break;
+ if (varValid) {
+ varValid &= !isa<Instruction>(*I) || presentInSet.test(VN.lookup(*I));
+ varValid &= !dependsOnInvoke(*I);
}
- if (rhsValid)
- rhsValid = !dependsOnInvoke(C->getOperand(1));
- if (!lhsValid || !rhsValid)
- set.erase(C);
+ if (!ptrValid || !varValid) {
+ set.erase(U);
+ presentInSet.flip(VN.lookup(U));
+ }
}
}
}
/// topo_sort - Given a set of values, sort them by topological
/// order into the provided vector.
-void GVNPRE::topo_sort(SmallPtrSet<Value*, 32>& set, std::vector<Value*>& vec) {
- SmallPtrSet<Value*, 32> toErase;
- for (SmallPtrSet<Value*, 32>::iterator I = set.begin(), E = set.end();
+void GVNPRE::topo_sort(SmallPtrSet<Value*, 16>& set, std::vector<Value*>& vec) {
+ SmallPtrSet<Value*, 16> visited;
+ std::vector<Value*> stack;
+ for (SmallPtrSet<Value*, 16>::iterator I = set.begin(), E = set.end();
I != E; ++I) {
- if (BinaryOperator* BO = dyn_cast<BinaryOperator>(*I))
- for (SmallPtrSet<Value*, 32>::iterator SI = set.begin(); SI != E; ++SI) {
- if (VN.lookup(BO->getOperand(0)) == VN.lookup(*SI) ||
- VN.lookup(BO->getOperand(1)) == VN.lookup(*SI)) {
- toErase.insert(*SI);
+ if (visited.count(*I) == 0)
+ stack.push_back(*I);
+
+ while (!stack.empty()) {
+ Value* e = stack.back();
+
+ // Handle unary ops
+ if (CastInst* U = dyn_cast<CastInst>(e)) {
+ Value* l = find_leader(set, VN.lookup(U->getOperand(0)));
+
+ if (l != 0 && isa<Instruction>(l) &&
+ visited.count(l) == 0)
+ stack.push_back(l);
+ else {
+ vec.push_back(e);
+ visited.insert(e);
+ stack.pop_back();
}
- }
- else if (CmpInst* C = dyn_cast<CmpInst>(*I))
- for (SmallPtrSet<Value*, 32>::iterator SI = set.begin(); SI != E; ++SI) {
- if (VN.lookup(C->getOperand(0)) == VN.lookup(*SI) ||
- VN.lookup(C->getOperand(1)) == VN.lookup(*SI)) {
- toErase.insert(*SI);
+
+ // Handle binary ops
+ } else if (isa<BinaryOperator>(e) || isa<CmpInst>(e) ||
+ isa<ExtractElementInst>(e)) {
+ User* U = cast<User>(e);
+ Value* l = find_leader(set, VN.lookup(U->getOperand(0)));
+ Value* r = find_leader(set, VN.lookup(U->getOperand(1)));
+
+ if (l != 0 && isa<Instruction>(l) &&
+ visited.count(l) == 0)
+ stack.push_back(l);
+ else if (r != 0 && isa<Instruction>(r) &&
+ visited.count(r) == 0)
+ stack.push_back(r);
+ else {
+ vec.push_back(e);
+ visited.insert(e);
+ stack.pop_back();
}
- }
- }
-
- std::vector<Value*> Q;
- for (SmallPtrSet<Value*, 32>::iterator I = set.begin(), E = set.end();
- I != E; ++I) {
- if (toErase.count(*I) == 0)
- Q.push_back(*I);
- }
-
- SmallPtrSet<Value*, 32> visited;
- while (!Q.empty()) {
- Value* e = Q.back();
-
- if (BinaryOperator* BO = dyn_cast<BinaryOperator>(e)) {
- Value* l = find_leader(set, VN.lookup(BO->getOperand(0)));
- Value* r = find_leader(set, VN.lookup(BO->getOperand(1)));
- if (l != 0 && isa<Instruction>(l) &&
- visited.count(l) == 0)
- Q.push_back(l);
- else if (r != 0 && isa<Instruction>(r) &&
- visited.count(r) == 0)
- Q.push_back(r);
- else {
- vec.push_back(e);
- visited.insert(e);
- Q.pop_back();
- }
- } else if (CmpInst* C = dyn_cast<CmpInst>(e)) {
- Value* l = find_leader(set, VN.lookup(C->getOperand(0)));
- Value* r = find_leader(set, VN.lookup(C->getOperand(1)));
+ // Handle ternary ops
+ } else if (isa<InsertElementInst>(e) || isa<ShuffleVectorInst>(e) ||
+ isa<SelectInst>(e)) {
+ User* U = cast<User>(e);
+ Value* l = find_leader(set, VN.lookup(U->getOperand(0)));
+ Value* r = find_leader(set, VN.lookup(U->getOperand(1)));
+ Value* m = find_leader(set, VN.lookup(U->getOperand(2)));
- if (l != 0 && isa<Instruction>(l) &&
- visited.count(l) == 0)
- Q.push_back(l);
- else if (r != 0 && isa<Instruction>(r) &&
- visited.count(r) == 0)
- Q.push_back(r);
- else {
- vec.push_back(e);
+ if (l != 0 && isa<Instruction>(l) &&
+ visited.count(l) == 0)
+ stack.push_back(l);
+ else if (r != 0 && isa<Instruction>(r) &&
+ visited.count(r) == 0)
+ stack.push_back(r);
+ else if (m != 0 && isa<Instruction>(m) &&
+ visited.count(m) == 0)
+ stack.push_back(m);
+ else {
+ vec.push_back(e);
+ visited.insert(e);
+ stack.pop_back();
+ }
+
+ // Handle vararg ops
+ } else if (GetElementPtrInst* U = dyn_cast<GetElementPtrInst>(e)) {
+ Value* p = find_leader(set, VN.lookup(U->getPointerOperand()));
+
+ if (p != 0 && isa<Instruction>(p) &&
+ visited.count(p) == 0)
+ stack.push_back(p);
+ else {
+ bool push_va = false;
+ for (GetElementPtrInst::op_iterator I = U->idx_begin(),
+ E = U->idx_end(); I != E; ++I) {
+ Value * v = find_leader(set, VN.lookup(*I));
+ if (v != 0 && isa<Instruction>(v) && visited.count(v) == 0) {
+ stack.push_back(v);
+ push_va = true;
+ }
+ }
+
+ if (!push_va) {
+ vec.push_back(e);
+ visited.insert(e);
+ stack.pop_back();
+ }
+ }
+
+ // Handle opaque ops
+ } else {
visited.insert(e);
- Q.pop_back();
+ vec.push_back(e);
+ stack.pop_back();
}
- } else {
- visited.insert(e);
- vec.push_back(e);
- Q.pop_back();
}
+
+ stack.clear();
}
}
/// dump - Dump a set of values to standard error
-void GVNPRE::dump(const SmallPtrSet<Value*, 32>& s) const {
+void GVNPRE::dump(const SmallPtrSet<Value*, 16>& s) const {
DOUT << "{ ";
- for (SmallPtrSet<Value*, 32>::iterator I = s.begin(), E = s.end();
+ for (SmallPtrSet<Value*, 16>::iterator I = s.begin(), E = s.end();
I != E; ++I) {
+ DOUT << "" << VN.lookup(*I) << ": ";
DEBUG((*I)->dump());
}
DOUT << "}\n\n";
E = df_end(DT.getRootNode()); DI != E; ++DI) {
BasicBlock* BB = DI->getBlock();
- DOUT << "Block: " << BB->getName() << "\n";
- dump(availableOut[BB]);
- DOUT << "\n\n";
+ //DOUT << "Block: " << BB->getName() << "\n";
+ //dump(availableOut[BB]);
+ //DOUT << "\n\n";
for (BasicBlock::iterator BI = BB->begin(), BE = BB->end();
BI != BE; ++BI) {
- if (isa<BinaryOperator>(BI) || isa<CmpInst>(BI)) {
+ if (isa<BinaryOperator>(BI) || isa<CmpInst>(BI) ||
+ isa<ShuffleVectorInst>(BI) || isa<InsertElementInst>(BI) ||
+ isa<ExtractElementInst>(BI) || isa<SelectInst>(BI) ||
+ isa<CastInst>(BI) || isa<GetElementPtrInst>(BI)) {
Value *leader = find_leader(availableOut[BB], VN.lookup(BI));
if (leader != 0)
/// buildsets_availout - When calculating availability, handle an instruction
/// by inserting it into the appropriate sets
void GVNPRE::buildsets_availout(BasicBlock::iterator I,
- SmallPtrSet<Value*, 32>& currAvail,
- SmallPtrSet<PHINode*, 32>& currPhis,
- SmallPtrSet<Value*, 32>& currExps,
- SmallPtrSet<Value*, 32>& currTemps,
+ SmallPtrSet<Value*, 16>& currAvail,
+ SmallPtrSet<Value*, 16>& currPhis,
+ SmallPtrSet<Value*, 16>& currExps,
+ SmallPtrSet<Value*, 16>& currTemps,
BitVector& availNumbers,
BitVector& expNumbers) {
- // Handle PHI nodes...
+ // Handle PHI nodes
if (PHINode* p = dyn_cast<PHINode>(I)) {
VN.lookup_or_add(p);
expNumbers.resize(VN.size());
availNumbers.resize(VN.size());
currPhis.insert(p);
+
+ // Handle unary ops
+ } else if (CastInst* U = dyn_cast<CastInst>(I)) {
+ Value* leftValue = U->getOperand(0);
+
+ unsigned num = VN.lookup_or_add(U);
+ expNumbers.resize(VN.size());
+ availNumbers.resize(VN.size());
+
+ if (isa<Instruction>(leftValue))
+ if (!expNumbers.test(VN.lookup(leftValue))) {
+ currExps.insert(leftValue);
+ expNumbers.set(VN.lookup(leftValue));
+ }
- // Handle binary ops...
- } else if (BinaryOperator* BO = dyn_cast<BinaryOperator>(I)) {
- Value* leftValue = BO->getOperand(0);
- Value* rightValue = BO->getOperand(1);
+ if (!expNumbers.test(VN.lookup(U))) {
+ currExps.insert(U);
+ expNumbers.set(num);
+ }
+
+ // Handle binary ops
+ } else if (isa<BinaryOperator>(I) || isa<CmpInst>(I) ||
+ isa<ExtractElementInst>(I)) {
+ User* U = cast<User>(I);
+ Value* leftValue = U->getOperand(0);
+ Value* rightValue = U->getOperand(1);
- unsigned num = VN.lookup_or_add(BO);
+ unsigned num = VN.lookup_or_add(U);
expNumbers.resize(VN.size());
availNumbers.resize(VN.size());
if (isa<Instruction>(leftValue))
- if (!expNumbers.test(VN.lookup(leftValue)-1)) {
+ if (!expNumbers.test(VN.lookup(leftValue))) {
currExps.insert(leftValue);
- expNumbers.set(VN.lookup(leftValue)-1);
+ expNumbers.set(VN.lookup(leftValue));
}
if (isa<Instruction>(rightValue))
- if (!expNumbers.test(VN.lookup(rightValue)-1)) {
+ if (!expNumbers.test(VN.lookup(rightValue))) {
currExps.insert(rightValue);
- expNumbers.set(VN.lookup(rightValue)-1);
+ expNumbers.set(VN.lookup(rightValue));
}
- if (!expNumbers.test(VN.lookup(BO)-1)) {
- currExps.insert(BO);
- expNumbers.set(num-1);
+ if (!expNumbers.test(VN.lookup(U))) {
+ currExps.insert(U);
+ expNumbers.set(num);
}
- // Handle cmp ops...
- } else if (CmpInst* C = dyn_cast<CmpInst>(I)) {
- Value* leftValue = C->getOperand(0);
- Value* rightValue = C->getOperand(1);
+ // Handle ternary ops
+ } else if (isa<InsertElementInst>(I) || isa<ShuffleVectorInst>(I) ||
+ isa<SelectInst>(I)) {
+ User* U = cast<User>(I);
+ Value* leftValue = U->getOperand(0);
+ Value* rightValue = U->getOperand(1);
+ Value* thirdValue = U->getOperand(2);
- VN.lookup_or_add(C);
+ VN.lookup_or_add(U);
- unsigned num = VN.lookup_or_add(C);
+ unsigned num = VN.lookup_or_add(U);
expNumbers.resize(VN.size());
availNumbers.resize(VN.size());
if (isa<Instruction>(leftValue))
- if (!expNumbers.test(VN.lookup(leftValue)-1)) {
+ if (!expNumbers.test(VN.lookup(leftValue))) {
currExps.insert(leftValue);
- expNumbers.set(VN.lookup(leftValue)-1);
+ expNumbers.set(VN.lookup(leftValue));
}
if (isa<Instruction>(rightValue))
- if (!expNumbers.test(VN.lookup(rightValue)-1)) {
+ if (!expNumbers.test(VN.lookup(rightValue))) {
currExps.insert(rightValue);
- expNumbers.set(VN.lookup(rightValue)-1);
+ expNumbers.set(VN.lookup(rightValue));
+ }
+ if (isa<Instruction>(thirdValue))
+ if (!expNumbers.test(VN.lookup(thirdValue))) {
+ currExps.insert(thirdValue);
+ expNumbers.set(VN.lookup(thirdValue));
}
- if (!expNumbers.test(VN.lookup(C)-1)) {
- currExps.insert(C);
- expNumbers.set(num-1);
+ if (!expNumbers.test(VN.lookup(U))) {
+ currExps.insert(U);
+ expNumbers.set(num);
}
- // Handle unsupported ops
+ // Handle vararg ops
+ } else if (GetElementPtrInst* U = dyn_cast<GetElementPtrInst>(I)) {
+ Value* ptrValue = U->getPointerOperand();
+
+ VN.lookup_or_add(U);
+
+ unsigned num = VN.lookup_or_add(U);
+ expNumbers.resize(VN.size());
+ availNumbers.resize(VN.size());
+
+ if (isa<Instruction>(ptrValue))
+ if (!expNumbers.test(VN.lookup(ptrValue))) {
+ currExps.insert(ptrValue);
+ expNumbers.set(VN.lookup(ptrValue));
+ }
+
+ for (GetElementPtrInst::op_iterator OI = U->idx_begin(), OE = U->idx_end();
+ OI != OE; ++OI)
+ if (isa<Instruction>(*OI) && !expNumbers.test(VN.lookup(*OI))) {
+ currExps.insert(*OI);
+ expNumbers.set(VN.lookup(*OI));
+ }
+
+ if (!expNumbers.test(VN.lookup(U))) {
+ currExps.insert(U);
+ expNumbers.set(num);
+ }
+
+ // Handle opaque ops
} else if (!I->isTerminator()){
VN.lookup_or_add(I);
expNumbers.resize(VN.size());
}
if (!I->isTerminator())
- if (!availNumbers.test(VN.lookup(I)-1)) {
+ if (!availNumbers.test(VN.lookup(I))) {
currAvail.insert(I);
- availNumbers.set(VN.lookup(I)-1);
+ availNumbers.set(VN.lookup(I));
}
}
/// buildsets_anticout - When walking the postdom tree, calculate the ANTIC_OUT
/// set as a function of the ANTIC_IN set of the block's predecessors
bool GVNPRE::buildsets_anticout(BasicBlock* BB,
- SmallPtrSet<Value*, 32>& anticOut,
+ SmallPtrSet<Value*, 16>& anticOut,
std::set<BasicBlock*>& visited) {
if (BB->getTerminator()->getNumSuccessors() == 1) {
- if (visited.count(BB->getTerminator()->getSuccessor(0)) == 0)
+ if (BB->getTerminator()->getSuccessor(0) != BB &&
+ visited.count(BB->getTerminator()->getSuccessor(0)) == 0) {
+ DOUT << "DEFER: " << BB->getName() << "\n";
return true;
- else
+ }
+ else {
phi_translate_set(anticipatedIn[BB->getTerminator()->getSuccessor(0)],
BB, BB->getTerminator()->getSuccessor(0), anticOut);
+ }
} else if (BB->getTerminator()->getNumSuccessors() > 1) {
BasicBlock* first = BB->getTerminator()->getSuccessor(0);
anticOut.insert(anticipatedIn[first].begin(), anticipatedIn[first].end());
for (unsigned i = 1; i < BB->getTerminator()->getNumSuccessors(); ++i) {
BasicBlock* currSucc = BB->getTerminator()->getSuccessor(i);
- SmallPtrSet<Value*, 32>& succAnticIn = anticipatedIn[currSucc];
+ SmallPtrSet<Value*, 16>& succAnticIn = anticipatedIn[currSucc];
std::vector<Value*> temp;
- for (SmallPtrSet<Value*, 32>::iterator I = anticOut.begin(),
+ for (SmallPtrSet<Value*, 16>::iterator I = anticOut.begin(),
E = anticOut.end(); I != E; ++I)
- if (succAnticIn.count(*I) == 0)
+ if (find_leader(succAnticIn, VN.lookup(*I)) == 0)
temp.push_back(*I);
for (std::vector<Value*>::iterator I = temp.begin(), E = temp.end();
/// each block. ANTIC_IN is then a function of ANTIC_OUT and the GEN
/// sets populated in buildsets_availout
unsigned GVNPRE::buildsets_anticin(BasicBlock* BB,
- SmallPtrSet<Value*, 32>& anticOut,
- SmallPtrSet<Value*, 32>& currExps,
- SmallPtrSet<Value*, 32>& currTemps,
+ SmallPtrSet<Value*, 16>& anticOut,
+ SmallPtrSet<Value*, 16>& currExps,
+ SmallPtrSet<Value*, 16>& currTemps,
std::set<BasicBlock*>& visited) {
- SmallPtrSet<Value*, 32>& anticIn = anticipatedIn[BB];
- SmallPtrSet<Value*, 32> old (anticIn.begin(), anticIn.end());
+ SmallPtrSet<Value*, 16>& anticIn = anticipatedIn[BB];
+ unsigned old = anticIn.size();
bool defer = buildsets_anticout(BB, anticOut, visited);
if (defer)
return 0;
-
- SmallPtrSet<Value*, 32> S;
- for (SmallPtrSet<Value*, 32>::iterator I = anticOut.begin(),
- E = anticOut.end(); I != E; ++I)
- if (currTemps.count(*I) == 0)
- S.insert(*I);
anticIn.clear();
- for (SmallPtrSet<Value*, 32>::iterator I = currExps.begin(),
- E = currExps.end(); I != E; ++I)
- if (currTemps.count(*I) == 0)
- anticIn.insert(*I);
-
BitVector numbers(VN.size());
- for (SmallPtrSet<Value*, 32>::iterator I = anticIn.begin(),
- E = anticIn.end(); I != E; ++I)
- numbers.set(VN.lookup(*I)-1);
- for (SmallPtrSet<Value*, 32>::iterator I = S.begin(), E = S.end();
- I != E; ++I) {
- // For non-opaque values, we should already have a value numbering.
- // However, for opaques, such as constants within PHI nodes, it is
- // possible that they have not yet received a number. Make sure they do
- // so now.
- if (!isa<BinaryOperator>(*I) && !isa<CmpInst>(*I))
- VN.lookup_or_add(*I);
- if (!numbers.test(VN.lookup(*I)-1))
+ for (SmallPtrSet<Value*, 16>::iterator I = anticOut.begin(),
+ E = anticOut.end(); I != E; ++I) {
+ unsigned num = VN.lookup_or_add(*I);
+ numbers.resize(VN.size());
+
+ if (isa<Instruction>(*I) && !numbers.test(num)) {
anticIn.insert(*I);
+ numbers.set(num);
+ }
}
-
- clean(anticIn);
+ for (SmallPtrSet<Value*, 16>::iterator I = currExps.begin(),
+ E = currExps.end(); I != E; ++I) {
+ if (!numbers.test(VN.lookup_or_add(*I))) {
+ anticIn.insert(*I);
+ numbers.set(VN.lookup(*I));
+ }
+ }
+
+ for (SmallPtrSet<Value*, 16>::iterator I = currTemps.begin(),
+ E = currTemps.end(); I != E; ++I) {
+ anticIn.erase(*I);
+ numbers.flip(VN.lookup(*I));
+ }
+
+ clean(anticIn, numbers);
anticOut.clear();
- if (old.size() != anticIn.size())
+ if (old != anticIn.size())
return 2;
else
return 1;
/// buildsets - Phase 1 of the main algorithm. Construct the AVAIL_OUT
/// and the ANTIC_IN sets.
-unsigned GVNPRE::buildsets(Function& F) {
- std::map<BasicBlock*, SmallPtrSet<Value*, 32> > generatedExpressions;
- std::map<BasicBlock*, SmallPtrSet<PHINode*, 32> > generatedPhis;
- std::map<BasicBlock*, SmallPtrSet<Value*, 32> > generatedTemporaries;
+void GVNPRE::buildsets(Function& F) {
+ std::map<BasicBlock*, SmallPtrSet<Value*, 16> > generatedExpressions;
+ std::map<BasicBlock*, SmallPtrSet<Value*, 16> > generatedTemporaries;
DominatorTree &DT = getAnalysis<DominatorTree>();
E = df_end(DT.getRootNode()); DI != E; ++DI) {
// Get the sets to update for this block
- SmallPtrSet<Value*, 32>& currExps = generatedExpressions[DI->getBlock()];
- SmallPtrSet<PHINode*, 32>& currPhis = generatedPhis[DI->getBlock()];
- SmallPtrSet<Value*, 32>& currTemps = generatedTemporaries[DI->getBlock()];
- SmallPtrSet<Value*, 32>& currAvail = availableOut[DI->getBlock()];
+ SmallPtrSet<Value*, 16>& currExps = generatedExpressions[DI->getBlock()];
+ SmallPtrSet<Value*, 16>& currPhis = generatedPhis[DI->getBlock()];
+ SmallPtrSet<Value*, 16>& currTemps = generatedTemporaries[DI->getBlock()];
+ SmallPtrSet<Value*, 16>& currAvail = availableOut[DI->getBlock()];
BasicBlock* BB = DI->getBlock();
availableOut[DI->getIDom()->getBlock()].end());
BitVector availNumbers(VN.size());
- for (SmallPtrSet<Value*, 32>::iterator I = currAvail.begin(),
+ for (SmallPtrSet<Value*, 16>::iterator I = currAvail.begin(),
E = currAvail.end(); I != E; ++I)
availNumbers.set(VN.lookup(*I));
currTemps, availNumbers, expNumbers);
}
-
- // If function has no exit blocks, only perform GVN
- PostDominatorTree &PDT = getAnalysis<PostDominatorTree>();
- if (PDT[&F.getEntryBlock()] == 0) {
- bool changed_function = elimination();
- cleanup();
-
- if (changed_function)
- return 2; // Bailed early, made changes
- else
- return 1; // Bailed early, no changes
- }
-
-
+
// Phase 1, Part 2: calculate ANTIC_IN
std::set<BasicBlock*> visited;
+ SmallPtrSet<BasicBlock*, 4> block_changed;
+ for (Function::iterator FI = F.begin(), FE = F.end(); FI != FE; ++FI)
+ block_changed.insert(FI);
bool changed = true;
unsigned iterations = 0;
+
while (changed) {
changed = false;
- SmallPtrSet<Value*, 32> anticOut;
+ SmallPtrSet<Value*, 16> anticOut;
- // Top-down walk of the postdominator tree
- for (df_iterator<DomTreeNode*> PDI =
- df_begin(PDT.getRootNode()), E = df_end(PDT.getRootNode());
- PDI != E; ++PDI) {
- BasicBlock* BB = PDI->getBlock();
- if (BB == 0)
- continue;
-
-
+ // Postorder walk of the CFG
+ for (po_iterator<BasicBlock*> BBI = po_begin(&F.getEntryBlock()),
+ BBE = po_end(&F.getEntryBlock()); BBI != BBE; ++BBI) {
+ BasicBlock* BB = *BBI;
- unsigned ret = buildsets_anticin(BB, anticOut, generatedTemporaries[BB],
- generatedExpressions[BB], visited);
+ if (block_changed.count(BB) != 0) {
+ unsigned ret = buildsets_anticin(BB, anticOut,generatedExpressions[BB],
+ generatedTemporaries[BB], visited);
- if (ret == 0) {
- changed = true;
- break;
- } else {
- visited.insert(BB);
- changed |= (ret == 2);
+ if (ret == 0) {
+ changed = true;
+ continue;
+ } else {
+ visited.insert(BB);
+
+ if (ret == 2)
+ for (pred_iterator PI = pred_begin(BB), PE = pred_end(BB);
+ PI != PE; ++PI) {
+ block_changed.insert(*PI);
+ }
+ else
+ block_changed.erase(BB);
+
+ changed |= (ret == 2);
+ }
}
}
iterations++;
}
- return 0; // No bail, no changes
+ DOUT << "ITERATIONS: " << iterations << "\n";
}
/// insertion_pre - When a partial redundancy has been identified, eliminate it
/// the main block
void GVNPRE::insertion_pre(Value* e, BasicBlock* BB,
std::map<BasicBlock*, Value*>& avail,
- SmallPtrSet<Value*, 32>& new_set) {
+ std::map<BasicBlock*, SmallPtrSet<Value*, 16> >& new_sets) {
for (pred_iterator PI = pred_begin(BB), PE = pred_end(BB); PI != PE; ++PI) {
+ DOUT << "PRED: " << (*PI)->getName() << "\n";
Value* e2 = avail[*PI];
if (!find_leader(availableOut[*PI], VN.lookup(e2))) {
User* U = cast<User>(e2);
Value* s1 = 0;
if (isa<BinaryOperator>(U->getOperand(0)) ||
- isa<CmpInst>(U->getOperand(0)))
+ isa<CmpInst>(U->getOperand(0)) ||
+ isa<ShuffleVectorInst>(U->getOperand(0)) ||
+ isa<ExtractElementInst>(U->getOperand(0)) ||
+ isa<InsertElementInst>(U->getOperand(0)) ||
+ isa<SelectInst>(U->getOperand(0)) ||
+ isa<CastInst>(U->getOperand(0)) ||
+ isa<GetElementPtrInst>(U->getOperand(0)))
s1 = find_leader(availableOut[*PI], VN.lookup(U->getOperand(0)));
else
s1 = U->getOperand(0);
Value* s2 = 0;
- if (isa<BinaryOperator>(U->getOperand(1)) ||
- isa<CmpInst>(U->getOperand(1)))
- s2 = find_leader(availableOut[*PI], VN.lookup(U->getOperand(1)));
- else
- s2 = U->getOperand(1);
+
+ if (isa<BinaryOperator>(U) ||
+ isa<CmpInst>(U) ||
+ isa<ShuffleVectorInst>(U) ||
+ isa<ExtractElementInst>(U) ||
+ isa<InsertElementInst>(U) ||
+ isa<SelectInst>(U))
+ if (isa<BinaryOperator>(U->getOperand(1)) ||
+ isa<CmpInst>(U->getOperand(1)) ||
+ isa<ShuffleVectorInst>(U->getOperand(1)) ||
+ isa<ExtractElementInst>(U->getOperand(1)) ||
+ isa<InsertElementInst>(U->getOperand(1)) ||
+ isa<SelectInst>(U->getOperand(1)) ||
+ isa<CastInst>(U->getOperand(1)) ||
+ isa<GetElementPtrInst>(U->getOperand(1))) {
+ s2 = find_leader(availableOut[*PI], VN.lookup(U->getOperand(1)));
+ } else {
+ s2 = U->getOperand(1);
+ }
+
+ // Ternary Operators
+ Value* s3 = 0;
+ if (isa<ShuffleVectorInst>(U) ||
+ isa<InsertElementInst>(U) ||
+ isa<SelectInst>(U))
+ if (isa<BinaryOperator>(U->getOperand(2)) ||
+ isa<CmpInst>(U->getOperand(2)) ||
+ isa<ShuffleVectorInst>(U->getOperand(2)) ||
+ isa<ExtractElementInst>(U->getOperand(2)) ||
+ isa<InsertElementInst>(U->getOperand(2)) ||
+ isa<SelectInst>(U->getOperand(2)) ||
+ isa<CastInst>(U->getOperand(2)) ||
+ isa<GetElementPtrInst>(U->getOperand(2))) {
+ s3 = find_leader(availableOut[*PI], VN.lookup(U->getOperand(2)));
+ } else {
+ s3 = U->getOperand(2);
+ }
+
+ // Vararg operators
+ std::vector<Value*> sVarargs;
+ if (GetElementPtrInst* G = dyn_cast<GetElementPtrInst>(U)) {
+ for (GetElementPtrInst::op_iterator OI = G->idx_begin(),
+ OE = G->idx_end(); OI != OE; ++OI) {
+ if (isa<BinaryOperator>(*OI) ||
+ isa<CmpInst>(*OI) ||
+ isa<ShuffleVectorInst>(*OI) ||
+ isa<ExtractElementInst>(*OI) ||
+ isa<InsertElementInst>(*OI) ||
+ isa<SelectInst>(*OI) ||
+ isa<CastInst>(*OI) ||
+ isa<GetElementPtrInst>(*OI)) {
+ sVarargs.push_back(find_leader(availableOut[*PI],
+ VN.lookup(*OI)));
+ } else {
+ sVarargs.push_back(*OI);
+ }
+ }
+ }
Value* newVal = 0;
if (BinaryOperator* BO = dyn_cast<BinaryOperator>(U))
newVal = CmpInst::create(C->getOpcode(), C->getPredicate(), s1, s2,
C->getName()+".gvnpre",
(*PI)->getTerminator());
+ else if (ShuffleVectorInst* S = dyn_cast<ShuffleVectorInst>(U))
+ newVal = new ShuffleVectorInst(s1, s2, s3, S->getName()+".gvnpre",
+ (*PI)->getTerminator());
+ else if (InsertElementInst* S = dyn_cast<InsertElementInst>(U))
+ newVal = new InsertElementInst(s1, s2, s3, S->getName()+".gvnpre",
+ (*PI)->getTerminator());
+ else if (ExtractElementInst* S = dyn_cast<ExtractElementInst>(U))
+ newVal = new ExtractElementInst(s1, s2, S->getName()+".gvnpre",
+ (*PI)->getTerminator());
+ else if (SelectInst* S = dyn_cast<SelectInst>(U))
+ newVal = new SelectInst(s1, s2, s3, S->getName()+".gvnpre",
+ (*PI)->getTerminator());
+ else if (CastInst* C = dyn_cast<CastInst>(U))
+ newVal = CastInst::create(C->getOpcode(), s1, C->getType(),
+ C->getName()+".gvnpre",
+ (*PI)->getTerminator());
+ else if (GetElementPtrInst* G = dyn_cast<GetElementPtrInst>(U))
+ newVal = new GetElementPtrInst(s1, &sVarargs[0], sVarargs.size(),
+ G->getName()+".gvnpre",
+ (*PI)->getTerminator());
+
VN.add(newVal, VN.lookup(U));
- SmallPtrSet<Value*, 32>& predAvail = availableOut[*PI];
+ SmallPtrSet<Value*, 16>& predAvail = availableOut[*PI];
val_replace(predAvail, newVal);
+ val_replace(new_sets[*PI], newVal);
std::map<BasicBlock*, Value*>::iterator av = avail.find(*PI);
if (av != avail.end())
for (pred_iterator PI = pred_begin(BB), PE = pred_end(BB); PI != PE; ++PI) {
if (p == 0)
p = new PHINode(avail[*PI]->getType(), "gvnpre-join", BB->begin());
-
+
p->addIncoming(avail[*PI], *PI);
}
VN.add(p, VN.lookup(e));
val_replace(availableOut[BB], p);
- new_set.insert(p);
+ generatedPhis[BB].insert(p);
+ new_sets[BB].insert(p);
++NumInsertedPhis;
}
/// block for the possibility of a partial redundancy. If present, eliminate it
unsigned GVNPRE::insertion_mergepoint(std::vector<Value*>& workList,
df_iterator<DomTreeNode*>& D,
- SmallPtrSet<Value*, 32>& new_set) {
+ std::map<BasicBlock*, SmallPtrSet<Value*, 16> >& new_sets) {
bool changed_function = false;
bool new_stuff = false;
for (unsigned i = 0; i < workList.size(); ++i) {
Value* e = workList[i];
- if (isa<BinaryOperator>(e) || isa<CmpInst>(e)) {
+ if (isa<BinaryOperator>(e) || isa<CmpInst>(e) ||
+ isa<ExtractElementInst>(e) || isa<InsertElementInst>(e) ||
+ isa<ShuffleVectorInst>(e) || isa<SelectInst>(e) || isa<CastInst>(e) ||
+ isa<GetElementPtrInst>(e)) {
if (find_leader(availableOut[D->getIDom()->getBlock()],
VN.lookup(e)) != 0)
continue;
std::map<BasicBlock*, Value*> avail;
bool by_some = false;
- int num_avail = 0;
+ bool all_same = true;
+ Value * first_s = 0;
for (pred_iterator PI = pred_begin(BB), PE = pred_end(BB); PI != PE;
++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);
if (av != avail.end())
avail.insert(std::make_pair(*PI, e3));
by_some = true;
- num_avail++;
+ if (first_s == 0)
+ first_s = e3;
+ else if (first_s != e3)
+ all_same = false;
}
}
- if (by_some && num_avail < std::distance(pred_begin(BB), pred_end(BB))) {
- insertion_pre(e, BB, avail, new_set);
+ if (by_some && !all_same &&
+ !find_leader(generatedPhis[BB], VN.lookup(e))) {
+ insertion_pre(e, BB, avail, new_sets);
changed_function = true;
new_stuff = true;
DominatorTree &DT = getAnalysis<DominatorTree>();
- std::map<BasicBlock*, SmallPtrSet<Value*, 32> > new_sets;
+ std::map<BasicBlock*, SmallPtrSet<Value*, 16> > new_sets;
bool new_stuff = true;
while (new_stuff) {
new_stuff = false;
if (BB == 0)
continue;
- SmallPtrSet<Value*, 32>& new_set = new_sets[BB];
- SmallPtrSet<Value*, 32>& availOut = availableOut[BB];
- SmallPtrSet<Value*, 32>& anticIn = anticipatedIn[BB];
-
- new_set.clear();
+ SmallPtrSet<Value*, 16>& availOut = availableOut[BB];
+ SmallPtrSet<Value*, 16>& anticIn = anticipatedIn[BB];
// Replace leaders with leaders inherited from dominator
if (DI->getIDom() != 0) {
- SmallPtrSet<Value*, 32>& dom_set = new_sets[DI->getIDom()->getBlock()];
- for (SmallPtrSet<Value*, 32>::iterator I = dom_set.begin(),
+ SmallPtrSet<Value*, 16>& dom_set = new_sets[DI->getIDom()->getBlock()];
+ for (SmallPtrSet<Value*, 16>::iterator I = dom_set.begin(),
E = dom_set.end(); I != E; ++I) {
- new_set.insert(*I);
+ val_replace(new_sets[BB], *I);
val_replace(availOut, *I);
}
}
workList.reserve(anticIn.size());
topo_sort(anticIn, workList);
- DOUT << "Merge Block: " << BB->getName() << "\n";
- DOUT << "ANTIC_IN: ";
- dump(anticIn);
- DOUT << "\n";
-
- unsigned result = insertion_mergepoint(workList, DI, new_set);
+ unsigned result = insertion_mergepoint(workList, DI, new_sets);
if (result & 1)
changed_function = true;
if (result & 2)
createdExpressions.clear();
availableOut.clear();
anticipatedIn.clear();
-
+ generatedPhis.clear();
+
bool changed_function = false;
// Phase 1: BuildSets
// This phase calculates the AVAIL_OUT and ANTIC_IN sets
- // NOTE: If full postdom information is no available, this will bail
- // early, performing GVN but not PRE
- unsigned bail = buildsets(F);
- //If a bail occurred, terminate early
- if (bail != 0)
- return (bail == 2);
+ buildsets(F);
// Phase 2: Insert
// This phase inserts values to make partially redundant values
projects / oota-llvm.git / blobdiff