6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-07-06 01:24:35 +00:00
Code Issues Projects Releases Wiki Activity

Cleaned up code layout. No functional changes.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@6304 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Misha Brukman
2003-05-22 21:49:18 +00:00
parent e3d3219f76
commit 6b77ec4156
4 changed files with 1262 additions and 1374 deletions
Download Patch File Download Diff File Expand all files Collapse all files

168
lib/CodeGen/InstrSched/InstrScheduling.cpp
View File

@ -223,8 +223,7 @@ ScheduleIterator<_NodeType>::skipToNextInstr()
(*S.groups[cycleNum])[slotNum] == NULL) (*S.groups[cycleNum])[slotNum] == NULL)
{ {
++slotNum; ++slotNum;
if (slotNum == S.nslots) if (slotNum == S.nslots) {
{
++cycleNum; ++cycleNum;
slotNum = 0; slotNum = 0;
while(cycleNum < S.groups.size() && S.groups[cycleNum] == NULL) while(cycleNum < S.groups.size() && S.groups[cycleNum] == NULL)
@ -239,8 +238,7 @@ ScheduleIterator<_NodeType>&
ScheduleIterator<_NodeType>::operator++() // Preincrement ScheduleIterator<_NodeType>::operator++() // Preincrement
{ {
++slotNum; ++slotNum;
if (slotNum == S.nslots) if (slotNum == S.nslots) {
{
++cycleNum; ++cycleNum;
slotNum = 0; slotNum = 0;
} }
@ -574,8 +572,8 @@ AssignInstructionsToSlots(class SchedulingManager& S, unsigned maxIssue)
// If only one instruction can be issued, do so. // If only one instruction can be issued, do so.
if (maxIssue == 1) if (maxIssue == 1)
for (unsigned s=startSlot; s < S.nslots; s++) for (unsigned s=startSlot; s < S.nslots; s++)
if (S.getChoicesForSlot(s).size() > 0) if (S.getChoicesForSlot(s).size() > 0) {
{// found the one instruction // found the one instruction
S.scheduleInstr(*S.getChoicesForSlot(s).begin(), s, curTime); S.scheduleInstr(*S.getChoicesForSlot(s).begin(), s, curTime);
return; return;
} }
@ -589,26 +587,23 @@ AssignInstructionsToSlots(class SchedulingManager& S, unsigned maxIssue)
// If all slots have 0 or multiple choices, pick the first slot with // If all slots have 0 or multiple choices, pick the first slot with
// choices and use its last instruction (just to avoid shifting the vector). // choices and use its last instruction (just to avoid shifting the vector).
unsigned numIssued; unsigned numIssued;
for (numIssued = 0; numIssued < maxIssue; numIssued++) for (numIssued = 0; numIssued < maxIssue; numIssued++) {
{
int chosenSlot = -1; int chosenSlot = -1;
for (unsigned s=startSlot; s < S.nslots; s++) for (unsigned s=startSlot; s < S.nslots; s++)
if ((*igroup)[s] == NULL && S.getChoicesForSlot(s).size() == 1) if ((*igroup)[s] == NULL && S.getChoicesForSlot(s).size() == 1) {
{
chosenSlot = (int) s; chosenSlot = (int) s;
break; break;
} }
if (chosenSlot == -1) if (chosenSlot == -1)
for (unsigned s=startSlot; s < S.nslots; s++) for (unsigned s=startSlot; s < S.nslots; s++)
if ((*igroup)[s] == NULL && S.getChoicesForSlot(s).size() > 0) if ((*igroup)[s] == NULL && S.getChoicesForSlot(s).size() > 0) {
{
chosenSlot = (int) s; chosenSlot = (int) s;
break; break;
} }
if (chosenSlot != -1) if (chosenSlot != -1) {
{ // Insert the chosen instr in the chosen slot and // Insert the chosen instr in the chosen slot and
// erase it from all slots. // erase it from all slots.
const SchedGraphNode* node= *S.getChoicesForSlot(chosenSlot).begin(); const SchedGraphNode* node= *S.getChoicesForSlot(chosenSlot).begin();
S.scheduleInstr(node, chosenSlot, curTime); S.scheduleInstr(node, chosenSlot, curTime);
@ -673,13 +668,12 @@ MarkSuccessorsReady(SchedulingManager& S, const SchedGraphNode* node)
if (! (*SI)->isDummyNode() if (! (*SI)->isDummyNode()
&& ! S.isScheduled(*SI) && ! S.isScheduled(*SI)
&& ! S.schedPrio.nodeIsReady(*SI)) && ! S.schedPrio.nodeIsReady(*SI))
{// successor not scheduled and not marked ready; check *its* preds. {
// successor not scheduled and not marked ready; check *its* preds.
bool succIsReady = true; bool succIsReady = true;
for (sg_pred_const_iterator P=pred_begin(*SI); P != pred_end(*SI); ++P) for (sg_pred_const_iterator P=pred_begin(*SI); P != pred_end(*SI); ++P)
if (! (*P)->isDummyNode() if (! (*P)->isDummyNode() && ! S.isScheduled(*P)) {
&& ! S.isScheduled(*P))
{
succIsReady = false; succIsReady = false;
break; break;
} }
@ -710,8 +704,7 @@ FindSlotChoices(SchedulingManager& S,
unsigned int startSlot = 0; unsigned int startSlot = 0;
InstrGroup* igroup = S.isched.getIGroup(S.getTime()); InstrGroup* igroup = S.isched.getIGroup(S.getTime());
for (int s = S.nslots - 1; s >= 0; s--) for (int s = S.nslots - 1; s >= 0; s--)
if ((*igroup)[s] != NULL) if ((*igroup)[s] != NULL) {
{
startSlot = s+1; startSlot = s+1;
break; break;
} }
@ -729,17 +722,14 @@ FindSlotChoices(SchedulingManager& S,
// we choose them so that subsequent choices will be correctly tested // we choose them so that subsequent choices will be correctly tested
// for feasibility, w.r.t. higher priority choices for the same cycle. // for feasibility, w.r.t. higher priority choices for the same cycle.
// //
while (S.getNumChoices() < S.nslots - startSlot) while (S.getNumChoices() < S.nslots - startSlot) {
{
const SchedGraphNode* nextNode=S.schedPrio.getNextHighest(S,S.getTime()); const SchedGraphNode* nextNode=S.schedPrio.getNextHighest(S,S.getTime());
if (nextNode == NULL) if (nextNode == NULL)
break; // no more instructions for this cycle break; // no more instructions for this cycle
if (S.getInstrInfo().getNumDelaySlots(nextNode->getOpCode()) > 0) if (S.getInstrInfo().getNumDelaySlots(nextNode->getOpCode()) > 0) {
{
delaySlotInfo = S.getDelaySlotInfoForInstr(nextNode); delaySlotInfo = S.getDelaySlotInfoForInstr(nextNode);
if (delaySlotInfo != NULL) if (delaySlotInfo != NULL) {
{
if (indexForBreakingNode < S.nslots) if (indexForBreakingNode < S.nslots)
// cannot issue a delayed instr in the same cycle as one // cannot issue a delayed instr in the same cycle as one
// that breaks the issue group or as another delayed instr // that breaks the issue group or as another delayed instr
@ -747,9 +737,7 @@ FindSlotChoices(SchedulingManager& S,
else else
indexForDelayedInstr = S.getNumChoices(); indexForDelayedInstr = S.getNumChoices();
} }
} } else if (S.schedInfo.breaksIssueGroup(nextNode->getOpCode())) {
else if (S.schedInfo.breaksIssueGroup(nextNode->getOpCode()))
{
if (indexForBreakingNode < S.nslots) if (indexForBreakingNode < S.nslots)
// have a breaking instruction already so throw this one away // have a breaking instruction already so throw this one away
nextNode = NULL; nextNode = NULL;
@ -757,12 +745,10 @@ FindSlotChoices(SchedulingManager& S,
indexForBreakingNode = S.getNumChoices(); indexForBreakingNode = S.getNumChoices();
} }
if (nextNode != NULL) if (nextNode != NULL) {
{
S.addChoice(nextNode); S.addChoice(nextNode);
if (S.schedInfo.isSingleIssue(nextNode->getOpCode())) if (S.schedInfo.isSingleIssue(nextNode->getOpCode())) {
{
assert(S.getNumChoices() == 1 && assert(S.getNumChoices() == 1 &&
"Prioritizer returned invalid instr for this cycle!"); "Prioritizer returned invalid instr for this cycle!");
break; break;
@ -786,8 +772,7 @@ FindSlotChoices(SchedulingManager& S,
{ // No instructions that break the issue group or that have delay slots. { // No instructions that break the issue group or that have delay slots.
// This is the common case, so handle it separately for efficiency. // This is the common case, so handle it separately for efficiency.
if (S.getNumChoices() == 1) if (S.getNumChoices() == 1) {
{
MachineOpCode opCode = S.getChoice(0)->getOpCode(); MachineOpCode opCode = S.getChoice(0)->getOpCode();
unsigned int s; unsigned int s;
for (s=startSlot; s < S.nslots; s++) for (s=startSlot; s < S.nslots; s++)
@ -795,20 +780,15 @@ FindSlotChoices(SchedulingManager& S,
break; break;
assert(s < S.nslots && "No feasible slot for this opCode?"); assert(s < S.nslots && "No feasible slot for this opCode?");
S.addChoiceToSlot(s, S.getChoice(0)); S.addChoiceToSlot(s, S.getChoice(0));
} } else {
else for (unsigned i=0; i < S.getNumChoices(); i++) {
{
for (unsigned i=0; i < S.getNumChoices(); i++)
{
MachineOpCode opCode = S.getChoice(i)->getOpCode(); MachineOpCode opCode = S.getChoice(i)->getOpCode();
for (unsigned int s=startSlot; s < S.nslots; s++) for (unsigned int s=startSlot; s < S.nslots; s++)
if (S.schedInfo.instrCanUseSlot(opCode, s)) if (S.schedInfo.instrCanUseSlot(opCode, s))
S.addChoiceToSlot(s, S.getChoice(i)); S.addChoiceToSlot(s, S.getChoice(i));
} }
} }
} } else if (indexForDelayedInstr < S.nslots) {
else if (indexForDelayedInstr < S.nslots)
{
// There is an instruction that needs delay slots. // There is an instruction that needs delay slots.
// Try to assign that instruction to a higher slot than any other // Try to assign that instruction to a higher slot than any other
// instructions in the group, so that its delay slots can go // instructions in the group, so that its delay slots can go
@ -829,23 +809,20 @@ FindSlotChoices(SchedulingManager& S,
// Find the last possible slot for the delayed instruction that leaves // Find the last possible slot for the delayed instruction that leaves
// at least `d' slots vacant after it (d = #delay slots) // at least `d' slots vacant after it (d = #delay slots)
for (int s = S.nslots-ndelays-1; s >= (int) startSlot; s--) for (int s = S.nslots-ndelays-1; s >= (int) startSlot; s--)
if (S.schedInfo.instrCanUseSlot(delayOpCode, s)) if (S.schedInfo.instrCanUseSlot(delayOpCode, s)) {
{
delayedNodeSlot = s; delayedNodeSlot = s;
break; break;
} }
highestSlotUsed = -1; highestSlotUsed = -1;
for (unsigned i=0; i < S.getNumChoices() - 1; i++) for (unsigned i=0; i < S.getNumChoices() - 1; i++) {
{
// Try to assign every other instruction to a lower numbered // Try to assign every other instruction to a lower numbered
// slot than delayedNodeSlot. // slot than delayedNodeSlot.
MachineOpCode opCode =S.getChoice(i)->getOpCode(); MachineOpCode opCode =S.getChoice(i)->getOpCode();
bool noSlotFound = true; bool noSlotFound = true;
unsigned int s; unsigned int s;
for (s=startSlot; s < delayedNodeSlot; s++) for (s=startSlot; s < delayedNodeSlot; s++)
if (S.schedInfo.instrCanUseSlot(opCode, s)) if (S.schedInfo.instrCanUseSlot(opCode, s)) {
{
S.addChoiceToSlot(s, S.getChoice(i)); S.addChoiceToSlot(s, S.getChoice(i));
noSlotFound = false; noSlotFound = false;
} }
@ -855,8 +832,7 @@ FindSlotChoices(SchedulingManager& S,
// the next cycle. // the next cycle.
if (noSlotFound) if (noSlotFound)
for ( ; s < S.nslots; s++) for ( ; s < S.nslots; s++)
if (S.schedInfo.instrCanUseSlot(opCode, s)) if (S.schedInfo.instrCanUseSlot(opCode, s)) {
{
S.addChoiceToSlot(s, S.getChoice(i)); S.addChoiceToSlot(s, S.getChoice(i));
break; break;
} }
@ -874,16 +850,14 @@ FindSlotChoices(SchedulingManager& S,
// slots for the node at the same time. // slots for the node at the same time.
cycles_t dcycle = S.getTime(); cycles_t dcycle = S.getTime();
unsigned int dslot = highestSlotUsed + 1; unsigned int dslot = highestSlotUsed + 1;
if (dslot == S.nslots) if (dslot == S.nslots) {
{
dslot = 0; dslot = 0;
++dcycle; ++dcycle;
} }
delaySlotInfo->recordChosenSlot(dcycle, dslot); delaySlotInfo->recordChosenSlot(dcycle, dslot);
getDelaySlotInfo = delaySlotInfo; getDelaySlotInfo = delaySlotInfo;
} } else {
else // There is an instruction that breaks the issue group.
{ // There is an instruction that breaks the issue group.
// For such an instruction, assign to the last possible slot in // For such an instruction, assign to the last possible slot in
// the current group, and then don't assign any other instructions // the current group, and then don't assign any other instructions
// to later slots. // to later slots.
@ -894,8 +868,7 @@ FindSlotChoices(SchedulingManager& S,
// Find the last possible slot for this instruction. // Find the last possible slot for this instruction.
for (int s = S.nslots-1; s >= (int) startSlot; s--) for (int s = S.nslots-1; s >= (int) startSlot; s--)
if (S.schedInfo.instrCanUseSlot(breakingNode->getOpCode(), s)) if (S.schedInfo.instrCanUseSlot(breakingNode->getOpCode(), s)) {
{
breakingSlot = s; breakingSlot = s;
break; break;
} }
@ -916,10 +889,8 @@ FindSlotChoices(SchedulingManager& S,
bool foundLowerSlot = false; bool foundLowerSlot = false;
nslotsToUse = S.nslots; // May be modified in the loop nslotsToUse = S.nslots; // May be modified in the loop
for (unsigned int s=startSlot; s < nslotsToUse; s++) for (unsigned int s=startSlot; s < nslotsToUse; s++)
if (S.schedInfo.instrCanUseSlot(opCode, s)) if (S.schedInfo.instrCanUseSlot(opCode, s)) {
{ if (breakingSlot < S.nslots && s < breakingSlot) {
if (breakingSlot < S.nslots && s < breakingSlot)
{
foundLowerSlot = true; foundLowerSlot = true;
nslotsToUse = breakingSlot; // RESETS LOOP UPPER BOUND! nslotsToUse = breakingSlot; // RESETS LOOP UPPER BOUND!
} }
@ -934,19 +905,16 @@ FindSlotChoices(SchedulingManager& S,
// Assign the breaking instruction (if any) to a single slot // Assign the breaking instruction (if any) to a single slot
// Otherwise, just ignore the instruction. It will simply be // Otherwise, just ignore the instruction. It will simply be
// scheduled in a later cycle. // scheduled in a later cycle.
if (breakingSlot < S.nslots) if (breakingSlot < S.nslots) {
{
S.addChoiceToSlot(breakingSlot, breakingNode); S.addChoiceToSlot(breakingSlot, breakingNode);
nslotsToUse = breakingSlot; nslotsToUse = breakingSlot;
} } else
else
nslotsToUse = S.nslots; nslotsToUse = S.nslots;
// For lower priority instructions than the one that breaks the // For lower priority instructions than the one that breaks the
// group, only assign them to slots lower than the breaking slot. // group, only assign them to slots lower than the breaking slot.
// Otherwise, just ignore the instruction. // Otherwise, just ignore the instruction.
for (unsigned i=indexForBreakingNode+1; i < S.getNumChoices(); i++) for (unsigned i=indexForBreakingNode+1; i < S.getNumChoices(); i++) {
{
MachineOpCode opCode = S.getChoice(i)->getOpCode(); MachineOpCode opCode = S.getChoice(i)->getOpCode();
for (unsigned int s=startSlot; s < nslotsToUse; s++) for (unsigned int s=startSlot; s < nslotsToUse; s++)
if (S.schedInfo.instrCanUseSlot(opCode, s)) if (S.schedInfo.instrCanUseSlot(opCode, s))
@ -970,8 +938,7 @@ ChooseOneGroup(SchedulingManager& S)
// Choose up to `nslots' feasible instructions and their possible slots. // Choose up to `nslots' feasible instructions and their possible slots.
unsigned numIssued = FindSlotChoices(S, getDelaySlotInfo); unsigned numIssued = FindSlotChoices(S, getDelaySlotInfo);
while (numIssued == 0) while (numIssued == 0) {
{
S.updateTime(S.getTime()+1); S.updateTime(S.getTime()+1);
numIssued = FindSlotChoices(S, getDelaySlotInfo); numIssued = FindSlotChoices(S, getDelaySlotInfo);
} }
@ -982,14 +949,11 @@ ChooseOneGroup(SchedulingManager& S)
numIssued += getDelaySlotInfo->scheduleDelayedNode(S); numIssued += getDelaySlotInfo->scheduleDelayedNode(S);
// Print trace of scheduled instructions before newly ready ones // Print trace of scheduled instructions before newly ready ones
if (SchedDebugLevel >= Sched_PrintSchedTrace) if (SchedDebugLevel >= Sched_PrintSchedTrace) {
{ for (cycles_t c = firstCycle; c <= S.getTime(); c++) {
for (cycles_t c = firstCycle; c <= S.getTime(); c++)
{
std::cerr << " Cycle " << (long)c <<" : Scheduled instructions:\n"; std::cerr << " Cycle " << (long)c <<" : Scheduled instructions:\n";
const InstrGroup* igroup = S.isched.getIGroup(c); const InstrGroup* igroup = S.isched.getIGroup(c);
for (unsigned int s=0; s < S.nslots; s++) for (unsigned int s=0; s < S.nslots; s++) {
{
std::cerr << " "; std::cerr << " ";
if ((*igroup)[s] != NULL) if ((*igroup)[s] != NULL)
std::cerr << * ((*igroup)[s])->getMachineInstr() << "\n"; std::cerr << * ((*igroup)[s])->getMachineInstr() << "\n";
@ -1011,8 +975,7 @@ ForwardListSchedule(SchedulingManager& S)
S.schedPrio.initialize(); S.schedPrio.initialize();
while ((N = S.schedPrio.getNumReady()) > 0) while ((N = S.schedPrio.getNumReady()) > 0) {
{
cycles_t nextCycle = S.getTime(); cycles_t nextCycle = S.getTime();
// Choose one group of instructions for a cycle, plus any delay slot // Choose one group of instructions for a cycle, plus any delay slot
@ -1026,12 +989,10 @@ ForwardListSchedule(SchedulingManager& S)
// Notify the priority manager of scheduled instructions and mark // Notify the priority manager of scheduled instructions and mark
// any successors that may now be ready // any successors that may now be ready
// //
for (cycles_t c = nextCycle; c <= S.getTime(); c++) for (cycles_t c = nextCycle; c <= S.getTime(); c++) {
{
const InstrGroup* igroup = S.isched.getIGroup(c); const InstrGroup* igroup = S.isched.getIGroup(c);
for (unsigned int s=0; s < S.nslots; s++) for (unsigned int s=0; s < S.nslots; s++)
if ((node = (*igroup)[s]) != NULL) if ((node = (*igroup)[s]) != NULL) {
{
S.schedPrio.issuedReadyNodeAt(S.getTime(), node); S.schedPrio.issuedReadyNodeAt(S.getTime(), node);
MarkSuccessorsReady(S, node); MarkSuccessorsReady(S, node);
} }
@ -1092,8 +1053,7 @@ NodeCanFillDelaySlot(const SchedulingManager& S,
// instruction can be reordered relative to the branch. We simply check // instruction can be reordered relative to the branch. We simply check
// if the instr. has only 1 outgoing edge, viz., a CD edge to the branch. // if the instr. has only 1 outgoing edge, viz., a CD edge to the branch.
// //
if (nodeIsPredecessor) if (nodeIsPredecessor) {
{
bool onlyCDEdgeToBranch = true; bool onlyCDEdgeToBranch = true;
for (SchedGraphNode::const_iterator OEI = node->beginOutEdges(); for (SchedGraphNode::const_iterator OEI = node->beginOutEdges();
OEI != node->endOutEdges(); ++OEI) OEI != node->endOutEdges(); ++OEI)
@ -1120,14 +1080,13 @@ MarkNodeForDelaySlot(SchedulingManager& S,
const SchedGraphNode* brNode, const SchedGraphNode* brNode,
bool nodeIsPredecessor) bool nodeIsPredecessor)
{ {
if (nodeIsPredecessor) if (nodeIsPredecessor) {
{ // If node is in the same basic block (i.e., preceeds brNode), // If node is in the same basic block (i.e., preceeds brNode),
// remove it and all its incident edges from the graph. Make sure we // remove it and all its incident edges from the graph. Make sure we
// add dummy edges for pred/succ nodes that become entry/exit nodes. // add dummy edges for pred/succ nodes that become entry/exit nodes.
graph->eraseIncidentEdges(node, /*addDummyEdges*/ true); graph->eraseIncidentEdges(node, /*addDummyEdges*/ true);
} } else {
else // If the node was from a target block, add the node to the graph
{ // If the node was from a target block, add the node to the graph
// and add a CD edge from brNode to node. // and add a CD edge from brNode to node.
assert(0 && "NOT IMPLEMENTED YET"); assert(0 && "NOT IMPLEMENTED YET");
} }
@ -1173,8 +1132,7 @@ FindUsefulInstructionsForDelaySlots(SchedulingManager& S,
// Note that this is the most efficient code when only 1 (or even 2) // Note that this is the most efficient code when only 1 (or even 2)
// values need to be selected. // values need to be selected.
// //
while (sdelayNodeVec.size() < ndelays && mdelayNodeVec.size() > 0) while (sdelayNodeVec.size() < ndelays && mdelayNodeVec.size() > 0) {
{
unsigned lmin = unsigned lmin =
mii.maxLatency(mdelayNodeVec[0]->getOpCode()); mii.maxLatency(mdelayNodeVec[0]->getOpCode());
unsigned minIndex = 0; unsigned minIndex = 0;
@ -1202,6 +1160,7 @@ FindUsefulInstructionsForDelaySlots(SchedulingManager& S,
// //
static void ReplaceNopsWithUsefulInstr(SchedulingManager& S, static void ReplaceNopsWithUsefulInstr(SchedulingManager& S,
SchedGraphNode* node, SchedGraphNode* node,
// FIXME: passing vector BY VALUE!!!
std::vector<SchedGraphNode*> sdelayNodeVec, std::vector<SchedGraphNode*> sdelayNodeVec,
SchedGraph* graph) SchedGraph* graph)
{ {
@ -1234,8 +1193,7 @@ static void ReplaceNopsWithUsefulInstr(SchedulingManager& S,
if (mii.isNop(MBB[i]->getOpCode())) if (mii.isNop(MBB[i]->getOpCode()))
if (sdelayNodeVec.size() < ndelays) if (sdelayNodeVec.size() < ndelays)
sdelayNodeVec.push_back(graph->getGraphNodeForInstr(MBB[i])); sdelayNodeVec.push_back(graph->getGraphNodeForInstr(MBB[i]));
else else {
{
nopNodeVec.push_back(graph->getGraphNodeForInstr(MBB[i])); nopNodeVec.push_back(graph->getGraphNodeForInstr(MBB[i]));
//remove the MI from the Machine Code For Instruction //remove the MI from the Machine Code For Instruction
@ -1310,8 +1268,7 @@ ChooseInstructionsForDelaySlots(SchedulingManager& S, MachineBasicBlock &MBB,
// Compute a vector of the nodes chosen for delay slots and then // Compute a vector of the nodes chosen for delay slots and then
// mark delay slots to replace NOPs with these useful instructions. // mark delay slots to replace NOPs with these useful instructions.
// //
if (brInstr != NULL) if (brInstr != NULL) {
{
SchedGraphNode* brNode = graph->getGraphNodeForInstr(brInstr); SchedGraphNode* brNode = graph->getGraphNodeForInstr(brInstr);
FindUsefulInstructionsForDelaySlots(S, brNode, delayNodeVec); FindUsefulInstructionsForDelaySlots(S, brNode, delayNodeVec);
ReplaceNopsWithUsefulInstr(S, brNode, delayNodeVec, graph); ReplaceNopsWithUsefulInstr(S, brNode, delayNodeVec, graph);
@ -1347,11 +1304,9 @@ DelaySlotInfo::scheduleDelayedNode(SchedulingManager& S)
S.scheduleInstr(brNode, nextSlot, nextTime); S.scheduleInstr(brNode, nextSlot, nextTime);
for (unsigned d=0; d < ndelays; d++) for (unsigned d=0; d < ndelays; d++) {
{
++nextSlot; ++nextSlot;
if (nextSlot == S.nslots) if (nextSlot == S.nslots) {
{
nextSlot = 0; nextSlot = 0;
nextTime++; nextTime++;
} }
@ -1361,8 +1316,7 @@ DelaySlotInfo::scheduleDelayedNode(SchedulingManager& S)
// We do *not* check for flow dependences but rely on pipeline // We do *not* check for flow dependences but rely on pipeline
// interlocks to resolve them. Machines without interlocks // interlocks to resolve them. Machines without interlocks
// will require this code to be modified. // will require this code to be modified.
for (unsigned i=0; i < delayNodeVec.size(); i++) for (unsigned i=0; i < delayNodeVec.size(); i++) {
{
const SchedGraphNode* dnode = delayNodeVec[i]; const SchedGraphNode* dnode = delayNodeVec[i];
if ( ! S.isScheduled(dnode) if ( ! S.isScheduled(dnode)
&& S.schedInfo.instrCanUseSlot(dnode->getOpCode(), nextSlot) && S.schedInfo.instrCanUseSlot(dnode->getOpCode(), nextSlot)
@ -1388,12 +1342,10 @@ DelaySlotInfo::scheduleDelayedNode(SchedulingManager& S)
nextSlot = delayedNodeSlotNum; nextSlot = delayedNodeSlotNum;
nextTime = delayedNodeCycle; nextTime = delayedNodeCycle;
for (unsigned i=0; i < delayNodeVec.size(); i++) for (unsigned i=0; i < delayNodeVec.size(); i++)
if (! S.isScheduled(delayNodeVec[i])) if (! S.isScheduled(delayNodeVec[i])) {
{
do { // find the next empty slot do { // find the next empty slot
++nextSlot; ++nextSlot;
if (nextSlot == S.nslots) if (nextSlot == S.nslots) {
{
nextSlot = 0; nextSlot = 0;
nextTime++; nextTime++;
} }
@ -1507,8 +1459,7 @@ bool InstructionSchedulingWithSSA::runOnFunction(Function &F)
{ {
SchedGraphSet graphSet(&F, target); SchedGraphSet graphSet(&F, target);
if (SchedDebugLevel >= Sched_PrintSchedGraphs) if (SchedDebugLevel >= Sched_PrintSchedGraphs) {
{
std::cerr << "\n*** SCHEDULING GRAPHS FOR INSTRUCTION SCHEDULING\n"; std::cerr << "\n*** SCHEDULING GRAPHS FOR INSTRUCTION SCHEDULING\n";
graphSet.dump(); graphSet.dump();
} }
@ -1531,8 +1482,7 @@ bool InstructionSchedulingWithSSA::runOnFunction(Function &F)
RecordSchedule(MBB, S); // records schedule in BB RecordSchedule(MBB, S); // records schedule in BB
} }
if (SchedDebugLevel >= Sched_PrintMachineCode) if (SchedDebugLevel >= Sched_PrintMachineCode) {
{
std::cerr << "\n*** Machine instructions after INSTRUCTION SCHEDULING\n"; std::cerr << "\n*** Machine instructions after INSTRUCTION SCHEDULING\n";
MachineFunction::get(&F).dump(); MachineFunction::get(&F).dump();
} }

36
lib/CodeGen/InstrSched/SchedGraph.cpp
View File

@ -257,7 +257,8 @@ SchedGraph::eraseIncomingEdges(SchedGraphNode* node, bool addDummyEdges)
if (addDummyEdges && if (addDummyEdges &&
srcNode != getRoot() && srcNode != getRoot() &&
srcNode->beginOutEdges() == srcNode->endOutEdges()) srcNode->beginOutEdges() == srcNode->endOutEdges())
{ // srcNode has no more out edges, so add an edge to dummy EXIT node {
// srcNode has no more out edges, so add an edge to dummy EXIT node
assert(node != getLeaf() && "Adding edge that was just removed?"); assert(node != getLeaf() && "Adding edge that was just removed?");
(void) new SchedGraphEdge(srcNode, getLeaf(), (void) new SchedGraphEdge(srcNode, getLeaf(),
SchedGraphEdge::CtrlDep, SchedGraphEdge::NonDataDep, 0); SchedGraphEdge::CtrlDep, SchedGraphEdge::NonDataDep, 0);
@ -490,9 +491,8 @@ SchedGraph::addCallCCEdges(const std::vector<SchedGraphNode*>& memNodeVec,
if (callNodeVec[lastCallNodeIdx]->getMachineInstr() == bbMvec[i]) if (callNodeVec[lastCallNodeIdx]->getMachineInstr() == bbMvec[i])
break; break;
assert(lastCallNodeIdx < (int)callNodeVec.size() && "Missed Call?"); assert(lastCallNodeIdx < (int)callNodeVec.size() && "Missed Call?");
} } else if (mii.isCCInstr(bbMvec[i]->getOpCode())) {
else if (mii.isCCInstr(bbMvec[i]->getOpCode())) // Add incoming/outgoing edges from/to preceding/later calls
{ // Add incoming/outgoing edges from/to preceding/later calls
SchedGraphNode* ccNode = this->getGraphNodeForInstr(bbMvec[i]); SchedGraphNode* ccNode = this->getGraphNodeForInstr(bbMvec[i]);
int j=0; int j=0;
for ( ; j <= lastCallNodeIdx; j++) for ( ; j <= lastCallNodeIdx; j++)
@ -522,26 +522,22 @@ SchedGraph::addMachineRegEdges(RegToRefVecMap& regToRefVecMap,
RefVec& regRefVec = (*I).second; RefVec& regRefVec = (*I).second;
// regRefVec is ordered by control flow order in the basic block // regRefVec is ordered by control flow order in the basic block
for (unsigned i=0; i < regRefVec.size(); ++i) for (unsigned i=0; i < regRefVec.size(); ++i) {
{
SchedGraphNode* node = regRefVec[i].first; SchedGraphNode* node = regRefVec[i].first;
unsigned int opNum = regRefVec[i].second; unsigned int opNum = regRefVec[i].second;
bool isDef = node->getMachineInstr()->operandIsDefined(opNum); bool isDef = node->getMachineInstr()->operandIsDefined(opNum);
bool isDefAndUse = bool isDefAndUse =
node->getMachineInstr()->operandIsDefinedAndUsed(opNum); node->getMachineInstr()->operandIsDefinedAndUsed(opNum);
for (unsigned p=0; p < i; ++p) for (unsigned p=0; p < i; ++p) {
{
SchedGraphNode* prevNode = regRefVec[p].first; SchedGraphNode* prevNode = regRefVec[p].first;
if (prevNode != node) if (prevNode != node) {
{
unsigned int prevOpNum = regRefVec[p].second; unsigned int prevOpNum = regRefVec[p].second;
bool prevIsDef = bool prevIsDef =
prevNode->getMachineInstr()->operandIsDefined(prevOpNum); prevNode->getMachineInstr()->operandIsDefined(prevOpNum);
bool prevIsDefAndUse = bool prevIsDefAndUse =
prevNode->getMachineInstr()->operandIsDefinedAndUsed(prevOpNum); prevNode->getMachineInstr()->operandIsDefinedAndUsed(prevOpNum);
if (isDef) if (isDef) {
{
if (prevIsDef) if (prevIsDef)
new SchedGraphEdge(prevNode, node, regNum, new SchedGraphEdge(prevNode, node, regNum,
SchedGraphEdge::OutputDep); SchedGraphEdge::OutputDep);
@ -582,17 +578,16 @@ SchedGraph::addEdgesForValue(SchedGraphNode* refNode,
if ((*I).first == refNode) if ((*I).first == refNode)
continue; // Dont add any self-loops continue; // Dont add any self-loops
if ((*I).first->getOrigIndexInBB() < refNode->getOrigIndexInBB()) if ((*I).first->getOrigIndexInBB() < refNode->getOrigIndexInBB()) {
{ // (*).first is before refNode // (*).first is before refNode
if (refNodeIsDef) if (refNodeIsDef)
(void) new SchedGraphEdge((*I).first, refNode, defValue, (void) new SchedGraphEdge((*I).first, refNode, defValue,
SchedGraphEdge::OutputDep); SchedGraphEdge::OutputDep);
if (refNodeIsUse) if (refNodeIsUse)
(void) new SchedGraphEdge((*I).first, refNode, defValue, (void) new SchedGraphEdge((*I).first, refNode, defValue,
SchedGraphEdge::TrueDep); SchedGraphEdge::TrueDep);
} } else {
else // (*).first is after refNode
{ // (*).first is after refNode
if (refNodeIsDef) if (refNodeIsDef)
(void) new SchedGraphEdge(refNode, (*I).first, defValue, (void) new SchedGraphEdge(refNode, (*I).first, defValue,
SchedGraphEdge::OutputDep); SchedGraphEdge::OutputDep);
@ -692,8 +687,8 @@ SchedGraph::findDefUseInfoAtInstr(const TargetMachine& target,
{ {
int regNum = mop.getMachineRegNum(); int regNum = mop.getMachineRegNum();
if (regNum != target.getRegInfo().getZeroRegNum()) if (regNum != target.getRegInfo().getZeroRegNum())
regToRefVecMap[mop.getMachineRegNum()].push_back( regToRefVecMap[mop.getMachineRegNum()]
std::make_pair(node, i)); .push_back(std::make_pair(node, i));
continue; // nothing more to do continue; // nothing more to do
} }
@ -903,8 +898,7 @@ std::ostream &operator<<(std::ostream &os, const SchedGraphNode& node)
if (node.getMachineInstr() == NULL) if (node.getMachineInstr() == NULL)
os << "(Dummy node)\n"; os << "(Dummy node)\n";
else else {
{
os << *node.getMachineInstr() << "\n" << std::string(12, ' '); os << *node.getMachineInstr() << "\n" << std::string(12, ' ');
os << node.inEdges.size() << " Incoming Edges:\n"; os << node.inEdges.size() << " Incoming Edges:\n";
for (unsigned i=0, N=node.inEdges.size(); i < N; i++) for (unsigned i=0, N=node.inEdges.size(); i < N; i++)

168
lib/Target/SparcV9/InstrSched/InstrScheduling.cpp
View File

@ -223,8 +223,7 @@ ScheduleIterator<_NodeType>::skipToNextInstr()
(*S.groups[cycleNum])[slotNum] == NULL) (*S.groups[cycleNum])[slotNum] == NULL)
{ {
++slotNum; ++slotNum;
if (slotNum == S.nslots) if (slotNum == S.nslots) {
{
++cycleNum; ++cycleNum;
slotNum = 0; slotNum = 0;
while(cycleNum < S.groups.size() && S.groups[cycleNum] == NULL) while(cycleNum < S.groups.size() && S.groups[cycleNum] == NULL)
@ -239,8 +238,7 @@ ScheduleIterator<_NodeType>&
ScheduleIterator<_NodeType>::operator++() // Preincrement ScheduleIterator<_NodeType>::operator++() // Preincrement
{ {
++slotNum; ++slotNum;
if (slotNum == S.nslots) if (slotNum == S.nslots) {
{
++cycleNum; ++cycleNum;
slotNum = 0; slotNum = 0;
} }
@ -574,8 +572,8 @@ AssignInstructionsToSlots(class SchedulingManager& S, unsigned maxIssue)
// If only one instruction can be issued, do so. // If only one instruction can be issued, do so.
if (maxIssue == 1) if (maxIssue == 1)
for (unsigned s=startSlot; s < S.nslots; s++) for (unsigned s=startSlot; s < S.nslots; s++)
if (S.getChoicesForSlot(s).size() > 0) if (S.getChoicesForSlot(s).size() > 0) {
{// found the one instruction // found the one instruction
S.scheduleInstr(*S.getChoicesForSlot(s).begin(), s, curTime); S.scheduleInstr(*S.getChoicesForSlot(s).begin(), s, curTime);
return; return;
} }
@ -589,26 +587,23 @@ AssignInstructionsToSlots(class SchedulingManager& S, unsigned maxIssue)
// If all slots have 0 or multiple choices, pick the first slot with // If all slots have 0 or multiple choices, pick the first slot with
// choices and use its last instruction (just to avoid shifting the vector). // choices and use its last instruction (just to avoid shifting the vector).
unsigned numIssued; unsigned numIssued;
for (numIssued = 0; numIssued < maxIssue; numIssued++) for (numIssued = 0; numIssued < maxIssue; numIssued++) {
{
int chosenSlot = -1; int chosenSlot = -1;
for (unsigned s=startSlot; s < S.nslots; s++) for (unsigned s=startSlot; s < S.nslots; s++)
if ((*igroup)[s] == NULL && S.getChoicesForSlot(s).size() == 1) if ((*igroup)[s] == NULL && S.getChoicesForSlot(s).size() == 1) {
{
chosenSlot = (int) s; chosenSlot = (int) s;
break; break;
} }
if (chosenSlot == -1) if (chosenSlot == -1)
for (unsigned s=startSlot; s < S.nslots; s++) for (unsigned s=startSlot; s < S.nslots; s++)
if ((*igroup)[s] == NULL && S.getChoicesForSlot(s).size() > 0) if ((*igroup)[s] == NULL && S.getChoicesForSlot(s).size() > 0) {
{
chosenSlot = (int) s; chosenSlot = (int) s;
break; break;
} }
if (chosenSlot != -1) if (chosenSlot != -1) {
{ // Insert the chosen instr in the chosen slot and // Insert the chosen instr in the chosen slot and
// erase it from all slots. // erase it from all slots.
const SchedGraphNode* node= *S.getChoicesForSlot(chosenSlot).begin(); const SchedGraphNode* node= *S.getChoicesForSlot(chosenSlot).begin();
S.scheduleInstr(node, chosenSlot, curTime); S.scheduleInstr(node, chosenSlot, curTime);
@ -673,13 +668,12 @@ MarkSuccessorsReady(SchedulingManager& S, const SchedGraphNode* node)
if (! (*SI)->isDummyNode() if (! (*SI)->isDummyNode()
&& ! S.isScheduled(*SI) && ! S.isScheduled(*SI)
&& ! S.schedPrio.nodeIsReady(*SI)) && ! S.schedPrio.nodeIsReady(*SI))
{// successor not scheduled and not marked ready; check *its* preds. {
// successor not scheduled and not marked ready; check *its* preds.
bool succIsReady = true; bool succIsReady = true;
for (sg_pred_const_iterator P=pred_begin(*SI); P != pred_end(*SI); ++P) for (sg_pred_const_iterator P=pred_begin(*SI); P != pred_end(*SI); ++P)
if (! (*P)->isDummyNode() if (! (*P)->isDummyNode() && ! S.isScheduled(*P)) {
&& ! S.isScheduled(*P))
{
succIsReady = false; succIsReady = false;
break; break;
} }
@ -710,8 +704,7 @@ FindSlotChoices(SchedulingManager& S,
unsigned int startSlot = 0; unsigned int startSlot = 0;
InstrGroup* igroup = S.isched.getIGroup(S.getTime()); InstrGroup* igroup = S.isched.getIGroup(S.getTime());
for (int s = S.nslots - 1; s >= 0; s--) for (int s = S.nslots - 1; s >= 0; s--)
if ((*igroup)[s] != NULL) if ((*igroup)[s] != NULL) {
{
startSlot = s+1; startSlot = s+1;
break; break;
} }
@ -729,17 +722,14 @@ FindSlotChoices(SchedulingManager& S,
// we choose them so that subsequent choices will be correctly tested // we choose them so that subsequent choices will be correctly tested
// for feasibility, w.r.t. higher priority choices for the same cycle. // for feasibility, w.r.t. higher priority choices for the same cycle.
// //
while (S.getNumChoices() < S.nslots - startSlot) while (S.getNumChoices() < S.nslots - startSlot) {
{
const SchedGraphNode* nextNode=S.schedPrio.getNextHighest(S,S.getTime()); const SchedGraphNode* nextNode=S.schedPrio.getNextHighest(S,S.getTime());
if (nextNode == NULL) if (nextNode == NULL)
break; // no more instructions for this cycle break; // no more instructions for this cycle
if (S.getInstrInfo().getNumDelaySlots(nextNode->getOpCode()) > 0) if (S.getInstrInfo().getNumDelaySlots(nextNode->getOpCode()) > 0) {
{
delaySlotInfo = S.getDelaySlotInfoForInstr(nextNode); delaySlotInfo = S.getDelaySlotInfoForInstr(nextNode);
if (delaySlotInfo != NULL) if (delaySlotInfo != NULL) {
{
if (indexForBreakingNode < S.nslots) if (indexForBreakingNode < S.nslots)
// cannot issue a delayed instr in the same cycle as one // cannot issue a delayed instr in the same cycle as one
// that breaks the issue group or as another delayed instr // that breaks the issue group or as another delayed instr
@ -747,9 +737,7 @@ FindSlotChoices(SchedulingManager& S,
else else
indexForDelayedInstr = S.getNumChoices(); indexForDelayedInstr = S.getNumChoices();
} }
} } else if (S.schedInfo.breaksIssueGroup(nextNode->getOpCode())) {
else if (S.schedInfo.breaksIssueGroup(nextNode->getOpCode()))
{
if (indexForBreakingNode < S.nslots) if (indexForBreakingNode < S.nslots)
// have a breaking instruction already so throw this one away // have a breaking instruction already so throw this one away
nextNode = NULL; nextNode = NULL;
@ -757,12 +745,10 @@ FindSlotChoices(SchedulingManager& S,
indexForBreakingNode = S.getNumChoices(); indexForBreakingNode = S.getNumChoices();
} }
if (nextNode != NULL) if (nextNode != NULL) {
{
S.addChoice(nextNode); S.addChoice(nextNode);
if (S.schedInfo.isSingleIssue(nextNode->getOpCode())) if (S.schedInfo.isSingleIssue(nextNode->getOpCode())) {
{
assert(S.getNumChoices() == 1 && assert(S.getNumChoices() == 1 &&
"Prioritizer returned invalid instr for this cycle!"); "Prioritizer returned invalid instr for this cycle!");
break; break;
@ -786,8 +772,7 @@ FindSlotChoices(SchedulingManager& S,
{ // No instructions that break the issue group or that have delay slots. { // No instructions that break the issue group or that have delay slots.
// This is the common case, so handle it separately for efficiency. // This is the common case, so handle it separately for efficiency.
if (S.getNumChoices() == 1) if (S.getNumChoices() == 1) {
{
MachineOpCode opCode = S.getChoice(0)->getOpCode(); MachineOpCode opCode = S.getChoice(0)->getOpCode();
unsigned int s; unsigned int s;
for (s=startSlot; s < S.nslots; s++) for (s=startSlot; s < S.nslots; s++)
@ -795,20 +780,15 @@ FindSlotChoices(SchedulingManager& S,
break; break;
assert(s < S.nslots && "No feasible slot for this opCode?"); assert(s < S.nslots && "No feasible slot for this opCode?");
S.addChoiceToSlot(s, S.getChoice(0)); S.addChoiceToSlot(s, S.getChoice(0));
} } else {
else for (unsigned i=0; i < S.getNumChoices(); i++) {
{
for (unsigned i=0; i < S.getNumChoices(); i++)
{
MachineOpCode opCode = S.getChoice(i)->getOpCode(); MachineOpCode opCode = S.getChoice(i)->getOpCode();
for (unsigned int s=startSlot; s < S.nslots; s++) for (unsigned int s=startSlot; s < S.nslots; s++)
if (S.schedInfo.instrCanUseSlot(opCode, s)) if (S.schedInfo.instrCanUseSlot(opCode, s))
S.addChoiceToSlot(s, S.getChoice(i)); S.addChoiceToSlot(s, S.getChoice(i));
} }
} }
} } else if (indexForDelayedInstr < S.nslots) {
else if (indexForDelayedInstr < S.nslots)
{
// There is an instruction that needs delay slots. // There is an instruction that needs delay slots.
// Try to assign that instruction to a higher slot than any other // Try to assign that instruction to a higher slot than any other
// instructions in the group, so that its delay slots can go // instructions in the group, so that its delay slots can go
@ -829,23 +809,20 @@ FindSlotChoices(SchedulingManager& S,
// Find the last possible slot for the delayed instruction that leaves // Find the last possible slot for the delayed instruction that leaves
// at least `d' slots vacant after it (d = #delay slots) // at least `d' slots vacant after it (d = #delay slots)
for (int s = S.nslots-ndelays-1; s >= (int) startSlot; s--) for (int s = S.nslots-ndelays-1; s >= (int) startSlot; s--)
if (S.schedInfo.instrCanUseSlot(delayOpCode, s)) if (S.schedInfo.instrCanUseSlot(delayOpCode, s)) {
{
delayedNodeSlot = s; delayedNodeSlot = s;
break; break;
} }
highestSlotUsed = -1; highestSlotUsed = -1;
for (unsigned i=0; i < S.getNumChoices() - 1; i++) for (unsigned i=0; i < S.getNumChoices() - 1; i++) {
{
// Try to assign every other instruction to a lower numbered // Try to assign every other instruction to a lower numbered
// slot than delayedNodeSlot. // slot than delayedNodeSlot.
MachineOpCode opCode =S.getChoice(i)->getOpCode(); MachineOpCode opCode =S.getChoice(i)->getOpCode();
bool noSlotFound = true; bool noSlotFound = true;
unsigned int s; unsigned int s;
for (s=startSlot; s < delayedNodeSlot; s++) for (s=startSlot; s < delayedNodeSlot; s++)
if (S.schedInfo.instrCanUseSlot(opCode, s)) if (S.schedInfo.instrCanUseSlot(opCode, s)) {
{
S.addChoiceToSlot(s, S.getChoice(i)); S.addChoiceToSlot(s, S.getChoice(i));
noSlotFound = false; noSlotFound = false;
} }
@ -855,8 +832,7 @@ FindSlotChoices(SchedulingManager& S,
// the next cycle. // the next cycle.
if (noSlotFound) if (noSlotFound)
for ( ; s < S.nslots; s++) for ( ; s < S.nslots; s++)
if (S.schedInfo.instrCanUseSlot(opCode, s)) if (S.schedInfo.instrCanUseSlot(opCode, s)) {
{
S.addChoiceToSlot(s, S.getChoice(i)); S.addChoiceToSlot(s, S.getChoice(i));
break; break;
} }
@ -874,16 +850,14 @@ FindSlotChoices(SchedulingManager& S,
// slots for the node at the same time. // slots for the node at the same time.
cycles_t dcycle = S.getTime(); cycles_t dcycle = S.getTime();
unsigned int dslot = highestSlotUsed + 1; unsigned int dslot = highestSlotUsed + 1;
if (dslot == S.nslots) if (dslot == S.nslots) {
{
dslot = 0; dslot = 0;
++dcycle; ++dcycle;
} }
delaySlotInfo->recordChosenSlot(dcycle, dslot); delaySlotInfo->recordChosenSlot(dcycle, dslot);
getDelaySlotInfo = delaySlotInfo; getDelaySlotInfo = delaySlotInfo;
} } else {
else // There is an instruction that breaks the issue group.
{ // There is an instruction that breaks the issue group.
// For such an instruction, assign to the last possible slot in // For such an instruction, assign to the last possible slot in
// the current group, and then don't assign any other instructions // the current group, and then don't assign any other instructions
// to later slots. // to later slots.
@ -894,8 +868,7 @@ FindSlotChoices(SchedulingManager& S,
// Find the last possible slot for this instruction. // Find the last possible slot for this instruction.
for (int s = S.nslots-1; s >= (int) startSlot; s--) for (int s = S.nslots-1; s >= (int) startSlot; s--)
if (S.schedInfo.instrCanUseSlot(breakingNode->getOpCode(), s)) if (S.schedInfo.instrCanUseSlot(breakingNode->getOpCode(), s)) {
{
breakingSlot = s; breakingSlot = s;
break; break;
} }
@ -916,10 +889,8 @@ FindSlotChoices(SchedulingManager& S,
bool foundLowerSlot = false; bool foundLowerSlot = false;
nslotsToUse = S.nslots; // May be modified in the loop nslotsToUse = S.nslots; // May be modified in the loop
for (unsigned int s=startSlot; s < nslotsToUse; s++) for (unsigned int s=startSlot; s < nslotsToUse; s++)
if (S.schedInfo.instrCanUseSlot(opCode, s)) if (S.schedInfo.instrCanUseSlot(opCode, s)) {
{ if (breakingSlot < S.nslots && s < breakingSlot) {
if (breakingSlot < S.nslots && s < breakingSlot)
{
foundLowerSlot = true; foundLowerSlot = true;
nslotsToUse = breakingSlot; // RESETS LOOP UPPER BOUND! nslotsToUse = breakingSlot; // RESETS LOOP UPPER BOUND!
} }
@ -934,19 +905,16 @@ FindSlotChoices(SchedulingManager& S,
// Assign the breaking instruction (if any) to a single slot // Assign the breaking instruction (if any) to a single slot
// Otherwise, just ignore the instruction. It will simply be // Otherwise, just ignore the instruction. It will simply be
// scheduled in a later cycle. // scheduled in a later cycle.
if (breakingSlot < S.nslots) if (breakingSlot < S.nslots) {
{
S.addChoiceToSlot(breakingSlot, breakingNode); S.addChoiceToSlot(breakingSlot, breakingNode);
nslotsToUse = breakingSlot; nslotsToUse = breakingSlot;
} } else
else
nslotsToUse = S.nslots; nslotsToUse = S.nslots;
// For lower priority instructions than the one that breaks the // For lower priority instructions than the one that breaks the
// group, only assign them to slots lower than the breaking slot. // group, only assign them to slots lower than the breaking slot.
// Otherwise, just ignore the instruction. // Otherwise, just ignore the instruction.
for (unsigned i=indexForBreakingNode+1; i < S.getNumChoices(); i++) for (unsigned i=indexForBreakingNode+1; i < S.getNumChoices(); i++) {
{
MachineOpCode opCode = S.getChoice(i)->getOpCode(); MachineOpCode opCode = S.getChoice(i)->getOpCode();
for (unsigned int s=startSlot; s < nslotsToUse; s++) for (unsigned int s=startSlot; s < nslotsToUse; s++)
if (S.schedInfo.instrCanUseSlot(opCode, s)) if (S.schedInfo.instrCanUseSlot(opCode, s))
@ -970,8 +938,7 @@ ChooseOneGroup(SchedulingManager& S)
// Choose up to `nslots' feasible instructions and their possible slots. // Choose up to `nslots' feasible instructions and their possible slots.
unsigned numIssued = FindSlotChoices(S, getDelaySlotInfo); unsigned numIssued = FindSlotChoices(S, getDelaySlotInfo);
while (numIssued == 0) while (numIssued == 0) {
{
S.updateTime(S.getTime()+1); S.updateTime(S.getTime()+1);
numIssued = FindSlotChoices(S, getDelaySlotInfo); numIssued = FindSlotChoices(S, getDelaySlotInfo);
} }
@ -982,14 +949,11 @@ ChooseOneGroup(SchedulingManager& S)
numIssued += getDelaySlotInfo->scheduleDelayedNode(S); numIssued += getDelaySlotInfo->scheduleDelayedNode(S);
// Print trace of scheduled instructions before newly ready ones // Print trace of scheduled instructions before newly ready ones
if (SchedDebugLevel >= Sched_PrintSchedTrace) if (SchedDebugLevel >= Sched_PrintSchedTrace) {
{ for (cycles_t c = firstCycle; c <= S.getTime(); c++) {
for (cycles_t c = firstCycle; c <= S.getTime(); c++)
{
std::cerr << " Cycle " << (long)c <<" : Scheduled instructions:\n"; std::cerr << " Cycle " << (long)c <<" : Scheduled instructions:\n";
const InstrGroup* igroup = S.isched.getIGroup(c); const InstrGroup* igroup = S.isched.getIGroup(c);
for (unsigned int s=0; s < S.nslots; s++) for (unsigned int s=0; s < S.nslots; s++) {
{
std::cerr << " "; std::cerr << " ";
if ((*igroup)[s] != NULL) if ((*igroup)[s] != NULL)
std::cerr << * ((*igroup)[s])->getMachineInstr() << "\n"; std::cerr << * ((*igroup)[s])->getMachineInstr() << "\n";
@ -1011,8 +975,7 @@ ForwardListSchedule(SchedulingManager& S)
S.schedPrio.initialize(); S.schedPrio.initialize();
while ((N = S.schedPrio.getNumReady()) > 0) while ((N = S.schedPrio.getNumReady()) > 0) {
{
cycles_t nextCycle = S.getTime(); cycles_t nextCycle = S.getTime();
// Choose one group of instructions for a cycle, plus any delay slot // Choose one group of instructions for a cycle, plus any delay slot
@ -1026,12 +989,10 @@ ForwardListSchedule(SchedulingManager& S)
// Notify the priority manager of scheduled instructions and mark // Notify the priority manager of scheduled instructions and mark
// any successors that may now be ready // any successors that may now be ready
// //
for (cycles_t c = nextCycle; c <= S.getTime(); c++) for (cycles_t c = nextCycle; c <= S.getTime(); c++) {
{
const InstrGroup* igroup = S.isched.getIGroup(c); const InstrGroup* igroup = S.isched.getIGroup(c);
for (unsigned int s=0; s < S.nslots; s++) for (unsigned int s=0; s < S.nslots; s++)
if ((node = (*igroup)[s]) != NULL) if ((node = (*igroup)[s]) != NULL) {
{
S.schedPrio.issuedReadyNodeAt(S.getTime(), node); S.schedPrio.issuedReadyNodeAt(S.getTime(), node);
MarkSuccessorsReady(S, node); MarkSuccessorsReady(S, node);
} }
@ -1092,8 +1053,7 @@ NodeCanFillDelaySlot(const SchedulingManager& S,
// instruction can be reordered relative to the branch. We simply check // instruction can be reordered relative to the branch. We simply check
// if the instr. has only 1 outgoing edge, viz., a CD edge to the branch. // if the instr. has only 1 outgoing edge, viz., a CD edge to the branch.
// //
if (nodeIsPredecessor) if (nodeIsPredecessor) {
{
bool onlyCDEdgeToBranch = true; bool onlyCDEdgeToBranch = true;
for (SchedGraphNode::const_iterator OEI = node->beginOutEdges(); for (SchedGraphNode::const_iterator OEI = node->beginOutEdges();
OEI != node->endOutEdges(); ++OEI) OEI != node->endOutEdges(); ++OEI)
@ -1120,14 +1080,13 @@ MarkNodeForDelaySlot(SchedulingManager& S,
const SchedGraphNode* brNode, const SchedGraphNode* brNode,
bool nodeIsPredecessor) bool nodeIsPredecessor)
{ {
if (nodeIsPredecessor) if (nodeIsPredecessor) {
{ // If node is in the same basic block (i.e., preceeds brNode), // If node is in the same basic block (i.e., preceeds brNode),
// remove it and all its incident edges from the graph. Make sure we // remove it and all its incident edges from the graph. Make sure we
// add dummy edges for pred/succ nodes that become entry/exit nodes. // add dummy edges for pred/succ nodes that become entry/exit nodes.
graph->eraseIncidentEdges(node, /*addDummyEdges*/ true); graph->eraseIncidentEdges(node, /*addDummyEdges*/ true);
} } else {
else // If the node was from a target block, add the node to the graph
{ // If the node was from a target block, add the node to the graph
// and add a CD edge from brNode to node. // and add a CD edge from brNode to node.
assert(0 && "NOT IMPLEMENTED YET"); assert(0 && "NOT IMPLEMENTED YET");
} }
@ -1173,8 +1132,7 @@ FindUsefulInstructionsForDelaySlots(SchedulingManager& S,
// Note that this is the most efficient code when only 1 (or even 2) // Note that this is the most efficient code when only 1 (or even 2)
// values need to be selected. // values need to be selected.
// //
while (sdelayNodeVec.size() < ndelays && mdelayNodeVec.size() > 0) while (sdelayNodeVec.size() < ndelays && mdelayNodeVec.size() > 0) {
{
unsigned lmin = unsigned lmin =
mii.maxLatency(mdelayNodeVec[0]->getOpCode()); mii.maxLatency(mdelayNodeVec[0]->getOpCode());
unsigned minIndex = 0; unsigned minIndex = 0;
@ -1202,6 +1160,7 @@ FindUsefulInstructionsForDelaySlots(SchedulingManager& S,
// //
static void ReplaceNopsWithUsefulInstr(SchedulingManager& S, static void ReplaceNopsWithUsefulInstr(SchedulingManager& S,
SchedGraphNode* node, SchedGraphNode* node,
// FIXME: passing vector BY VALUE!!!
std::vector<SchedGraphNode*> sdelayNodeVec, std::vector<SchedGraphNode*> sdelayNodeVec,
SchedGraph* graph) SchedGraph* graph)
{ {
@ -1234,8 +1193,7 @@ static void ReplaceNopsWithUsefulInstr(SchedulingManager& S,
if (mii.isNop(MBB[i]->getOpCode())) if (mii.isNop(MBB[i]->getOpCode()))
if (sdelayNodeVec.size() < ndelays) if (sdelayNodeVec.size() < ndelays)
sdelayNodeVec.push_back(graph->getGraphNodeForInstr(MBB[i])); sdelayNodeVec.push_back(graph->getGraphNodeForInstr(MBB[i]));
else else {
{
nopNodeVec.push_back(graph->getGraphNodeForInstr(MBB[i])); nopNodeVec.push_back(graph->getGraphNodeForInstr(MBB[i]));
//remove the MI from the Machine Code For Instruction //remove the MI from the Machine Code For Instruction
@ -1310,8 +1268,7 @@ ChooseInstructionsForDelaySlots(SchedulingManager& S, MachineBasicBlock &MBB,
// Compute a vector of the nodes chosen for delay slots and then // Compute a vector of the nodes chosen for delay slots and then
// mark delay slots to replace NOPs with these useful instructions. // mark delay slots to replace NOPs with these useful instructions.
// //
if (brInstr != NULL) if (brInstr != NULL) {
{
SchedGraphNode* brNode = graph->getGraphNodeForInstr(brInstr); SchedGraphNode* brNode = graph->getGraphNodeForInstr(brInstr);
FindUsefulInstructionsForDelaySlots(S, brNode, delayNodeVec); FindUsefulInstructionsForDelaySlots(S, brNode, delayNodeVec);
ReplaceNopsWithUsefulInstr(S, brNode, delayNodeVec, graph); ReplaceNopsWithUsefulInstr(S, brNode, delayNodeVec, graph);
@ -1347,11 +1304,9 @@ DelaySlotInfo::scheduleDelayedNode(SchedulingManager& S)
S.scheduleInstr(brNode, nextSlot, nextTime); S.scheduleInstr(brNode, nextSlot, nextTime);
for (unsigned d=0; d < ndelays; d++) for (unsigned d=0; d < ndelays; d++) {
{
++nextSlot; ++nextSlot;
if (nextSlot == S.nslots) if (nextSlot == S.nslots) {
{
nextSlot = 0; nextSlot = 0;
nextTime++; nextTime++;
} }
@ -1361,8 +1316,7 @@ DelaySlotInfo::scheduleDelayedNode(SchedulingManager& S)
// We do *not* check for flow dependences but rely on pipeline // We do *not* check for flow dependences but rely on pipeline
// interlocks to resolve them. Machines without interlocks // interlocks to resolve them. Machines without interlocks
// will require this code to be modified. // will require this code to be modified.
for (unsigned i=0; i < delayNodeVec.size(); i++) for (unsigned i=0; i < delayNodeVec.size(); i++) {
{
const SchedGraphNode* dnode = delayNodeVec[i]; const SchedGraphNode* dnode = delayNodeVec[i];
if ( ! S.isScheduled(dnode) if ( ! S.isScheduled(dnode)
&& S.schedInfo.instrCanUseSlot(dnode->getOpCode(), nextSlot) && S.schedInfo.instrCanUseSlot(dnode->getOpCode(), nextSlot)
@ -1388,12 +1342,10 @@ DelaySlotInfo::scheduleDelayedNode(SchedulingManager& S)
nextSlot = delayedNodeSlotNum; nextSlot = delayedNodeSlotNum;
nextTime = delayedNodeCycle; nextTime = delayedNodeCycle;
for (unsigned i=0; i < delayNodeVec.size(); i++) for (unsigned i=0; i < delayNodeVec.size(); i++)
if (! S.isScheduled(delayNodeVec[i])) if (! S.isScheduled(delayNodeVec[i])) {
{
do { // find the next empty slot do { // find the next empty slot
++nextSlot; ++nextSlot;
if (nextSlot == S.nslots) if (nextSlot == S.nslots) {
{
nextSlot = 0; nextSlot = 0;
nextTime++; nextTime++;
} }
@ -1507,8 +1459,7 @@ bool InstructionSchedulingWithSSA::runOnFunction(Function &F)
{ {
SchedGraphSet graphSet(&F, target); SchedGraphSet graphSet(&F, target);
if (SchedDebugLevel >= Sched_PrintSchedGraphs) if (SchedDebugLevel >= Sched_PrintSchedGraphs) {
{
std::cerr << "\n*** SCHEDULING GRAPHS FOR INSTRUCTION SCHEDULING\n"; std::cerr << "\n*** SCHEDULING GRAPHS FOR INSTRUCTION SCHEDULING\n";
graphSet.dump(); graphSet.dump();
} }
@ -1531,8 +1482,7 @@ bool InstructionSchedulingWithSSA::runOnFunction(Function &F)
RecordSchedule(MBB, S); // records schedule in BB RecordSchedule(MBB, S); // records schedule in BB
} }
if (SchedDebugLevel >= Sched_PrintMachineCode) if (SchedDebugLevel >= Sched_PrintMachineCode) {
{
std::cerr << "\n*** Machine instructions after INSTRUCTION SCHEDULING\n"; std::cerr << "\n*** Machine instructions after INSTRUCTION SCHEDULING\n";
MachineFunction::get(&F).dump(); MachineFunction::get(&F).dump();
} }

36
lib/Target/SparcV9/InstrSched/SchedGraph.cpp
View File

@ -257,7 +257,8 @@ SchedGraph::eraseIncomingEdges(SchedGraphNode* node, bool addDummyEdges)
if (addDummyEdges && if (addDummyEdges &&
srcNode != getRoot() && srcNode != getRoot() &&
srcNode->beginOutEdges() == srcNode->endOutEdges()) srcNode->beginOutEdges() == srcNode->endOutEdges())
{ // srcNode has no more out edges, so add an edge to dummy EXIT node {
// srcNode has no more out edges, so add an edge to dummy EXIT node
assert(node != getLeaf() && "Adding edge that was just removed?"); assert(node != getLeaf() && "Adding edge that was just removed?");
(void) new SchedGraphEdge(srcNode, getLeaf(), (void) new SchedGraphEdge(srcNode, getLeaf(),
SchedGraphEdge::CtrlDep, SchedGraphEdge::NonDataDep, 0); SchedGraphEdge::CtrlDep, SchedGraphEdge::NonDataDep, 0);
@ -490,9 +491,8 @@ SchedGraph::addCallCCEdges(const std::vector<SchedGraphNode*>& memNodeVec,
if (callNodeVec[lastCallNodeIdx]->getMachineInstr() == bbMvec[i]) if (callNodeVec[lastCallNodeIdx]->getMachineInstr() == bbMvec[i])
break; break;
assert(lastCallNodeIdx < (int)callNodeVec.size() && "Missed Call?"); assert(lastCallNodeIdx < (int)callNodeVec.size() && "Missed Call?");
} } else if (mii.isCCInstr(bbMvec[i]->getOpCode())) {
else if (mii.isCCInstr(bbMvec[i]->getOpCode())) // Add incoming/outgoing edges from/to preceding/later calls
{ // Add incoming/outgoing edges from/to preceding/later calls
SchedGraphNode* ccNode = this->getGraphNodeForInstr(bbMvec[i]); SchedGraphNode* ccNode = this->getGraphNodeForInstr(bbMvec[i]);
int j=0; int j=0;
for ( ; j <= lastCallNodeIdx; j++) for ( ; j <= lastCallNodeIdx; j++)
@ -522,26 +522,22 @@ SchedGraph::addMachineRegEdges(RegToRefVecMap& regToRefVecMap,
RefVec& regRefVec = (*I).second; RefVec& regRefVec = (*I).second;
// regRefVec is ordered by control flow order in the basic block // regRefVec is ordered by control flow order in the basic block
for (unsigned i=0; i < regRefVec.size(); ++i) for (unsigned i=0; i < regRefVec.size(); ++i) {
{
SchedGraphNode* node = regRefVec[i].first; SchedGraphNode* node = regRefVec[i].first;
unsigned int opNum = regRefVec[i].second; unsigned int opNum = regRefVec[i].second;
bool isDef = node->getMachineInstr()->operandIsDefined(opNum); bool isDef = node->getMachineInstr()->operandIsDefined(opNum);
bool isDefAndUse = bool isDefAndUse =
node->getMachineInstr()->operandIsDefinedAndUsed(opNum); node->getMachineInstr()->operandIsDefinedAndUsed(opNum);
for (unsigned p=0; p < i; ++p) for (unsigned p=0; p < i; ++p) {
{
SchedGraphNode* prevNode = regRefVec[p].first; SchedGraphNode* prevNode = regRefVec[p].first;
if (prevNode != node) if (prevNode != node) {
{
unsigned int prevOpNum = regRefVec[p].second; unsigned int prevOpNum = regRefVec[p].second;
bool prevIsDef = bool prevIsDef =
prevNode->getMachineInstr()->operandIsDefined(prevOpNum); prevNode->getMachineInstr()->operandIsDefined(prevOpNum);
bool prevIsDefAndUse = bool prevIsDefAndUse =
prevNode->getMachineInstr()->operandIsDefinedAndUsed(prevOpNum); prevNode->getMachineInstr()->operandIsDefinedAndUsed(prevOpNum);
if (isDef) if (isDef) {
{
if (prevIsDef) if (prevIsDef)
new SchedGraphEdge(prevNode, node, regNum, new SchedGraphEdge(prevNode, node, regNum,
SchedGraphEdge::OutputDep); SchedGraphEdge::OutputDep);
@ -582,17 +578,16 @@ SchedGraph::addEdgesForValue(SchedGraphNode* refNode,
if ((*I).first == refNode) if ((*I).first == refNode)
continue; // Dont add any self-loops continue; // Dont add any self-loops
if ((*I).first->getOrigIndexInBB() < refNode->getOrigIndexInBB()) if ((*I).first->getOrigIndexInBB() < refNode->getOrigIndexInBB()) {
{ // (*).first is before refNode // (*).first is before refNode
if (refNodeIsDef) if (refNodeIsDef)
(void) new SchedGraphEdge((*I).first, refNode, defValue, (void) new SchedGraphEdge((*I).first, refNode, defValue,
SchedGraphEdge::OutputDep); SchedGraphEdge::OutputDep);
if (refNodeIsUse) if (refNodeIsUse)
(void) new SchedGraphEdge((*I).first, refNode, defValue, (void) new SchedGraphEdge((*I).first, refNode, defValue,
SchedGraphEdge::TrueDep); SchedGraphEdge::TrueDep);
} } else {
else // (*).first is after refNode
{ // (*).first is after refNode
if (refNodeIsDef) if (refNodeIsDef)
(void) new SchedGraphEdge(refNode, (*I).first, defValue, (void) new SchedGraphEdge(refNode, (*I).first, defValue,
SchedGraphEdge::OutputDep); SchedGraphEdge::OutputDep);
@ -692,8 +687,8 @@ SchedGraph::findDefUseInfoAtInstr(const TargetMachine& target,
{ {
int regNum = mop.getMachineRegNum(); int regNum = mop.getMachineRegNum();
if (regNum != target.getRegInfo().getZeroRegNum()) if (regNum != target.getRegInfo().getZeroRegNum())
regToRefVecMap[mop.getMachineRegNum()].push_back( regToRefVecMap[mop.getMachineRegNum()]
std::make_pair(node, i)); .push_back(std::make_pair(node, i));
continue; // nothing more to do continue; // nothing more to do
} }
@ -903,8 +898,7 @@ std::ostream &operator<<(std::ostream &os, const SchedGraphNode& node)
if (node.getMachineInstr() == NULL) if (node.getMachineInstr() == NULL)
os << "(Dummy node)\n"; os << "(Dummy node)\n";
else else {
{
os << *node.getMachineInstr() << "\n" << std::string(12, ' '); os << *node.getMachineInstr() << "\n" << std::string(12, ' ');
os << node.inEdges.size() << " Incoming Edges:\n"; os << node.inEdges.size() << " Incoming Edges:\n";
for (unsigned i=0, N=node.inEdges.size(); i < N; i++) for (unsigned i=0, N=node.inEdges.size(); i < N; i++)