X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbelive.c;h=fb51388912a10ca215c8f1e7d8e868a9248d459e;hb=bc7b5ee69d084e629590a6977b79a2fab7cd1aa1;hp=bffa22b109d7a397788782991bb2921875a68e83;hpb=74ceddfa4c0023a7d1824e521135f7df6f372e5b;p=libfirm diff --git a/ir/be/belive.c b/ir/be/belive.c index bffa22b10..fb5138891 100644 --- a/ir/be/belive.c +++ b/ir/be/belive.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1995-2007 University of Karlsruhe. All right reserved. + * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. * * This file is part of libFirm. * @@ -24,9 +24,10 @@ * @date 06.12.2004 * @version $Id$ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif + +/* statev is expensive here, only enable when needed */ +#define DISABLE_STATEV #include "impl.h" #include "iredges_t.h" @@ -36,6 +37,10 @@ #include "irdump_t.h" #include "irnodeset.h" +#include "dfs_t.h" +#include "absgraph.h" +#include "statev.h" + #include "beutil.h" #include "belive_t.h" #include "beirg_t.h" @@ -44,21 +49,32 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;) +/* see comment in compute_liveness() */ +#define LV_COMPUTE_SORTED #define LV_STD_SIZE 64 #define LV_USE_BINARY_SEARCH #undef LV_INTESIVE_CHECKS -static INLINE int is_liveness_node(const ir_node *irn) +void be_live_chk_compare(be_lv_t *lv, lv_chk_t *lvc); + +/** + * Filter out some nodes for which we never need liveness. + * + * @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) { - switch(get_irn_opcode(irn)) { + switch (get_irn_opcode(irn)) { case iro_Block: case iro_Bad: case iro_End: + case iro_Anchor: + case iro_NoMem: return 0; - default:; + default: + return 1; } - - return 1; } int (be_lv_next_irn)(const struct _be_lv_t *lv, const ir_node *bl, unsigned flags, int i) @@ -88,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; @@ -100,15 +116,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; @@ -145,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; @@ -160,8 +167,11 @@ static INLINE unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned struct _be_lv_info_node_t *be_lv_get(const struct _be_lv_t *li, const ir_node *bl, const ir_node *irn) { - struct _be_lv_info_t *irn_live = phase_get_irn_data(&li->ph, bl); + struct _be_lv_info_t *irn_live; + struct _be_lv_info_node_t *res = NULL; + stat_ev_tim_push(); + irn_live = phase_get_irn_data(&li->ph, bl); if(irn_live) { unsigned idx = get_irn_idx(irn); @@ -169,14 +179,15 @@ struct _be_lv_info_node_t *be_lv_get(const struct _be_lv_t *li, const ir_node *b int pos = _be_liveness_bsearch(irn_live, idx); /* Get the record in question. 1 must be added, since the first record contains information about the array and must be skipped. */ - struct _be_lv_info_node_t *res = &irn_live[pos + 1].u.node; + struct _be_lv_info_node_t *rec = &irn_live[pos + 1].u.node; /* Check, if the irn is in deed in the array. */ - if(res->idx == idx) - return res; + if(rec->idx == idx) + res = rec; } + stat_ev_tim_pop("be_lv_get"); - return NULL; + return res; } static struct _be_lv_info_node_t *be_lv_get_or_set(struct _be_lv_t *li, ir_node *bl, ir_node *irn) @@ -246,7 +257,8 @@ static struct _be_lv_info_node_t *be_lv_get_or_set(struct _be_lv_t *li, ir_node * Removes a node from the list of live variables of a block. * @return 1 if the node was live at that block, 0 if not. */ -static int be_lv_remove(struct _be_lv_t *li, ir_node *bl, ir_node *irn) +static int be_lv_remove(struct _be_lv_t *li, const ir_node *bl, + const ir_node *irn) { struct _be_lv_info_t *irn_live = phase_get_irn_data(&li->ph, bl); @@ -292,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)); @@ -303,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)); @@ -314,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)); @@ -357,30 +369,30 @@ static void live_end_at_block(be_lv_t *lv, ir_node *def, ir_node *block, bitset_ } } -struct _lv_walker_t { +typedef struct _lv_walker_t { be_lv_t *lv; void *data; -}; +} lv_walker_t; + +typedef struct lv_remove_walker_t { + be_lv_t *lv; + const ir_node *irn; +} lv_remove_walker_t; + /** * Liveness analysis for a value. - * This functions is meant to be called by a firm walker, to compute the - * set of all blocks a value is live in. - * @param irn The node (value). - * @param env Ignored. + * 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, void *data) +static void liveness_for_node(ir_node *irn, lv_walker_t *walker) { - struct _lv_walker_t *walker = data; - be_lv_t *lv = walker->lv; - bitset_t *visited = walker->data; + be_lv_t *lv = walker->lv; + bitset_t *visited = walker->data; const ir_edge_t *edge; ir_node *def_block; - /* Don't compute liveness information for non-data nodes. */ - if(!is_liveness_node(irn)) - return; - bitset_clear_all(visited); def_block = get_nodes_block(irn); @@ -389,11 +401,14 @@ 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. */ - if(!is_liveness_node(use)) + if (!is_liveness_node(use)) continue; /* Get the block where the usage is in. */ @@ -404,7 +419,7 @@ static void liveness_for_node(ir_node *irn, void *data) * through which the value reaches the phi function and mark the * value as live out of that block. */ - if(is_Phi(use)) { + 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); } @@ -413,12 +428,12 @@ static void liveness_for_node(ir_node *irn, void *data) * Else, the value is live in at this block. Mark it and call live * out on the predecessors. */ - else if(def_block != use_block) { + else if (def_block != use_block) { int i, n; mark_live_in(lv, use_block, irn); - for(i = 0, n = get_Block_n_cfgpreds(use_block); i < n; ++i) { + for (i = 0, n = get_Block_n_cfgpreds(use_block); i < n; ++i) { ir_node *pred_block = get_Block_cfgpred_block(use_block, i); live_end_at_block(lv, irn, pred_block, visited, 1); } @@ -428,10 +443,8 @@ static void liveness_for_node(ir_node *irn, void *data) static void lv_remove_irn_walker(ir_node *bl, void *data) { - struct _lv_walker_t *w = data; - be_lv_t *lv = w->lv; - ir_node *irn = w->data; - be_lv_remove(lv, bl, irn); + lv_remove_walker_t *w = data; + be_lv_remove(w->lv, bl, w->irn); } static const char *lv_flags_to_str(unsigned flags) @@ -469,89 +482,188 @@ 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) +static void *lv_phase_data_init(ir_phase *phase, const 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; } +/** + * Walker, collect all nodes for which we want calculate liveness info + * on an obstack. + */ +static void collect_nodes(ir_node *irn, void *data) +{ + struct obstack *obst = 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; +} +#endif /* LV_COMPUTE_SORTED */ + static void compute_liveness(be_lv_t *lv) { - struct _lv_walker_t w; + 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); + + /* + * 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 + w.lv = lv; - w.data = bitset_malloc(get_irg_last_idx(lv->irg)); - irg_walk_graph(lv->irg, liveness_for_node, NULL, &w); - bitset_free(w.data); + w.data = bitset_obstack_alloc(&obst, get_irg_last_idx(lv->irg)); + + for (i = 0; i < n; ++i) + liveness_for_node(nodes[i], &w); + + obstack_free(&obst, NULL); + register_hook(hook_node_info, &lv->hook_info); + stat_ev_tim_pop("be_lv_sets_cons"); +} + +void be_liveness_assure_sets(be_lv_t *lv) +{ + if (!lv->nodes) { + 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); + } +} + +void be_liveness_assure_chk(be_lv_t *lv) +{ +#ifndef USE_LIVE_CHK + BE_TIMER_PUSH(t_verify); + be_liveness_assure_sets(lv); + BE_TIMER_POP(t_verify); +#else + (void) lv; +#endif +} + +void be_liveness_invalidate(be_lv_t *lv) +{ + if (lv && lv->nodes) { + unregister_hook(hook_node_info, &lv->hook_info); + phase_free(&lv->ph); + bitset_free(lv->nodes); + lv->nodes = NULL; + } } /* 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])); + be_lv_t *lv = XMALLOCZ(be_lv_t); - memset(lv, 0, sizeof(lv[0])); - lv->irg = irg; - lv->nodes = bitset_malloc(2 * get_irg_last_idx(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; - register_hook(hook_node_info, &lv->hook_info); - phase_init(&lv->ph, "liveness", irg, PHASE_DEFAULT_GROWTH, lv_phase_data_init, NULL); - compute_liveness(lv); return lv; } void be_liveness_recompute(be_lv_t *lv) { - unsigned last_idx = get_irg_last_idx(lv->irg); + unsigned last_idx; + + BE_TIMER_PUSH(t_live); + last_idx = get_irg_last_idx(lv->irg); if(last_idx >= bitset_size(lv->nodes)) { bitset_free(lv->nodes); lv->nodes = bitset_malloc(last_idx * 2); - } - - else + } else bitset_clear_all(lv->nodes); phase_free(&lv->ph); phase_init(&lv->ph, "liveness", lv->irg, PHASE_DEFAULT_GROWTH, lv_phase_data_init, NULL); compute_liveness(lv); + + BE_TIMER_POP(t_live); } void be_liveness_free(be_lv_t *lv) { - unregister_hook(hook_node_info, &lv->hook_info); - phase_free(&lv->ph); - bitset_free(lv->nodes); - free(lv); + be_liveness_invalidate(lv); +#ifdef USE_LIVE_CHK + lv_chk_free(lv->lvc); + dfs_free(lv->dfs); +#endif + xfree(lv); } -void be_liveness_remove(be_lv_t *lv, ir_node *irn) +void be_liveness_remove(be_lv_t *lv, const ir_node *irn) { - unsigned idx = get_irn_idx(irn); - struct _lv_walker_t w; + if (lv->nodes) { + unsigned idx = get_irn_idx(irn); + lv_remove_walker_t w; - /* - * Removes a single irn from the liveness information. - * Since an irn can only be live at blocks dominated by the block of its - * definition, we only have to process that dominance subtree. - */ - w.lv = lv; - w.data = irn; - dom_tree_walk(get_nodes_block(irn), lv_remove_irn_walker, NULL, &w); - if(idx < bitset_size(lv->nodes)) - bitset_clear(lv->nodes, idx); + /* + * Removes a single irn from the liveness information. + * Since an irn can only be live at blocks dominated by the block of its + * definition, we only have to process that dominance subtree. + */ + w.lv = lv; + w.irn = irn; + dom_tree_walk(get_nodes_block(irn), lv_remove_irn_walker, NULL, &w); + if(idx < bitset_size(lv->nodes)) + bitset_clear(lv->nodes, idx); + } } void be_liveness_introduce(be_lv_t *lv, ir_node *irn) { - struct _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); + /* 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); + } } void be_liveness_update(be_lv_t *lv, ir_node *irn) @@ -560,26 +672,9 @@ void be_liveness_update(be_lv_t *lv, ir_node *irn) be_liveness_introduce(lv, irn); } -static void lv_add_missing_walker(ir_node *irn, void *data) -{ - struct _lv_walker_t *w = data; - if(!is_Block(irn) && !bitset_contains_irn(w->lv->nodes, irn)) { - liveness_for_node(irn, w); - } -} - -void be_liveness_add_missing(be_lv_t *lv) -{ - struct _lv_walker_t w; - w.lv = lv; - w.data = bitset_malloc(get_irg_last_idx(lv->irg)); - irg_walk_graph(lv->irg, lv_add_missing_walker, NULL, &w); - bitset_free(w.data); -} - static void lv_check_walker(ir_node *bl, void *data) { - struct _lv_walker_t *w = data; + lv_walker_t *w = data; be_lv_t *lv = w->lv; be_lv_t *fresh = w->data; @@ -621,8 +716,8 @@ 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); + lv_walker_t w; + be_lv_t *fresh = be_liveness(lv->birg); w.lv = lv; w.data = fresh; @@ -633,7 +728,7 @@ void be_liveness_check(be_lv_t *lv) static void lv_dump_block_walker(ir_node *irn, void *data) { - struct _lv_walker_t *w = data; + lv_walker_t *w = data; if(is_Block(irn)) lv_dump_block(w->lv, w->data, irn); } @@ -642,7 +737,7 @@ static void lv_dump_block_walker(ir_node *irn, void *data) /* Dump the liveness information for a graph. */ void be_liveness_dump(const be_lv_t *lv, FILE *f) { - struct _lv_walker_t w; + lv_walker_t w; w.lv = (be_lv_t *) lv; w.data = f; @@ -702,32 +797,8 @@ 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_register_class_t *cls, + ir_node *node, ir_nodeset_t *nodeset) { int i, arity; @@ -735,44 +806,41 @@ 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(cls, proj)) { + ir_nodeset_remove(nodeset, proj); + } + } + } else if (arch_irn_consider_in_reg_alloc(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(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; - 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_register_class_t *cls, + const ir_node *block, ir_nodeset_t *live) { int i; + assert(lv->nodes && "live sets must be computed"); be_lv_foreach(lv, block, be_lv_state_end, i) { ir_node *node = be_lv_get_irn(lv, block, i); - if(!arch_irn_consider_in_reg_alloc(arch_env, cls, node)) + if (!arch_irn_consider_in_reg_alloc(cls, node)) continue; ir_nodeset_insert(live, node); @@ -781,39 +849,24 @@ 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_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; - be_liveness_end_of_block(lv, arch_env, cls, bl, live); + be_liveness_end_of_block(lv, cls, bl, live); sched_foreach_reverse(bl, irn) { /* * If we encounter the node we want to insert the Perm after, * exit immediately, so that this node is still live */ if(irn == pos) - return live; + return; - be_liveness_transfer(arch_env, cls, irn, live); + be_liveness_transfer(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) -{ - const ir_node *bl = is_Block(pos) ? pos : get_nodes_block(pos); - ir_node *irn; - - be_liveness_end_of_block(lv, arch_env, cls, bl, live); - sched_foreach_reverse(bl, irn) { - be_liveness_transfer(arch_env, cls, irn, live); - if(irn == pos) - return live; - } - - return live; } static void collect_node(ir_node *irn, void *data) @@ -822,22 +875,15 @@ static void collect_node(ir_node *irn, void *data) obstack_ptr_grow(obst, irn); } -void be_live_chk_compare(be_irg_t *birg) +void be_live_chk_compare(be_lv_t *lv, lv_chk_t *lvc) { - ir_graph *irg = be_get_birg_irg(birg); + ir_graph *irg = lv->irg; struct obstack obst; ir_node **nodes; ir_node **blocks; - be_lv_t *lv; - lv_chk_t *lvc; int i, j; - be_assure_liveness(birg); - be_assure_liveness_chk(birg); - lv = be_get_birg_liveness(birg); - lvc = be_get_birg_liveness_chk(birg); - obstack_init(&obst); irg_block_walk_graph(irg, collect_node, NULL, &obst); @@ -848,11 +894,12 @@ void be_live_chk_compare(be_irg_t *birg) obstack_ptr_grow(&obst, NULL); nodes = obstack_finish(&obst); - for (i = 0; blocks[i]; ++i) { - ir_node *bl = blocks[i]; + stat_ev_ctx_push("be_lv_chk_compare"); + for (j = 0; nodes[j]; ++j) { + ir_node *irn = nodes[j]; + for (i = 0; blocks[i]; ++i) { + ir_node *bl = blocks[i]; - for (j = 0; nodes[j]; ++j) { - ir_node *irn = nodes[j]; if (!is_Block(irn)) { int lvr_in = be_is_live_in (lv, bl, irn); int lvr_out = be_is_live_out(lv, bl, irn); @@ -873,7 +920,7 @@ void be_live_chk_compare(be_irg_t *birg) } } } - + stat_ev_ctx_pop("be_lv_chk_compare"); obstack_free(&obst, NULL); }