reduce code size

[libfirm] / ir / be / belive.c

diff --git a/ir/be/belive.c b/ir/be/belive.c
index 7be9f1a..a2e400e 100644 (file)
--- a/ir/be/belive.c
+++ b/ir/be/belive.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -38,6 +38,7 @@
 
 #include "dfs_t.h"
 #include "absgraph.h"
+#include "statev.h"
 
 #include "beutil.h"
 #include "belive_t.h"
@@ -62,6 +63,7 @@ static INLINE int is_liveness_node(const ir_node *irn)
        case iro_Bad:
        case iro_End:
        case iro_Anchor:
+       case iro_NoMem:
                return 0;
        default:;
        }
@@ -159,8 +161,11 @@ static INLINE unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned
 
 struct _be_lv_info_node_t *be_lv_get(const struct _be_lv_t *li, const ir_node *bl, const ir_node *irn)
 {
-       struct _be_lv_info_t *irn_live = phase_get_irn_data(&li->ph, bl);
+       struct _be_lv_info_t *irn_live;
+       struct _be_lv_info_node_t *res = NULL;
 
+       stat_ev_tim_push();
+       irn_live = phase_get_irn_data(&li->ph, bl);
        if(irn_live) {
                unsigned idx = get_irn_idx(irn);
 
@@ -168,14 +173,15 @@ struct _be_lv_info_node_t *be_lv_get(const struct _be_lv_t *li, const ir_node *b
                int pos = _be_liveness_bsearch(irn_live, idx);
 
                /* Get the record in question. 1 must be added, since the first record contains information about the array and must be skipped. */
-               struct _be_lv_info_node_t *res = &irn_live[pos + 1].u.node;
+               struct _be_lv_info_node_t *rec = &irn_live[pos + 1].u.node;
 
                /* Check, if the irn is in deed in the array. */
-               if(res->idx == idx)
-                       return res;
+               if(rec->idx == idx)
+                       res = rec;
        }
+       stat_ev_tim_pop("be_lv_get");
 
-       return NULL;
+       return res;
 }
 
 static struct _be_lv_info_node_t *be_lv_get_or_set(struct _be_lv_t *li, ir_node *bl, ir_node *irn)
@@ -245,7 +251,8 @@ static struct _be_lv_info_node_t *be_lv_get_or_set(struct _be_lv_t *li, ir_node
  * Removes a node from the list of live variables of a block.
  * @return 1 if the node was live at that block, 0 if not.
  */
-static int be_lv_remove(struct _be_lv_t *li, ir_node *bl, ir_node *irn)
+static int be_lv_remove(struct _be_lv_t *li, const ir_node *bl,
+                        const ir_node *irn)
 {
        struct _be_lv_info_t *irn_live = phase_get_irn_data(&li->ph, bl);
 
@@ -361,6 +368,12 @@ struct _lv_walker_t {
        void *data;
 };
 
+typedef struct lv_remove_walker_t {
+       be_lv_t       *lv;
+       const ir_node *irn;
+} lv_remove_walker_t;
+
+
 /**
  * Liveness analysis for a value.
  * This functions is meant to be called by a firm walker, to compute the
@@ -430,10 +443,8 @@ static void liveness_for_node(ir_node *irn, void *data)
 
 static void lv_remove_irn_walker(ir_node *bl, void *data)
 {
-       struct _lv_walker_t *w = data;
-       be_lv_t *lv  = w->lv;
-       ir_node *irn = w->data;
-       be_lv_remove(lv, bl, irn);
+       lv_remove_walker_t *w = data;
+       be_lv_remove(w->lv, bl, w->irn);
 }
 
 static const char *lv_flags_to_str(unsigned flags)
@@ -471,7 +482,7 @@ static void lv_dump_block(void *context, FILE *f, const ir_node *bl)
        }
 }
 
-static void *lv_phase_data_init(ir_phase *phase, ir_node *irn, void *old)
+static void *lv_phase_data_init(ir_phase *phase, const ir_node *irn, void *old)
 {
        struct _be_lv_info_t *info = phase_alloc(phase, LV_STD_SIZE * sizeof(info[0]));
        (void) irn;
@@ -505,6 +516,7 @@ static void compute_liveness(be_lv_t *lv)
        ir_node **nodes;
        int i, n;
 
+       stat_ev_tim_push();
        obstack_init(&obst);
        irg_walk_graph(lv->irg, collect_nodes, NULL, &obst);
        n      = obstack_object_size(&obst) / sizeof(nodes[0]);
@@ -529,22 +541,29 @@ static void compute_liveness(be_lv_t *lv)
 
        obstack_free(&obst, NULL);
        register_hook(hook_node_info, &lv->hook_info);
+       stat_ev_tim_pop("be_lv_sets_cons");
 }
 
 void be_liveness_assure_sets(be_lv_t *lv)
 {
        if (!lv->nodes) {
+               BE_TIMER_PUSH(t_live);
+
                lv->nodes = bitset_malloc(2 * get_irg_last_idx(lv->irg));
                phase_init(&lv->ph, "liveness", lv->irg, PHASE_DEFAULT_GROWTH, lv_phase_data_init, NULL);
                compute_liveness(lv);
                /* be_live_chk_compare(lv, lv->lvc); */
+
+               BE_TIMER_POP(t_live);
        }
 }
 
 void be_liveness_assure_chk(be_lv_t *lv)
 {
 #ifndef USE_LIVE_CHK
+       BE_TIMER_PUSH(t_verify);
        be_liveness_assure_sets(lv);
+       BE_TIMER_POP(t_verify);
 #else
        (void) lv;
 #endif
@@ -580,18 +599,21 @@ be_lv_t *be_liveness(const be_irg_t *birg)
 
 void be_liveness_recompute(be_lv_t *lv)
 {
-       unsigned last_idx = get_irg_last_idx(lv->irg);
+       unsigned last_idx;
+
+       BE_TIMER_PUSH(t_live);
+       last_idx = get_irg_last_idx(lv->irg);
        if(last_idx >= bitset_size(lv->nodes)) {
                bitset_free(lv->nodes);
                lv->nodes = bitset_malloc(last_idx * 2);
-       }
-
-       else
+       } else
                bitset_clear_all(lv->nodes);
 
        phase_free(&lv->ph);
        phase_init(&lv->ph, "liveness", lv->irg, PHASE_DEFAULT_GROWTH, lv_phase_data_init, NULL);
        compute_liveness(lv);
+
+       BE_TIMER_POP(t_live);
 }
 
 
@@ -601,19 +623,19 @@ void be_liveness_free(be_lv_t *lv)
        free(lv);
 }
 
