diff options
author | Dan Gohman <gohman@apple.com> | 2008-04-15 22:40:14 +0000 |
---|---|---|
committer | Dan Gohman <gohman@apple.com> | 2008-04-15 22:40:14 +0000 |
commit | 5a2d335c4cdc2bf870f04b8ca20c8032638d1961 (patch) | |
tree | a504ed920e22e2752c5da8551100049b56da975b /lib/CodeGen | |
parent | ff140fa1f13b3c11fde2dcde273b3615c22fc4a5 (diff) | |
download | external_llvm-5a2d335c4cdc2bf870f04b8ca20c8032638d1961.zip external_llvm-5a2d335c4cdc2bf870f04b8ca20c8032638d1961.tar.gz external_llvm-5a2d335c4cdc2bf870f04b8ca20c8032638d1961.tar.bz2 |
Fix the new scheduler assertion checks to work when
the scheduler has inserted no-ops. This fixes
the 2006-07-03-schedulers.ll regression on ppc32.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@49747 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/CodeGen')
-rw-r--r-- | lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp b/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp index ab492f4..a08fc05 100644 --- a/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp +++ b/lib/CodeGen/SelectionDAG/ScheduleDAGRRList.cpp @@ -1076,6 +1076,7 @@ void ScheduleDAGRRList::ListScheduleBottomUp() { // Verify that all SUnits were scheduled. bool AnyNotSched = false; unsigned DeadNodes = 0; + unsigned Noops = 0; for (unsigned i = 0, e = SUnits.size(); i != e; ++i) { if (!SUnits[i].isScheduled) { if (SUnits[i].NumPreds == 0 && SUnits[i].NumSuccs == 0) { @@ -1096,8 +1097,11 @@ void ScheduleDAGRRList::ListScheduleBottomUp() { AnyNotSched = true; } } + for (unsigned i = 0, e = Sequence.size(); i != e; ++i) + if (!Sequence[i]) + ++Noops; assert(!AnyNotSched); - assert(Sequence.size() + DeadNodes == SUnits.size() && + assert(Sequence.size() + DeadNodes - Noops == SUnits.size() && "The number of nodes scheduled doesn't match the expected number!"); #endif } @@ -1193,6 +1197,7 @@ void ScheduleDAGRRList::ListScheduleTopDown() { // Verify that all SUnits were scheduled. bool AnyNotSched = false; unsigned DeadNodes = 0; + unsigned Noops = 0; for (unsigned i = 0, e = SUnits.size(); i != e; ++i) { if (!SUnits[i].isScheduled) { if (SUnits[i].NumPreds == 0 && SUnits[i].NumSuccs == 0) { @@ -1213,8 +1218,11 @@ void ScheduleDAGRRList::ListScheduleTopDown() { AnyNotSched = true; } } + for (unsigned i = 0, e = Sequence.size(); i != e; ++i) + if (!Sequence[i]) + ++Noops; assert(!AnyNotSched); - assert(Sequence.size() + DeadNodes == SUnits.size() && + assert(Sequence.size() + DeadNodes - Noops == SUnits.size() && "The number of nodes scheduled doesn't match the expected number!"); #endif } |