6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-11-01 15:17:25 +00:00
Code Issues Projects Releases Wiki Activity

This huge changeset is a strictly cleanup change

Browse Source 
Bugfixes will come in the next revision so that the diff is obvious.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@2372 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner
2002-04-28 18:27:55 +00:00
parent 4ec35ab1c6
commit 9f4eb01dd4
1 changed files with 167 additions and 221 deletions
Download Patch File Download Diff File Expand all files Collapse all files

388
lib/Transforms/Utils/PromoteMemoryToRegister.cpp
View File

@@ -31,46 +31,44 @@ using namespace std;
namespace { namespace {
//instance of the promoter -- to keep all the local function data. // instance of the promoter -- to keep all the local function data.
// gets re-created for each function processed // gets re-created for each function processed
class PromoteInstance class PromoteInstance {
{ protected:
protected: vector<AllocaInst*> Allocas; // the alloca instruction..
vector<AllocaInst*> Allocas; // the alloca instruction.. map<Instruction*, unsigned> AllocaLookup; // reverse mapping of above
map<Instruction *, int> AllocaLookup; //reverse mapping of above
vector<vector<BasicBlock*> > WriteSets; // index corresponds to Allocas
vector<vector<BasicBlock*> > PhiNodes; // index corresponds to Allocas
vector<vector<Value*> > CurrentValue; // the current value stack
//list of instructions to remove at end of pass :)
vector<Instruction *> KillList;
vector<vector<BasicBlock *> > WriteSets; // index corresponds to Allocas set<BasicBlock*> visited; // the basic blocks we've already visited
vector<vector<BasicBlock *> > PhiNodes; // index corresponds to Allocas map<BasicBlock*, vector<PHINode*> > NewPhiNodes; // the phinodes we're adding
vector<vector<Value *> > CurrentValue; //the current value stack
//list of instructions to remove at end of pass :) void traverse(BasicBlock *f, BasicBlock * predecessor);
vector<Instruction *> killlist; bool PromoteFunction(Function *F, DominanceFrontier &DF);
bool QueuePhiNode(BasicBlock *bb, unsigned alloca_index);
set<BasicBlock *> visited; //the basic blocks we've already visited void findSafeAllocas(Function *M);
map<BasicBlock *, vector<PHINode *> > new_phinodes; //the phinodes we're adding bool didchange;
public:
// I do this so that I can force the deconstruction of the local variables
void traverse(BasicBlock *f, BasicBlock * predecessor); PromoteInstance(Function *F, DominanceFrontier &DF) {
bool PromoteFunction(Function *F, DominanceFrontier &DF); didchange = PromoteFunction(F, DF);
bool queuePhiNode(BasicBlock *bb, int alloca_index); }
void findSafeAllocas(Function *M); //This returns whether the pass changes anything
bool didchange; operator bool () { return didchange; }
public:
// I do this so that I can force the deconstruction of the local variables
PromoteInstance(Function *F, DominanceFrontier &DF)
{
didchange=PromoteFunction(F, DF);
}
//This returns whether the pass changes anything
operator bool () { return didchange; }
}; };
} // end of anonymous namespace } // end of anonymous namespace
// findSafeAllocas - Find allocas that are safe to promote // findSafeAllocas - Find allocas that are safe to promote
// //
void PromoteInstance::findSafeAllocas(Function *F) void PromoteInstance::findSafeAllocas(Function *F) {
{
BasicBlock *BB = F->getEntryNode(); // Get the entry node for the function BasicBlock *BB = F->getEntryNode(); // Get the entry node for the function
// Look at all instructions in the entry node // Look at all instructions in the entry node
@@ -84,224 +82,175 @@ void PromoteInstance::findSafeAllocas(Function *F)
// Only allow nonindexed memory access instructions... // Only allow nonindexed memory access instructions...
if (MemAccessInst *MAI = dyn_cast<MemAccessInst>(*UI)) { if (MemAccessInst *MAI = dyn_cast<MemAccessInst>(*UI)) {
if (MAI->hasIndices()) { // indexed? if (MAI->hasIndices()) { // indexed?
// Allow the access if there is only one index and the index is zero. // Allow the access if there is only one index and the index is
// zero.
if (*MAI->idx_begin() != ConstantUInt::get(Type::UIntTy, 0) || if (*MAI->idx_begin() != ConstantUInt::get(Type::UIntTy, 0) ||
MAI->idx_begin()+1 != MAI->idx_end()) { MAI->idx_begin()+1 != MAI->idx_end()) {
isSafe = false; break; isSafe = false;
break;
} }
} }
} else { } else {
isSafe = false; break; // Not a load or store? isSafe = false; break; // Not a load or store?
} }
} }
if (isSafe) // If all checks pass, add alloca to safe list if (isSafe) { // If all checks pass, add alloca to safe list
{ AllocaLookup[AI] = Allocas.size();
AllocaLookup[AI]=Allocas.size(); Allocas.push_back(AI);
Allocas.push_back(AI); }
}
} }
} }
bool PromoteInstance::PromoteFunction(Function *F, DominanceFrontier & DF) { bool PromoteInstance::PromoteFunction(Function *F, DominanceFrontier &DF) {
// Calculate the set of safe allocas // Calculate the set of safe allocas
findSafeAllocas(F); findSafeAllocas(F);
// Add each alloca to the killlist // Add each alloca to the KillList. Note: KillList is destroyed MOST recently
// note: killlist is destroyed MOST recently added to least recently. // added to least recently.
killlist.assign(Allocas.begin(), Allocas.end()); KillList.assign(Allocas.begin(), Allocas.end());
// Calculate the set of write-locations for each alloca. // Calculate the set of write-locations for each alloca. This is analogous to
// this is analogous to counting the number of 'redefinitions' of each variable. // counting the number of 'redefinitions' of each variable.
for (unsigned i = 0; i<Allocas.size(); ++i) WriteSets.resize(Allocas.size());
{ for (unsigned i = 0; i != Allocas.size(); ++i) {
AllocaInst * AI = Allocas[i]; AllocaInst *AI = Allocas[i];
WriteSets.push_back(std::vector<BasicBlock *>()); //add a new set for (Value::use_iterator U =AI->use_begin(), E = AI->use_end(); U != E; ++U)
for (Value::use_iterator U = AI->use_begin();U!=AI->use_end();++U) if (StoreInst *SI = dyn_cast<StoreInst>(*U))
{ // jot down the basic-block it came from
if (MemAccessInst *MAI = dyn_cast<StoreInst>(*U)) { WriteSets[i].push_back(SI->getParent());
WriteSets[i].push_back(MAI->getParent()); // jot down the basic-block it came from }
}
}
}
// Compute the locations where PhiNodes need to be inserted // Compute the locations where PhiNodes need to be inserted. Look at the
// look at the dominance frontier of EACH basic-block we have a write in // dominance frontier of EACH basic-block we have a write in
PhiNodes.resize(Allocas.size()); //
for (unsigned i = 0; i<Allocas.size(); ++i) PhiNodes.resize(Allocas.size());
{ for (unsigned i = 0; i != Allocas.size(); ++i) {
for (unsigned j = 0; j<WriteSets[i].size(); j++) for (unsigned j = 0; j != WriteSets[i].size(); j++) {
{ // Look up the DF for this write, add it to PhiNodes
//look up the DF for this write, add it to PhiNodes DominanceFrontier::const_iterator it = DF.find(WriteSets[i][j]);
DominanceFrontier::const_iterator it = DF.find(WriteSets[i][j]); DominanceFrontier::DomSetType S = it->second;
DominanceFrontier::DomSetType s = (*it).second; for (DominanceFrontier::DomSetType::iterator P = S.begin(), PE = S.end();
for (DominanceFrontier::DomSetType::iterator p = s.begin();p!=s.end(); ++p) P != PE; ++P)
{ QueuePhiNode(*P, i);
if (queuePhiNode(*p, i)) }
PhiNodes[i].push_back(*p);
} // Perform iterative step
} for (unsigned k = 0; k != PhiNodes[i].size(); k++) {
// perform iterative step DominanceFrontier::const_iterator it = DF.find(PhiNodes[i][k]);
for (unsigned k = 0; k<PhiNodes[i].size(); k++) DominanceFrontier::DomSetType S = it->second;
{ for (DominanceFrontier::DomSetType::iterator P = S.begin(), PE = S.end();
DominanceFrontier::const_iterator it = DF.find(PhiNodes[i][k]); P != PE; ++P)
DominanceFrontier::DomSetType s = it->second; QueuePhiNode(*P, i);
for (DominanceFrontier::DomSetType::iterator p = s.begin(); p!=s.end(); ++p) }
{ }
if (queuePhiNode(*p,i))
PhiNodes[i].push_back(*p);
}
}
}
// Walks all basic blocks in the function // Walks all basic blocks in the function performing the SSA rename algorithm
// performing the SSA rename algorithm // and inserting the phi nodes we marked as necessary
// and inserting the phi nodes we marked as necessary //
BasicBlock * f = F->front(); //get root basic-block CurrentValue.push_back(vector<Value *>(Allocas.size()));
traverse(F->front(), 0); // there is no predecessor of the root node
CurrentValue.push_back(vector<Value *>(Allocas.size())); // Remove all instructions marked by being placed in the KillList...
//
while (!KillList.empty()) {
Instruction *I = KillList.back();
KillList.pop_back();
traverse(f, NULL); // there is no predecessor of the root node //now go find..
I->getParent()->getInstList().remove(I);
delete I;
}
return !Allocas.empty();
// ** REMOVE EVERYTHING IN THE KILL-LIST **
// we need to kill 'uses' before root values
// so we should probably run through in reverse
for (vector<Instruction *>::reverse_iterator i = killlist.rbegin(); i!=killlist.rend(); ++i)
{
Instruction * r = *i;
BasicBlock * o = r->getParent();
//now go find..
BasicBlock::InstListType & l = o->getInstList();
o->getInstList().remove(r);
delete r;
}
return !Allocas.empty();
} }
// QueuePhiNode - queues a phi-node to be added to a basic-block for a specific
// Alloca returns true if there wasn't already a phi-node for that variable
//
bool PromoteInstance::QueuePhiNode(BasicBlock *BB, unsigned i /*the alloca*/) {
// Look up the basic-block in question
vector<PHINode*> &BBPNs = NewPhiNodes[BB];
if (BBPNs.empty()) BBPNs.resize(Allocas.size());
void PromoteInstance::traverse(BasicBlock *f, BasicBlock * predecessor) // If the BB already has a phi node added for the i'th alloca then we're done!
{ if (BBPNs[i]) return false;
vector<Value *> * tos = &CurrentValue.back(); //look at top-
//if this is a BB needing a phi node, lookup/create the phinode for // Create a phi-node using the dereferenced type...
// each variable we need phinodes for. PHINode *PN = new PHINode(Allocas[i]->getType()->getElementType(),
map<BasicBlock *, vector<PHINode *> >::iterator nd = new_phinodes.find(f); Allocas[i]->getName()+".mem2reg");
if (nd!=new_phinodes.end()) BBPNs[i] = PN;
{
for (unsigned k = 0; k!=nd->second.size(); ++k)
if (nd->second[k])
{
//at this point we can assume that the array has phi nodes.. let's
// add the incoming data
if ((*tos)[k])
nd->second[k]->addIncoming((*tos)[k],predecessor);
//also note that the active variable IS designated by the phi node
(*tos)[k] = nd->second[k];
}
}
//don't revisit nodes // Add the phi-node to the basic-block
if (visited.find(f)!=visited.end()) BB->getInstList().push_front(PN);
return;
//mark as visited
visited.insert(f);
BasicBlock::iterator i = f->begin(); PhiNodes[i].push_back(BB);
//keep track of the value of each variable we're watching.. how? return true;
while(i!=f->end())
{
Instruction * inst = *i; //get the instruction
//is this a write/read?
if (LoadInst * LI = dyn_cast<LoadInst>(inst))
{
// This is a bit weird...
Value * ptr = LI->getPointerOperand(); //of type value
if (AllocaInst * srcinstr = dyn_cast<AllocaInst>(ptr))
{
map<Instruction *, int>::iterator ai = AllocaLookup.find(srcinstr);
if (ai!=AllocaLookup.end())
{
if (Value *r = (*tos)[ai->second])
{
//walk the use list of this load and replace
// all uses with r
LI->replaceAllUsesWith(r);
//now delete the instruction.. somehow..
killlist.push_back((Instruction *)LI);
}
}
}
}
else if (StoreInst * SI = dyn_cast<StoreInst>(inst))
{
// delete this instruction and mark the name as the
// current holder of the value
Value * ptr = SI->getPointerOperand(); //of type value
if (Instruction * srcinstr = dyn_cast<Instruction>(ptr))
{
map<Instruction *, int>::iterator ai = AllocaLookup.find(srcinstr);
if (ai!=AllocaLookup.end())
{
//what value were we writing?
Value * writeval = SI->getOperand(0);
//write down...
(*tos)[ai->second] = writeval;
//now delete it.. somehow?
killlist.push_back((Instruction *)SI);
}
}
}
else if (TerminatorInst * TI = dyn_cast<TerminatorInst>(inst))
{
// Recurse across our sucessors
for (unsigned i = 0; i!=TI->getNumSuccessors(); i++)
{
CurrentValue.push_back(CurrentValue.back());
traverse(TI->getSuccessor(i),f); //this node IS the predecessor
CurrentValue.pop_back();
}
}
i++;
}
} }
// queues a phi-node to be added to a basic-block for a specific Alloca void PromoteInstance::traverse(BasicBlock *BB, BasicBlock *Pred) {
// returns true if there wasn't already a phi-node for that variable vector<Value *> &TOS = CurrentValue.back(); // look at top
// If this is a BB needing a phi node, lookup/create the phinode for each
// variable we need phinodes for.
vector<PHINode *> &BBPNs = NewPhiNodes[BB];
for (unsigned k = 0; k != BBPNs.size(); ++k)
if (BBPNs[k]) {
// at this point we can assume that the array has phi nodes.. let's add
// the incoming data
BBPNs[k]->addIncoming(TOS[k], Pred);
bool PromoteInstance::queuePhiNode(BasicBlock *bb, int i /*the alloca*/) // also note that the active variable IS designated by the phi node
{ TOS[k] = BBPNs[k];
map<BasicBlock *, vector<PHINode *> >::iterator nd; }
//look up the basic-block in question
nd = new_phinodes.find(bb);
//if the basic-block has no phi-nodes added, or at least none
//for the i'th alloca. then add.
if (nd==new_phinodes.end() || nd->second[i]==NULL)
{
//we're not added any phi nodes to this basicblock yet
// create the phi-node array.
if (nd==new_phinodes.end())
{
new_phinodes[bb] = vector<PHINode *>(Allocas.size());
nd = new_phinodes.find(bb);
}
//find the type the alloca returns // don't revisit nodes
const PointerType * pt = Allocas[i]->getType(); if (visited.count(BB)) return;
//create a phi-node using the DEREFERENCED type
PHINode * ph = new PHINode(pt->getElementType(), Allocas[i]->getName()+".mem2reg"); // mark as visited
nd->second[i] = ph; visited.insert(BB);
//add the phi-node to the basic-block
bb->getInstList().push_front(ph); // keep track of the value of each variable we're watching.. how?
return true; for (BasicBlock::iterator II = BB->begin(); II != BB->end(); ++II) {
} Instruction *I = *II; //get the instruction
return false;
if (LoadInst *LI = dyn_cast<LoadInst>(I)) {
Value *Ptr = LI->getPointerOperand();
if (AllocaInst *Src = dyn_cast<AllocaInst>(Ptr)) {
map<Instruction*, unsigned>::iterator ai = AllocaLookup.find(Src);
if (ai != AllocaLookup.end()) {
Value *V = TOS[ai->second];
// walk the use list of this load and replace all uses with r
LI->replaceAllUsesWith(V);
KillList.push_back(LI); // Mark the load to be deleted
}
}
} else if (StoreInst *SI = dyn_cast<StoreInst>(I)) {
// delete this instruction and mark the name as the current holder of the
// value
Value *Ptr = SI->getPointerOperand();
if (AllocaInst *Dest = dyn_cast<AllocaInst>(Ptr)) {
map<Instruction *, unsigned>::iterator ai = AllocaLookup.find(Dest);
if (ai != AllocaLookup.end()) {
// what value were we writing?
TOS[ai->second] = SI->getOperand(0);
KillList.push_back(SI); // Mark the store to be deleted
}
}
} else if (TerminatorInst *TI = dyn_cast<TerminatorInst>(I)) {
// Recurse across our successors
for (unsigned i = 0; i != TI->getNumSuccessors(); i++) {
CurrentValue.push_back(CurrentValue.back());
traverse(TI->getSuccessor(i), BB); // This node becomes the predecessor
CurrentValue.pop_back();
}
}
}
} }
@@ -314,7 +263,6 @@ namespace {
virtual bool runOnFunction(Function *F) { virtual bool runOnFunction(Function *F) {
return (bool)PromoteInstance(F, getAnalysis<DominanceFrontier>()); return (bool)PromoteInstance(F, getAnalysis<DominanceFrontier>());
} }
// getAnalysisUsage - We need dominance frontiers // getAnalysisUsage - We need dominance frontiers
// //
@@ -328,7 +276,5 @@ namespace {
// createPromoteMemoryToRegister - Provide an entry point to create this pass. // createPromoteMemoryToRegister - Provide an entry point to create this pass.
// //
Pass *createPromoteMemoryToRegister() { Pass *createPromoteMemoryToRegister() {
return new PromotePass(); return new PromotePass();
} }