nv50/ir: Take into account function args in the live range calculation code.

diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_ra.cpp b/src/gallium/drivers/nv50/codegen/nv50_ir_ra.cpp
index a08ca31ff84ef5ae3e2938ade7cfeb5d479c11b2..3f8254619569f6b9d08ab0aadae4263d3a0f45ce 100644 (file)
--- a/src/gallium/drivers/nv50/codegen/nv50_ir_ra.cpp
+++ b/src/gallium/drivers/nv50/codegen/nv50_ir_ra.cpp
@@ -268,7 +268,8 @@ RegAlloc::BuildIntervalsPass::addLiveRange(Value *val,
    Instruction *insn = val->getUniqueInsn();
 
    if (!insn)
-      return;
+      insn = bb->getFirst();
+
    assert(bb->getFirst()->serial <= bb->getExit()->serial);
    assert(bb->getExit()->serial + 1 >= end);
 
@@ -420,6 +421,7 @@ RegAlloc::ArgumentMovesPass::visit(BasicBlock *bb)
 bool
 RegAlloc::buildLiveSets(BasicBlock *bb)
 {
+   Function *f = bb->getFunction();
    BasicBlock *bn;
    Instruction *i;
    unsigned int s, d;
@@ -453,6 +455,14 @@ RegAlloc::buildLiveSets(BasicBlock *bb)
    // if (!bb->getEntry())
    //   return true;
 
+   if (bb == BasicBlock::get(f->cfgExit)) {
+      for (std::deque<ValueRef>::iterator it = f->outs.begin();
+           it != f->outs.end(); ++it) {
+         assert(it->get()->asLValue());
+         bb->liveSet.set(it->get()->id);
+      }
+   }
+
    for (i = bb->getExit(); i && i != bb->getEntry()->prev; i = i->prev) {
       for (d = 0; i->defExists(d); ++d)
          bb->liveSet.clr(i->getDef(d)->id);
@@ -476,8 +486,6 @@ RegAlloc::BuildIntervalsPass::collectLiveValues(BasicBlock *bb)
 {
    BasicBlock *bbA = NULL, *bbB = NULL;
 
-   assert(bb->cfg.incidentCount() || bb->liveSet.popCount() == 0);
-
    if (bb->cfg.outgoingCount()) {
       // trickery to save a loop of OR'ing liveSets
       // aliasing works fine with BitSet::setOr
@@ -548,6 +556,14 @@ RegAlloc::BuildIntervalsPass::visit(BasicBlock *bb)
       }
    }
 
+   if (bb == BasicBlock::get(func->cfg.getRoot())) {
+      for (std::deque<ValueDef>::iterator it = func->ins.begin();
+           it != func->ins.end(); ++it) {
+         if (it->get()->reg.data.id >= 0) // add hazard for fixed regs
+            it->get()->livei.extend(0, 1);
+      }
+   }
+
    return true;
 }
 

diff --git a/src/gallium/drivers/nv50/codegen/nv50_ir_ssa.cpp b/src/gallium/drivers/nv50/codegen/nv50_ir_ssa.cpp
index 88a9911816a5f7922440a2dd01df56c70b5a647b..38a37efdd4ff9b12284827dc50cea2c2aeff520c 100644 (file)
--- a/src/gallium/drivers/nv50/codegen/nv50_ir_ssa.cpp
+++ b/src/gallium/drivers/nv50/codegen/nv50_ir_ssa.cpp
@@ -219,6 +219,7 @@ void DominatorTree::findDominanceFrontiers()
 void
 Function::buildLiveSetsPreSSA(BasicBlock *bb, const int seq)
 {
+   Function *f = bb->getFunction();
    BitSet usedBeforeAssigned(allLValues.getSize(), true);
    BitSet assigned(allLValues.getSize(), true);
 
@@ -248,6 +249,14 @@ Function::buildLiveSetsPreSSA(BasicBlock *bb, const int seq)
          assigned.set(i->getDef(d)->id);
    }
 
+   if (bb == BasicBlock::get(f->cfgExit)) {
+      for (std::deque<ValueRef>::iterator it = f->outs.begin();
+           it != f->outs.end(); ++it) {
+         if (!assigned.test(it->get()->id))
+            usedBeforeAssigned.set(it->get()->id);
+      }
+   }
+
    bb->liveSet.andNot(assigned);
    bb->liveSet |= usedBeforeAssigned;
 }