From: Christoph Bumiller <e0425955@student.tuwien.ac.at>
Date: Thu, 28 Feb 2013 21:08:36 +0000 (+0100)
Subject: nvc0/ir: skip back edges when determining latest sched value
X-Git-Tag: android-x86-4.4-r1~920
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ac9f19e485a15b2c58680d5c884597f60d6f1b1b;p=android-x86%2Fexternal-mesa.git

nvc0/ir: skip back edges when determining latest sched value
---

diff --git a/src/gallium/drivers/nvc0/codegen/nv50_ir_emit_nvc0.cpp b/src/gallium/drivers/nvc0/codegen/nv50_ir_emit_nvc0.cpp
index 7fd9b86884b..04081cf1177 100644
--- a/src/gallium/drivers/nvc0/codegen/nv50_ir_emit_nvc0.cpp
+++ b/src/gallium/drivers/nvc0/codegen/nv50_ir_emit_nvc0.cpp
@@ -2623,15 +2623,16 @@ SchedDataCalculator::visit(BasicBlock *bb)
    score = &scoreBoards.at(bb->getId());
 
    for (Graph::EdgeIterator ei = bb->cfg.incident(); !ei.end(); ei.next()) {
+      // back branches will wait until all target dependencies are satisfied
+      if (ei.getType() == Graph::Edge::BACK) // sched would be uninitialized
+         continue;
       BasicBlock *in = BasicBlock::get(ei.getNode());
       if (in->getExit()) {
          if (prevData != 0x04)
             prevData = in->getExit()->sched;
          prevOp = in->getExit()->op;
       }
-      if (ei.getType() != Graph::Edge::BACK)
-         score->setMax(&scoreBoards.at(in->getId()));
-      // back branches will wait until all target dependencies are satisfied
+      score->setMax(&scoreBoards.at(in->getId()));
    }
    if (bb->cfg.incidentCount() > 1)
       prevOp = OP_NOP;