PBQP edges now have pointers to their incident node, instead of only their index...

[libfirm] / html_dumper.c

diff --git a/html_dumper.c b/html_dumper.c
index bbb8372..bfa6dbd 100644 (file)
--- a/html_dumper.c
+++ b/html_dumper.c
@@ -15,9 +15,23 @@ static void dump_vector(FILE *f, vector *vec)
 
        fprintf(f, "<span class=\"vector\">( ");
        unsigned len = vec->len;
-       assert(len> 0);
+       assert(len > 0);
        for (index = 0; index < len; ++index) {
-               fprintf(f, "%6d", vec->entries[index].data);
+#if EXT_GRS_DEBUG
+               if (vec->entries[index].data == INF_COSTS) {
+                       fprintf(f, "<span title=\"%s\"> inf </span>",
+                                       vec->entries[index].name);
+               } else {
+                       fprintf(f, "<span title=\"%s\">%6d</span>",
+                                       vec->entries[index].name, vec->entries[index].data);
+               }
+#else
+               if (vec->entries[index].data == INF_COSTS) {
+                       fputs(" inf ", f);
+               } else {
+                       fprintf(f, "%6d", vec->entries[index].data);
+               }
+#endif
        }
        fprintf(f, " )</span>\n");
 }
@@ -28,19 +42,39 @@ static void dump_matrix(FILE *f, pbqp_matrix *mat)
        assert(mat);
        num *p = mat->entries;
 
-       assert(mat->cols > 0);
-       assert(mat->rows > 0);
+       assert(mat->cols> 0);
+       assert(mat->rows> 0);
        fprintf(f, "\t\\begin{pmatrix}\n");
        for (row = 0; row < mat->rows; ++row) {
-               fprintf(f, "\t %6d", *p++);
+               if (*p == INF_COSTS) {
+                       fputs("\t inf", f);
+                       p++;
+               } else {
+                       fprintf(f, "\t %6d", *p++);
+               }
+
                for (col = 1; col < mat->cols; ++col) {
-                       fprintf(f, "& %6d", *p++);
+                       if (*p == INF_COSTS) {
+                               fputs("& inf", f);
+                               p++;
+                       } else {
+                               fprintf(f, "& %6d", *p++);
+                       }
                }
                fprintf(f, "\\\\\n");
        }
        fprintf(f, "\t\\end{pmatrix}\n");
 }
 
+void dump_edge(pbqp *pbqp, pbqp_edge *edge)
+{
+       fputs("<tex>\n", pbqp->dump_file);
+       fprintf(pbqp->dump_file, "\t\\overline\n{C}_{%d,%d}=\n",
+                       edge->src->index, edge->tgt->index);
+       dump_matrix(pbqp->dump_file, edge->costs);
+       fputs("</tex><br>", pbqp->dump_file);
+}
+
 static void dump_edge_costs(pbqp *pbqp)
 {
        unsigned src_index;
@@ -51,23 +85,35 @@ static void dump_edge_costs(pbqp *pbqp)
        fputs("<p>", pbqp->dump_file);
        for (src_index = 0; src_index < pbqp->num_nodes; ++src_index) {
                pbqp_node *src_node = get_node(pbqp, src_index);
+
+               if (!src_node)
+                       continue;
+
                unsigned edge_index;
                unsigned len = ARR_LEN(src_node->edges);
                for (edge_index = 0; edge_index < len; ++edge_index) {
                        pbqp_edge *edge = src_node->edges[edge_index];
-                       unsigned tgt_index = edge->tgt;
+                       unsigned tgt_index = edge->tgt->index;
                        if (src_index < tgt_index) {
-                               fputs("<tex>\n", pbqp->dump_file);
-                               fprintf(pbqp->dump_file, "\t\\overline\n{C}_{%d,%d}=\n",
-                                               src_index, tgt_index);
-                               dump_matrix(pbqp->dump_file, edge->costs);
-                               fputs("</tex><br>", pbqp->dump_file);
+                               dump_edge(pbqp, edge);
                        }
                }
        }
        fputs("</p>", pbqp->dump_file);
 }
 
