cleanup irphase: phase_reinit is a special case and doesn't polute the main callback...
[libfirm] / ir / be / belive.c
index f422869..4a46e93 100644 (file)
@@ -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.
  *
  * @date        06.12.2004
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
-#include "impl.h"
+/* statev is expensive here, only enable when needed */
+#define DISABLE_STATEV
+
 #include "iredges_t.h"
 #include "irgwalk.h"
 #include "irprintf_t.h"
 #include "irbitset.h"
 #include "irdump_t.h"
+#include "irnodeset.h"
+
+#include "dfs_t.h"
+#include "absgraph.h"
+#include "statev.h"
 
 #include "beutil.h"
 #include "belive_t.h"
-#include "besched_t.h"
+#include "beirg.h"
+#include "besched.h"
 #include "bemodule.h"
 
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
-#define LV_STD_SIZE             128
+#define LV_STD_SIZE             64
+
+/* if defined, use binary search for already live nodes, else linear */
 #define LV_USE_BINARY_SEARCH
 #undef  LV_INTESIVE_CHECKS
 
-static INLINE int is_liveness_node(const ir_node *irn)
+void be_live_chk_compare(be_lv_t *lv, lv_chk_t *lvc);
+
+/**
+ * Filter out some nodes for which we never need liveness.
+ *
+ * @param irn  the node t check
+ * @return 0 if no liveness info is needed, 1 else
+ */
+static inline int is_liveness_node(const ir_node *irn)
 {
-       switch(get_irn_opcode(irn)) {
+       switch (get_irn_opcode(irn)) {
        case iro_Block:
        case iro_Bad:
        case iro_End:
+       case iro_Anchor:
+       case iro_NoMem:
                return 0;
-       default:;
+       default:
+               return 1;
        }
-
-       return 1;
-}
-
-int (be_lv_next_irn)(const struct _be_lv_t *lv, const ir_node *bl, unsigned flags, int i)
-{
-       return _be_lv_next_irn(lv, bl, flags, i);
-}
-
-const ir_node * (be_lv_get_irn)(const struct _be_lv_t *lv, const ir_node *bl, int i)
-{
-       return _be_lv_get_irn(lv, bl, i);
 }
 
 int (be_is_live_in)(const be_lv_t *lv, const ir_node *block, const ir_node *irn)
@@ -86,7 +93,7 @@ int (be_is_live_end)(const be_lv_t *lv, const ir_node *block, const ir_node *irn
 
 
 #ifdef LV_USE_BINARY_SEARCH
-static INLINE unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned idx)
+static inline unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned idx)
 {
        struct _be_lv_info_t *payload = arr + 1;
 
@@ -95,25 +102,16 @@ static INLINE unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned
        int lo       = 0;
        int hi       = n;
 
-       if(n == 0)
-               return 0;
-
-#if 0
-       if(idx < payload[0].u.node.idx)
+       if (n == 0)
                return 0;
 
-       if(idx > payload[n - 1].u.node.idx)
-               return n - 1;
-#endif
-
-       /* start a binary search for the requested node. */
-       while(lo < hi) {
+       do {
                int md          = lo + ((hi - lo) >> 1);
                unsigned md_idx = payload[md].u.node.idx;
 
-               if(idx > md_idx)
+               if (idx > md_idx)
                        lo = md + 1;
-               else if(idx < md_idx)
+               else if (idx < md_idx)
                        hi = md;
                else {
                        res = md;
@@ -122,15 +120,15 @@ static INLINE unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned
                }
 
                res = lo;
-       }
+       } while (lo < hi);
 
 #ifdef LV_INTESIVE_CHECKS
        {
                unsigned i;
-               for(i = res; i < n; ++i)
+               for (i = res; i < n; ++i)
                        assert(payload[i].u.node.idx >= idx);
 
-               for(i = 0; i < res; ++i)
+               for (i = 0; i < res; ++i)
                        assert(payload[i].u.node.idx < idx);
        }
 #endif
@@ -143,12 +141,13 @@ static INLINE unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned
 /**
  * This function searches linearly for the node in the array.
  */
-static INLINE unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned idx) {
+static inline unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned idx)
+{
        unsigned n  = arr[0].u.head.n_members;
        unsigned i;
 
-       for(i = 0; i < n; ++i) {
-               if(arr[i + 1].u.node.idx == idx)
+       for (i = 0; i < n; ++i) {
+               if (arr[i + 1].u.node.idx == idx)
                        return i;
        }
 
@@ -158,23 +157,27 @@ 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;
 
-       if(irn_live) {
+       stat_ev_tim_push();
+       irn_live = phase_get_irn_data(&li->ph, bl);
+       if (irn_live) {
                unsigned idx = get_irn_idx(irn);
 
                /* Get the position of the index in the array. */
                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)
@@ -190,23 +193,29 @@ static struct _be_lv_info_node_t *be_lv_get_or_set(struct _be_lv_t *li, ir_node
        struct _be_lv_info_node_t *res = &irn_live[pos + 1].u.node;
 
        /* Check, if the irn is in deed in the array. */
-       if(res->idx != idx) {
+       if (res->idx != idx) {
                struct _be_lv_info_t *payload;
                unsigned n_members = irn_live[0].u.head.n_members;
                unsigned n_size    = irn_live[0].u.head.n_size;
                unsigned i;
 
-               if(n_members == n_size - 1) {
-                       unsigned new_size = 2 * n_size * sizeof(irn_live[0]);
-                       struct _be_lv_info_t *nw = phase_alloc(&li->ph, new_size);
-                       memcpy(nw, irn_live, new_size);
-                       nw[0].u.head.n_size = new_size;
+               if (n_members + 1 >= n_size) {
+                       /* double the array size. Remember that the first entry is
+                        * metadata about the array and not a real array element */
+                       unsigned old_size_bytes  = (n_size + 1) * sizeof(irn_live[0]);
+                       unsigned new_size        = (2 * n_size) + 1;
+                       size_t   new_size_bytes  = new_size * sizeof(irn_live[0]);
+                       struct _be_lv_info_t *nw = phase_alloc(&li->ph, new_size_bytes);
+                       memcpy(nw, irn_live, old_size_bytes);
+                       memset(((char*) nw) + old_size_bytes, 0,
+                              new_size_bytes - old_size_bytes);
+                       nw[0].u.head.n_size = new_size - 1;
                        irn_live = nw;
-                       phase_set_irn_data(&li->ph, irn, nw);
+                       phase_set_irn_data(&li->ph, bl, nw);
                }
 
                payload = &irn_live[1];
-               for(i = n_members; i > pos; --i) {
+               for (i = n_members; i > pos; --i) {
                        payload[i] = payload[i - 1];
                }
 
@@ -224,7 +233,7 @@ static struct _be_lv_info_node_t *be_lv_get_or_set(struct _be_lv_t *li, ir_node
                unsigned last = 0;
                struct _be_lv_info_t *payload = &irn_live[1];
 
-               for(i = 0; i < n; ++i) {
+               for (i = 0; i < n; ++i) {
                        assert(payload[i].u.node.idx >= last);
                        last = payload[i].u.node.idx;
                }
@@ -238,11 +247,12 @@ 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);
 
-       if(irn_live) {
+       if (irn_live) {
                unsigned n   = irn_live[0].u.head.n_members;
                unsigned idx = get_irn_idx(irn);
                unsigned pos = _be_liveness_bsearch(irn_live, idx);
@@ -250,10 +260,10 @@ static int be_lv_remove(struct _be_lv_t *li, ir_node *bl, ir_node *irn)
                struct _be_lv_info_node_t *res = &payload[pos].u.node;
 
                /* The node is in deed in the block's array. Let's remove it. */
-               if(res->idx == idx) {
+               if (res->idx == idx) {
                        unsigned i;
 
-                       for(i = pos + 1; i < n; ++i)
+                       for (i = pos + 1; i < n; ++i)
                                payload[i - 1] = payload[i];
 
                        payload[n - 1].u.node.idx   = 0;
@@ -271,9 +281,9 @@ static int be_lv_remove(struct _be_lv_t *li, ir_node *bl, ir_node *irn)
 static void register_node(be_lv_t *lv, const ir_node *irn)
 {
        unsigned idx = get_irn_idx(irn);
-       if(idx >= bitset_size(lv->nodes)) {
+       if (idx >= bitset_size(lv->nodes)) {
                bitset_t *nw = bitset_malloc(2 * idx);
-               bitset_copy(nw, lv->nodes);
+               bitset_copy_into(nw, lv->nodes);
                bitset_free(lv->nodes);
                lv->nodes = nw;
        }
@@ -284,7 +294,7 @@ static void register_node(be_lv_t *lv, const ir_node *irn)
 /**
  * Mark a node as live-in in a block.
  */
-static INLINE void mark_live_in(be_lv_t *lv, ir_node *block, ir_node *irn)
+static inline void mark_live_in(be_lv_t *lv, ir_node *block, ir_node *irn)
 {
        struct _be_lv_info_node_t *n = be_lv_get_or_set(lv, block, irn);
        DBG((dbg, LEVEL_2, "marking %+F live in at %+F\n", irn, block));
@@ -295,7 +305,7 @@ static INLINE void mark_live_in(be_lv_t *lv, ir_node *block, ir_node *irn)
 /**
  * Mark a node as live-out in a block.
  */
-static INLINE void mark_live_out(be_lv_t *lv, ir_node *block, ir_node *irn)
+static inline void mark_live_out(be_lv_t *lv, ir_node *block, ir_node *irn)
 {
        struct _be_lv_info_node_t *n = be_lv_get_or_set(lv, block, irn);
        DBG((dbg, LEVEL_2, "marking %+F live out at %+F\n", irn, block));
@@ -306,7 +316,7 @@ static INLINE void mark_live_out(be_lv_t *lv, ir_node *block, ir_node *irn)
 /**
  * Mark a node as live-end in a block.
  */
-static INLINE void mark_live_end(be_lv_t *lv, ir_node *block, ir_node *irn)
+static inline void mark_live_end(be_lv_t *lv, ir_node *block, ir_node *irn)
 {
        struct _be_lv_info_node_t *n = be_lv_get_or_set(lv, block, irn);
        DBG((dbg, LEVEL_2, "marking %+F live end at %+F\n", irn, block));
@@ -314,78 +324,90 @@ static INLINE void mark_live_end(be_lv_t *lv, ir_node *block, ir_node *irn)
        register_node(lv, irn);
 }
 
+static struct {
+       be_lv_t  *lv;         /**< The liveness object. */
+       ir_node  *def;        /**< The node (value). */
+       ir_node  *def_block;  /**< The block of def. */
+       bitset_t *visited;    /**< A set were all visited blocks are recorded. */
+} re;
+
 /**
  * Mark a node (value) live out at a certain block. Do this also
  * transitively, i.e. if the block is not the block of the value's
  * definition, all predecessors are also marked live.
- * @param def The node (value).
  * @param block The block to mark the value live out of.
- * @param visited A set were all visited blocks are recorded.
  * @param is_true_out Is the node real out there or only live at the end
  * of the block.
  */
-static void live_end_at_block(be_lv_t *lv, ir_node *def, ir_node *block, bitset_t *visited, int is_true_out)
+static void live_end_at_block(ir_node *block, int is_true_out)
 {
+       be_lv_t *lv  = re.lv;
+       ir_node *def = re.def;
+       bitset_t *visited;
+
        mark_live_end(lv, block, def);
-       if(is_true_out)
+       if (is_true_out)
                mark_live_out(lv, block, def);
 
-       if(!bitset_contains_irn(visited, block)) {
+       visited = re.visited;
+       if (!bitset_contains_irn(visited, block)) {
                bitset_add_irn(visited, block);
 
                /*
-               * If this block is not the definition block, we have to go up
-               * further.
-               */
-               if(get_nodes_block(def) != block) {
-                       int i, n;
+                * If this block is not the definition block, we have to go up
+                * further.
+                */
+               if (re.def_block != block) {
+                       int i;
 
                        mark_live_in(lv, block, def);
 
-                       for(i = 0, n = get_Block_n_cfgpreds(block); i < n; ++i)
-                               live_end_at_block(lv, def, get_Block_cfgpred_block(block, i), visited, 1);
+                       for (i = get_Block_n_cfgpreds(block) - 1; i >= 0; --i)
+                               live_end_at_block(get_Block_cfgpred_block(block, i), 1);
                }
-
        }
 }
 
-struct _lv_walker_t {
+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;
+} lv_remove_walker_t;
+
 
 /**
  * Liveness analysis for a value.
- * This functions is meant to be called by a firm walker, to compute the
- * set of all blocks a value is live in.
- * @param irn The node (value).
- * @param env Ignored.
+ * Compute the set of all blocks a value is live in.
+ * @param irn     The node (value).
  */
-static void liveness_for_node(ir_node *irn, void *data)
+static void liveness_for_node(ir_node *irn)
 {
-       struct _lv_walker_t *walker = data;
-       be_lv_t *lv       = walker->lv;
-       bitset_t *visited = walker->data;
        const ir_edge_t *edge;
        ir_node *def_block;
 
-       /* Don't compute liveness information for non-data nodes. */
-       if(!is_liveness_node(irn))
-               return;
-
-       bitset_clear_all(visited);
+       bitset_clear_all(re.visited);
        def_block = get_nodes_block(irn);
 
+       re.def       = irn;
+       re.def_block = def_block;
+
        /* Go over all uses of the value */
        foreach_out_edge(irn, edge) {
                ir_node *use = edge->src;
                ir_node *use_block;
 
+               DBG((dbg, LEVEL_4, "%+F: use at %+F, pos %d in %+F\n", irn, use, edge->pos, get_block(use)));
+               assert(get_irn_n(use, edge->pos) == irn);
+
                /*
                 * If the usage is no data node, skip this use, since it does not
                 * affect the liveness of the node.
                 */
-               if(!is_liveness_node(use))
+               if (!is_liveness_node(use))
                        continue;
 
                /* Get the block where the usage is in. */
@@ -396,23 +418,23 @@ static void liveness_for_node(ir_node *irn, void *data)
                 * through which the value reaches the phi function and mark the
                 * value as live out of that block.
                 */
-               if(is_Phi(use)) {
+               if (is_Phi(use)) {
                        ir_node *pred_block = get_Block_cfgpred_block(use_block, edge->pos);
-                       live_end_at_block(lv, irn, pred_block, visited, 0);
+                       live_end_at_block(pred_block, 0);
                }
 
                /*
                 * Else, the value is live in at this block. Mark it and call live
                 * out on the predecessors.
                 */
-               else if(def_block != use_block) {
-                       int i, n;
+               else if (def_block != use_block) {
+                       int i;
 
-                       mark_live_in(lv, use_block, irn);
+                       mark_live_in(re.lv, use_block, irn);
 
-                       for(i = 0, n = get_Block_n_cfgpreds(use_block); i < n; ++i) {
+                       for (i = get_Block_n_cfgpreds(use_block) - 1; i >= 0; --i) {
                                ir_node *pred_block = get_Block_cfgpred_block(use_block, i);
-                               live_end_at_block(lv, irn, pred_block, visited, 1);
+                               live_end_at_block(pred_block, 1);
                        }
                }
        }
@@ -420,10 +442,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)
@@ -444,16 +464,16 @@ static const char *lv_flags_to_str(unsigned flags)
 
 static void lv_dump_block(void *context, FILE *f, const ir_node *bl)
 {
-       if(is_Block(bl)) {
+       if (is_Block(bl)) {
                be_lv_t *lv = context;
                struct _be_lv_info_t *info = phase_get_irn_data(&lv->ph, bl);
 
                fprintf(f, "liveness:\n");
-               if(info) {
+               if (info) {
                        unsigned n = info[0].u.head.n_members;
                        unsigned i;
 
-                       for(i = 0; i < n; ++i) {
+                       for (i = 0; i < n; ++i) {
                                struct _be_lv_info_node_t *n = &info[i+1].u.node;
                                ir_fprintf(f, "%s %+F\n", lv_flags_to_str(n->flags), get_idx_irn(lv->irg, n->idx));
                        }
@@ -461,89 +481,167 @@ 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)
 {
        struct _be_lv_info_t *info = phase_alloc(phase, LV_STD_SIZE * sizeof(info[0]));
+       (void) irn;
+
        memset(info, 0, LV_STD_SIZE * sizeof(info[0]));
        info[0].u.head.n_size = LV_STD_SIZE - 1;
        return info;
 }
 
+/**
+ * Walker, collect all nodes for which we want calculate liveness info
+ * on an obstack.
+ */
+static void collect_liveness_nodes(ir_node *irn, void *data)
+{
+       ir_node **nodes = data;
+       if (is_liveness_node(irn))
+               nodes[get_irn_idx(irn)] = irn;
+}
+
 static void compute_liveness(be_lv_t *lv)
 {
-       struct _lv_walker_t w;
-       w.lv   = lv;
-       w.data = bitset_malloc(get_irg_last_idx(lv->irg));
-       irg_walk_graph(lv->irg, liveness_for_node, NULL, &w);
-       bitset_free(w.data);
+       ir_node **nodes;
+       int i, n;
+
+       stat_ev_tim_push();
+       n = get_irg_last_idx(lv->irg);
+       nodes = NEW_ARR_F(ir_node *, n);
+       memset(nodes, 0, sizeof(nodes[0]) * n);
+
+       /*
+        * inserting the variables sorted by their ID is probably
+        * more efficient since the binary sorted set insertion
+        * will not need to move around the data.
+        */
+       irg_walk_graph(lv->irg, NULL, collect_liveness_nodes, nodes);
+
+       re.lv      = lv;
+       re.visited = bitset_malloc(n);
+
+       for (i = 0; i < n; ++i) {
+               if (nodes[i] != NULL)
+                       liveness_for_node(nodes[i]);
+       }
+
+       DEL_ARR_F(nodes);
+       free(re.visited);
+       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, lv->irg, lv_phase_data_init);
+               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
+}
+
+void be_liveness_invalidate(be_lv_t *lv)
+{
+       if (lv && lv->nodes) {
+               unregister_hook(hook_node_info, &lv->hook_info);
+               phase_deinit(&lv->ph);
+               bitset_free(lv->nodes);
+               lv->nodes = NULL;
+       }
 }
 
 /* Compute the inter block liveness for a graph. */
 be_lv_t *be_liveness(ir_graph *irg)
 {
-       be_lv_t *lv = xmalloc(sizeof(lv[0]));
+       be_lv_t *lv = XMALLOCZ(be_lv_t);
 
-       memset(lv, 0, sizeof(lv[0]));
-       lv->irg = irg;
-       lv->nodes = bitset_malloc(2 * get_irg_last_idx(irg));
+       lv->irg  = irg;
+#ifdef USE_LIVE_CHK
+       lv->dfs  = dfs_new(&absgraph_irg_cfg_succ, 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;
-       register_hook(hook_node_info, &lv->hook_info);
-       phase_init(&lv->ph, "liveness", irg, PHASE_DEFAULT_GROWTH, lv_phase_data_init, NULL);
-       compute_liveness(lv);
 
        return lv;
 }
 
 void be_liveness_recompute(be_lv_t *lv)
 {
-       unsigned last_idx = get_irg_last_idx(lv->irg);
-       if(last_idx >= bitset_size(lv->nodes)) {
+       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);
+       phase_deinit(&lv->ph);
+       phase_init(&lv->ph, lv->irg, lv_phase_data_init);
        compute_liveness(lv);
+
+       be_timer_pop(T_LIVE);
 }
 
 
 void be_liveness_free(be_lv_t *lv)
 {
-       unregister_hook(hook_node_info, &lv->hook_info);
-       phase_free(&lv->ph);
-       bitset_free(lv->nodes);
-       free(lv);
+       be_liveness_invalidate(lv);
+#ifdef USE_LIVE_CHK
+       lv_chk_free(lv->lvc);
+       dfs_free(lv->dfs);
+#endif
+       xfree(lv);
 }
 
-void be_liveness_remove(be_lv_t *lv, ir_node *irn)
+void be_liveness_remove(be_lv_t *lv, const ir_node *irn)
 {
-       unsigned idx = get_irn_idx(irn);
-       struct _lv_walker_t w;
+       if (lv->nodes) {
+               unsigned idx = get_irn_idx(irn);
+               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;
-       dom_tree_walk(get_nodes_block(irn), lv_remove_irn_walker, NULL, &w);
-       if(idx < bitset_size(lv->nodes))
-               bitset_clear(lv->nodes, idx);
+               /*
+                * 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.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);
+       }
 }
 
 void be_liveness_introduce(be_lv_t *lv, ir_node *irn)
 {
-       struct _lv_walker_t w;
-       w.lv   = lv;
-       w.data = bitset_malloc(get_irg_last_idx(lv->irg));
-       liveness_for_node(irn, &w);
-       bitset_free(w.data);
+       /* Don't compute liveness information for non-data nodes. */
+       if (lv->nodes && is_liveness_node(irn)) {
+               re.lv      = lv;
+               re.visited = bitset_malloc(get_irg_last_idx(lv->irg));
+               liveness_for_node(irn);
+               bitset_free(re.visited);
+       }
 }
 
 void be_liveness_update(be_lv_t *lv, ir_node *irn)
@@ -552,58 +650,41 @@ void be_liveness_update(be_lv_t *lv, ir_node *irn)
        be_liveness_introduce(lv, irn);
 }
 
-static void lv_add_missing_walker(ir_node *irn, void *data)
-{
-       struct _lv_walker_t *w = data;
-       if(!is_Block(irn) && !bitset_contains_irn(w->lv->nodes, irn)) {
-               liveness_for_node(irn, w);
-       }
-}
-
-void be_liveness_add_missing(be_lv_t *lv)
-{
-       struct _lv_walker_t w;
-       w.lv   = lv;
-       w.data = bitset_malloc(get_irg_last_idx(lv->irg));
-       irg_walk_graph(lv->irg, lv_add_missing_walker, NULL, &w);
-       bitset_free(w.data);
-}
-
 static void lv_check_walker(ir_node *bl, void *data)
 {
-       struct _lv_walker_t *w = data;
+       lv_walker_t *w = data;
        be_lv_t *lv    = w->lv;
        be_lv_t *fresh = w->data;
 
        struct _be_lv_info_t *curr = phase_get_irn_data(&lv->ph, bl);
        struct _be_lv_info_t *fr   = phase_get_irn_data(&fresh->ph, bl);
 
-       if(!fr && curr && curr[0].u.head.n_members > 0) {
+       if (!fr && curr && curr[0].u.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].u.head.n_members; ++i) {
+               for (i = 0; i < curr[0].u.head.n_members; ++i) {
                        ir_fprintf(stderr, "\t%+F\n", get_idx_irn(lv->irg, curr[1 + i].u.node.idx));
                }
        }
 
-       else if(curr) {
+       else if (curr) {
                unsigned n_curr  = curr[0].u.head.n_members;
                unsigned n_fresh = fr[0].u.head.n_members;
 
                unsigned i;
 
-               if(n_curr != n_fresh) {
+               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) {
+                       for (i = 0; i < n_curr; ++i) {
                                struct _be_lv_info_node_t *n = &curr[1 + i].u.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) {
+                       for (i = 0; i < n_fresh; ++i) {
                                struct _be_lv_info_node_t *n = &fr[1 + i].u.node;
                                ir_fprintf(stderr, "%+F %u %+F %s\n", bl, i, get_idx_irn(lv->irg, n->idx), lv_flags_to_str(n->flags));
                        }
@@ -613,7 +694,7 @@ static void lv_check_walker(ir_node *bl, void *data)
 
 void be_liveness_check(be_lv_t *lv)
 {
-       struct _lv_walker_t w;
+       lv_walker_t w;
        be_lv_t *fresh = be_liveness(lv->irg);
 
        w.lv   = lv;
@@ -625,8 +706,8 @@ void be_liveness_check(be_lv_t *lv)
 
 static void lv_dump_block_walker(ir_node *irn, void *data)
 {
-       struct _lv_walker_t *w = data;
-       if(is_Block(irn))
+       lv_walker_t *w = data;
+       if (is_Block(irn))
                lv_dump_block(w->lv, w->data, irn);
 }
 
@@ -634,7 +715,7 @@ static void lv_dump_block_walker(ir_node *irn, void *data)
 /* Dump the liveness information for a graph. */
 void be_liveness_dump(const be_lv_t *lv, FILE *f)
 {
-       struct _lv_walker_t w;
+       lv_walker_t w;
 
        w.lv   = (be_lv_t *) lv;
        w.data = f;
@@ -647,7 +728,7 @@ 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) {
+       if ((f = fopen(buf, "wt")) != NULL) {
                be_liveness_dump(lv, f);
                fclose(f);
        }
@@ -661,19 +742,19 @@ static void dom_check(ir_node *irn, void *data)
 {
        int *problem_found = data;
 
-       if(!is_Block(irn) && irn != get_irg_end(get_irn_irg(irn))) {
+       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) {
+               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))
+                       if (is_Phi(irn))
                                use_bl = get_Block_cfgpred_block(bl, i);
 
-                       if(get_irn_opcode(use_bl) != iro_Bad
+                       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)));
@@ -694,79 +775,136 @@ int be_check_dominance(ir_graph *irg)
        return !problem_found;
 }
 
-pset *be_liveness_transfer(const arch_env_t *arch_env, const arch_register_class_t *cls, ir_node *irn, pset *live)
+void be_liveness_transfer(const arch_register_class_t *cls,
+                          ir_node *node, ir_nodeset_t *nodeset)
 {
-       int i, n;
+       int i, arity;
 
-       /* You should better break out of your loop when hitting the first phi function. */
-       assert(!is_Phi(irn) && "liveness_transfer produces invalid results for phi nodes");
+       /* You should better break out of your loop when hitting the first phi
+        * function. */
+       assert(!is_Phi(node) && "liveness_transfer produces invalid results for phi nodes");
 
-       if(arch_irn_consider_in_reg_alloc(arch_env, cls, irn)) {
-               ir_node *del = pset_remove_ptr(live, irn);
-               (void) del;
-               assert(irn == del);
-       }
+       if (get_irn_mode(node) == mode_T) {
+               const ir_edge_t *edge;
 
-       for(i = 0, n = get_irn_arity(irn); i < n; ++i) {
-               ir_node *op = get_irn_n(irn, i);
+               foreach_out_edge(node, edge) {
+                       ir_node *proj = get_edge_src_irn(edge);
 
-               if(arch_irn_consider_in_reg_alloc(arch_env, cls, op))
-                       pset_insert_ptr(live, op);
+                       if (arch_irn_consider_in_reg_alloc(cls, proj)) {
+                               ir_nodeset_remove(nodeset, proj);
+                       }
+               }
+       } else if (arch_irn_consider_in_reg_alloc(cls, node)) {
+               ir_nodeset_remove(nodeset, node);
        }
 
-       return live;
+       arity = get_irn_arity(node);
+       for (i = 0; i < arity; ++i) {
+               ir_node *op = get_irn_n(node, i);
+
+               if (arch_irn_consider_in_reg_alloc(cls, op))
+                       ir_nodeset_insert(nodeset, op);
+       }
 }
 
-pset *be_liveness_end_of_block(const be_lv_t *lv, const arch_env_t *arch_env, const arch_register_class_t *cls, const ir_node *bl, pset *live)
+
+
+void be_liveness_end_of_block(const be_lv_t *lv,
+                              const arch_register_class_t *cls,
+                              const ir_node *block, ir_nodeset_t *live)
 {
        int i;
-       be_lv_foreach(lv, bl, be_lv_state_end, i) {
-               ir_node *irn = be_lv_get_irn(lv, bl, i);
-               if(arch_irn_consider_in_reg_alloc(arch_env, cls, irn))
-                       pset_insert_ptr(live, irn);
-       }
 
-       return live;
+       assert(lv->nodes && "live sets must be computed");
+       be_lv_foreach(lv, block, be_lv_state_end, i) {
+               ir_node *node = be_lv_get_irn(lv, block, i);
+               if (!arch_irn_consider_in_reg_alloc(cls, node))
+                       continue;
+
+               ir_nodeset_insert(live, node);
+       }
 }
 
-pset *be_liveness_nodes_live_at(const be_lv_t *lv, const arch_env_t *arch_env, const arch_register_class_t *cls, const ir_node *pos, pset *live)
+
+
+void be_liveness_nodes_live_at(const be_lv_t *lv,
+                               const arch_register_class_t *cls,
+                               const ir_node *pos, ir_nodeset_t *live)
 {
        const ir_node *bl = is_Block(pos) ? pos : get_nodes_block(pos);
        ir_node *irn;
 
-       be_liveness_end_of_block(lv, arch_env, cls, bl, live);
+       be_liveness_end_of_block(lv, cls, bl, live);
        sched_foreach_reverse(bl, irn) {
                /*
                 * If we encounter the node we want to insert the Perm after,
                 * exit immediately, so that this node is still live
                 */
-               if(irn == pos)
-                       return live;
+               if (irn == pos)
+                       return;
 
-               be_liveness_transfer(arch_env, cls, irn, live);
+               be_liveness_transfer(cls, irn, live);
        }
+}
 
-       return live;
+static void collect_node(ir_node *irn, void *data)
+{
+       struct obstack *obst = data;
+       obstack_ptr_grow(obst, irn);
 }
 
-pset *be_liveness_nodes_live_at_input(const be_lv_t *lv, const arch_env_t *arch_env, const arch_register_class_t *cls, const ir_node *pos, pset *live)
+void be_live_chk_compare(be_lv_t *lv, lv_chk_t *lvc)
 {
-       const ir_node *bl = is_Block(pos) ? pos : get_nodes_block(pos);
-       ir_node *irn;
+       ir_graph *irg    = lv->irg;
 
-       be_liveness_end_of_block(lv, arch_env, cls, bl, live);
-       sched_foreach_reverse(bl, irn) {
-               be_liveness_transfer(arch_env, cls, irn, live);
-               if(irn == pos)
-                       return live;
+       struct obstack obst;
+       ir_node **nodes;
+       ir_node **blocks;
+       int i, j;
+
+       obstack_init(&obst);
+
+       irg_block_walk_graph(irg, collect_node, NULL, &obst);
+       obstack_ptr_grow(&obst, NULL);
+       blocks = obstack_finish(&obst);
+
+       irg_walk_graph(irg, collect_node, NULL, &obst);
+       obstack_ptr_grow(&obst, NULL);
+       nodes = obstack_finish(&obst);
+
+       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];
+
+                       if (!is_Block(irn)) {
+                               int lvr_in  = be_is_live_in (lv, bl, irn);
+                               int lvr_out = be_is_live_out(lv, bl, irn);
+                               int lvr_end = be_is_live_end(lv, bl, irn);
+
+                               int lvc_in  = lv_chk_bl_in (lvc, bl, irn);
+                               int lvc_out = lv_chk_bl_out(lvc, bl, irn);
+                               int lvc_end = lv_chk_bl_end(lvc, bl, irn);
+
+                               if (lvr_in - lvc_in != 0)
+                                       ir_fprintf(stderr, "live in  info for %+F at %+F differs: nml: %d, chk: %d\n", irn, bl, lvr_in, lvc_in);
+
+                               if (lvr_end - lvc_end != 0)
+                                       ir_fprintf(stderr, "live end info for %+F at %+F differs: nml: %d, chk: %d\n", irn, bl, lvr_end, lvc_end);
+
+                               if (lvr_out - lvc_out != 0)
+                                       ir_fprintf(stderr, "live out info for %+F at %+F differs: nml: %d, chk: %d\n", irn, bl, lvr_out, lvc_out);
+                       }
+               }
        }
+       stat_ev_ctx_pop("be_lv_chk_compare");
 
-       return live;
+       obstack_free(&obst, NULL);
 }
 
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_live);
 void be_init_live(void)
 {
        FIRM_DBG_REGISTER(dbg, "firm.be.liveness");
 }
-
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_live);