struct _lv_chk_t {
ir_phase ph;
- dfs_t *dfs;
+ const dfs_t *dfs;
DEBUG_ONLY(firm_dbg_module_t *dbg;)
int n_blocks;
bitset_t *back_edge_src;
int i, n;
for (i = 0, n = dfs_get_n_nodes(lv->dfs); i < n; ++i) {
- ir_node *bl = dfs_get_post_num_node(lv->dfs, i);
+ const ir_node *bl = dfs_get_post_num_node(lv->dfs, i);
bl_info_t *bi = get_block_info(lv, bl);
const ir_edge_t *edge;
}
for (i = 0, n = dfs_get_n_nodes(lv->dfs); i < n; ++i) {
- ir_node *bl = dfs_get_post_num_node(lv->dfs, i);
- bl_info_t *bi = get_block_info(lv, bl);
+ const ir_node *bl = dfs_get_post_num_node(lv->dfs, i);
+ bl_info_t *bi = get_block_info(lv, bl);
const ir_edge_t *edge;
}
}
}
+
+ 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);
+ bl_info_t *bi = get_block_info(lv, bl);
+ bitset_set(bi->be_tgt_reach, bi->id);
+ }
}
-lv_chk_t *lv_chk_new(ir_graph *irg)
+lv_chk_t *lv_chk_new(ir_graph *irg, const dfs_t *dfs)
{
lv_chk_t *res = xmalloc(sizeof(res[0]));
struct obstack *obst;
int i;
+ stat_ev_tim_push();
phase_init(&res->ph, "liveness check", irg, PHASE_DEFAULT_GROWTH, init_block_data, NULL);
obst = phase_obst(&res->ph);
FIRM_DBG_REGISTER(res->dbg, "ir.ana.lvchk");
- res->dfs = dfs_new(&absgraph_irg_cfg_succ, irg);
+ res->dfs = 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);
/* fill the map which maps pre_num to block infos */
for (i = res->n_blocks - 1; i >= 0; --i) {
- ir_node *irn = dfs_get_pre_num_node(res->dfs, i);
- bl_info_t *bi = phase_get_or_set_irn_data(&res->ph, irn);
+ 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);
res->map[bi->id] = bi;
}
/* compute back edge chains */
compute_back_edge_chains(res);
-
-DEBUG_ONLY({
- DBG((res->dbg, LEVEL_1, "liveness chk in %+F\n", irg));
- for (i = res->n_blocks - 1; i >= 0; --i) {
- ir_node *irn = 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));
- DBG((res->dbg, LEVEL_1, "\ttgt reach: %B\n", bi->be_tgt_reach));
- }
- })
+#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);
+ 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));
+ DBG((res->dbg, LEVEL_1, "\ttgt reach: %B\n", bi->be_tgt_reach));
+ }
+#endif
DBG((res->dbg, LEVEL_1, "back edge src: %B\n", res->back_edge_src));
DBG((res->dbg, LEVEL_1, "back edge tgt: %B\n", res->back_edge_tgt));
+ stat_ev_tim_pop("lv_chk_cons_time");
return res;
}
void lv_chk_free(lv_chk_t *lv)
{
obstack_free(phase_obst(&lv->ph), NULL);
- dfs_free(lv->dfs);
xfree(lv);
}
if (!is_liveness_node(var))
return 0;
- stat_ev_ctx_push_fobj("node", var);
- stat_ev("lv_chk");
+ stat_ev_ctx_push_fmt("lv_chk", "%u", get_irn_idx(var));
+ stat_ev_tim_push();
/* If there is no dominance relation, go out, too */
def_bl = get_nodes_block(var);
* silently exploited below.
*/
else {
- bitset_t *tmp = bitset_alloca(lv->n_blocks);
- bitset_t *uses = bitset_alloca(lv->n_blocks);
bl_info_t *def = get_block_info(lv, def_bl);
bl_info_t *bli = get_block_info(lv, bl);
+ bitset_t *uses = bitset_alloca(lv->n_blocks);
+ bitset_t *Tq;
- int i, min_dom, max_dom;
+ unsigned i, min_dom, max_dom;
const ir_edge_t *edge;
/* if the block has no DFS info, it cannot be reached.
if (!bli)
goto end;
+ (void) def;
DBG((lv->dbg, LEVEL_2, "lv check %+F (def in %+F #%d) in different block %+F #%d\n",
var, def_bl, def->id, bl, bli->id));
res |= mask;
bi = get_block_info(lv, use_bl);
- bitset_set(uses, bi->id);
+ if (bi)
+ bitset_set(uses, bi->id);
}
/* get the dominance range which really matters. all uses outside
/* prepare a set with all reachable back edge targets.
* this will determine our "looking points" from where
- * we will search/find the calculated uses.
- *
- * Since there might be no reachable back edge targets
- * we add the current block also since reachability of
- * uses are then checked from there. */
- bitset_copy(tmp, bli->be_tgt_reach);
- bitset_set (tmp, bli->id);
+ * we will search/find the calculated uses. */
+ Tq = bli->be_tgt_reach;
/* now, visit all viewing points in the temporary bitset lying
* in the dominance range of the variable. Note that for reducible
* flow-graphs the first iteration is sufficient and the loop
* will be left. */
- 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)) {
+ 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) {
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
* and end/out we have to handle all the border cases correctly.
goto end;
}
- bitset_andnot(tmp, ti->red_reachable);
-
/*
* if we deleted a use do to the commentary above, we have to
* re-add it since it might be visible from further view points
*/
if (use_in_current_block)
bitset_set(uses, ti->id);
+
+ i = bitset_next_set(Tq, get_Block_dom_max_subtree_pre_num(ti->block) + 1);
}
}
end:
+ stat_ev_tim_pop("lv_chk_query_time");
stat_ev_cnt_done(uses, "lv_chk_uses");
stat_ev_cnt_done(iter, "lv_chk_iter");
- stat_ev_ctx_pop();
+ stat_ev_ctx_pop("lv_chk");
return res;
}
projects / libfirm / blobdiff