X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbelive.c;h=7be9f1acc7b42f3a2d44e2fab63eda3063a3b84c;hb=67b6304bf1b2df3cefa9f39151ed7436e64c48dd;hp=136b229ae4c37af7038595ce3970e5047bf0d081;hpb=39266b956d107709b1142883c03205979108a62d;p=libfirm diff --git a/ir/be/belive.c b/ir/be/belive.c index 136b229ae..7be9f1acc 100644 --- a/ir/be/belive.c +++ b/ir/be/belive.c @@ -36,6 +36,9 @@ #include "irdump_t.h" #include "irnodeset.h" +#include "dfs_t.h" +#include "absgraph.h" + #include "beutil.h" #include "belive_t.h" #include "beirg_t.h" @@ -50,12 +53,15 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;) #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: return 0; default:; } @@ -102,15 +108,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; @@ -391,6 +388,9 @@ 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. @@ -474,6 +474,9 @@ 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; @@ -488,8 +491,10 @@ static void collect_nodes(ir_node *irn, void *data) static int node_idx_cmp(const void *a, const void *b) { - int ia = get_irn_idx(a); - int ib = get_irn_idx(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; } @@ -532,13 +537,16 @@ void be_liveness_assure_sets(be_lv_t *lv) 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); */ } } void be_liveness_assure_chk(be_lv_t *lv) { #ifndef USE_LIVE_CHK - be_liveness_assure_sets(be_lv_t *lv); + be_liveness_assure_sets(lv); +#else + (void) lv; #endif } @@ -553,13 +561,17 @@ void be_liveness_invalidate(be_lv_t *lv) } /* 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])); memset(lv, 0, sizeof(lv[0])); - lv->irg = irg; - lv->lvc = lv_chk_new(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; @@ -670,7 +682,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; @@ -750,32 +762,9 @@ 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) -{ - int i, n; - - /* 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"); - - if(arch_irn_consider_in_reg_alloc(arch_env, cls, irn)) { - ir_node *del = pset_remove_ptr(live, irn); - (void) del; - assert(irn == del); - } - - for(i = 0, n = get_irn_arity(irn); i < n; ++i) { - ir_node *op = get_irn_n(irn, i); - - if(arch_irn_consider_in_reg_alloc(arch_env, cls, op)) - pset_insert_ptr(live, op); - } - - return live; -} - -void be_liveness_transfer_ir_nodeset(const arch_env_t *arch_env, - const arch_register_class_t *cls, - ir_node *node, ir_nodeset_t *nodeset) +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, arity; @@ -783,39 +772,36 @@ void be_liveness_transfer_ir_nodeset(const arch_env_t *arch_env, * function. */ assert(!is_Phi(node) && "liveness_transfer produces invalid results for phi nodes"); - if(arch_irn_consider_in_reg_alloc(arch_env, cls, node)) { + if (get_irn_mode(node) == mode_T) { + const ir_edge_t *edge; + + foreach_out_edge(node, edge) { + ir_node *proj = get_edge_src_irn(edge); + + if (arch_irn_consider_in_reg_alloc(arch_env, cls, proj)) { + ir_nodeset_remove(nodeset, proj); + } + } + } + + 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) { + 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)) + 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) -{ - int i; - assert(lv->nodes && "live sets must be computed"); - 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; -} - -void be_liveness_end_of_block_ir_nodeset(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) +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; @@ -831,7 +817,9 @@ void be_liveness_end_of_block_ir_nodeset(const be_lv_t *lv, -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; @@ -843,15 +831,16 @@ 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; @@ -861,10 +850,8 @@ pset *be_liveness_nodes_live_at_input(const be_lv_t *lv, const arch_env_t *arch_ 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)