numbers.set(i);
}
- void copyNumbers(ValueNumberedSet& other) {
+ void operator=(const ValueNumberedSet& other) {
+ contents = other.contents;
numbers = other.numbers;
}
void GVNPRE::val_replace(ValueNumberedSet& s, Value* v) {
uint32_t num = VN.lookup(v);
Value* leader = find_leader(s, num);
- while (leader != 0) {
+ if (leader != 0)
s.erase(leader);
- leader = find_leader(s, num);
- }
s.insert(v);
+ s.set(num);
}
/// phi_translate - Given a value, its parent block, and a predecessor of its
/// elimination by walking the dominator tree and removing any instruction that
/// is dominated by another instruction with the same value number.
bool GVNPRE::elimination() {
- DOUT << "\n\nPhase 3: Elimination\n\n";
-
bool changed_function = false;
std::vector<std::pair<Instruction*, Value*> > replace;
E = df_end(DT.getRootNode()); DI != E; ++DI) {
BasicBlock* BB = DI->getBlock();
- //DOUT << "Block: " << BB->getName() << "\n";
- //dump(availableOut[BB]);
- //DOUT << "\n\n";
-
for (BasicBlock::iterator BI = BB->begin(), BE = BB->end();
BI != BE; ++BI) {
if (BB->getTerminator()->getNumSuccessors() == 1) {
if (BB->getTerminator()->getSuccessor(0) != BB &&
visited.count(BB->getTerminator()->getSuccessor(0)) == 0) {
- DOUT << "DEFER: " << BB->getName() << "\n";
return true;
}
else {
BasicBlock* BB = DI->getBlock();
// A block inherits AVAIL_OUT from its dominator
- if (DI->getIDom() != 0) {
- currAvail.insert(availableOut[DI->getIDom()->getBlock()].begin(),
- availableOut[DI->getIDom()->getBlock()].end());
-
- currAvail.copyNumbers(availableOut[DI->getIDom()->getBlock()]);
- }
+ if (DI->getIDom() != 0)
+ currAvail = availableOut[DI->getIDom()->getBlock()];
for (BasicBlock::iterator BI = BB->begin(), BE = BB->end();
BI != BE; ++BI)
iterations++;
}
-
- DOUT << "ITERATIONS: " << iterations << "\n";
}
/// insertion_pre - When a partial redundancy has been identified, eliminate it
std::map<BasicBlock*, Value*>& avail,
std::map<BasicBlock*, ValueNumberedSet>& 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 (!availableOut[*PI].test(VN.lookup(e2))) {
User* U = cast<User>(e2);