X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firlivechk.c;h=89b12f101ba712bfac227ee89e531dc41f825724;hb=6f2df337ba40d5c7461f9459fd57efbcc0686c9b;hp=c7dcf5172b89826df671a22baec4c1710f00bf1e;hpb=5244f95767968d8b59ef3f2031612b86474e2455;p=libfirm diff --git a/ir/ana/irlivechk.c b/ir/ana/irlivechk.c index c7dcf5172..89b12f101 100644 --- a/ir/ana/irlivechk.c +++ b/ir/ana/irlivechk.c @@ -21,7 +21,6 @@ * @file livechk.c * @date 21.04.2007 * @author Sebastian Hack - * @version $Id$ * @brief * * Liveness checks as developed by Benoit Boissinot, Fabrice Rastello and myself. @@ -41,9 +40,12 @@ #include +/* statev is expensive here, only enable when needed */ +#define DISABLE_STATEV + #include "irgraph_t.h" #include "irnode_t.h" -#include "irphase_t.h" +#include "irnodemap.h" #include "iredges_t.h" #include "irprintf.h" @@ -56,7 +58,7 @@ #include "irlivechk.h" -#include "statev.h" +#include "statev_t.h" typedef struct bl_info_t { const ir_node *block; /**< The block. */ @@ -73,29 +75,30 @@ typedef struct bl_info_t { in the reduced graph. */ } bl_info_t; -#define get_block_info(lv, bl) ((bl_info_t *) phase_get_irn_data(&(lv)->ph, bl)) - struct lv_chk_t { - ir_phase ph; - const dfs_t *dfs; - int n_blocks; - bitset_t *back_edge_src; - bitset_t *back_edge_tgt; - bl_info_t **map; + ir_nodemap block_infos; + struct obstack obst; + dfs_t *dfs; + int n_blocks; + bitset_t *back_edge_src; + bitset_t *back_edge_tgt; + bl_info_t **map; DEBUG_ONLY(firm_dbg_module_t *dbg;) }; -static void *init_block_data(ir_phase *ph, const ir_node *irn) +static bl_info_t *get_block_info(lv_chk_t *lv, const ir_node *block) { - lv_chk_t *lv = firm_container_of(ph, lv_chk_t, ph); - bl_info_t *bi = (bl_info_t*) phase_alloc(ph, sizeof(bi[0])); - - bi->id = get_Block_dom_tree_pre_num(irn); - bi->block = irn; - bi->red_reachable = bitset_obstack_alloc(phase_obst(ph), lv->n_blocks); - bi->be_tgt_reach = bitset_obstack_alloc(phase_obst(ph), lv->n_blocks); - bi->be_tgt_calc = 0; - return bi; + bl_info_t *info = ir_nodemap_get(bl_info_t, &lv->block_infos, block); + if (info == NULL) { + info = OALLOC(&lv->obst, bl_info_t); + info->id = get_Block_dom_tree_pre_num(block); + info->block = block; + info->red_reachable = bitset_obstack_alloc(&lv->obst, lv->n_blocks); + info->be_tgt_reach = bitset_obstack_alloc(&lv->obst, lv->n_blocks); + info->be_tgt_calc = 0; + ir_nodemap_insert(&lv->block_infos, block, info); + } + return info; } /** @@ -135,8 +138,6 @@ static void red_trans_closure(lv_chk_t *lv) const ir_node *bl = (const ir_node*) dfs_get_post_num_node(lv->dfs, i); bl_info_t *bi = get_block_info(lv, bl); - const ir_edge_t *edge; - bitset_set(bi->red_reachable, bi->id); foreach_block_succ (bl, edge) { ir_node *succ = get_edge_src_irn(edge); @@ -168,8 +169,6 @@ static void compute_back_edge_chain(lv_chk_t *lv, const ir_node *bl) bitset_t *tmp = bitset_alloca(lv->n_blocks); bl_info_t *bi = get_block_info(lv, bl); - size_t elm; - DBG((lv->dbg, LEVEL_2, "computing T_%d\n", bi->id)); /* put all back edge sources reachable (reduced) from here in tmp */ @@ -183,7 +182,6 @@ static void compute_back_edge_chain(lv_chk_t *lv, const ir_node *bl) /* iterate over them ... */ bitset_foreach(tmp, elm) { bl_info_t *si = lv->map[elm]; - const ir_edge_t *edge; /* and find back edge targets which are not reduced reachable from bl */ foreach_block_succ (si->block, edge) { @@ -205,7 +203,6 @@ static void compute_back_edge_chain(lv_chk_t *lv, const ir_node *bl) static inline void compute_back_edge_chains(lv_chk_t *lv) { - size_t elm; int i, n; DBG((lv->dbg, LEVEL_2, "back edge sources: %B\n", lv->back_edge_src)); @@ -217,8 +214,6 @@ static inline void compute_back_edge_chains(lv_chk_t *lv) const ir_node *bl = (const ir_node*) dfs_get_post_num_node(lv->dfs, i); bl_info_t *bi = get_block_info(lv, bl); - const ir_edge_t *edge; - if (!bitset_is_set(lv->back_edge_tgt, bi->id)) { foreach_block_succ (bl, edge) { ir_node *succ = get_edge_src_irn(edge); @@ -240,45 +235,29 @@ static inline void compute_back_edge_chains(lv_chk_t *lv) } } -lv_chk_t *lv_chk_new(ir_graph *irg, const dfs_t *dfs) +lv_chk_t *lv_chk_new(ir_graph *irg) { lv_chk_t *res = XMALLOC(lv_chk_t); - struct obstack *obst; int i; - edges_deactivate(irg); - edges_activate(irg); - compute_doms(irg); + assure_doms(irg); stat_ev_tim_push(); - phase_init(&res->ph, irg, init_block_data); - obst = phase_obst(&res->ph); + ir_nodemap_init(&res->block_infos, irg); + obstack_init(&res->obst); FIRM_DBG_REGISTER(res->dbg, "ir.ana.lvchk"); - res->dfs = dfs; + res->dfs = dfs_new(&absgraph_irg_cfg_succ, irg); res->n_blocks = dfs_get_n_nodes(res->dfs); - res->back_edge_src = bitset_obstack_alloc(obst, res->n_blocks); - res->back_edge_tgt = bitset_obstack_alloc(obst, res->n_blocks); - res->map = OALLOCNZ(obst, bl_info_t*, res->n_blocks); - -#if 0 - { - char name[256]; - FILE *f; - ir_snprintf(name, sizeof(name), "dfs_%F.dot", irg); - if ((f = fopen(name, "wt")) != NULL) { - dfs_dump(res->dfs, f); - fclose(f); - } - dump_ir_block_graph(irg, "-lvchk"); - } -#endif + res->back_edge_src = bitset_obstack_alloc(&res->obst, res->n_blocks); + res->back_edge_tgt = bitset_obstack_alloc(&res->obst, res->n_blocks); + res->map = OALLOCNZ(&res->obst, bl_info_t*, res->n_blocks); /* fill the map which maps pre_num to block infos */ for (i = res->n_blocks - 1; i >= 0; --i) { ir_node *irn = (ir_node *) dfs_get_pre_num_node(res->dfs, i); - bl_info_t *bi = (bl_info_t*) phase_get_or_set_irn_data(&res->ph, irn); + bl_info_t *bi = get_block_info(res, irn); assert(bi->id < res->n_blocks); assert(res->map[bi->id] == NULL); res->map[bi->id] = bi; @@ -310,192 +289,13 @@ lv_chk_t *lv_chk_new(ir_graph *irg, const dfs_t *dfs) void lv_chk_free(lv_chk_t *lv) { - phase_deinit(&lv->ph); + dfs_free(lv->dfs); + obstack_free(&lv->obst, NULL); + ir_nodemap_destroy(&lv->block_infos); xfree(lv); } -#if 0 -/** - * Check if a node is live at the end of a block. - * This function is for internal use as its code is shared between - * the in/end routines below. It is almost the "live_end" routine - * but passing in the bitset for recording the blocks where the variable - * is used saves some effort in the "live_in" routine. See below for - * details. - * - * @param lv The liveness check environment. - * @param what The node to check for. - * @param bl The block under investigation. - * @param uses A bitset where this routine records all ids of blocks - * where this variable is used. Note that the bitset - * is only guaranteed to be filled if the node was not - * live at the end of the block. - * @return 1, if @p what is live at the end at @p bl. - */ -unsigned lv_chk_bl_in_mask(const lv_chk_t *lv, const ir_node *bl, const ir_node *var) -{ - ir_node *def_bl; - const ir_edge_t *edge; - - stat_ev_cnt_decl(uses); - - int res = 0; - - assert(is_Block(bl) && "can only check for liveness in a block"); - - if (!is_liveness_node(var)) - return 0; - - def_bl = get_nodes_block(var); - if (def_bl == bl || !block_dominates(def_bl, bl)) { - goto end; - } - - else { - bitset_t *uses = bitset_alloca(lv->n_blocks); - bitset_t *tmp = bitset_alloca(lv->n_blocks); - int min_dom = get_Block_dom_tree_pre_num(def_bl) + 1; - int max_dom = get_Block_dom_max_subtree_pre_num(def_bl); - bl_info_t *bli = get_block_info(lv, bl); - int i; - - DBG((lv->dbg, LEVEL_2, "lv check of %+F, def=%+F,%d != q=%+F,%d\n", - var, def_bl, min_dom - 1, bl, bli->id)); - - foreach_out_edge (var, edge) { - ir_node *user = get_edge_src_irn(edge); - ir_node *use_bl; - bl_info_t *bi; - - if (!is_liveness_node(user)) - continue; - - stat_ev_cnt_inc(uses); - use_bl = get_nodes_block(user); - if (is_Phi(user)) { - int pos = get_edge_src_pos(edge); - use_bl = get_Block_cfgpred_block(use_bl, pos); - } - - if (use_bl == bl) { - res = lv_chk_state_in; - DBG((lv->dbg, LEVEL_2, "\tuse directly in block %+F by %+F\n", use_bl, user)); - goto end; - } - - bi = get_block_info(lv, use_bl); - bitset_set(uses, bi->id); - } - - DBG((lv->dbg, LEVEL_2, "\tuses: %B\n", uses)); - - { - - bitset_copy(tmp, bli->be_tgt_reach); - bitset_set(tmp, bli->id); - - DBG((lv->dbg, LEVEL_2, "\tbe tgt reach: %B, dom span: [%d, %d]\n", tmp, min_dom, max_dom)); - for (i = bitset_next_set(tmp, min_dom); i >= 0 && i <= max_dom; i = bitset_next_set(tmp, i + 1)) { - bl_info_t *ti = lv->map[i]; - DBG((lv->dbg, LEVEL_2, "\tlooking from %d: seeing %B\n", ti->id, ti->red_reachable)); - if (bitset_intersect(ti->red_reachable, uses)) { - res = lv_chk_state_in; - goto end; - } - - bitset_andnot(tmp, ti->red_reachable); - } - } - } - -end: - return res; -} - -unsigned lv_chk_bl_end_mask(const lv_chk_t *lv, const ir_node *bl, const ir_node *var) -{ - ir_node *def_bl; - const ir_edge_t *edge; - - stat_ev_cnt_decl(uses); - - int res = 0; - - assert(is_Block(bl) && "can only check for liveness in a block"); - - if (!is_liveness_node(var)) - return 0; - - def_bl = get_nodes_block(var); - if (!block_dominates(def_bl, bl)) { - goto end; - } else { - bitset_t *uses = bitset_alloca(lv->n_blocks); - bitset_t *tmp = bitset_alloca(lv->n_blocks); - int min_dom = get_Block_dom_tree_pre_num(def_bl) + 1; - int max_dom = get_Block_dom_max_subtree_pre_num(def_bl); - bl_info_t *bli = get_block_info(lv, bl); - int i; - - DBG((lv->dbg, LEVEL_2, "lv end check of %+F, def=%+F,%d != q=%+F,%d\n", - var, def_bl, min_dom - 1, bl, bli->id)); - - foreach_out_edge (var, edge) { - ir_node *user = get_edge_src_irn(edge); - ir_node *use_bl; - bl_info_t *bi; - - if (!is_liveness_node(user)) - continue; - - stat_ev_cnt_inc(uses); - use_bl = get_nodes_block(user); - if (is_Phi(user)) { - int pos = get_edge_src_pos(edge); - use_bl = get_Block_cfgpred_block(use_bl, pos); - - if (bl == use_bl) - res |= lv_chk_state_end; - } - - bi = get_block_info(lv, use_bl); - if (use_bl != bl || bitset_is_set(lv->back_edge_tgt, bi->id)) - bitset_set(uses, bi->id); - } - - DBG((lv->dbg, LEVEL_2, "\tuses: %B\n", uses)); - - bitset_copy(tmp, bli->be_tgt_reach); - bitset_set(tmp, bli->id); - - DBG((lv->dbg, LEVEL_2, "\tbe tgt reach + current: %B, dom span: [%d, %d]\n", tmp, min_dom, max_dom)); - for (i = bitset_next_set(tmp, min_dom); i >= 0 && i <= max_dom; i = bitset_next_set(tmp, i + 1)) { - bl_info_t *ti = lv->map[i]; - DBG((lv->dbg, LEVEL_2, "\tlooking from %d: seeing %B\n", ti->id, ti->red_reachable)); - if (bitset_intersect(ti->red_reachable, uses)) { - res = lv_chk_state_out | lv_chk_state_end; - goto end; - } - - bitset_andnot(tmp, ti->red_reachable); - } - } - -end: - return res; -} -#endif - -/** - * Check a nodes liveness situation of a block. - * This routine considers both cases, the live in and end/out case. - * - * @param lv The liveness check environment. - * @param bl The block under investigation. - * @param var The node to check for. - * @return A bitmask of lv_chk_state_XXX fields. - */ -unsigned lv_chk_bl_xxx(const lv_chk_t *lv, const ir_node *bl, const ir_node *var) +unsigned lv_chk_bl_xxx(lv_chk_t *lv, const ir_node *bl, const ir_node *var) { int res = 0; ir_node *def_bl; @@ -523,8 +323,6 @@ unsigned lv_chk_bl_xxx(const lv_chk_t *lv, const ir_node *bl, const ir_node *var * the algorithm is simple. Just check for uses not inside this block. */ if (def_bl == bl) { - const ir_edge_t *edge; - stat_ev("lv_chk_def_block"); DBG((lv->dbg, LEVEL_2, "lv check same block %+F in %+F\n", var, bl)); foreach_out_edge (var, edge) { @@ -571,7 +369,6 @@ unsigned lv_chk_bl_xxx(const lv_chk_t *lv, const ir_node *bl, const ir_node *var size_t i; unsigned min_dom, max_dom; - const ir_edge_t *edge; /* if the block has no DFS info, it cannot be reached. * This can happen in functions with endless loops.