RPCS3/llvm
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm.git synced 2025-02-06 10:38:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Updated ModuloScheduling. It makes it all the wya through register allocation on the new code!!

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@15351 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Tanya Lattner 2004-07-30 23:36:10 +00:00
parent 88f8f9226f
commit 0a88d2d8b9
8 changed files with 1534 additions and 640 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/CodeGen/ModuloScheduling/MSSchedule.cpp
View File

@ -49,12 +49,12 @@ bool MSSchedule::insert(MSchedGraphNode *node, int cycle) {
bool MSSchedule::resourcesFree(MSchedGraphNode *node, int cycle) { bool MSSchedule::resourcesFree(MSchedGraphNode *node, int cycle) {
//Get Resource usage for this instruction //Get Resource usage for this instruction
const TargetSchedInfo & msi = node->getParent()->getTarget()->getSchedInfo(); const TargetSchedInfo *msi = node->getParent()->getTarget()->getSchedInfo();
int currentCycle = cycle; int currentCycle = cycle;
bool success = true; bool success = true;
//Get resource usage for this instruction //Get resource usage for this instruction
InstrRUsage rUsage = msi.getInstrRUsage(node->getInst()->getOpcode()); InstrRUsage rUsage = msi->getInstrRUsage(node->getInst()->getOpcode());
std::vector<std::vector<resourceId_t> > resources = rUsage.resourcesByCycle; std::vector<std::vector<resourceId_t> > resources = rUsage.resourcesByCycle;
//Loop over resources in each cycle and increments their usage count //Loop over resources in each cycle and increments their usage count
@ -101,7 +101,7 @@ bool MSSchedule::resourcesFree(MSchedGraphNode *node, int cycle) {
int oldCycle = cycle; int oldCycle = cycle;
DEBUG(std::cerr << "Backtrack\n"); DEBUG(std::cerr << "Backtrack\n");
//Get resource usage for this instruction //Get resource usage for this instruction
InstrRUsage rUsage = msi.getInstrRUsage(node->getInst()->getOpcode()); InstrRUsage rUsage = msi->getInstrRUsage(node->getInst()->getOpcode());
std::vector<std::vector<resourceId_t> > resources = rUsage.resourcesByCycle; std::vector<std::vector<resourceId_t> > resources = rUsage.resourcesByCycle;
//Loop over resources in each cycle and increments their usage count //Loop over resources in each cycle and increments their usage count

32
lib/CodeGen/ModuloScheduling/MSchedGraph.cpp
View File

@ -103,7 +103,7 @@ MSchedGraph::~MSchedGraph () {
void MSchedGraph::buildNodesAndEdges() { void MSchedGraph::buildNodesAndEdges() {
//Get Machine target information for calculating latency //Get Machine target information for calculating latency
const TargetInstrInfo &MTI = Target.getInstrInfo(); const TargetInstrInfo *MTI = Target.getInstrInfo();
std::vector<MSchedGraphNode*> memInstructions; std::vector<MSchedGraphNode*> memInstructions;
std::map<int, std::vector<OpIndexNodePair> > regNumtoNodeMap; std::map<int, std::vector<OpIndexNodePair> > regNumtoNodeMap;
@ -124,16 +124,16 @@ void MSchedGraph::buildNodesAndEdges() {
#if 0 // FIXME: LOOK INTO THIS #if 0 // FIXME: LOOK INTO THIS
//Check if subsequent instructions can be issued before //Check if subsequent instructions can be issued before
//the result is ready, if so use min delay. //the result is ready, if so use min delay.
if(MTI.hasResultInterlock(MIopCode)) if(MTI->hasResultInterlock(MIopCode))
delay = MTI.minLatency(MIopCode); delay = MTI->minLatency(MIopCode);
else else
#endif #endif
//Get delay //Get delay
delay = MTI.maxLatency(opCode); delay = MTI->maxLatency(opCode);
//Create new node for this machine instruction and add to the graph. //Create new node for this machine instruction and add to the graph.
//Create only if not a nop //Create only if not a nop
if(MTI.isNop(opCode)) if(MTI->isNop(opCode))
continue; continue;
//Add PHI to phi instruction list to be processed later //Add PHI to phi instruction list to be processed later
@ -143,7 +143,7 @@ void MSchedGraph::buildNodesAndEdges() {
bool isBranch = false; bool isBranch = false;
//We want to flag the branch node to treat it special //We want to flag the branch node to treat it special
if(MTI.isBranch(opCode)) if(MTI->isBranch(opCode))
isBranch = true; isBranch = true;
//Node is created and added to the graph automatically //Node is created and added to the graph automatically
@ -152,7 +152,7 @@ void MSchedGraph::buildNodesAndEdges() {
DEBUG(std::cerr << "Created Node: " << *node << "\n"); DEBUG(std::cerr << "Created Node: " << *node << "\n");
//Check OpCode to keep track of memory operations to add memory dependencies later. //Check OpCode to keep track of memory operations to add memory dependencies later.
if(MTI.isLoad(opCode) || MTI.isStore(opCode)) if(MTI->isLoad(opCode) || MTI->isStore(opCode))
memInstructions.push_back(node); memInstructions.push_back(node);
//Loop over all operands, and put them into the register number to //Loop over all operands, and put them into the register number to
@ -370,7 +370,7 @@ void MSchedGraph::addMachRegEdges(std::map<int, std::vector<OpIndexNodePair> >&
void MSchedGraph::addMemEdges(const std::vector<MSchedGraphNode*>& memInst) { void MSchedGraph::addMemEdges(const std::vector<MSchedGraphNode*>& memInst) {
//Get Target machine instruction info //Get Target machine instruction info
const TargetInstrInfo& TMI = Target.getInstrInfo(); const TargetInstrInfo *TMI = Target.getInstrInfo();
//Loop over all memory instructions in the vector //Loop over all memory instructions in the vector
//Knowing that they are in execution, add true, anti, and output dependencies //Knowing that they are in execution, add true, anti, and output dependencies
@ -383,15 +383,15 @@ void MSchedGraph::addMemEdges(const std::vector<MSchedGraphNode*>& memInst) {
for(unsigned destIndex = srcIndex + 1; destIndex < memInst.size(); ++destIndex) { for(unsigned destIndex = srcIndex + 1; destIndex < memInst.size(); ++destIndex) {
//source is a Load, so add anti-dependencies (store after load) //source is a Load, so add anti-dependencies (store after load)
if(TMI.isLoad(srcNodeOpCode)) if(TMI->isLoad(srcNodeOpCode))
if(TMI.isStore(memInst[destIndex]->getInst()->getOpcode())) if(TMI->isStore(memInst[destIndex]->getInst()->getOpcode()))
memInst[srcIndex]->addOutEdge(memInst[destIndex], memInst[srcIndex]->addOutEdge(memInst[destIndex],
MSchedGraphEdge::MemoryDep, MSchedGraphEdge::MemoryDep,
MSchedGraphEdge::AntiDep); MSchedGraphEdge::AntiDep);
//If source is a store, add output and true dependencies //If source is a store, add output and true dependencies
if(TMI.isStore(srcNodeOpCode)) { if(TMI->isStore(srcNodeOpCode)) {
if(TMI.isStore(memInst[destIndex]->getInst()->getOpcode())) if(TMI->isStore(memInst[destIndex]->getInst()->getOpcode()))
memInst[srcIndex]->addOutEdge(memInst[destIndex], memInst[srcIndex]->addOutEdge(memInst[destIndex],
MSchedGraphEdge::MemoryDep, MSchedGraphEdge::MemoryDep,
MSchedGraphEdge::OutputDep); MSchedGraphEdge::OutputDep);
@ -405,13 +405,13 @@ void MSchedGraph::addMemEdges(const std::vector<MSchedGraphNode*>& memInst) {
//All instructions before the src in execution order have an iteration delay of 1 //All instructions before the src in execution order have an iteration delay of 1
for(unsigned destIndex = 0; destIndex < srcIndex; ++destIndex) { for(unsigned destIndex = 0; destIndex < srcIndex; ++destIndex) {
//source is a Load, so add anti-dependencies (store after load) //source is a Load, so add anti-dependencies (store after load)
if(TMI.isLoad(srcNodeOpCode)) if(TMI->isLoad(srcNodeOpCode))
if(TMI.isStore(memInst[destIndex]->getInst()->getOpcode())) if(TMI->isStore(memInst[destIndex]->getInst()->getOpcode()))
memInst[srcIndex]->addOutEdge(memInst[destIndex], memInst[srcIndex]->addOutEdge(memInst[destIndex],
MSchedGraphEdge::MemoryDep, MSchedGraphEdge::MemoryDep,
MSchedGraphEdge::AntiDep, 1); MSchedGraphEdge::AntiDep, 1);
if(TMI.isStore(srcNodeOpCode)) { if(TMI->isStore(srcNodeOpCode)) {
if(TMI.isStore(memInst[destIndex]->getInst()->getOpcode())) if(TMI->isStore(memInst[destIndex]->getInst()->getOpcode()))
memInst[srcIndex]->addOutEdge(memInst[destIndex], memInst[srcIndex]->addOutEdge(memInst[destIndex],
MSchedGraphEdge::MemoryDep, MSchedGraphEdge::MemoryDep,
MSchedGraphEdge::OutputDep, 1); MSchedGraphEdge::OutputDep, 1);

1038
lib/CodeGen/ModuloScheduling/ModuloScheduling.cpp
View File

File diff suppressed because it is too large Load Diff

11
lib/CodeGen/ModuloScheduling/ModuloScheduling.h
View File

@ -89,13 +89,18 @@ namespace llvm {
void predIntersect(std::vector<MSchedGraphNode*> &CurrentSet, std::vector<MSchedGraphNode*> &IntersectResult); void predIntersect(std::vector<MSchedGraphNode*> &CurrentSet, std::vector<MSchedGraphNode*> &IntersectResult);
void succIntersect(std::vector<MSchedGraphNode*> &CurrentSet, std::vector<MSchedGraphNode*> &IntersectResult); void succIntersect(std::vector<MSchedGraphNode*> &CurrentSet, std::vector<MSchedGraphNode*> &IntersectResult);
void reconstructLoop(const MachineBasicBlock*); void reconstructLoop(MachineBasicBlock*);
//void saveValue(const MachineInstr*, const std::set<Value*>&, std::vector<Value*>*); //void saveValue(const MachineInstr*, const std::set<Value*>&, std::vector<Value*>*);
void writePrologues(std::vector<MachineBasicBlock *> &prologues, const MachineBasicBlock *origBB, std::vector<BasicBlock*> &llvm_prologues); void writePrologues(std::vector<MachineBasicBlock *> &prologues, MachineBasicBlock *origBB, std::vector<BasicBlock*> &llvm_prologues, std::map<const Value*, std::pair<const MSchedGraphNode*, int> > &valuesToSave, std::map<Value*, std::map<int, std::vector<Value*> > > &newValues, std::map<Value*, MachineBasicBlock*> &newValLocation);
void writeEpilogues(std::vector<MachineBasicBlock *> &epilogues, const MachineBasicBlock *origBB, std::vector<BasicBlock*> &llvm_epilogues); void writeEpilogues(std::vector<MachineBasicBlock *> &epilogues, const MachineBasicBlock *origBB, std::vector<BasicBlock*> &llvm_epilogues, std::map<const Value*, std::pair<const MSchedGraphNode*, int> > &valuesToSave,std::map<Value*, std::map<int, std::vector<Value*> > > &newValues, std::map<Value*, MachineBasicBlock*> &newValLocation);
void writeKernel(BasicBlock *llvmBB, MachineBasicBlock *machineBB, std::map<const Value*, std::pair<const MSchedGraphNode*, int> > &valuesToSave, std::map<Value*, std::map<int, std::vector<Value*> > > &newValues, std::map<Value*, MachineBasicBlock*> &newValLocation);
void removePHIs(const MachineBasicBlock *origBB, std::vector<MachineBasicBlock *> &prologues, std::vector<MachineBasicBlock *> &epilogues, MachineBasicBlock *kernelBB, std::map<Value*, MachineBasicBlock*> &newValLocation);
public: public:
ModuloSchedulingPass(TargetMachine &targ) : target(targ) {} ModuloSchedulingPass(TargetMachine &targ) : target(targ) {}

6
lib/Target/SparcV9/ModuloScheduling/MSSchedule.cpp
View File

@ -49,12 +49,12 @@ bool MSSchedule::insert(MSchedGraphNode *node, int cycle) {
bool MSSchedule::resourcesFree(MSchedGraphNode *node, int cycle) { bool MSSchedule::resourcesFree(MSchedGraphNode *node, int cycle) {
//Get Resource usage for this instruction //Get Resource usage for this instruction
const TargetSchedInfo & msi = node->getParent()->getTarget()->getSchedInfo(); const TargetSchedInfo *msi = node->getParent()->getTarget()->getSchedInfo();
int currentCycle = cycle; int currentCycle = cycle;
bool success = true; bool success = true;
//Get resource usage for this instruction //Get resource usage for this instruction
InstrRUsage rUsage = msi.getInstrRUsage(node->getInst()->getOpcode()); InstrRUsage rUsage = msi->getInstrRUsage(node->getInst()->getOpcode());
std::vector<std::vector<resourceId_t> > resources = rUsage.resourcesByCycle; std::vector<std::vector<resourceId_t> > resources = rUsage.resourcesByCycle;
//Loop over resources in each cycle and increments their usage count //Loop over resources in each cycle and increments their usage count
@ -101,7 +101,7 @@ bool MSSchedule::resourcesFree(MSchedGraphNode *node, int cycle) {
int oldCycle = cycle; int oldCycle = cycle;
DEBUG(std::cerr << "Backtrack\n"); DEBUG(std::cerr << "Backtrack\n");
//Get resource usage for this instruction //Get resource usage for this instruction
InstrRUsage rUsage = msi.getInstrRUsage(node->getInst()->getOpcode()); InstrRUsage rUsage = msi->getInstrRUsage(node->getInst()->getOpcode());
std::vector<std::vector<resourceId_t> > resources = rUsage.resourcesByCycle; std::vector<std::vector<resourceId_t> > resources = rUsage.resourcesByCycle;
//Loop over resources in each cycle and increments their usage count //Loop over resources in each cycle and increments their usage count

32
lib/Target/SparcV9/ModuloScheduling/MSchedGraph.cpp
View File

@ -103,7 +103,7 @@ MSchedGraph::~MSchedGraph () {
void MSchedGraph::buildNodesAndEdges() { void MSchedGraph::buildNodesAndEdges() {
//Get Machine target information for calculating latency //Get Machine target information for calculating latency
const TargetInstrInfo &MTI = Target.getInstrInfo(); const TargetInstrInfo *MTI = Target.getInstrInfo();
std::vector<MSchedGraphNode*> memInstructions; std::vector<MSchedGraphNode*> memInstructions;
std::map<int, std::vector<OpIndexNodePair> > regNumtoNodeMap; std::map<int, std::vector<OpIndexNodePair> > regNumtoNodeMap;
@ -124,16 +124,16 @@ void MSchedGraph::buildNodesAndEdges() {
#if 0 // FIXME: LOOK INTO THIS #if 0 // FIXME: LOOK INTO THIS
//Check if subsequent instructions can be issued before //Check if subsequent instructions can be issued before
//the result is ready, if so use min delay. //the result is ready, if so use min delay.
if(MTI.hasResultInterlock(MIopCode)) if(MTI->hasResultInterlock(MIopCode))
delay = MTI.minLatency(MIopCode); delay = MTI->minLatency(MIopCode);
else else
#endif #endif
//Get delay //Get delay
delay = MTI.maxLatency(opCode); delay = MTI->maxLatency(opCode);
//Create new node for this machine instruction and add to the graph. //Create new node for this machine instruction and add to the graph.
//Create only if not a nop //Create only if not a nop
if(MTI.isNop(opCode)) if(MTI->isNop(opCode))
continue; continue;
//Add PHI to phi instruction list to be processed later //Add PHI to phi instruction list to be processed later
@ -143,7 +143,7 @@ void MSchedGraph::buildNodesAndEdges() {
bool isBranch = false; bool isBranch = false;
//We want to flag the branch node to treat it special //We want to flag the branch node to treat it special
if(MTI.isBranch(opCode)) if(MTI->isBranch(opCode))
isBranch = true; isBranch = true;
//Node is created and added to the graph automatically //Node is created and added to the graph automatically
@ -152,7 +152,7 @@ void MSchedGraph::buildNodesAndEdges() {
DEBUG(std::cerr << "Created Node: " << *node << "\n"); DEBUG(std::cerr << "Created Node: " << *node << "\n");
//Check OpCode to keep track of memory operations to add memory dependencies later. //Check OpCode to keep track of memory operations to add memory dependencies later.
if(MTI.isLoad(opCode) || MTI.isStore(opCode)) if(MTI->isLoad(opCode) || MTI->isStore(opCode))
memInstructions.push_back(node); memInstructions.push_back(node);
//Loop over all operands, and put them into the register number to //Loop over all operands, and put them into the register number to
@ -370,7 +370,7 @@ void MSchedGraph::addMachRegEdges(std::map<int, std::vector<OpIndexNodePair> >&
void MSchedGraph::addMemEdges(const std::vector<MSchedGraphNode*>& memInst) { void MSchedGraph::addMemEdges(const std::vector<MSchedGraphNode*>& memInst) {
//Get Target machine instruction info //Get Target machine instruction info
const TargetInstrInfo& TMI = Target.getInstrInfo(); const TargetInstrInfo *TMI = Target.getInstrInfo();
//Loop over all memory instructions in the vector //Loop over all memory instructions in the vector
//Knowing that they are in execution, add true, anti, and output dependencies //Knowing that they are in execution, add true, anti, and output dependencies
@ -383,15 +383,15 @@ void MSchedGraph::addMemEdges(const std::vector<MSchedGraphNode*>& memInst) {
for(unsigned destIndex = srcIndex + 1; destIndex < memInst.size(); ++destIndex) { for(unsigned destIndex = srcIndex + 1; destIndex < memInst.size(); ++destIndex) {
//source is a Load, so add anti-dependencies (store after load) //source is a Load, so add anti-dependencies (store after load)
if(TMI.isLoad(srcNodeOpCode)) if(TMI->isLoad(srcNodeOpCode))
if(TMI.isStore(memInst[destIndex]->getInst()->getOpcode())) if(TMI->isStore(memInst[destIndex]->getInst()->getOpcode()))
memInst[srcIndex]->addOutEdge(memInst[destIndex], memInst[srcIndex]->addOutEdge(memInst[destIndex],
MSchedGraphEdge::MemoryDep, MSchedGraphEdge::MemoryDep,
MSchedGraphEdge::AntiDep); MSchedGraphEdge::AntiDep);
//If source is a store, add output and true dependencies //If source is a store, add output and true dependencies
if(TMI.isStore(srcNodeOpCode)) { if(TMI->isStore(srcNodeOpCode)) {
if(TMI.isStore(memInst[destIndex]->getInst()->getOpcode())) if(TMI->isStore(memInst[destIndex]->getInst()->getOpcode()))
memInst[srcIndex]->addOutEdge(memInst[destIndex], memInst[srcIndex]->addOutEdge(memInst[destIndex],
MSchedGraphEdge::MemoryDep, MSchedGraphEdge::MemoryDep,
MSchedGraphEdge::OutputDep); MSchedGraphEdge::OutputDep);
@ -405,13 +405,13 @@ void MSchedGraph::addMemEdges(const std::vector<MSchedGraphNode*>& memInst) {
//All instructions before the src in execution order have an iteration delay of 1 //All instructions before the src in execution order have an iteration delay of 1
for(unsigned destIndex = 0; destIndex < srcIndex; ++destIndex) { for(unsigned destIndex = 0; destIndex < srcIndex; ++destIndex) {
//source is a Load, so add anti-dependencies (store after load) //source is a Load, so add anti-dependencies (store after load)
if(TMI.isLoad(srcNodeOpCode)) if(TMI->isLoad(srcNodeOpCode))
if(TMI.isStore(memInst[destIndex]->getInst()->getOpcode())) if(TMI->isStore(memInst[destIndex]->getInst()->getOpcode()))
memInst[srcIndex]->addOutEdge(memInst[destIndex], memInst[srcIndex]->addOutEdge(memInst[destIndex],
MSchedGraphEdge::MemoryDep, MSchedGraphEdge::MemoryDep,
MSchedGraphEdge::AntiDep, 1); MSchedGraphEdge::AntiDep, 1);
if(TMI.isStore(srcNodeOpCode)) { if(TMI->isStore(srcNodeOpCode)) {
if(TMI.isStore(memInst[destIndex]->getInst()->getOpcode())) if(TMI->isStore(memInst[destIndex]->getInst()->getOpcode()))
memInst[srcIndex]->addOutEdge(memInst[destIndex], memInst[srcIndex]->addOutEdge(memInst[destIndex],
MSchedGraphEdge::MemoryDep, MSchedGraphEdge::MemoryDep,
MSchedGraphEdge::OutputDep, 1); MSchedGraphEdge::OutputDep, 1);

1038
lib/Target/SparcV9/ModuloScheduling/ModuloScheduling.cpp
View File

File diff suppressed because it is too large Load Diff

11
lib/Target/SparcV9/ModuloScheduling/ModuloScheduling.h
View File

@ -89,13 +89,18 @@ namespace llvm {
void predIntersect(std::vector<MSchedGraphNode*> &CurrentSet, std::vector<MSchedGraphNode*> &IntersectResult); void predIntersect(std::vector<MSchedGraphNode*> &CurrentSet, std::vector<MSchedGraphNode*> &IntersectResult);
void succIntersect(std::vector<MSchedGraphNode*> &CurrentSet, std::vector<MSchedGraphNode*> &IntersectResult); void succIntersect(std::vector<MSchedGraphNode*> &CurrentSet, std::vector<MSchedGraphNode*> &IntersectResult);
void reconstructLoop(const MachineBasicBlock*); void reconstructLoop(MachineBasicBlock*);
//void saveValue(const MachineInstr*, const std::set<Value*>&, std::vector<Value*>*); //void saveValue(const MachineInstr*, const std::set<Value*>&, std::vector<Value*>*);
void writePrologues(std::vector<MachineBasicBlock *> &prologues, const MachineBasicBlock *origBB, std::vector<BasicBlock*> &llvm_prologues); void writePrologues(std::vector<MachineBasicBlock *> &prologues, MachineBasicBlock *origBB, std::vector<BasicBlock*> &llvm_prologues, std::map<const Value*, std::pair<const MSchedGraphNode*, int> > &valuesToSave, std::map<Value*, std::map<int, std::vector<Value*> > > &newValues, std::map<Value*, MachineBasicBlock*> &newValLocation);
void writeEpilogues(std::vector<MachineBasicBlock *> &epilogues, const MachineBasicBlock *origBB, std::vector<BasicBlock*> &llvm_epilogues); void writeEpilogues(std::vector<MachineBasicBlock *> &epilogues, const MachineBasicBlock *origBB, std::vector<BasicBlock*> &llvm_epilogues, std::map<const Value*, std::pair<const MSchedGraphNode*, int> > &valuesToSave,std::map<Value*, std::map<int, std::vector<Value*> > > &newValues, std::map<Value*, MachineBasicBlock*> &newValLocation);
void writeKernel(BasicBlock *llvmBB, MachineBasicBlock *machineBB, std::map<const Value*, std::pair<const MSchedGraphNode*, int> > &valuesToSave, std::map<Value*, std::map<int, std::vector<Value*> > > &newValues, std::map<Value*, MachineBasicBlock*> &newValLocation);
void removePHIs(const MachineBasicBlock *origBB, std::vector<MachineBasicBlock *> &prologues, std::vector<MachineBasicBlock *> &epilogues, MachineBasicBlock *kernelBB, std::map<Value*, MachineBasicBlock*> &newValLocation);
public: public:
ModuloSchedulingPass(TargetMachine &targ) : target(targ) {} ModuloSchedulingPass(TargetMachine &targ) : target(targ) {}