Remove the unused function be_liveness_nodes_live_at_input().
[libfirm] / ir / be / belive.c
index ac22510..c1537e1 100644 (file)
@@ -1,28 +1,79 @@
+/*
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
+ */
+
 /**
- * Interblock liveness analysis.
- * @author Sebastian Hack
- * @date 6.12.2004
+ * @file
+ * @brief       Interblock liveness analysis.
+ * @author      Sebastian Hack
+ * @date        06.12.2004
+ * @version     $Id$
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
+/* statev is expensive here, only enable when needed */
+#define DISABLE_STATEV
+
 #include "impl.h"
 #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 "beirg_t.h"
 #include "besched_t.h"
+#include "bemodule.h"
 
-#define DBG_MODULE              "firm.be.liveness"
+DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
 
-#define LV_STD_SIZE             128
+/* see comment in compute_liveness() */
+#define LV_COMPUTE_SORTED
+#define LV_STD_SIZE             64
 #define LV_USE_BINARY_SEARCH
 #undef  LV_INTESIVE_CHECKS
 
+void be_live_chk_compare(be_lv_t *lv, lv_chk_t *lvc);
+
+static INLINE int is_liveness_node(const ir_node *irn)
+{
+       switch(get_irn_opcode(irn)) {
+       case iro_Block:
+       case iro_Bad:
+       case iro_End:
+       case iro_Anchor:
+       case iro_NoMem:
+               return 0;
+       default:;
+       }
+
+       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);
@@ -62,15 +113,6 @@ static INLINE unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned
        if(n == 0)
                return 0;
 
-#if 0
-       if(idx < payload[0].u.node.idx)
-               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) {
                int md          = lo + ((hi - lo) >> 1);
                unsigned md_idx = payload[md].u.node.idx;
@@ -105,7 +147,7 @@ static INLINE unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned
 #else
 
 /**
- * This function searches linearily for the node in the array.
+ * This function searches linearly for the node in the array.
  */
 static INLINE unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned idx) {
        unsigned n  = arr[0].u.head.n_members;
@@ -122,8 +164,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);
 
@@ -131,14 +176,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)
@@ -160,13 +206,19 @@ static struct _be_lv_info_node_t *be_lv_get_or_set(struct _be_lv_t *li, ir_node
                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];
@@ -202,7 +254,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);
 
@@ -224,7 +277,7 @@ static int be_lv_remove(struct _be_lv_t *li, ir_node *bl, ir_node *irn)
                        payload[n - 1].u.node.flags = 0;
 
                        --irn_live[0].u.head.n_members;
-                       DBG((li->dbg, LEVEL_3, "\tdeleting %+F from %+F at pos %d\n", irn, bl, pos));
+                       DBG((dbg, LEVEL_3, "\tdeleting %+F from %+F at pos %d\n", irn, bl, pos));
                        return 1;
                }
        }
@@ -251,7 +304,7 @@ static void register_node(be_lv_t *lv, const 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((lv->dbg, LEVEL_2, "marking %+F live in at %+F\n", irn, block));
+       DBG((dbg, LEVEL_2, "marking %+F live in at %+F\n", irn, block));
        n->flags |= be_lv_state_in;
        register_node(lv, irn);
 }
@@ -262,7 +315,7 @@ static INLINE void mark_live_in(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((lv->dbg, LEVEL_2, "marking %+F live out at %+F\n", irn, block));
+       DBG((dbg, LEVEL_2, "marking %+F live out at %+F\n", irn, block));
        n->flags |= be_lv_state_out | be_lv_state_end;
        register_node(lv, irn);
 }
@@ -273,7 +326,7 @@ static INLINE void mark_live_out(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((lv->dbg, LEVEL_2, "marking %+F live end at %+F\n", irn, block));
+       DBG((dbg, LEVEL_2, "marking %+F live end at %+F\n", irn, block));
        n->flags |= be_lv_state_end;
        register_node(lv, irn);
 }
@@ -318,6 +371,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
@@ -334,7 +393,7 @@ static void liveness_for_node(ir_node *irn, void *data)
        ir_node *def_block;
 
        /* Don't compute liveness information for non-data nodes. */
-       if(!is_data_node(irn))
+       if(!is_liveness_node(irn))
                return;
 
        bitset_clear_all(visited);
@@ -345,30 +404,33 @@ static void liveness_for_node(ir_node *irn, void *data)
                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_data_node(use))
+                * 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))
                        continue;
 
                /* Get the block where the usage is in. */
                use_block = get_nodes_block(use);
 
                /*
-               * If the use is a phi function, determine the corresponding block
-               * through which the value reaches the phi function and mark the
-               * value as live out of that block.
-               */
+                * If the use is a phi function, determine the corresponding block
+                * through which the value reaches the phi function and mark the
+                * value as live out of that block.
+                */
                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);
                }
 
                /*
-               * Else, the value is live in at this block. Mark it and call live
-               * out on the predecessors.
-               */
+                * 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;
 
@@ -384,10 +446,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)
@@ -425,90 +485,178 @@ static void lv_dump_block(void *context, FILE *f, const ir_node *bl)
        }
 }
 
-static void *lv_phase_data_init(phase_t *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;
+       (void) old;
+
        memset(info, 0, LV_STD_SIZE * sizeof(info[0]));
        info[0].u.head.n_size = LV_STD_SIZE - 1;
        return info;
 }
 
