X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbessadestr.c;h=2a6124dbab8d74d45cdebfd7af7331337774a60f;hb=e46543287024a67217991be317e9692984939659;hp=41c11d380280b7c721286f2f9b4a36acf8c62da0;hpb=8eee0e6361868153ae82c8d8bdda1446a9af9084;p=libfirm diff --git a/ir/be/bessadestr.c b/ir/be/bessadestr.c index 41c11d380..2a6124dba 100644 --- a/ir/be/bessadestr.c +++ b/ir/be/bessadestr.c @@ -62,6 +62,7 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;) #define is_curr_reg_class(irn) (get_reg_cls(p) == chordal_env->cls) static void clear_link(ir_node *irn, void *data) { + (void) data; set_irn_link(irn, NULL); } @@ -96,6 +97,8 @@ typedef struct { static int cmp_perm_proj(const void *a, const void *b, size_t n) { const perm_proj_t *p = a; const perm_proj_t *q = b; + (void) n; + return !(p->arg == q->arg); } @@ -140,6 +143,9 @@ static void insert_all_perms_walker(ir_node *bl, void *data) { ir_node *arg = get_irn_n(phi, i); unsigned hash = nodeset_hash(arg); + if (arch_irn_is(chordal_env->birg->main_env->arch_env, arg, ignore)) + continue; + templ.arg = arg; pp = set_find(arg_set, &templ, sizeof(templ), hash); @@ -169,7 +175,6 @@ static void insert_all_perms_walker(ir_node *bl, void *data) { perm = be_new_Perm(chordal_env->cls, irg, pred_bl, n_projs, in); be_stat_ev("phi_perm", n_projs); - free(in); insert_after = sched_skip(sched_last(pred_bl), 0, sched_skip_cf_predicator, chordal_env->birg->main_env->arch_env); sched_add_after(insert_after, perm); @@ -184,7 +189,9 @@ static void insert_all_perms_walker(ir_node *bl, void *data) { pp->proj = proj; assert(get_reg(pp->arg)); set_reg(proj, get_reg(pp->arg)); +#ifdef SCHEDULE_PROJS sched_add_after(insert_after, proj); +#endif insert_after = proj; DBG((dbg, LEVEL_2, "Copy register assignment %s from %+F to %+F\n", get_reg(pp->arg)->name, pp->arg, pp->proj)); } @@ -199,10 +206,20 @@ static void insert_all_perms_walker(ir_node *bl, void *data) { pp = set_find(arg_set, &templ, sizeof(templ), nodeset_hash(templ.arg)); /* If not found, it was an interfering argument */ - if (pp) + if (pp) { set_irn_n(phi, i, pp->proj); + be_liveness_introduce(lv, pp->proj); + } } + /* update the liveness of the Perm's operands. It might be changed. */ + { + int i; + for (i = 0; i < n_projs; ++i) + be_liveness_update(lv, in[i]); + } + free(in); + /* register in perm map */ pmap_insert(perm_map, pred_bl, perm); } @@ -221,6 +238,7 @@ static void insert_all_perms_walker(ir_node *bl, void *data) { */ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) { be_chordal_env_t *chordal_env = data; + be_lv_t *lv = chordal_env->birg->lv; ir_node *phi; /* Consider all phis of this block */ @@ -242,6 +260,9 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) { arg_block = get_Block_cfgpred_block(phi_block, i); arg_reg = get_reg(arg); + if (arch_irn_is(chordal_env->birg->main_env->arch_env, arg, ignore)) + continue; + assert(arg_reg && "Register must be set while placing perms"); DBG((dbg, LEVEL_1, " for %+F(%s) -- %+F(%s)\n", phi, phi_reg->name, arg, arg_reg->name)); @@ -273,6 +294,8 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) { set_reg(dupl, phi_reg); sched_add_after(sched_skip(sched_last(arg_block), 0, sched_skip_cf_predicator, chordal_env->birg->main_env->arch_env), dupl); pin_irn(dupl, phi_block); + be_liveness_introduce(lv, dupl); + be_liveness_update(lv, arg); DBG((dbg, LEVEL_1, " they do interfere: insert %+F(%s)\n", dupl, get_reg(dupl)->name)); continue; /* with next argument */ } @@ -345,6 +368,8 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) { for(ins = sched_next(perm); is_Proj(ins); ins = sched_next(ins)); sched_add_before(ins, dupl); pin_irn(dupl, phi_block); + be_liveness_introduce(lv, dupl); + be_liveness_update(lv, arg); DBG((dbg, LEVEL_1, " arg is pinned: insert %+F(%s)\n", dupl, get_reg(dupl)->name)); } else { /* @@ -360,13 +385,15 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) { } void be_ssa_destruction(be_chordal_env_t *chordal_env) { + insert_all_perms_env_t insert_perms_env; pmap *perm_map = pmap_create(); ir_graph *irg = chordal_env->irg; - insert_all_perms_env_t insert_perms_env; + be_lv_t *lv = be_assure_liveness(chordal_env->birg); FIRM_DBG_REGISTER(dbg, "ir.be.ssadestr"); - be_assure_liveness(chordal_env->birg); + be_liveness_invalidate(lv); + be_liveness_assure_sets(lv); /* create a map for fast lookup of perms: block --> perm */ irg_walk_graph(irg, clear_link, collect_phis_walker, chordal_env); @@ -376,16 +403,21 @@ void be_ssa_destruction(be_chordal_env_t *chordal_env) { insert_perms_env.perm_map = perm_map; irg_block_walk_graph(irg, insert_all_perms_walker, NULL, &insert_perms_env); + // Matze: really needed here? + // Sebastian: Yes. the walker function uses interference. + be_liveness_invalidate(lv); + if (chordal_env->opts->dump_flags & BE_CH_DUMP_SSADESTR) be_dump(irg, "-ssa_destr_perms_placed", dump_ir_block_graph_sched); - // Matze: really needed here? - be_invalidate_liveness(chordal_env->birg); - be_assure_liveness(chordal_env->birg); + be_liveness_assure_chk(lv); DBG((dbg, LEVEL_1, "Setting regs and placing dupls...\n")); irg_block_walk_graph(irg, set_regs_or_place_dupls_walker, NULL, chordal_env); + /* TODO: unfortunaltely updating doesn't work yet. */ + be_liveness_invalidate(lv); + if (chordal_env->opts->dump_flags & BE_CH_DUMP_SSADESTR) be_dump(irg, "-ssa_destr_regs_set", dump_ir_block_graph_sched); @@ -405,6 +437,9 @@ static void ssa_destruction_check_walker(ir_node *bl, void *data) { for (i = 0, max = get_irn_arity(phi); i < max; ++i) { ir_node *arg = get_irn_n(phi, i); + if (arch_irn_is(chordal_env->birg->main_env->arch_env, arg, ignore)) + continue; + arg_reg = get_reg(arg); if (phi_reg != arg_reg) {