+void dump_node(pbqp *pbqp, pbqp_node *node)
+{
+       assert(pbqp);
+       assert(pbqp->dump_file);
+
+       if (node) {
+               fprintf(pbqp->dump_file, "\tc<sub>%d</sub> = ", node->index);
+               dump_vector(pbqp->dump_file, node->costs);
+               fputs("<br>\n", pbqp->dump_file);
+       }
+}
+
 static void dump_node_costs(pbqp *pbqp)
 {
        unsigned index;
@@ -78,39 +124,43 @@ static void dump_node_costs(pbqp *pbqp)
        /* dump node costs */
        fputs("<p>", pbqp->dump_file);
        for (index = 0; index < pbqp->num_nodes; ++index) {
-               pbqp_node *node = get_node(pbqp, index);
-               fprintf(pbqp->dump_file, "\tc<sub>%d</sub> = ", index);
-               dump_vector(pbqp->dump_file, node->costs);
-               fputs("<br>\n", pbqp->dump_file);
+               dump_node(pbqp, get_node(pbqp, index));
        }
        fputs("</p>", pbqp->dump_file);
 }
 
-static void dump_section(FILE *f, int level, char *txt)
+void dump_section(FILE *f, int level, char *txt)
 {
        assert(f);
 
        fprintf(f, "<h%d>%s</h%d>\n", level, txt, level);
 }
 
-void dump_graph(pbqp *pbqp)
+void pbqp_dump_graph(pbqp *pbqp)
 {
        unsigned src_index;
 
-       assert(pbqp != NULL);
-       assert(pbqp->dump_file != NULL);
+       assert(pbqp);
+       assert(pbqp->dump_file);
 
        fputs("<p>\n<graph>\n\tgraph input {\n", pbqp->dump_file);
        for (src_index = 0; src_index < pbqp->num_nodes; ++src_index) {
-               fprintf(pbqp->dump_file, "\t n%d;\n", src_index);
+               pbqp_node *node = get_node(pbqp, src_index);
+               if (node) {
+                       fprintf(pbqp->dump_file, "\t n%d;\n", src_index);
+               }
        }
 
        for (src_index = 0; src_index < pbqp->num_nodes; ++src_index) {
                pbqp_node *node = get_node(pbqp, src_index);
+
+               if (!node)
+                       continue;
+
                unsigned len = ARR_LEN(node->edges);
                unsigned edge_index;
                for (edge_index = 0; edge_index < len; ++edge_index) {
-                       unsigned tgt_index = node->edges[edge_index]->tgt;
+                       unsigned tgt_index = node->edges[edge_index]->tgt->index;
 
                        if (src_index < tgt_index) {
                                fprintf(pbqp->dump_file, "\t n%d -- n%d;\n", src_index,
@@ -121,16 +171,26 @@ void dump_graph(pbqp *pbqp)
        fputs("\t}\n</graph>\n</p>\n", pbqp->dump_file);
 }
 
-void dump_input(pbqp *pbqp)
+void pbqp_dump_input(pbqp *pbqp)
 {
        assert(pbqp);
        assert(pbqp->dump_file);
 
        dump_section(pbqp->dump_file, 1, "1. PBQP Problem");
        dump_section(pbqp->dump_file, 2, "1.1 Topology");
-       dump_graph(pbqp);
+       pbqp_dump_graph(pbqp);
        dump_section(pbqp->dump_file, 2, "1.2 Cost Vectors");
        dump_node_costs(pbqp);
        dump_section(pbqp->dump_file, 2, "1.3 Cost Matrices");
        dump_edge_costs(pbqp);
 }
+
+void dump_simplifyedge(pbqp *pbqp, pbqp_edge *edge)
+{
+       assert(pbqp);
+       assert(pbqp->dump_file);
+
+       dump_node(pbqp, edge->src);
+       dump_edge(pbqp, edge);
+       dump_node(pbqp, edge->tgt);
+}