nv50/ir: remove DUMMY edge type

it was never used

Signed-off-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>

diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_bb.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_bb.cpp
index 9f0e0733326cc2a3b23e7f4bfc852c692f8e1147..76fee8c791edb4c7f0ce9f410c9c360d04716864 100644 (file)
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_bb.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_bb.cpp
@@ -536,9 +536,6 @@ Function::printCFGraph(const char *filePath)
          case Graph::Edge::BACK:
             fprintf(out, "\t%i -> %i;\n", idA, idB);
             break;
-         case Graph::Edge::DUMMY:
-            fprintf(out, "\t%i -> %i [style=dotted];\n", idA, idB);
-            break;
          default:
             assert(0);
             break;

diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_graph.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_graph.cpp
index b1076cf4129a2a48479d3c18ef43e4a88c9ed2ca..e9a9981746aa51556eb99e0bd2a36767972ed52f 100644 (file)
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_graph.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_graph.cpp
@@ -77,7 +77,6 @@ const char *Graph::Edge::typeStr() const
    case FORWARD: return "forward";
    case BACK:    return "back";
    case CROSS:   return "cross";
-   case DUMMY:   return "dummy";
    case UNKNOWN:
    default:
       return "unk";
@@ -184,7 +183,7 @@ Graph::Node::reachableBy(const Node *node, const Node *term) const
          continue;
 
       for (EdgeIterator ei = pos->outgoing(); !ei.end(); ei.next()) {
-         if (ei.getType() == Edge::BACK || ei.getType() == Edge::DUMMY)
+         if (ei.getType() == Edge::BACK)
             continue;
          if (ei.getNode()->visit(seq))
             stack.push(ei.getNode());
@@ -301,7 +300,6 @@ private:
             switch (ei.getType()) {
             case Graph::Edge::TREE:
             case Graph::Edge::FORWARD:
-            case Graph::Edge::DUMMY:
                if (++(ei.getNode()->tag) == ei.getNode()->incidentCountFwd())
                   bb.push(ei.getNode());
                break;
@@ -371,8 +369,6 @@ void Graph::classifyDFS(Node *curr, int& seq)
 
    for (edge = curr->out; edge; edge = edge->next[0]) {
       node = edge->target;
-      if (edge->type == Edge::DUMMY)
-         continue;
 
       if (node->getSequence() == 0) {
          edge->type = Edge::TREE;
@@ -387,8 +383,6 @@ void Graph::classifyDFS(Node *curr, int& seq)
 
    for (edge = curr->in; edge; edge = edge->next[1]) {
       node = edge->origin;
-      if (edge->type == Edge::DUMMY)
-         continue;
 
       if (node->getSequence() == 0) {
          edge->type = Edge::TREE;

diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_graph.h b/src/gallium/drivers/nouveau/codegen/nv50_ir_graph.h
index 115f20e5e993075ff5730965926d30c4b51f926a..fc85e78a50c316c5bc67cdbaaeb59e3408bf6709 100644 (file)
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_graph.h
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_graph.h
@@ -47,7 +47,6 @@ public:
          FORWARD,
          BACK,
          CROSS, // e.g. loop break
-         DUMMY
       };
 
       Edge(Node *dst, Node *src, Type kind);

diff --git a/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp b/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp
index f25bce00884be51b1bc2edf9d942ec127b9936bd..6df2664da22e1d65ebab422d3a08173f55499f3e 100644 (file)
--- a/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp
+++ b/src/gallium/drivers/nouveau/codegen/nv50_ir_ra.cpp
@@ -624,8 +624,6 @@ RegAlloc::BuildIntervalsPass::collectLiveValues(BasicBlock *bb)
       // trickery to save a loop of OR'ing liveSets
       // aliasing works fine with BitSet::setOr
       for (Graph::EdgeIterator ei = bb->cfg.outgoing(); !ei.end(); ei.next()) {
-         if (ei.getType() == Graph::Edge::DUMMY)
-            continue;
          if (bbA) {
             bb->liveSet.setOr(&bbA->liveSet, &bbB->liveSet);
             bbA = bb;