6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-15 20:29:48 +00:00
Code Issues Projects Releases Wiki Activity

Major bug fix: was not adding CD edges for RETURNs!

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@4137 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Vikram S. Adve 2002-10-13 00:39:22 +00:00
parent 5aefcad35b
commit acf0f704f9
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -341,15 +341,16 @@ SchedGraph::addCDEdges(const TerminatorInst* term,
// Find the first branch instr in the sequence of machine instrs for term // Find the first branch instr in the sequence of machine instrs for term
// //
unsigned first = 0; unsigned first = 0;
while (!mii.isBranch(termMvec[first]->getOpCode())) while (! mii.isBranch(termMvec[first]->getOpCode()) &&
! mii.isReturn(termMvec[first]->getOpCode()))
++first; ++first;
assert(first < termMvec.size() && assert(first < termMvec.size() &&
"No branch instructions for BR? Ok, but weird! Delete assertion."); "No branch instructions for terminator? Ok, but weird!");
if (first == termMvec.size()) if (first == termMvec.size())
return; return;
SchedGraphNode* firstBrNode = getGraphNodeForInstr(termMvec[first]); SchedGraphNode* firstBrNode = getGraphNodeForInstr(termMvec[first]);
// Add CD edges from each instruction in the sequence to the // Add CD edges from each instruction in the sequence to the
// *last preceding* branch instr. in the sequence // *last preceding* branch instr. in the sequence
// Use a latency of 0 because we only need to prevent out-of-order issue. // Use a latency of 0 because we only need to prevent out-of-order issue.
@ -357,13 +358,14 @@ SchedGraph::addCDEdges(const TerminatorInst* term,
for (unsigned i = termMvec.size(); i > first+1; --i) for (unsigned i = termMvec.size(); i > first+1; --i)
{ {
SchedGraphNode* toNode = getGraphNodeForInstr(termMvec[i-1]); SchedGraphNode* toNode = getGraphNodeForInstr(termMvec[i-1]);
assert(toNode && "No node for instr generated for branch?"); assert(toNode && "No node for instr generated for branch/ret?");
for (unsigned j = i-1; j != 0; --j) for (unsigned j = i-1; j != 0; --j)
if (mii.isBranch(termMvec[j-1]->getOpCode())) if (mii.isBranch(termMvec[j-1]->getOpCode()) ||
mii.isReturn(termMvec[j-1]->getOpCode()))
{ {
SchedGraphNode* brNode = getGraphNodeForInstr(termMvec[j-1]); SchedGraphNode* brNode = getGraphNodeForInstr(termMvec[j-1]);
assert(brNode && "No node for instr generated for branch?"); assert(brNode && "No node for instr generated for branch/ret?");
(void) new SchedGraphEdge(brNode, toNode, SchedGraphEdge::CtrlDep, (void) new SchedGraphEdge(brNode, toNode, SchedGraphEdge::CtrlDep,
SchedGraphEdge::NonDataDep, 0); SchedGraphEdge::NonDataDep, 0);
break; // only one incoming edge is enough break; // only one incoming edge is enough
@ -388,7 +390,7 @@ SchedGraph::addCDEdges(const TerminatorInst* term,
const MachineCodeForBasicBlock& mvec = MachineCodeForBasicBlock::get(bb); const MachineCodeForBasicBlock& mvec = MachineCodeForBasicBlock::get(bb);
for (unsigned i=0, N=mvec.size(); i < N; i++) for (unsigned i=0, N=mvec.size(); i < N; i++)
{ {
if (mvec[i] == termMvec[first]) // reached the first branch if (mvec[i] == termMvec[first]) // reached the first branch
break; break;
SchedGraphNode* fromNode = this->getGraphNodeForInstr(mvec[i]); SchedGraphNode* fromNode = this->getGraphNodeForInstr(mvec[i]);

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

@ -341,15 +341,16 @@ SchedGraph::addCDEdges(const TerminatorInst* term,
// Find the first branch instr in the sequence of machine instrs for term // Find the first branch instr in the sequence of machine instrs for term
// //
unsigned first = 0; unsigned first = 0;
while (!mii.isBranch(termMvec[first]->getOpCode())) while (! mii.isBranch(termMvec[first]->getOpCode()) &&
! mii.isReturn(termMvec[first]->getOpCode()))
++first; ++first;
assert(first < termMvec.size() && assert(first < termMvec.size() &&
"No branch instructions for BR? Ok, but weird! Delete assertion."); "No branch instructions for terminator? Ok, but weird!");
if (first == termMvec.size()) if (first == termMvec.size())
return; return;
SchedGraphNode* firstBrNode = getGraphNodeForInstr(termMvec[first]); SchedGraphNode* firstBrNode = getGraphNodeForInstr(termMvec[first]);
// Add CD edges from each instruction in the sequence to the // Add CD edges from each instruction in the sequence to the
// *last preceding* branch instr. in the sequence // *last preceding* branch instr. in the sequence
// Use a latency of 0 because we only need to prevent out-of-order issue. // Use a latency of 0 because we only need to prevent out-of-order issue.
@ -357,13 +358,14 @@ SchedGraph::addCDEdges(const TerminatorInst* term,
for (unsigned i = termMvec.size(); i > first+1; --i) for (unsigned i = termMvec.size(); i > first+1; --i)
{ {
SchedGraphNode* toNode = getGraphNodeForInstr(termMvec[i-1]); SchedGraphNode* toNode = getGraphNodeForInstr(termMvec[i-1]);
assert(toNode && "No node for instr generated for branch?"); assert(toNode && "No node for instr generated for branch/ret?");
for (unsigned j = i-1; j != 0; --j) for (unsigned j = i-1; j != 0; --j)
if (mii.isBranch(termMvec[j-1]->getOpCode())) if (mii.isBranch(termMvec[j-1]->getOpCode()) ||
mii.isReturn(termMvec[j-1]->getOpCode()))
{ {
SchedGraphNode* brNode = getGraphNodeForInstr(termMvec[j-1]); SchedGraphNode* brNode = getGraphNodeForInstr(termMvec[j-1]);
assert(brNode && "No node for instr generated for branch?"); assert(brNode && "No node for instr generated for branch/ret?");
(void) new SchedGraphEdge(brNode, toNode, SchedGraphEdge::CtrlDep, (void) new SchedGraphEdge(brNode, toNode, SchedGraphEdge::CtrlDep,
SchedGraphEdge::NonDataDep, 0); SchedGraphEdge::NonDataDep, 0);
break; // only one incoming edge is enough break; // only one incoming edge is enough
@ -388,7 +390,7 @@ SchedGraph::addCDEdges(const TerminatorInst* term,
const MachineCodeForBasicBlock& mvec = MachineCodeForBasicBlock::get(bb); const MachineCodeForBasicBlock& mvec = MachineCodeForBasicBlock::get(bb);
for (unsigned i=0, N=mvec.size(); i < N; i++) for (unsigned i=0, N=mvec.size(); i < N; i++)
{ {
if (mvec[i] == termMvec[first]) // reached the first branch if (mvec[i] == termMvec[first]) // reached the first branch
break; break;
SchedGraphNode* fromNode = this->getGraphNodeForInstr(mvec[i]); SchedGraphNode* fromNode = this->getGraphNodeForInstr(mvec[i]);