X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbelive.c;h=8ab7a8dc3c67f91f492d704044ae87bd50dba3b1;hb=6bf9142e848b30660e943a4628cfec9647b98de5;hp=77a49e61dac22f87d0870b0e3495bd4ab0d33a9f;hpb=0df5e0ea5d4d6a566339ac4b93a73719858e81e1;p=libfirm diff --git a/ir/be/belive.c b/ir/be/belive.c index 77a49e61d..8ab7a8dc3 100644 --- a/ir/be/belive.c +++ b/ir/be/belive.c @@ -22,7 +22,6 @@ * @brief Interblock liveness analysis. * @author Sebastian Hack * @date 06.12.2004 - * @version $Id$ */ #include "config.h" @@ -32,30 +31,23 @@ #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 "statev_t.h" #include "beutil.h" #include "belive_t.h" #include "beirg.h" #include "besched.h" #include "bemodule.h" +#include "bedump.h" DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;) #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 - -void be_live_chk_compare(be_lv_t *lv, lv_chk_t *lvc); - /** * Filter out some nodes for which we never need liveness. * @@ -91,13 +83,11 @@ int (be_is_live_end)(const be_lv_t *lv, const ir_node *block, const ir_node *irn return _be_is_live_xxx(lv, block, irn, be_lv_state_end); } - -#ifdef LV_USE_BINARY_SEARCH static inline unsigned _be_liveness_bsearch(be_lv_info_t *arr, unsigned idx) { be_lv_info_t *payload = arr + 1; - unsigned n = arr[0].u.head.n_members; + unsigned n = arr[0].head.n_members; unsigned res = 0; int lo = 0; int hi = n; @@ -107,7 +97,7 @@ static inline unsigned _be_liveness_bsearch(be_lv_info_t *arr, unsigned idx) do { int md = lo + ((hi - lo) >> 1); - unsigned md_idx = payload[md].u.node.idx; + unsigned md_idx = payload[md].node.idx; if (idx > md_idx) lo = md + 1; @@ -115,61 +105,32 @@ static inline unsigned _be_liveness_bsearch(be_lv_info_t *arr, unsigned idx) hi = md; else { res = md; - assert(payload[res].u.node.idx == idx); + assert(payload[res].node.idx == idx); break; } res = lo; } while (lo < hi); -#ifdef LV_INTESIVE_CHECKS - { - unsigned i; - for (i = res; i < n; ++i) - assert(payload[i].u.node.idx >= idx); - - for (i = 0; i < res; ++i) - assert(payload[i].u.node.idx < idx); - } -#endif - return res; } -#else - -/** - * This function searches linearly for the node in the array. - */ -static inline unsigned _be_liveness_bsearch(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) - return i; - } - - return i; -} -#endif - -be_lv_info_node_t *be_lv_get(const be_lv_t *li, const ir_node *bl, const ir_node *irn) +be_lv_info_node_t *be_lv_get(const be_lv_t *li, const ir_node *bl, + const ir_node *irn) { be_lv_info_t *irn_live; be_lv_info_node_t *res = NULL; stat_ev_tim_push(); - irn_live = (be_lv_info_t*)phase_get_irn_data(&li->ph, bl); - if (irn_live) { + irn_live = ir_nodehashmap_get(be_lv_info_t, &li->map, bl); + if (irn_live != NULL) { 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. */ - be_lv_info_node_t *rec = &irn_live[pos + 1].u.node; + be_lv_info_node_t *rec = &irn_live[pos + 1].node; /* Check, if the irn is in deed in the array. */ if (rec->idx == idx) @@ -180,9 +141,15 @@ be_lv_info_node_t *be_lv_get(const be_lv_t *li, const ir_node *bl, const ir_node return res; } -static be_lv_info_node_t *be_lv_get_or_set(be_lv_t *li, ir_node *bl, ir_node *irn) +static be_lv_info_node_t *be_lv_get_or_set(be_lv_t *li, ir_node *bl, + ir_node *irn) { - be_lv_info_t *irn_live = (be_lv_info_t*)phase_get_or_set_irn_data(&li->ph, bl); + be_lv_info_t *irn_live = ir_nodehashmap_get(be_lv_info_t, &li->map, bl); + if (irn_live == NULL) { + irn_live = OALLOCNZ(&li->obst, be_lv_info_t, LV_STD_SIZE); + irn_live[0].head.n_size = LV_STD_SIZE-1; + ir_nodehashmap_insert(&li->map, bl, irn_live); + } unsigned idx = get_irn_idx(irn); @@ -190,13 +157,13 @@ static be_lv_info_node_t *be_lv_get_or_set(be_lv_t *li, ir_node *bl, ir_node *ir unsigned 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. */ - be_lv_info_node_t *res = &irn_live[pos + 1].u.node; + be_lv_info_node_t *res = &irn_live[pos + 1].node; /* Check, if the irn is in deed in the array. */ if (res->idx != idx) { 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 n_members = irn_live[0].head.n_members; + unsigned n_size = irn_live[0].head.n_size; unsigned i; if (n_members + 1 >= n_size) { @@ -205,13 +172,13 @@ static be_lv_info_node_t *be_lv_get_or_set(be_lv_t *li, ir_node *bl, ir_node *ir 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]); - be_lv_info_t *nw = (be_lv_info_t*)phase_alloc(&li->ph, new_size_bytes); + be_lv_info_t *nw = OALLOCN(&li->obst, be_lv_info_t, new_size); 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; + nw[0].head.n_size = new_size - 1; irn_live = nw; - phase_set_irn_data(&li->ph, bl, nw); + ir_nodehashmap_insert(&li->map, bl, nw); } payload = &irn_live[1]; @@ -219,27 +186,13 @@ static be_lv_info_node_t *be_lv_get_or_set(be_lv_t *li, ir_node *bl, ir_node *ir payload[i] = payload[i - 1]; } - ++irn_live[0].u.head.n_members; + ++irn_live[0].head.n_members; - res = &payload[pos].u.node; + res = &payload[pos].node; res->idx = idx; res->flags = 0; } -#ifdef LV_INTESIVE_CHECKS - { - unsigned i; - unsigned n = irn_live[0].u.head.n_members; - unsigned last = 0; - be_lv_info_t *payload = &irn_live[1]; - - for (i = 0; i < n; ++i) { - assert(payload[i].u.node.idx >= last); - last = payload[i].u.node.idx; - } - } -#endif - return res; } @@ -250,14 +203,14 @@ static be_lv_info_node_t *be_lv_get_or_set(be_lv_t *li, ir_node *bl, ir_node *ir static int be_lv_remove(be_lv_t *li, const ir_node *bl, const ir_node *irn) { - be_lv_info_t *irn_live = (be_lv_info_t*)phase_get_irn_data(&li->ph, bl); + be_lv_info_t *irn_live = ir_nodehashmap_get(be_lv_info_t, &li->map, bl); - if (irn_live) { - unsigned n = irn_live[0].u.head.n_members; + if (irn_live != NULL) { + unsigned n = irn_live[0].head.n_members; unsigned idx = get_irn_idx(irn); unsigned pos = _be_liveness_bsearch(irn_live, idx); be_lv_info_t *payload = irn_live + 1; - be_lv_info_node_t *res = &payload[pos].u.node; + be_lv_info_node_t *res = &payload[pos].node; /* The node is in deed in the block's array. Let's remove it. */ if (res->idx == idx) { @@ -266,10 +219,10 @@ static int be_lv_remove(be_lv_t *li, const ir_node *bl, for (i = pos + 1; i < n; ++i) payload[i - 1] = payload[i]; - payload[n - 1].u.node.idx = 0; - payload[n - 1].u.node.flags = 0; + payload[n - 1].node.idx = 0; + payload[n - 1].node.flags = 0; - --irn_live[0].u.head.n_members; + --irn_live[0].head.n_members; DBG((dbg, LEVEL_3, "\tdeleting %+F from %+F at pos %d\n", irn, bl, pos)); return 1; } @@ -278,19 +231,6 @@ static int be_lv_remove(be_lv_t *li, const ir_node *bl, return 0; } -static void register_node(be_lv_t *lv, const ir_node *irn) -{ - unsigned idx = get_irn_idx(irn); - if (idx >= bitset_size(lv->nodes)) { - bitset_t *nw = bitset_malloc(2 * idx); - bitset_copy_into(nw, lv->nodes); - bitset_free(lv->nodes); - lv->nodes = nw; - } - - bitset_set(lv->nodes, idx); -} - /** * Mark a node as live-in in a block. */ @@ -299,7 +239,6 @@ static inline void mark_live_in(be_lv_t *lv, ir_node *block, ir_node *irn) 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)); n->flags |= be_lv_state_in; - register_node(lv, irn); } /** @@ -310,7 +249,6 @@ static inline void mark_live_out(be_lv_t *lv, ir_node *block, ir_node *irn) 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)); n->flags |= be_lv_state_out | be_lv_state_end; - register_node(lv, irn); } /** @@ -321,7 +259,6 @@ static inline void mark_live_end(be_lv_t *lv, ir_node *block, ir_node *irn) 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)); n->flags |= be_lv_state_end; - register_node(lv, irn); } static struct { @@ -350,8 +287,8 @@ static void live_end_at_block(ir_node *block, int is_true_out) mark_live_out(lv, block, def); visited = re.visited; - if (!bitset_contains_irn(visited, block)) { - bitset_add_irn(visited, block); + if (!bitset_is_set(visited, get_irn_idx(block))) { + bitset_set(visited, get_irn_idx(block)); /* * If this block is not the definition block, we have to go up @@ -368,11 +305,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; @@ -386,7 +318,6 @@ typedef struct lv_remove_walker_t { */ static void liveness_for_node(ir_node *irn) { - const ir_edge_t *edge; ir_node *def_block; bitset_clear_all(re.visited); @@ -446,51 +377,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*)phase_get_irn_data(&lv->ph, bl); - - fprintf(f, "liveness:\n"); - if (info) { - unsigned n = info[0].u.head.n_members; - unsigned i; - - for (i = 0; i < n; ++i) { - 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)); - } - } - } -} - -static void *lv_phase_data_init(ir_phase *phase, const ir_node *irn) -{ - be_lv_info_t *info = (be_lv_info_t*)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. @@ -502,21 +388,26 @@ static void collect_liveness_nodes(ir_node *irn, void *data) nodes[get_irn_idx(irn)] = irn; } -static void compute_liveness(be_lv_t *lv) +void be_liveness_compute_sets(be_lv_t *lv) { ir_node **nodes; - int i, n; + int i; + int n; + + if (lv->sets_valid) + return; + + be_timer_push(T_LIVE); + ir_nodehashmap_init(&lv->map); + obstack_init(&lv->obst); - 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 + /* 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. - */ + * will not need to move around the data. */ irg_walk_graph(lv->irg, NULL, collect_liveness_nodes, nodes); re.lv = lv; @@ -530,94 +421,61 @@ static void compute_liveness(be_lv_t *lv) 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); - be_timer_pop(T_LIVE); - } + lv->sets_valid = true; } -void be_liveness_assure_chk(be_lv_t *lv) +void be_liveness_compute_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 + if (lv->lvc != NULL) + return; + lv->lvc = lv_chk_new(lv->irg); } -void be_liveness_invalidate(be_lv_t *lv) +void be_liveness_invalidate_sets(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; - } + if (!lv->sets_valid) + return; + unregister_hook(hook_node_info, &lv->hook_info); + obstack_free(&lv->obst, NULL); + ir_nodehashmap_destroy(&lv->map); + lv->sets_valid = false; } -/* Compute the inter block liveness for a graph. */ -be_lv_t *be_liveness(ir_graph *irg) +void be_liveness_invalidate_chk(be_lv_t *lv) { - be_lv_t *lv = XMALLOCZ(be_lv_t); - - 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; + be_liveness_invalidate_sets(lv); - return lv; + if (lv->lvc == NULL) + return; + lv_chk_free(lv->lvc); + lv->lvc = NULL; } -void be_liveness_recompute(be_lv_t *lv) +be_lv_t *be_liveness_new(ir_graph *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 - bitset_clear_all(lv->nodes); + be_lv_t *lv = XMALLOCZ(be_lv_t); - phase_deinit(&lv->ph); - phase_init(&lv->ph, lv->irg, lv_phase_data_init); - compute_liveness(lv); + lv->irg = irg; + lv->hook_info.context = lv; + lv->hook_info.hook._hook_node_info = be_dump_liveness_block; - be_timer_pop(T_LIVE); + return lv; } - void be_liveness_free(be_lv_t *lv) { - be_liveness_invalidate(lv); -#ifdef USE_LIVE_CHK - lv_chk_free(lv->lvc); - dfs_free(lv->dfs); -#endif + be_liveness_invalidate_sets(lv); + be_liveness_invalidate_chk(lv); + xfree(lv); } void be_liveness_remove(be_lv_t *lv, const ir_node *irn) { - if (lv->nodes) { - unsigned idx = get_irn_idx(irn); + if (lv->sets_valid) { lv_remove_walker_t w; /* @@ -628,15 +486,13 @@ void be_liveness_remove(be_lv_t *lv, const ir_node *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); } } void be_liveness_introduce(be_lv_t *lv, ir_node *irn) { /* Don't compute liveness information for non-data nodes. */ - if (lv->nodes && is_liveness_node(irn)) { + if (lv->sets_valid && is_liveness_node(irn)) { re.lv = lv; re.visited = bitset_malloc(get_irg_last_idx(lv->irg)); liveness_for_node(irn); @@ -650,160 +506,24 @@ 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*)phase_get_irn_data(&lv->ph, bl); - be_lv_info_t *fr = (be_lv_info_t*)phase_get_irn_data(&fresh->ph, bl); - - 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) { - ir_fprintf(stderr, "\t%+F\n", get_idx_irn(lv->irg, curr[1 + i].u.node.idx)); - } - } - - 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) { - 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].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) { - 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)); - } - } - } -} - -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 the every predecessors of a node dominate - * the note. - */ -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) { - 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"); - if (get_irn_mode(node) == mode_T) { - const ir_edge_t *edge; + ir_node *value; + be_foreach_definition(node, cls, value, + ir_nodeset_remove(nodeset, value); + ); - foreach_out_edge(node, edge) { - ir_node *proj = get_edge_src_irn(edge); - - 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); - } - - arity = get_irn_arity(node); - for (i = 0; i < arity; ++i) { + int arity = get_irn_arity(node); + for (int 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); + if (!arch_irn_consider_in_reg_alloc(cls, op)) + continue; + ir_nodeset_insert(nodeset, op); } } @@ -813,11 +533,8 @@ 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; - - 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); + assert(lv->sets_valid && "live sets must be computed"); + be_lv_foreach(lv, block, be_lv_state_end, node) { if (!arch_irn_consider_in_reg_alloc(cls, node)) continue; @@ -832,7 +549,6 @@ void be_liveness_nodes_live_at(const be_lv_t *lv, 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, cls, bl, live); sched_foreach_reverse(bl, irn) { @@ -853,7 +569,7 @@ static void collect_node(ir_node *irn, void *data) obstack_ptr_grow(obst, irn); } -void be_live_chk_compare(be_lv_t *lv, lv_chk_t *lvc) +static void be_live_chk_compare(be_lv_t *lv, lv_chk_t *lvc) { ir_graph *irg = lv->irg; @@ -875,27 +591,27 @@ void be_live_chk_compare(be_lv_t *lv, lv_chk_t *lvc) stat_ev_ctx_push("be_lv_chk_compare"); for (j = 0; nodes[j]; ++j) { ir_node *irn = nodes[j]; + if (is_Block(irn)) + continue; + for (i = 0; blocks[i]; ++i) { ir_node *bl = blocks[i]; + 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); - 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); - 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_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_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); - } + 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"); @@ -906,5 +622,6 @@ void be_live_chk_compare(be_lv_t *lv, lv_chk_t *lvc) BE_REGISTER_MODULE_CONSTRUCTOR(be_init_live) void be_init_live(void) { + (void)be_live_chk_compare; FIRM_DBG_REGISTER(dbg, "firm.be.liveness"); }