X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbelive.c;h=205e08f550311f286a9ff25a6565e77caf2e3d4e;hb=0f3f5dcf8b021c4c43eb8b47f59c6aad0972ce0e;hp=273a64c50145a2be021ddec239e6b7525306cbbf;hpb=8eee0e6361868153ae82c8d8bdda1446a9af9084;p=libfirm diff --git a/ir/be/belive.c b/ir/be/belive.c index 273a64c50..205e08f55 100644 --- a/ir/be/belive.c +++ b/ir/be/belive.c @@ -34,6 +34,7 @@ #include "irprintf_t.h" #include "irbitset.h" #include "irdump_t.h" +#include "irnodeset.h" #include "beutil.h" #include "belive_t.h" @@ -43,7 +44,9 @@ 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 @@ -53,6 +56,7 @@ static INLINE int is_liveness_node(const ir_node *irn) case iro_Block: case iro_Bad: case iro_End: + case iro_Anchor: return 0; default:; } @@ -99,15 +103,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; @@ -197,13 +192,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]; @@ -465,18 +466,89 @@ 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) { 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; + + 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 arounf 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); +} + +void be_liveness_assure_sets(be_lv_t *lv) +{ + if (!lv->nodes) { + 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); + } +} + +void be_liveness_assure_chk(be_lv_t *lv) +{ +#ifndef USE_LIVE_CHK + be_liveness_assure_sets(lv); +#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. */ @@ -486,12 +558,11 @@ be_lv_t *be_liveness(ir_graph *irg) memset(lv, 0, sizeof(lv[0])); lv->irg = irg; - lv->nodes = bitset_malloc(2 * get_irg_last_idx(irg)); +#ifdef USE_LIVE_CHK + lv->lvc = lv_chk_new(irg); +#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; } @@ -515,36 +586,38 @@ void be_liveness_recompute(be_lv_t *lv) void be_liveness_free(be_lv_t *lv) { - unregister_hook(hook_node_info, &lv->hook_info); - phase_free(&lv->ph); - bitset_free(lv->nodes); + be_liveness_invalidate(lv); free(lv); } void be_liveness_remove(be_lv_t *lv, ir_node *irn) { - unsigned idx = get_irn_idx(irn); - struct _lv_walker_t w; + if (lv->nodes) { + unsigned idx = get_irn_idx(irn); + struct _lv_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.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); + } } 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) @@ -553,23 +626,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; @@ -695,42 +751,64 @@ 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_env_t *arch_env, + 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(arch_env, cls, proj)) { + ir_nodeset_remove(nodeset, proj); + } + } } - return live; + if (arch_irn_consider_in_reg_alloc(arch_env, cls, node)) { + ir_nodeset_remove(nodeset, node); + } + + 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)) + 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_env_t *arch_env, + 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(arch_env, 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_env_t *arch_env, + 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; @@ -742,27 +820,27 @@ pset *be_liveness_nodes_live_at(const be_lv_t *lv, const arch_env_t *arch_env, c * exit immediately, so that this node is still live */ if(irn == pos) - return live; + return; be_liveness_transfer(arch_env, cls, irn, live); } - - return live; } -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_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, ir_nodeset_t *live) { const ir_node *bl = is_Block(pos) ? pos : get_nodes_block(pos); ir_node *irn; + assert(lv->nodes && "live sets must be computed"); 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; + return; } - - return live; } static void collect_node(ir_node *irn, void *data) @@ -771,22 +849,15 @@ static void collect_node(ir_node *irn, void *data) obstack_ptr_grow(obst, irn); } -void be_live_chk_compare(be_irg_t *birg) +void be_live_chk_compare(be_lv_t *lv, lv_chk_t *lvc) { - ir_graph *irg = be_get_birg_irg(birg); + ir_graph *irg = lv->irg; struct obstack obst; ir_node **nodes; ir_node **blocks; - be_lv_t *lv; - lv_chk_t *lvc; int i, j; - be_assure_liveness(birg); - be_assure_liveness_chk(birg); - lv = be_get_birg_liveness(birg); - lvc = be_get_birg_liveness_chk(birg); - obstack_init(&obst); irg_block_walk_graph(irg, collect_node, NULL, &obst);