belive: move dumper to bedump, checker to beverify
authorMatthias Braun <matze@braunis.de>
Fri, 2 Dec 2011 20:41:26 +0000 (21:41 +0100)
committerMatthias Braun <matze@braunis.de>
Mon, 5 Dec 2011 11:52:03 +0000 (12:52 +0100)
ir/be/bedump.c
ir/be/bedump.h
ir/be/belive.c
ir/be/belive.h
ir/be/beverify.c
ir/be/beverify.h

index 5e478c5..74dc9fe 100644 (file)
 #include "bedump.h"
 
 #include "irdump_t.h"
+#include "irgwalk.h"
 #include "beifg.h"
 #include "becopyopt_t.h"
+#include "belive_t.h"
 
 static void dump_ifg_nodes(FILE *F, const be_ifg_t *ifg)
 {
@@ -132,3 +134,60 @@ void be_dump_ifg_co(FILE *F, const copy_opt_t *co, bool dump_costs,
 
        fprintf(F, "}\n");
 }
+
+static const char *lv_flags_to_str(unsigned flags)
+{
+       static const char *states[] = {
+               "---",
+               "i--",
+               "-e-",
+               "ie-",
+               "--o",
+               "i-o",
+               "-eo",
+               "ieo"
+       };
+
+       return states[flags & 7];
+}
+
+void be_dump_liveness_block(void *context, FILE *F, const ir_node *bl)
+{
+       if (is_Block(bl)) {
+               be_lv_t *lv = (be_lv_t*)context;
+               be_lv_info_t *info = (be_lv_info_t*)ir_nodehashmap_get(&lv->map, bl);
+
+               fprintf(F, "liveness:\n");
+               if (info != NULL) {
+                       unsigned n = info[0].head.n_members;
+                       unsigned i;
+
+                       for (i = 0; i < n; ++i) {
+                               be_lv_info_node_t *n = &info[i+1].node;
+                               ir_fprintf(F, "%s %+F\n", lv_flags_to_str(n->flags), get_idx_irn(lv->irg, n->idx));
+                       }
+               }
+       }
+}
+
+typedef struct lv_walker_t {
+       be_lv_t *lv;
+       void *data;
+} lv_walker_t;
+
+static void lv_dump_block_walker(ir_node *irn, void *data)
+{
+       lv_walker_t *w = (lv_walker_t*)data;
+       if (!is_Block(irn))
+               return;
+       be_dump_liveness_block(w->lv, (FILE*)w->data, irn);
+}
+
+void be_liveness_dump(FILE *F, const be_lv_t *lv)
+{
+       lv_walker_t w;
+
+       w.lv   = (be_lv_t *) lv;
+       w.data = F;
+       irg_block_walk_graph(lv->irg, lv_dump_block_walker, NULL, &w);
+}
index 3909bdf..9326ff3 100644 (file)
@@ -42,4 +42,16 @@ void be_dump_ifg(FILE *F, ir_graph *irg, const be_ifg_t *ifg);
 void be_dump_ifg_co(FILE *F, const copy_opt_t *co,
                     bool dump_costs, bool dump_colors);
 
+/**
+ * Dump the liveness information for a graph.
+ * @param f The output.
+ * @param irg The graph.
+ */
+void be_liveness_dump(FILE *F, const be_lv_t *lv);
+
+/**
+ * node_info hook that dumps liveness for blocks
+ */
+void be_dump_liveness_block(void *context, FILE *F, const ir_node *block);
+
 #endif
index 1e52531..cec1516 100644 (file)
@@ -43,6 +43,7 @@
 #include "beirg.h"
 #include "besched.h"
 #include "bemodule.h"
+#include "bedump.h"
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
@@ -373,11 +374,6 @@ static void live_end_at_block(ir_node *block, int is_true_out)
        }
 }
 
-typedef struct lv_walker_t {
-       be_lv_t *lv;
-       void *data;
-} lv_walker_t;
-
 typedef struct lv_remove_walker_t {
        be_lv_t       *lv;
        const ir_node *irn;
@@ -451,41 +447,6 @@ static void lv_remove_irn_walker(ir_node *bl, void *data)
        be_lv_remove(w->lv, bl, w->irn);
 }
 
