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

MI-Sched: Rename IssueCount to CurrMOps.

Browse Source 
"Counts" refer to scaled resource counts within a region. CurrMOps is
simply the number of micro-ops to be issue in the current cycle.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@184031 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Andrew Trick 2013-06-15 04:49:49 +00:00
parent 63a8d824b0
commit bacb24975d
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/CodeGen/MachineScheduler.cpp
View File

@ -1232,7 +1232,7 @@ public:
ScheduleHazardRecognizer *HazardRec; ScheduleHazardRecognizer *HazardRec;
unsigned CurrCycle; unsigned CurrCycle;
unsigned IssueCount; unsigned CurrMOps;
/// MinReadyCycle - Cycle of the soonest available instruction. /// MinReadyCycle - Cycle of the soonest available instruction.
unsigned MinReadyCycle; unsigned MinReadyCycle;
@ -1271,7 +1271,7 @@ public:
NextSUs.clear(); NextSUs.clear();
HazardRec = 0; HazardRec = 0;
CurrCycle = 0; CurrCycle = 0;
IssueCount = 0; CurrMOps = 0;
MinReadyCycle = UINT_MAX; MinReadyCycle = UINT_MAX;
ExpectedLatency = 0; ExpectedLatency = 0;
DependentLatency = 0; DependentLatency = 0;
@ -1527,7 +1527,7 @@ bool ConvergingScheduler::SchedBoundary::checkHazard(SUnit *SU) {
return HazardRec->getHazardType(SU) != ScheduleHazardRecognizer::NoHazard; return HazardRec->getHazardType(SU) != ScheduleHazardRecognizer::NoHazard;
unsigned uops = SchedModel->getNumMicroOps(SU->getInstr()); unsigned uops = SchedModel->getNumMicroOps(SU->getInstr());
if ((IssueCount > 0) && (IssueCount + uops > SchedModel->getIssueWidth())) { if ((CurrMOps > 0) && (CurrMOps + uops > SchedModel->getIssueWidth())) {
DEBUG(dbgs() << " SU(" << SU->NodeNum << ") uops=" DEBUG(dbgs() << " SU(" << SU->NodeNum << ") uops="
<< SchedModel->getNumMicroOps(SU->getInstr()) << '\n'); << SchedModel->getNumMicroOps(SU->getInstr()) << '\n');
return true; return true;
@ -1590,12 +1590,12 @@ void ConvergingScheduler::SchedBoundary::releaseNode(SUnit *SU,
/// Move the boundary of scheduled code by one cycle. /// Move the boundary of scheduled code by one cycle.
void ConvergingScheduler::SchedBoundary::bumpCycle() { void ConvergingScheduler::SchedBoundary::bumpCycle() {
unsigned Width = SchedModel->getIssueWidth(); unsigned Width = SchedModel->getIssueWidth();
IssueCount = (IssueCount <= Width) ? 0 : IssueCount - Width; CurrMOps = (CurrMOps <= Width) ? 0 : CurrMOps - Width;
unsigned NextCycle = CurrCycle + 1; unsigned NextCycle = CurrCycle + 1;
assert(MinReadyCycle < UINT_MAX && "MinReadyCycle uninitialized"); assert(MinReadyCycle < UINT_MAX && "MinReadyCycle uninitialized");
if (MinReadyCycle > NextCycle) { if (MinReadyCycle > NextCycle) {
IssueCount = 0; CurrMOps = 0;
NextCycle = MinReadyCycle; NextCycle = MinReadyCycle;
} }
if ((NextCycle - CurrCycle) > DependentLatency) if ((NextCycle - CurrCycle) > DependentLatency)
@ -1679,14 +1679,14 @@ void ConvergingScheduler::SchedBoundary::bumpNode(SUnit *SU) {
// Check the instruction group dispatch limit. // Check the instruction group dispatch limit.
// TODO: Check if this SU must end a dispatch group. // TODO: Check if this SU must end a dispatch group.
IssueCount += SchedModel->getNumMicroOps(SU->getInstr()); CurrMOps += SchedModel->getNumMicroOps(SU->getInstr());
// checkHazard prevents scheduling multiple instructions per cycle that exceed // checkHazard prevents scheduling multiple instructions per cycle that exceed
// issue width. However, we commonly reach the maximum. In this case // issue width. However, we commonly reach the maximum. In this case
// opportunistically bump the cycle to avoid uselessly checking everything in // opportunistically bump the cycle to avoid uselessly checking everything in
// the readyQ. Furthermore, a single instruction may produce more than one // the readyQ. Furthermore, a single instruction may produce more than one
// cycle's worth of micro-ops. // cycle's worth of micro-ops.
if (IssueCount >= SchedModel->getIssueWidth()) { if (CurrMOps >= SchedModel->getIssueWidth()) {
DEBUG(dbgs() << " *** Max instrs at cycle " << CurrCycle << '\n'); DEBUG(dbgs() << " *** Max instrs at cycle " << CurrCycle << '\n');
bumpCycle(); bumpCycle();
} }
@ -1739,7 +1739,7 @@ SUnit *ConvergingScheduler::SchedBoundary::pickOnlyChoice() {
if (CheckPending) if (CheckPending)
releasePending(); releasePending();
if (IssueCount > 0) { if (CurrMOps > 0) {
// Defer any ready instrs that now have a hazard. // Defer any ready instrs that now have a hazard.
for (ReadyQueue::iterator I = Available.begin(); I != Available.end();) { for (ReadyQueue::iterator I = Available.begin(); I != Available.end();) {
if (checkHazard(*I)) { if (checkHazard(*I)) {