X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Firlivechk.c;h=914374f59e9d76732686957ab3908c16f853b201;hb=78bac126e7f9ca55761ab892ebfa9c19a4a65fcf;hp=973d9ac7e41e49162a48c9382c7d8c70a91c6a60;hpb=c2b87d6336e0fc8a5bad0dc43cf6fca6c8288421;p=libfirm diff --git a/ir/ana/irlivechk.c b/ir/ana/irlivechk.c index 973d9ac7e..914374f59 100644 --- a/ir/ana/irlivechk.c +++ b/ir/ana/irlivechk.c @@ -22,7 +22,7 @@ * @date 21.04.2007 * @author Sebastian Hack * @version $Id$ - * @summary + * @brief * * Liveness checks as developed by Benoit Boissinot, Fabrice Rastello and myself. * @@ -37,9 +37,7 @@ * * The precomputation remains valid as long as the CFG is not altered. */ -#ifdef HAVE_CONFIG_H #include -#endif #include @@ -60,7 +58,7 @@ #include "statev.h" -typedef struct _bl_info_t { +typedef struct bl_info_t { const ir_node *block; /**< The block. */ int be_tgt_calc : 1; @@ -70,34 +68,33 @@ typedef struct _bl_info_t { bitset_t *red_reachable; /**< Holds all id's if blocks reachable in the CFG modulo back edges. */ - bitset_t *be_tgt_reach; /**< target blocks of back edges whose + bitset_t *be_tgt_reach; /**< target blocks of back edges whose sources are reachable from this block 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; +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; DEBUG_ONLY(firm_dbg_module_t *dbg;) - int n_blocks; - bitset_t *back_edge_src; - bitset_t *back_edge_tgt; - bl_info_t **map; }; -static void *init_block_data(ir_phase *ph, const ir_node *irn, void *old) +static void *init_block_data(ir_phase *ph, const ir_node *irn) { - lv_chk_t *lv = container_of(ph, lv_chk_t, ph); - bl_info_t *bi = phase_alloc(ph, sizeof(bi[0])); + 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; - (void) old; return bi; } @@ -106,15 +103,16 @@ static void *init_block_data(ir_phase *ph, const ir_node *irn, void *old) * @param irn A node. * @return 1 if the node shall be considered in liveness, 0 if not. */ -static INLINE int is_liveness_node(const ir_node *irn) +static inline int is_liveness_node(const ir_node *irn) { - switch(get_irn_opcode(irn)) { + switch (get_irn_opcode(irn)) { case iro_Block: case iro_Bad: case iro_End: case iro_Anchor: return 0; - default:; + default: + break; } return 1; @@ -134,7 +132,7 @@ static void red_trans_closure(lv_chk_t *lv) int i, n; for (i = 0, n = dfs_get_n_nodes(lv->dfs); i < n; ++i) { - const ir_node *bl = dfs_get_post_num_node(lv->dfs, i); + 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; @@ -170,7 +168,7 @@ 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); - bitset_pos_t elm; + size_t elm; DBG((lv->dbg, LEVEL_2, "computing T_%d\n", bi->id)); @@ -205,9 +203,9 @@ 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) +static inline void compute_back_edge_chains(lv_chk_t *lv) { - bitset_pos_t elm; + size_t elm; int i, n; DBG((lv->dbg, LEVEL_2, "back edge sources: %B\n", lv->back_edge_src)); @@ -216,7 +214,7 @@ static INLINE void compute_back_edge_chains(lv_chk_t *lv) } for (i = 0, n = dfs_get_n_nodes(lv->dfs); i < n; ++i) { - const ir_node *bl = dfs_get_post_num_node(lv->dfs, i); + 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; @@ -236,7 +234,7 @@ static INLINE void compute_back_edge_chains(lv_chk_t *lv) } for (i = 0, n = dfs_get_n_nodes(lv->dfs); i < n; ++i) { - const ir_node *bl = dfs_get_post_num_node(lv->dfs, i); + const ir_node *bl = (const ir_node*) dfs_get_post_num_node(lv->dfs, i); bl_info_t *bi = get_block_info(lv, bl); bitset_set(bi->be_tgt_reach, bi->id); } @@ -244,16 +242,14 @@ 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 *res = xmalloc(sizeof(res[0])); + 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, "liveness check", irg, PHASE_DEFAULT_GROWTH, init_block_data, NULL); + phase_init(&res->ph, irg, init_block_data); obst = phase_obst(&res->ph); FIRM_DBG_REGISTER(res->dbg, "ir.ana.lvchk"); @@ -262,26 +258,12 @@ lv_chk_t *lv_chk_new(ir_graph *irg, const dfs_t *dfs) 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 = obstack_alloc(obst, res->n_blocks * sizeof(res->map[0])); - memset(res->map, 0, res->n_blocks * sizeof(res->map[0])); - -#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->map = OALLOCNZ(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 = phase_get_or_set_irn_data(&res->ph, irn); + bl_info_t *bi = (bl_info_t*) phase_get_or_set_irn_data(&res->ph, irn); assert(bi->id < res->n_blocks); assert(res->map[bi->id] == NULL); res->map[bi->id] = bi; @@ -296,7 +278,7 @@ lv_chk_t *lv_chk_new(ir_graph *irg, const dfs_t *dfs) #ifndef NDEBUG DBG((res->dbg, LEVEL_1, "liveness chk in %+F\n", irg)); for (i = res->n_blocks - 1; i >= 0; --i) { - const ir_node *irn = dfs_get_pre_num_node(res->dfs, i); + const ir_node *irn = (const ir_node*) dfs_get_pre_num_node(res->dfs, i); bl_info_t *bi = get_block_info(res, irn); DBG((res->dbg, LEVEL_1, "lv_chk for %d -> %+F\n", i, irn)); DBG((res->dbg, LEVEL_1, "\tred reach: %B\n", bi->red_reachable)); @@ -313,182 +295,10 @@ lv_chk_t *lv_chk_new(ir_graph *irg, const dfs_t *dfs) void lv_chk_free(lv_chk_t *lv) { - obstack_free(phase_obst(&lv->ph), NULL); + phase_deinit(&lv->ph); xfree(lv); } -/** - * 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) -{ - stat_ev_cnt_decl(uses); - - ir_node *def_bl; - const ir_edge_t *edge; - - 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) -{ - stat_ev_cnt_decl(uses); - - ir_node *def_bl; - const ir_edge_t *edge; - - 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; -} - /** * Check a nodes liveness situation of a block. * This routine considers both cases, the live in and end/out case. @@ -500,11 +310,10 @@ end: */ unsigned lv_chk_bl_xxx(const lv_chk_t *lv, const ir_node *bl, const ir_node *var) { - stat_ev_cnt_decl(uses); - stat_ev_cnt_decl(iter); - int res = 0; ir_node *def_bl; + stat_ev_cnt_decl(uses); + stat_ev_cnt_decl(iter); assert(is_Block(bl) && "can only check for liveness in a block"); @@ -564,7 +373,7 @@ unsigned lv_chk_bl_xxx(const lv_chk_t *lv, const ir_node *bl, const ir_node *var * We try to gather as much information as possible during looking * at the uses. * - * Note that we know for shure that bl != def_bl. That is sometimes + * Note that we know for sure that bl != def_bl. That is sometimes * silently exploited below. */ else { @@ -573,7 +382,8 @@ unsigned lv_chk_bl_xxx(const lv_chk_t *lv, const ir_node *bl, const ir_node *var bitset_t *uses = bitset_alloca(lv->n_blocks); bitset_t *Tq; - unsigned i, min_dom, max_dom; + size_t i; + unsigned min_dom, max_dom; const ir_edge_t *edge; /* if the block has no DFS info, it cannot be reached. @@ -647,18 +457,18 @@ unsigned lv_chk_bl_xxx(const lv_chk_t *lv, const ir_node *bl, const ir_node *var * will be left. */ DBG((lv->dbg, LEVEL_2, "\tbe tgt reach: %B, dom span: [%d, %d]\n", Tq, min_dom, max_dom)); i = bitset_next_set(Tq, min_dom); - while(i <= max_dom) { + while (i <= max_dom) { bl_info_t *ti = lv->map[i]; int use_in_current_block = bitset_is_set(uses, ti->id); stat_ev_cnt_inc(iter); /* - * This is somehat tricky. Since this routine handles both, live in + * This is somewhat tricky. Since this routine handles both, live in * and end/out we have to handle all the border cases correctly. * Each node is in its own red_reachable set (see calculation * function above). That means, that in the case where bl == t, the - * intersection check of uses and rechability below will always + * intersection check of uses and reachability below will always * find an intersection, namely t. * * However, if a block contains a use and the variable is dead