-static const char *lv_flags_to_str(unsigned flags)
-{
-       static const char *states[] = {
-               "---",
-               "i--",
-               "-e-",
-               "ie-",
-               "--o",
-               "i-o",
-               "-eo",
-               "ieo"
-       };
-
-       return states[flags & 7];
-}
-
-static void lv_dump_block(void *context, FILE *f, const ir_node *bl)
-{
-       if (is_Block(bl)) {
-               be_lv_t *lv = (be_lv_t*)context;
-               be_lv_info_t *info = (be_lv_info_t*)ir_nodehashmap_get(&lv->map, bl);
-
-               fprintf(f, "liveness:\n");
-               if (info != NULL) {
-                       unsigned n = info[0].head.n_members;
-                       unsigned i;
-
-                       for (i = 0; i < n; ++i) {
-                               be_lv_info_node_t *n = &info[i+1].node;
-                               ir_fprintf(f, "%s %+F\n", lv_flags_to_str(n->flags), get_idx_irn(lv->irg, n->idx));
-                       }
-               }
-       }
-}
-
 /**
  * Walker, collect all nodes for which we want calculate liveness info
  * on an obstack.
@@ -576,7 +537,7 @@ be_lv_t *be_liveness(ir_graph *irg)
        lv->lvc  = lv_chk_new(lv->irg, lv->dfs);
 #endif
        lv->hook_info.context = lv;
-       lv->hook_info.hook._hook_node_info = lv_dump_block;
+       lv->hook_info.hook._hook_node_info = be_dump_liveness_block;
 
        return lv;
 }
@@ -650,130 +611,6 @@ void be_liveness_update(be_lv_t *lv, ir_node *irn)
        be_liveness_introduce(lv, irn);
 }
 
-static void lv_check_walker(ir_node *bl, void *data)
-{
-       lv_walker_t *w = (lv_walker_t*)data;
-       be_lv_t *lv    = w->lv;
-       be_lv_t *fresh = (be_lv_t*)w->data;
-
-       be_lv_info_t *curr = (be_lv_info_t*)ir_nodehashmap_get(&fresh->map, bl);
-       be_lv_info_t *fr   = (be_lv_info_t*)ir_nodehashmap_get(&fresh->map, bl);
-
-       if (!fr && curr && curr[0].head.n_members > 0) {
-               unsigned i;
-
-               ir_fprintf(stderr, "%+F liveness should be empty but current liveness contains:\n", bl);
-               for (i = 0; i < curr[0].head.n_members; ++i) {
-                       ir_fprintf(stderr, "\t%+F\n", get_idx_irn(lv->irg, curr[1 + i].node.idx));
-               }
-       }
-
-       else if (curr) {
-               unsigned n_curr  = curr[0].head.n_members;
-               unsigned n_fresh = fr[0].head.n_members;
-
-               unsigned i;
-
-               if (n_curr != n_fresh) {
-                       ir_fprintf(stderr, "%+F: liveness set sizes differ. curr %d, correct %d\n", bl, n_curr, n_fresh);
-
-                       ir_fprintf(stderr, "current:\n");
-                       for (i = 0; i < n_curr; ++i) {
-                               be_lv_info_node_t *n = &curr[1 + i].node;
-                               ir_fprintf(stderr, "%+F %u %+F %s\n", bl, i, get_idx_irn(lv->irg, n->idx), lv_flags_to_str(n->flags));
-                       }
-
-                       ir_fprintf(stderr, "correct:\n");
-                       for (i = 0; i < n_fresh; ++i) {
-                               be_lv_info_node_t *n = &fr[1 + i].node;
-                               ir_fprintf(stderr, "%+F %u %+F %s\n", bl, i, get_idx_irn(lv->irg, n->idx), lv_flags_to_str(n->flags));
-                       }
-               }
-       }
-}
-
-void be_liveness_check(be_lv_t *lv)
-{
-       lv_walker_t w;
-       be_lv_t *fresh = be_liveness(lv->irg);
-
-       w.lv   = lv;
-       w.data = fresh;
-       irg_block_walk_graph(lv->irg, lv_check_walker, NULL, &w);
-       be_liveness_free(fresh);
-}
-
-
-static void lv_dump_block_walker(ir_node *irn, void *data)
-{
-       lv_walker_t *w = (lv_walker_t*)data;
-       if (is_Block(irn))
-               lv_dump_block(w->lv, (FILE*)w->data, irn);
-}
-
-
-/* Dump the liveness information for a graph. */
-void be_liveness_dump(const be_lv_t *lv, FILE *f)
-{
-       lv_walker_t w;
-
-       w.lv   = (be_lv_t *) lv;
-       w.data = f;
-       irg_block_walk_graph(lv->irg, lv_dump_block_walker, NULL, &w);
-}
-
-/* Dump the liveness information for a graph. */
-void be_liveness_dumpto(const be_lv_t *lv, const char *cls_name)
-{
-       FILE *f;
-       char buf[128];
-       ir_snprintf(buf, sizeof(buf), "%F_%s-live.txt", lv->irg, cls_name);
-       if ((f = fopen(buf, "wt")) != NULL) {
-               be_liveness_dump(lv, f);
-               fclose(f);
-       }
-}
-
-/**
- * Walker: checks that every predecessors of a node dominates the node.
- */
-static void dom_check(ir_node *irn, void *data)
-{
-       int *problem_found = (int*)data;
-
-       if (!is_Block(irn) && irn != get_irg_end(get_irn_irg(irn))) {
-               int i, n;
-               ir_node *bl = get_nodes_block(irn);
-
-               for (i = 0, n = get_irn_arity(irn); i < n; ++i) {
-                       ir_node *op     = get_irn_n(irn, i);
-                       ir_node *def_bl = get_nodes_block(op);
-                       ir_node *use_bl = bl;
-
-                       if (is_Phi(irn))
-                               use_bl = get_Block_cfgpred_block(bl, i);
-
-                       if (get_irn_opcode(use_bl) != iro_Bad
-                            && get_irn_opcode(def_bl) != iro_Bad
-                            && !block_dominates(def_bl, use_bl)) {
-                               ir_fprintf(stderr, "Verify warning: %+F in %+F must dominate %+F for user %+F (%s)\n", op, def_bl, use_bl, irn, get_irg_dump_name(get_irn_irg(op)));
-                               *problem_found = 1;
-                       }
-               }
-       }
-}
-
-/* Check, if the SSA dominance property is fulfilled. */
-int be_check_dominance(ir_graph *irg)
-{
-       int problem_found = 0;
-
-       assure_doms(irg);
-       irg_walk_graph(irg, dom_check, NULL, &problem_found);
-
-       return !problem_found;
-}
-
 void be_liveness_transfer(const arch_register_class_t *cls,
                           ir_node *node, ir_nodeset_t *nodeset)
 {
index f9570a5..792633c 100644 (file)
@@ -49,11 +49,6 @@ typedef enum {
  */
 be_lv_t *be_liveness(ir_graph *irg);
 
-/**
- * Check the given liveness information against a freshly computed one.
- */
-void be_liveness_check(be_lv_t *lv);
-
 /**
  * Free the liveness information.
  */
@@ -93,20 +88,6 @@ void be_liveness_introduce(be_lv_t *lv, ir_node *irn);
  */
 void be_liveness_add_missing(be_lv_t *lv);
 
-/**
- * Dump the liveness information for a graph.
- * @param f The output.
- * @param irg The graph.
- */
-void be_liveness_dump(const be_lv_t *lv, FILE *f);
-
-/**
- * Dump the liveness information for a graph.
- * @param irg The graph.
- * @param cls_name A string used as substring in the filename.
- */
-void be_liveness_dumpto(const be_lv_t *lv, const char *cls_name);
-
 /**
  * Check, if a node is live in at a block.
  * @param block The block.
@@ -131,13 +112,6 @@ int (be_is_live_out)(const be_lv_t *lv, const ir_node *block, const ir_node *irn
  */
 int (be_is_live_end)(const be_lv_t *lv, const ir_node *block, const ir_node *irn);
 
-/**
- * Check, if the SSA dominance property is fulfilled.
- * @param irg The graph.
- * @return   1 if dominance property is fulfilled, 0 otherwise
- */
-int be_check_dominance(ir_graph *irg);
-
 /**
  * The liveness transfer function.
  * Updates a live set over a single step from a given node to its predecessor.
index 1b0441d..90a9324 100644 (file)
@@ -884,3 +884,121 @@ bool be_verify_register_allocation(ir_graph *new_irg)
 
        return !problem_found;
 }
+
+/*--------------------------------------------------------------------------- */
+
+/**
+ * Walker: checks that every predecessors of a node dominates the node.
+ */
+static void dom_check(ir_node *irn, void *data)
+{
+       bool *problem_found = (bool*)data;
+
+       if (!is_Block(irn) && irn != get_irg_end(get_irn_irg(irn))) {
+               int i, n;
+               ir_node *bl = get_nodes_block(irn);
+
+               for (i = 0, n = get_irn_arity(irn); i < n; ++i) {
+                       ir_node *op     = get_irn_n(irn, i);
+                       ir_node *def_bl = get_nodes_block(op);
+                       ir_node *use_bl = bl;
+
+                       if (is_Phi(irn))
+                               use_bl = get_Block_cfgpred_block(bl, i);
+
+                       if (get_irn_opcode(use_bl) != iro_Bad
+                            && get_irn_opcode(def_bl) != iro_Bad
+                            && !block_dominates(def_bl, use_bl)) {
+                               ir_fprintf(stderr, "Verify warning: %+F in %+F must dominate %+F for user %+F (%s)\n", op, def_bl, use_bl, irn, get_irg_dump_name(get_irn_irg(op)));
+                               *problem_found = true;
+                       }
+               }
+       }
+}
+
+/* Check, if the SSA dominance property is fulfilled. */
+bool be_check_dominance(ir_graph *irg)
+{
+       bool problem_found = false;
+
+       assure_doms(irg);
+       irg_walk_graph(irg, dom_check, NULL, &problem_found);
+
+       return !problem_found;
+}
+
+/*--------------------------------------------------------------------------- */
+
+typedef struct lv_walker_t {
+       be_lv_t *lv;
+       void *data;
+} lv_walker_t;
+
+static const char *lv_flags_to_str(unsigned flags)
+{
+       static const char *states[] = {
+               "---",
+               "i--",
+               "-e-",
+               "ie-",
+               "--o",
+               "i-o",
+               "-eo",
+               "ieo"
+       };
+
+       return states[flags & 7];
+}
+
+static void lv_check_walker(ir_node *bl, void *data)
+{
+       lv_walker_t *w = (lv_walker_t*)data;
+       be_lv_t *lv    = w->lv;
+       be_lv_t *fresh = (be_lv_t*)w->data;
+
+       be_lv_info_t *curr = (be_lv_info_t*)ir_nodehashmap_get(&fresh->map, bl);
+       be_lv_info_t *fr   = (be_lv_info_t*)ir_nodehashmap_get(&fresh->map, bl);
+
+       if (!fr && curr && curr[0].head.n_members > 0) {
+               unsigned i;
+
+               ir_fprintf(stderr, "%+F liveness should be empty but current liveness contains:\n", bl);
+               for (i = 0; i < curr[0].head.n_members; ++i) {
+                       ir_fprintf(stderr, "\t%+F\n", get_idx_irn(lv->irg, curr[1 + i].node.idx));
+               }
+       }
+
+       else if (curr) {
+               unsigned n_curr  = curr[0].head.n_members;
+               unsigned n_fresh = fr[0].head.n_members;
+
+               unsigned i;
+
+               if (n_curr != n_fresh) {
+                       ir_fprintf(stderr, "%+F: liveness set sizes differ. curr %d, correct %d\n", bl, n_curr, n_fresh);
+
+                       ir_fprintf(stderr, "current:\n");
+                       for (i = 0; i < n_curr; ++i) {
+                               be_lv_info_node_t *n = &curr[1 + i].node;
+                               ir_fprintf(stderr, "%+F %u %+F %s\n", bl, i, get_idx_irn(lv->irg, n->idx), lv_flags_to_str(n->flags));
+                       }
+
+                       ir_fprintf(stderr, "correct:\n");
+                       for (i = 0; i < n_fresh; ++i) {
+                               be_lv_info_node_t *n = &fr[1 + i].node;
+                               ir_fprintf(stderr, "%+F %u %+F %s\n", bl, i, get_idx_irn(lv->irg, n->idx), lv_flags_to_str(n->flags));
+                       }
+               }
+       }
+}
+
+void be_liveness_check(be_lv_t *lv)
+{
+       lv_walker_t w;
+       be_lv_t *fresh = be_liveness(lv->irg);
+
+       w.lv   = lv;
+       w.data = fresh;
+       irg_block_walk_graph(lv->irg, lv_check_walker, NULL, &w);
+       be_liveness_free(fresh);
+}
index f744ba2..adcbe7e 100644 (file)
@@ -69,4 +69,16 @@ int be_verify_spillslots(ir_graph *irg);
  */
 bool be_verify_register_allocation(ir_graph *irg);
 
+/**
+ * Check, if the SSA dominance property is fulfilled.
+ * @param irg The graph.
+ * @return   true if dominance property is fulfilled, false otherwise
+ */
+bool be_check_dominance(ir_graph *irg);
+
+/**
+ * Check the given liveness information against a freshly computed one.
+ */
+void be_liveness_check(be_lv_t *lv);
+
 #endif