-void be_liveness_remove(be_lv_t *lv, ir_node *irn)
+void be_liveness_remove(be_lv_t *lv, const ir_node *irn)
 {
        if (lv->nodes) {
                unsigned idx = get_irn_idx(irn);
-               struct _lv_walker_t w;
+               lv_remove_walker_t w;
 
                /*
                 * Removes a single irn from the liveness information.
                 * Since an irn can only be live at blocks dominated by the block of its
                 * definition, we only have to process that dominance subtree.
                 */
-               w.lv   = lv;
-               w.data = irn;
+               w.lv  = lv;
+               w.irn = irn;
                dom_tree_walk(get_nodes_block(irn), lv_remove_irn_walker, NULL, &w);
                if(idx < bitset_size(lv->nodes))
                        bitset_clear(lv->nodes, idx);
@@ -879,11 +901,12 @@ void be_live_chk_compare(be_lv_t *lv, lv_chk_t *lvc)
        obstack_ptr_grow(&obst, NULL);
        nodes = obstack_finish(&obst);
 
-       for (i = 0; blocks[i]; ++i) {
-               ir_node *bl = blocks[i];
+       stat_ev_ctx_push("be_lv_chk_compare");
+       for (j = 0; nodes[j]; ++j) {
+               ir_node *irn = nodes[j];
+               for (i = 0; blocks[i]; ++i) {
+                       ir_node *bl = blocks[i];
 
-               for (j = 0; nodes[j]; ++j) {
-                       ir_node *irn = nodes[j];
                        if (!is_Block(irn)) {
                                int lvr_in  = be_is_live_in (lv, bl, irn);
                                int lvr_out = be_is_live_out(lv, bl, irn);
@@ -904,7 +927,7 @@ void be_live_chk_compare(be_lv_t *lv, lv_chk_t *lvc)
                        }
                }
        }
-
+       stat_ev_ctx_pop("be_lv_chk_compare");
 
        obstack_free(&obst, NULL);
 }