X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbelive.c;h=8a2d143f2429dfb02102b7f21fd1338036ef45a4;hb=070134aa742484085c66db733a759aa3316dbf24;hp=198c98e9188568a9359cee85af8471de5c70d1fb;hpb=bb62c5abd1b8dca6ad0da2a7f154571196b4014a;p=libfirm diff --git a/ir/be/belive.c b/ir/be/belive.c index 198c98e91..8a2d143f2 100644 --- a/ir/be/belive.c +++ b/ir/be/belive.c @@ -29,7 +29,6 @@ /* statev is expensive here, only enable when needed */ #define DISABLE_STATEV -#include "impl.h" #include "iredges_t.h" #include "irgwalk.h" #include "irprintf_t.h" @@ -94,11 +93,11 @@ 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(be_lv_info_t *arr, unsigned idx) { - struct _be_lv_info_t *payload = arr + 1; + be_lv_info_t *payload = arr + 1; - unsigned n = arr[0].u.head.n_members; + unsigned n = arr[0].head.n_members; unsigned res = 0; int lo = 0; int hi = n; @@ -108,7 +107,7 @@ static inline unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned do { int md = lo + ((hi - lo) >> 1); - unsigned md_idx = payload[md].u.node.idx; + unsigned md_idx = payload[md].node.idx; if (idx > md_idx) lo = md + 1; @@ -116,7 +115,7 @@ static inline unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned hi = md; else { res = md; - assert(payload[res].u.node.idx == idx); + assert(payload[res].node.idx == idx); break; } @@ -127,10 +126,10 @@ static inline unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned { unsigned i; for (i = res; i < n; ++i) - assert(payload[i].u.node.idx >= idx); + assert(payload[i].node.idx >= idx); for (i = 0; i < res; ++i) - assert(payload[i].u.node.idx < idx); + assert(payload[i].node.idx < idx); } #endif @@ -142,13 +141,13 @@ 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(be_lv_info_t *arr, unsigned idx) { - unsigned n = arr[0].u.head.n_members; + unsigned n = arr[0].head.n_members; unsigned i; for (i = 0; i < n; ++i) { - if (arr[i + 1].u.node.idx == idx) + if (arr[i + 1].node.idx == idx) return i; } @@ -156,21 +155,22 @@ static inline unsigned _be_liveness_bsearch(struct _be_lv_info_t *arr, unsigned } #endif -struct _be_lv_info_node_t *be_lv_get(const struct _be_lv_t *li, const ir_node *bl, const ir_node *irn) +be_lv_info_node_t *be_lv_get(const be_lv_t *li, const ir_node *bl, + const ir_node *irn) { - struct _be_lv_info_t *irn_live; - struct _be_lv_info_node_t *res = NULL; + be_lv_info_t *irn_live; + be_lv_info_node_t *res = NULL; stat_ev_tim_push(); - irn_live = phase_get_irn_data(&li->ph, bl); - if (irn_live) { + irn_live = (be_lv_info_t*)ir_nodehashmap_get(&li->map, bl); + if (irn_live != NULL) { unsigned idx = get_irn_idx(irn); /* Get the position of the index in the array. */ 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 *rec = &irn_live[pos + 1].u.node; + be_lv_info_node_t *rec = &irn_live[pos + 1].node; /* Check, if the irn is in deed in the array. */ if (rec->idx == idx) @@ -181,9 +181,15 @@ struct _be_lv_info_node_t *be_lv_get(const struct _be_lv_t *li, const ir_node *b 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) +static be_lv_info_node_t *be_lv_get_or_set(be_lv_t *li, ir_node *bl, + ir_node *irn) { - struct _be_lv_info_t *irn_live = phase_get_or_set_irn_data(&li->ph, bl); + be_lv_info_t *irn_live = (be_lv_info_t*)ir_nodehashmap_get(&li->map, bl); + if (irn_live == NULL) { + irn_live = OALLOCNZ(&li->obst, be_lv_info_t, LV_STD_SIZE); + irn_live[0].head.n_size = LV_STD_SIZE-1; + ir_nodehashmap_insert(&li->map, bl, irn_live); + } unsigned idx = get_irn_idx(irn); @@ -191,13 +197,13 @@ static struct _be_lv_info_node_t *be_lv_get_or_set(struct _be_lv_t *li, ir_node unsigned 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; + be_lv_info_node_t *res = &irn_live[pos + 1].node; /* Check, if the irn is in deed in the array. */ if (res->idx != idx) { - struct _be_lv_info_t *payload; - unsigned n_members = irn_live[0].u.head.n_members; - unsigned n_size = irn_live[0].u.head.n_size; + be_lv_info_t *payload; + unsigned n_members = irn_live[0].head.n_members; + unsigned n_size = irn_live[0].head.n_size; unsigned i; if (n_members + 1 >= n_size) { @@ -206,13 +212,13 @@ static struct _be_lv_info_node_t *be_lv_get_or_set(struct _be_lv_t *li, ir_node unsigned old_size_bytes = (n_size + 1) * sizeof(irn_live[0]); unsigned new_size = (2 * n_size) + 1; size_t new_size_bytes = new_size * sizeof(irn_live[0]); - struct _be_lv_info_t *nw = phase_alloc(&li->ph, new_size_bytes); + be_lv_info_t *nw = OALLOCN(&li->obst, be_lv_info_t, new_size); memcpy(nw, irn_live, old_size_bytes); memset(((char*) nw) + old_size_bytes, 0, new_size_bytes - old_size_bytes); - nw[0].u.head.n_size = new_size - 1; + nw[0].head.n_size = new_size - 1; irn_live = nw; - phase_set_irn_data(&li->ph, bl, nw); + ir_nodehashmap_insert(&li->map, bl, nw); } payload = &irn_live[1]; @@ -220,9 +226,9 @@ static struct _be_lv_info_node_t *be_lv_get_or_set(struct _be_lv_t *li, ir_node payload[i] = payload[i - 1]; } - ++irn_live[0].u.head.n_members; + ++irn_live[0].head.n_members; - res = &payload[pos].u.node; + res = &payload[pos].node; res->idx = idx; res->flags = 0; } @@ -230,13 +236,13 @@ static struct _be_lv_info_node_t *be_lv_get_or_set(struct _be_lv_t *li, ir_node #ifdef LV_INTESIVE_CHECKS { unsigned i; - unsigned n = irn_live[0].u.head.n_members; + unsigned n = irn_live[0].head.n_members; unsigned last = 0; - struct _be_lv_info_t *payload = &irn_live[1]; + be_lv_info_t *payload = &irn_live[1]; for (i = 0; i < n; ++i) { - assert(payload[i].u.node.idx >= last); - last = payload[i].u.node.idx; + assert(payload[i].node.idx >= last); + last = payload[i].node.idx; } } #endif @@ -248,17 +254,17 @@ 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, const ir_node *bl, +static int be_lv_remove(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); + be_lv_info_t *irn_live = (be_lv_info_t*)ir_nodehashmap_get(&li->map, bl); - if (irn_live) { - unsigned n = irn_live[0].u.head.n_members; + if (irn_live != NULL) { + unsigned n = irn_live[0].head.n_members; unsigned idx = get_irn_idx(irn); unsigned pos = _be_liveness_bsearch(irn_live, idx); - struct _be_lv_info_t *payload = irn_live + 1; - struct _be_lv_info_node_t *res = &payload[pos].u.node; + be_lv_info_t *payload = irn_live + 1; + be_lv_info_node_t *res = &payload[pos].node; /* The node is in deed in the block's array. Let's remove it. */ if (res->idx == idx) { @@ -267,10 +273,10 @@ static int be_lv_remove(struct _be_lv_t *li, const ir_node *bl, for (i = pos + 1; i < n; ++i) payload[i - 1] = payload[i]; - payload[n - 1].u.node.idx = 0; - payload[n - 1].u.node.flags = 0; + payload[n - 1].node.idx = 0; + payload[n - 1].node.flags = 0; - --irn_live[0].u.head.n_members; + --irn_live[0].head.n_members; DBG((dbg, LEVEL_3, "\tdeleting %+F from %+F at pos %d\n", irn, bl, pos)); return 1; } @@ -297,7 +303,7 @@ static void register_node(be_lv_t *lv, const 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); + 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)); n->flags |= be_lv_state_in; register_node(lv, irn); @@ -308,7 +314,7 @@ static inline void mark_live_in(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); + 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)); n->flags |= be_lv_state_out | be_lv_state_end; register_node(lv, irn); @@ -319,7 +325,7 @@ static inline void mark_live_out(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); + 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)); n->flags |= be_lv_state_end; register_node(lv, irn); @@ -327,7 +333,7 @@ static inline void mark_live_end(be_lv_t *lv, ir_node *block, ir_node *irn) static struct { be_lv_t *lv; /**< The liveness object. */ - ir_node *def; /**< The node (value). */ + 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; @@ -369,7 +375,7 @@ static void live_end_at_block(ir_node *block, int is_true_out) } } -typedef struct _lv_walker_t { +typedef struct lv_walker_t { be_lv_t *lv; void *data; } lv_walker_t; @@ -443,7 +449,7 @@ static void liveness_for_node(ir_node *irn) static void lv_remove_irn_walker(ir_node *bl, void *data) { - lv_remove_walker_t *w = data; + lv_remove_walker_t *w = (lv_remove_walker_t*)data; be_lv_remove(w->lv, bl, w->irn); } @@ -466,40 +472,29 @@ static const char *lv_flags_to_str(unsigned flags) static void lv_dump_block(void *context, FILE *f, const ir_node *bl) { if (is_Block(bl)) { - be_lv_t *lv = context; - struct _be_lv_info_t *info = phase_get_irn_data(&lv->ph, bl); + be_lv_t *lv = (be_lv_t*)context; + be_lv_info_t *info = (be_lv_info_t*)ir_nodehashmap_get(&lv->map, bl); fprintf(f, "liveness:\n"); - if (info) { - unsigned n = info[0].u.head.n_members; + if (info != NULL) { + unsigned n = info[0].head.n_members; unsigned i; for (i = 0; i < n; ++i) { - struct _be_lv_info_node_t *n = &info[i+1].u.node; + be_lv_info_node_t *n = &info[i+1].node; ir_fprintf(f, "%s %+F\n", lv_flags_to_str(n->flags), get_idx_irn(lv->irg, n->idx)); } } } } -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_liveness_nodes(ir_node *irn, void *data) { - ir_node **nodes = data; + ir_node **nodes = (ir_node**)data; if (is_liveness_node(irn)) nodes[get_irn_idx(irn)] = irn; } @@ -541,7 +536,8 @@ void be_liveness_assure_sets(be_lv_t *lv) be_timer_push(T_LIVE); lv->nodes = bitset_malloc(2 * get_irg_last_idx(lv->irg)); - phase_init(&lv->ph, lv->irg, lv_phase_data_init); + ir_nodehashmap_init(&lv->map); + obstack_init(&lv->obst); compute_liveness(lv); /* be_live_chk_compare(lv, lv->lvc); */ @@ -564,7 +560,8 @@ void be_liveness_invalidate(be_lv_t *lv) { if (lv && lv->nodes) { unregister_hook(hook_node_info, &lv->hook_info); - phase_deinit(&lv->ph); + obstack_free(&lv->obst, NULL); + ir_nodehashmap_destroy(&lv->map); bitset_free(lv->nodes); lv->nodes = NULL; } @@ -598,8 +595,11 @@ void be_liveness_recompute(be_lv_t *lv) } else bitset_clear_all(lv->nodes); - phase_deinit(&lv->ph); - phase_init(&lv->ph, lv->irg, lv_phase_data_init); + ir_nodehashmap_destroy(&lv->map); + obstack_free(&lv->obst, NULL); + + ir_nodehashmap_init(&lv->map); + obstack_init(&lv->obst); compute_liveness(lv); be_timer_pop(T_LIVE); @@ -654,25 +654,25 @@ void be_liveness_update(be_lv_t *lv, ir_node *irn) static void lv_check_walker(ir_node *bl, void *data) { - lv_walker_t *w = data; + lv_walker_t *w = (lv_walker_t*)data; be_lv_t *lv = w->lv; - be_lv_t *fresh = w->data; + be_lv_t *fresh = (be_lv_t*)w->data; - struct _be_lv_info_t *curr = phase_get_irn_data(&lv->ph, bl); - struct _be_lv_info_t *fr = phase_get_irn_data(&fresh->ph, bl); + be_lv_info_t *curr = (be_lv_info_t*)ir_nodehashmap_get(&fresh->map, bl); + be_lv_info_t *fr = (be_lv_info_t*)ir_nodehashmap_get(&fresh->map, bl); - if (!fr && curr && curr[0].u.head.n_members > 0) { + if (!fr && curr && curr[0].head.n_members > 0) { unsigned i; ir_fprintf(stderr, "%+F liveness should be empty but current liveness contains:\n", bl); - for (i = 0; i < curr[0].u.head.n_members; ++i) { - ir_fprintf(stderr, "\t%+F\n", get_idx_irn(lv->irg, curr[1 + i].u.node.idx)); + for (i = 0; i < curr[0].head.n_members; ++i) { + ir_fprintf(stderr, "\t%+F\n", get_idx_irn(lv->irg, curr[1 + i].node.idx)); } } else if (curr) { - unsigned n_curr = curr[0].u.head.n_members; - unsigned n_fresh = fr[0].u.head.n_members; + unsigned n_curr = curr[0].head.n_members; + unsigned n_fresh = fr[0].head.n_members; unsigned i; @@ -681,13 +681,13 @@ static void lv_check_walker(ir_node *bl, void *data) ir_fprintf(stderr, "current:\n"); for (i = 0; i < n_curr; ++i) { - struct _be_lv_info_node_t *n = &curr[1 + i].u.node; + be_lv_info_node_t *n = &curr[1 + i].node; ir_fprintf(stderr, "%+F %u %+F %s\n", bl, i, get_idx_irn(lv->irg, n->idx), lv_flags_to_str(n->flags)); } ir_fprintf(stderr, "correct:\n"); for (i = 0; i < n_fresh; ++i) { - struct _be_lv_info_node_t *n = &fr[1 + i].u.node; + be_lv_info_node_t *n = &fr[1 + i].node; ir_fprintf(stderr, "%+F %u %+F %s\n", bl, i, get_idx_irn(lv->irg, n->idx), lv_flags_to_str(n->flags)); } } @@ -708,9 +708,9 @@ void be_liveness_check(be_lv_t *lv) static void lv_dump_block_walker(ir_node *irn, void *data) { - lv_walker_t *w = data; + lv_walker_t *w = (lv_walker_t*)data; if (is_Block(irn)) - lv_dump_block(w->lv, w->data, irn); + lv_dump_block(w->lv, (FILE*)w->data, irn); } @@ -737,12 +737,11 @@ void be_liveness_dumpto(const be_lv_t *lv, const char *cls_name) } /** - * Walker: checks the every predecessors of a node dominate - * the note. + * Walker: checks that every predecessors of a node dominates the node. */ static void dom_check(ir_node *irn, void *data) { - int *problem_found = data; + int *problem_found = (int*)data; if (!is_Block(irn) && irn != get_irg_end(get_irn_irg(irn))) { int i, n; @@ -851,7 +850,7 @@ void be_liveness_nodes_live_at(const be_lv_t *lv, static void collect_node(ir_node *irn, void *data) { - struct obstack *obst = data; + struct obstack *obst = (struct obstack*)data; obstack_ptr_grow(obst, irn); } @@ -868,36 +867,36 @@ void be_live_chk_compare(be_lv_t *lv, lv_chk_t *lvc) irg_block_walk_graph(irg, collect_node, NULL, &obst); obstack_ptr_grow(&obst, NULL); - blocks = obstack_finish(&obst); + blocks = (ir_node**)obstack_finish(&obst); irg_walk_graph(irg, collect_node, NULL, &obst); obstack_ptr_grow(&obst, NULL); - nodes = obstack_finish(&obst); + nodes = (ir_node**)obstack_finish(&obst); stat_ev_ctx_push("be_lv_chk_compare"); for (j = 0; nodes[j]; ++j) { ir_node *irn = nodes[j]; + if (is_Block(irn)) + continue; + for (i = 0; blocks[i]; ++i) { ir_node *bl = blocks[i]; + int lvr_in = be_is_live_in (lv, bl, irn); + int lvr_out = be_is_live_out(lv, bl, irn); + int lvr_end = be_is_live_end(lv, bl, irn); - if (!is_Block(irn)) { - int lvr_in = be_is_live_in (lv, bl, irn); - int lvr_out = be_is_live_out(lv, bl, irn); - int lvr_end = be_is_live_end(lv, bl, irn); + int lvc_in = lv_chk_bl_in (lvc, bl, irn); + int lvc_out = lv_chk_bl_out(lvc, bl, irn); + int lvc_end = lv_chk_bl_end(lvc, bl, irn); - int lvc_in = lv_chk_bl_in (lvc, bl, irn); - int lvc_out = lv_chk_bl_out(lvc, bl, irn); - int lvc_end = lv_chk_bl_end(lvc, bl, irn); + if (lvr_in - lvc_in != 0) + ir_fprintf(stderr, "live in info for %+F at %+F differs: nml: %d, chk: %d\n", irn, bl, lvr_in, lvc_in); - if (lvr_in - lvc_in != 0) - ir_fprintf(stderr, "live in info for %+F at %+F differs: nml: %d, chk: %d\n", irn, bl, lvr_in, lvc_in); + if (lvr_end - lvc_end != 0) + ir_fprintf(stderr, "live end info for %+F at %+F differs: nml: %d, chk: %d\n", irn, bl, lvr_end, lvc_end); - if (lvr_end - lvc_end != 0) - ir_fprintf(stderr, "live end info for %+F at %+F differs: nml: %d, chk: %d\n", irn, bl, lvr_end, lvc_end); - - if (lvr_out - lvc_out != 0) - ir_fprintf(stderr, "live out info for %+F at %+F differs: nml: %d, chk: %d\n", irn, bl, lvr_out, lvc_out); - } + if (lvr_out - lvc_out != 0) + ir_fprintf(stderr, "live out info for %+F at %+F differs: nml: %d, chk: %d\n", irn, bl, lvr_out, lvc_out); } } stat_ev_ctx_pop("be_lv_chk_compare"); @@ -905,7 +904,7 @@ void be_live_chk_compare(be_lv_t *lv, lv_chk_t *lvc) obstack_free(&obst, NULL); } -BE_REGISTER_MODULE_CONSTRUCTOR(be_init_live); +BE_REGISTER_MODULE_CONSTRUCTOR(be_init_live) void be_init_live(void) { FIRM_DBG_REGISTER(dbg, "firm.be.liveness");