X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbelive.c;h=16868881509d90446f72940ad4017d2e02cdcefb;hb=705e29fe8d95b03ee01f4cbe4a519b0b0f72eec0;hp=ad9c53e0eae2e2c0b5cb2dc5cc00b46427a0be69;hpb=0aa04a84a758e40748fc25eb8a2fef7343f8f49e;p=libfirm diff --git a/ir/be/belive.c b/ir/be/belive.c index ad9c53e0e..168688815 100644 --- a/ir/be/belive.c +++ b/ir/be/belive.c @@ -43,15 +43,15 @@ #include "beutil.h" #include "belive_t.h" -#include "beirg_t.h" -#include "besched_t.h" +#include "beirg.h" +#include "besched.h" #include "bemodule.h" DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;) -/* see comment in compute_liveness() */ -#define LV_COMPUTE_SORTED #define LV_STD_SIZE 64 + +/* if defined, use binary search for already live nodes, else linear */ #define LV_USE_BINARY_SEARCH #undef LV_INTESIVE_CHECKS @@ -63,7 +63,7 @@ void be_live_chk_compare(be_lv_t *lv, lv_chk_t *lvc); * @param irn the node t check * @return 0 if no liveness info is needed, 1 else */ -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)) { case iro_Block: @@ -104,7 +104,7 @@ int (be_is_live_end)(const be_lv_t *lv, const ir_node *block, const ir_node *irn #ifdef LV_USE_BINARY_SEARCH -static INLINE unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned idx) +static inline unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned idx) { struct _be_lv_info_t *payload = arr + 1; @@ -113,10 +113,10 @@ static INLINE unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned int lo = 0; int hi = n; - if(n == 0) + if (n == 0) return 0; - while(lo < hi) { + do { int md = lo + ((hi - lo) >> 1); unsigned md_idx = payload[md].u.node.idx; @@ -131,12 +131,12 @@ static INLINE unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned } res = lo; - } + } while (lo < hi); #ifdef LV_INTESIVE_CHECKS { unsigned i; - for(i = res; i < n; ++i) + for (i = res; i < n; ++i) assert(payload[i].u.node.idx >= idx); for(i = 0; i < res; ++i) @@ -152,7 +152,7 @@ static INLINE unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned /** * This function searches linearly for the node in the array. */ -static INLINE unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned idx) { +static inline unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned idx) { unsigned n = arr[0].u.head.n_members; unsigned i; @@ -304,7 +304,7 @@ static void register_node(be_lv_t *lv, const ir_node *irn) /** * Mark a node as live-in in a block. */ -static INLINE void mark_live_in(be_lv_t *lv, ir_node *block, ir_node *irn) +static inline void mark_live_in(be_lv_t *lv, ir_node *block, ir_node *irn) { struct _be_lv_info_node_t *n = be_lv_get_or_set(lv, block, irn); DBG((dbg, LEVEL_2, "marking %+F live in at %+F\n", irn, block)); @@ -315,7 +315,7 @@ static INLINE void mark_live_in(be_lv_t *lv, ir_node *block, ir_node *irn) /** * Mark a node as live-out in a block. */ -static INLINE void mark_live_out(be_lv_t *lv, ir_node *block, ir_node *irn) +static inline void mark_live_out(be_lv_t *lv, ir_node *block, ir_node *irn) { struct _be_lv_info_node_t *n = be_lv_get_or_set(lv, block, irn); DBG((dbg, LEVEL_2, "marking %+F live out at %+F\n", irn, block)); @@ -326,7 +326,7 @@ static INLINE void mark_live_out(be_lv_t *lv, ir_node *block, ir_node *irn) /** * Mark a node as live-end in a block. */ -static INLINE void mark_live_end(be_lv_t *lv, ir_node *block, ir_node *irn) +static inline void mark_live_end(be_lv_t *lv, ir_node *block, ir_node *irn) { struct _be_lv_info_node_t *n = be_lv_get_or_set(lv, block, irn); DBG((dbg, LEVEL_2, "marking %+F live end at %+F\n", irn, block)); @@ -334,38 +334,47 @@ static INLINE void mark_live_end(be_lv_t *lv, ir_node *block, ir_node *irn) register_node(lv, irn); } +static struct { + be_lv_t *lv; /**< The liveness object. */ + ir_node *def; /**< The node (value). */ + ir_node *def_block; /**< The block of def. */ + bitset_t *visited; /**< A set were all visited blocks are recorded. */ +} re; + /** * Mark a node (value) live out at a certain block. Do this also * transitively, i.e. if the block is not the block of the value's * definition, all predecessors are also marked live. - * @param def The node (value). * @param block The block to mark the value live out of. - * @param visited A set were all visited blocks are recorded. * @param is_true_out Is the node real out there or only live at the end * of the block. */ -static void live_end_at_block(be_lv_t *lv, ir_node *def, ir_node *block, bitset_t *visited, int is_true_out) +static void live_end_at_block(ir_node *block, int is_true_out) { + be_lv_t *lv = re.lv; + ir_node *def = re.def; + bitset_t *visited; + mark_live_end(lv, block, def); - if(is_true_out) + if (is_true_out) mark_live_out(lv, block, def); - if(!bitset_contains_irn(visited, block)) { + visited = re.visited; + if (!bitset_contains_irn(visited, block)) { bitset_add_irn(visited, block); /* - * If this block is not the definition block, we have to go up - * further. - */ - if(get_nodes_block(def) != block) { - int i, n; + * If this block is not the definition block, we have to go up + * further. + */ + if (re.def_block != block) { + int i; mark_live_in(lv, block, def); - for(i = 0, n = get_Block_n_cfgpreds(block); i < n; ++i) - live_end_at_block(lv, def, get_Block_cfgpred_block(block, i), visited, 1); + for (i = get_Block_n_cfgpreds(block) - 1; i >= 0; --i) + live_end_at_block(get_Block_cfgpred_block(block, i), 1); } - } } @@ -384,18 +393,18 @@ typedef struct lv_remove_walker_t { * Liveness analysis for a value. * Compute the set of all blocks a value is live in. * @param irn The node (value). - * @param walker walker data */ -static void liveness_for_node(ir_node *irn, lv_walker_t *walker) +static void liveness_for_node(ir_node *irn) { - be_lv_t *lv = walker->lv; - bitset_t *visited = walker->data; const ir_edge_t *edge; ir_node *def_block; - bitset_clear_all(visited); + bitset_clear_all(re.visited); def_block = get_nodes_block(irn); + re.def = irn; + re.def_block = def_block; + /* Go over all uses of the value */ foreach_out_edge(irn, edge) { ir_node *use = edge->src; @@ -421,7 +430,7 @@ static void liveness_for_node(ir_node *irn, lv_walker_t *walker) */ if (is_Phi(use)) { ir_node *pred_block = get_Block_cfgpred_block(use_block, edge->pos); - live_end_at_block(lv, irn, pred_block, visited, 0); + live_end_at_block(pred_block, 0); } /* @@ -429,13 +438,13 @@ static void liveness_for_node(ir_node *irn, lv_walker_t *walker) * out on the predecessors. */ else if (def_block != use_block) { - int i, n; + int i; - mark_live_in(lv, use_block, irn); + mark_live_in(re.lv, use_block, irn); - for (i = 0, n = get_Block_n_cfgpreds(use_block); i < n; ++i) { + for (i = get_Block_n_cfgpreds(use_block) - 1; i >= 0; --i) { ir_node *pred_block = get_Block_cfgpred_block(use_block, i); - live_end_at_block(lv, irn, pred_block, visited, 1); + live_end_at_block(pred_block, 1); } } } @@ -497,58 +506,40 @@ static void *lv_phase_data_init(ir_phase *phase, const ir_node *irn, void *old) * Walker, collect all nodes for which we want calculate liveness info * on an obstack. */ -static void collect_nodes(ir_node *irn, void *data) +static void collect_liveness_nodes(ir_node *irn, void *data) { - struct obstack *obst = data; + ir_node **nodes = data; if (is_liveness_node(irn)) - obstack_ptr_grow(obst, irn); -} - -#ifdef LV_COMPUTE_SORTED -/** - * Compare two nodes by its node index. - */ -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; + nodes[get_irn_idx(irn)] = irn; } -#endif /* LV_COMPUTE_SORTED */ static void compute_liveness(be_lv_t *lv) { - struct obstack obst; - lv_walker_t w; ir_node **nodes; int i, n; stat_ev_tim_push(); - obstack_init(&obst); - irg_walk_graph(lv->irg, NULL, collect_nodes, &obst); - n = obstack_object_size(&obst) / sizeof(nodes[0]); - nodes = obstack_finish(&obst); + n = get_irg_last_idx(lv->irg); + nodes = NEW_ARR_F(ir_node *, n); + memset(nodes, 0, sizeof(nodes[0]) * n); /* * inserting the variables sorted by their ID is probably * more efficient since the binary sorted set insertion * will not need to move around 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 + irg_walk_graph(lv->irg, NULL, collect_liveness_nodes, nodes); - w.lv = lv; - w.data = bitset_obstack_alloc(&obst, get_irg_last_idx(lv->irg)); + re.lv = lv; + re.visited = bitset_malloc(n); - for (i = 0; i < n; ++i) - liveness_for_node(nodes[i], &w); + for (i = 0; i < n; ++i) { + if (nodes[i] != NULL) + liveness_for_node(nodes[i]); + } - obstack_free(&obst, NULL); + DEL_ARR_F(nodes); + free(re.visited); register_hook(hook_node_info, &lv->hook_info); stat_ev_tim_pop("be_lv_sets_cons"); } @@ -556,23 +547,23 @@ static void compute_liveness(be_lv_t *lv) void be_liveness_assure_sets(be_lv_t *lv) { if (!lv->nodes) { - BE_TIMER_PUSH(t_live); + be_timer_push(T_LIVE); 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); */ - BE_TIMER_POP(t_live); + be_timer_pop(T_LIVE); } } void be_liveness_assure_chk(be_lv_t *lv) { #ifndef USE_LIVE_CHK - BE_TIMER_PUSH(t_verify); + be_timer_push(t_verify); be_liveness_assure_sets(lv); - BE_TIMER_POP(t_verify); + be_timer_pop(t_verify); #else (void) lv; #endif @@ -589,14 +580,13 @@ void be_liveness_invalidate(be_lv_t *lv) } /* Compute the inter block liveness for a graph. */ -be_lv_t *be_liveness(const be_irg_t *birg) +be_lv_t *be_liveness(ir_graph *irg) { be_lv_t *lv = XMALLOCZ(be_lv_t); - lv->irg = be_get_birg_irg(birg); - lv->birg = birg; + lv->irg = irg; #ifdef USE_LIVE_CHK - lv->dfs = dfs_new(&absgraph_irg_cfg_succ, lv->irg); + lv->dfs = dfs_new(&absgraph_irg_cfg_succ, irg); lv->lvc = lv_chk_new(lv->irg, lv->dfs); #endif lv->hook_info.context = lv; @@ -609,7 +599,7 @@ void be_liveness_recompute(be_lv_t *lv) { unsigned last_idx; - BE_TIMER_PUSH(t_live); + be_timer_push(T_LIVE); last_idx = get_irg_last_idx(lv->irg); if(last_idx >= bitset_size(lv->nodes)) { bitset_free(lv->nodes); @@ -621,7 +611,7 @@ void be_liveness_recompute(be_lv_t *lv) phase_init(&lv->ph, "liveness", lv->irg, PHASE_DEFAULT_GROWTH, lv_phase_data_init, NULL); compute_liveness(lv); - BE_TIMER_POP(t_live); + be_timer_pop(T_LIVE); } @@ -658,11 +648,10 @@ void be_liveness_introduce(be_lv_t *lv, ir_node *irn) { /* Don't compute liveness information for non-data nodes. */ if (lv->nodes && is_liveness_node(irn)) { - 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); + re.lv = lv; + re.visited = bitset_malloc(get_irg_last_idx(lv->irg)); + liveness_for_node(irn); + bitset_free(re.visited); } } @@ -717,7 +706,7 @@ static void lv_check_walker(ir_node *bl, void *data) void be_liveness_check(be_lv_t *lv) { lv_walker_t w; - be_lv_t *fresh = be_liveness(lv->birg); + be_lv_t *fresh = be_liveness(lv->irg); w.lv = lv; w.data = fresh;