+static void collect_nodes(ir_node *irn, void *data)
+{
+       struct obstack *obst = data;
+       if (is_liveness_node(irn))
+               obstack_ptr_grow(obst, irn);
+}
+
+static int node_idx_cmp(const void *a, const void *b)
+{
+       const ir_node *p = *(ir_node **) a;
+       const ir_node *q = *(ir_node **) b;
+       int ia = get_irn_idx(p);
+       int ib = get_irn_idx(q);
+       return ia - ib;
+}
+
 static void compute_liveness(be_lv_t *lv)
 {
+       struct obstack obst;
        struct _lv_walker_t w;
+       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]);
+       nodes  = obstack_finish(&obst);
+
+       /*
+        * 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.
+        * However, if sorting the variables a priori pays off
+        * needs to be checked, hence the define.
+        */
+#ifdef LV_COMPUTE_SORTED
+       qsort(nodes, n, sizeof(nodes[0]), node_idx_cmp);
+#endif
+
        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);
+       w.data = bitset_obstack_alloc(&obst, get_irg_last_idx(lv->irg));
+
+       for (i = 0; i < n; ++i)
+               liveness_for_node(nodes[i], &w);
+
+       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
+}
+
+void be_liveness_invalidate(be_lv_t *lv)
+{
+       if (lv && lv->nodes) {
+               unregister_hook(hook_node_info, &lv->hook_info);
+               phase_free(&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 *be_liveness(const be_irg_t *birg)
 {
-       be_lv_t *lv = xmalloc(sizeof(lv[0]));
+       be_lv_t *lv = XMALLOCZ(be_lv_t);
 
-       memset(lv, 0, sizeof(lv[0]));
-       FIRM_DBG_REGISTER(lv->dbg, DBG_MODULE);
-       lv->irg = irg;
-       lv->nodes = bitset_malloc(2 * get_irg_last_idx(irg));
+       lv->irg  = be_get_birg_irg(birg);
+       lv->birg = birg;
+#ifdef USE_LIVE_CHK
+       lv->dfs  = dfs_new(&absgraph_irg_cfg_succ, lv->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);
-       compute_liveness(lv);
 
        return lv;
 }
 
 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);
+       phase_init(&lv->ph, "liveness", lv->irg, PHASE_DEFAULT_GROWTH, lv_phase_data_init, NULL);
        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);
+       if (lv->nodes) {
+               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);
+       }
 }
 
 void be_liveness_update(be_lv_t *lv, ir_node *irn)
@@ -517,23 +665,6 @@ 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;
@@ -555,7 +686,6 @@ static void lv_check_walker(ir_node *bl, void *data)
        else if(curr) {
                unsigned n_curr  = curr[0].u.head.n_members;
                unsigned n_fresh = fr[0].u.head.n_members;
-               unsigned n = MIN(n_curr, n_fresh);
 
                unsigned i;
 
@@ -580,7 +710,7 @@ static void lv_check_walker(ir_node *bl, void *data)
 void be_liveness_check(be_lv_t *lv)
 {
        struct _lv_walker_t w;
-       be_lv_t *fresh = be_liveness(lv->irg);
+       be_lv_t *fresh = be_liveness(lv->birg);
 
        w.lv   = lv;
        w.data = fresh;
@@ -625,6 +755,8 @@ void be_liveness_dumpto(const be_lv_t *lv, const char *cls_name)
  */
 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))) {
                int i, n;
                ir_node *bl = get_nodes_block(irn);
@@ -637,78 +769,158 @@ static void dom_check(ir_node *irn, void *data)
                        if(is_Phi(irn))
                                use_bl = get_Block_cfgpred_block(bl, i);
 
-                       if(!block_dominates(def_bl, use_bl)) {
-                               ir_fprintf(stderr, "%+F in %+F must dominate %+F for user %+F\n", op, def_bl, use_bl, irn);
-                               assert(0);
+                       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. */
-void be_check_dominance(ir_graph *irg)
+int be_check_dominance(ir_graph *irg)
 {
-       irg_walk_graph(irg, dom_check, NULL, NULL);
+       int problem_found = 0;
+
+       assure_doms(irg);
+       irg_walk_graph(irg, dom_check, NULL, &problem_found);
+
+       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;
-       ir_node *x;
-       FIRM_DBG_REGISTER(firm_dbg_module_t *dbg, DBG_MODULE);
+       int i, arity;
+
+       /* 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");
 
-       DEBUG_ONLY(
-               DBG((dbg, LEVEL_1, "%+F\n", irn));
-               for(x = pset_first(live); x; x = pset_next(live))
-                       DBG((dbg, LEVEL_1, "\tlive: %+F\n", x));
-       )
+       if (get_irn_mode(node) == mode_T) {
+               const ir_edge_t *edge;
 
-       /* 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");
+               foreach_out_edge(node, edge) {
+                       ir_node *proj = get_edge_src_irn(edge);
 
-       if(arch_irn_consider_in_reg_alloc(arch_env, cls, irn)) {
-               ir_node *del = pset_remove_ptr(live, irn);
-               assert(irn == del);
+                       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);
        }
 
-       for(i = 0, n = get_irn_arity(irn); i < n; ++i) {
-               ir_node *op = get_irn_n(irn, i);
+       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(arch_env, cls, op))
-                       pset_insert_ptr(live, op);
+               if (arch_irn_consider_in_reg_alloc(cls, op))
+                       ir_nodeset_insert(nodeset, op);
        }
-
-       return live;
 }
 
-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;
+                       return;
+
+               be_liveness_transfer(cls, irn, live);
+       }
+}
+
+static void collect_node(ir_node *irn, void *data)
+{
+       struct obstack *obst = data;
+       obstack_ptr_grow(obst, irn);
+}
+
+void be_live_chk_compare(be_lv_t *lv, lv_chk_t *lvc)
+{
+       ir_graph *irg    = lv->irg;
+
+       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);
 
-               be_liveness_transfer(arch_env, cls, irn, live);
+                               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);
 }
+
+void be_init_live(void)
+{
+       FIRM_DBG_REGISTER(dbg, "firm.be.liveness");
+}
+
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_live);