RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-21 20:12:56 +02:00
Code Issues Projects Releases Wiki Activity

Minor pre-RA-sched fixes and cleanup.

Browse Source 
Fix the PendingQueue, then disable it because it's not required for
the current schedulers' heuristics.
Fix the logic for the unused list-ilp scheduler.

llvm-svn: 126981
This commit is contained in:
Andrew Trick 2011-03-04 02:03:45 +00:00
parent 9dbcb14cd8
commit 1478921dc0
1 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp
View File

@ -295,7 +295,7 @@ void ScheduleDAGRRList::ReleasePred(SUnit *SU, const SDep *PredEdge) {
if (Height < MinAvailableCycle) if (Height < MinAvailableCycle)
MinAvailableCycle = Height; MinAvailableCycle = Height;
if (isReady(SU)) { if (isReady(PredSU)) {
AvailableQueue->push(PredSU); AvailableQueue->push(PredSU);
} }
// CapturePred and others may have left the node in the pending queue, avoid // CapturePred and others may have left the node in the pending queue, avoid
@ -502,6 +502,12 @@ void ScheduleDAGRRList::ScheduleNodeBottomUp(SUnit *SU) {
AvailableQueue->ScheduledNode(SU); AvailableQueue->ScheduledNode(SU);
// If HazardRec is disabled, count each inst as one cycle.
// Advance CurCycle before ReleasePredecessors to avoid useles pushed to
// PendingQueue for schedulers that implement HasReadyFilter.
if (!HazardRec->isEnabled())
AdvanceToCycle(CurCycle + 1);
// Update liveness of predecessors before successors to avoid treating a // Update liveness of predecessors before successors to avoid treating a
// two-address node as a live range def. // two-address node as a live range def.
ReleasePredecessors(SU); ReleasePredecessors(SU);
@ -524,8 +530,10 @@ void ScheduleDAGRRList::ScheduleNodeBottomUp(SUnit *SU) {
// (1) No available instructions // (1) No available instructions
// (2) All pipelines full, so available instructions must have hazards. // (2) All pipelines full, so available instructions must have hazards.
// //
// If HazardRec is disabled, count each inst as one cycle. // If HazardRec is disabled, the cycle was advanced earlier.
if (!HazardRec->isEnabled() || HazardRec->atIssueLimit() //
// Check AvailableQueue after ReleasePredecessors in case of zero latency.
if ((HazardRec->isEnabled() && HazardRec->atIssueLimit())
|| AvailableQueue->empty()) || AvailableQueue->empty())
AdvanceToCycle(CurCycle + 1); AdvanceToCycle(CurCycle + 1);
} }
@ -1318,7 +1326,7 @@ struct src_ls_rr_sort : public queue_sort {
struct hybrid_ls_rr_sort : public queue_sort { struct hybrid_ls_rr_sort : public queue_sort {
enum { enum {
IsBottomUp = true, IsBottomUp = true,
HasReadyFilter = true HasReadyFilter = false
}; };
RegReductionPQBase *SPQ; RegReductionPQBase *SPQ;
@ -1337,7 +1345,7 @@ struct hybrid_ls_rr_sort : public queue_sort {
struct ilp_ls_rr_sort : public queue_sort { struct ilp_ls_rr_sort : public queue_sort {
enum { enum {
IsBottomUp = true, IsBottomUp = true,
HasReadyFilter = true HasReadyFilter = false
}; };
RegReductionPQBase *SPQ; RegReductionPQBase *SPQ;
@ -2112,7 +2120,7 @@ bool ilp_ls_rr_sort::isReady(SUnit *SU, unsigned CurCycle) const {
!= ScheduleHazardRecognizer::NoHazard) != ScheduleHazardRecognizer::NoHazard)
return false; return false;
return SU->getHeight() <= CurCycle; return true;
} }
bool ilp_ls_rr_sort::operator()(SUnit *left, SUnit *right) const { bool ilp_ls_rr_sort::operator()(SUnit *left, SUnit *right) const {
@ -2134,7 +2142,7 @@ bool ilp_ls_rr_sort::operator()(SUnit *left, SUnit *right) const {
if (left->NumPreds > right->NumPreds) if (left->NumPreds > right->NumPreds)
return false; return false;
else if (left->NumPreds < right->NumPreds) else if (left->NumPreds < right->NumPreds)
return false; return true;
} }
return BURRSort(left, right, SPQ); return BURRSort(left, right, SPQ);