X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fbe%2Fbessadestr.c;h=8d6d86093eb2918c0c7ee166c1bb3b5f4eedb0de;hb=df2faee01a5832057bb3ca0ba5f67e979c916e19;hp=168eaea77a3d04a37c65c282bba511e1c736db40;hpb=f8cc15664f571aa7ef89d6f6bc8d5bd2b8ca7d53;p=libfirm diff --git a/ir/be/bessadestr.c b/ir/be/bessadestr.c index 168eaea77..8d6d86093 100644 --- a/ir/be/bessadestr.c +++ b/ir/be/bessadestr.c @@ -45,9 +45,10 @@ #include "belive_t.h" #include "benode.h" #include "besched.h" -#include "bestatevent.h" +#include "statev_t.h" #include "beirg.h" #include "beintlive_t.h" +#include "bespillutil.h" DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;) @@ -66,7 +67,7 @@ static void clear_link(ir_node *irn, void *data) static void collect_phis_walker(ir_node *irn, void *data) { be_chordal_env_t *env = (be_chordal_env_t*)data; - if (is_Phi(irn) && chordal_has_class(env, irn)) { + if (is_Phi(irn) && arch_irn_consider_in_reg_alloc(env->cls, irn)) { ir_node *bl = get_nodes_block(irn); set_irn_link(irn, get_irn_link(bl)); set_irn_link(bl, irn); @@ -95,19 +96,12 @@ static int cmp_perm_proj(const void *a, const void *b, size_t n) return !(p->arg == q->arg); } -typedef struct insert_all_perms_env_t { - be_chordal_env_t *chordal_env; - pmap *perm_map; -} insert_all_perms_env_t; - /** * Insert Perms in all predecessors of a block containing a phi */ static void insert_all_perms_walker(ir_node *bl, void *data) { - insert_all_perms_env_t *env = (insert_all_perms_env_t*)data; - be_chordal_env_t *chordal_env = env->chordal_env; - pmap *perm_map = env->perm_map; + be_chordal_env_t *const chordal_env = (be_chordal_env_t*)data; be_lv_t *lv = be_get_irg_liveness(chordal_env->irg); int i, n; @@ -119,14 +113,11 @@ static void insert_all_perms_walker(ir_node *bl, void *data) /* Look at all predecessors of the phi block */ for (i = 0, n = get_irn_arity(bl); i < n; ++i) { - ir_node *phi, *perm, *insert_after, **in; - perm_proj_t *pp; + ir_node *phi, *perm, **in; set *arg_set = new_set(cmp_perm_proj, chordal_env->cls->n_regs); ir_node *pred_bl = get_Block_cfgpred_block(bl, i); int n_projs = 0; - assert(!pmap_contains(perm_map, pred_bl) && "Already permed that block"); - /* * Note that all phis in the list are in the same * register class by construction. @@ -139,7 +130,7 @@ static void insert_all_perms_walker(ir_node *bl, void *data) hash = hash_irn(arg); templ.arg = arg; - pp = (perm_proj_t*)set_find(arg_set, &templ, sizeof(templ), hash); + perm_proj_t *const pp = set_find(perm_proj_t, arg_set, &templ, sizeof(templ), hash); /* * If a proj_perm_t entry has not been made in the argument set, @@ -150,7 +141,7 @@ static void insert_all_perms_walker(ir_node *bl, void *data) */ if (!pp && !be_is_live_in(lv, bl, arg)) { templ.pos = n_projs++; - set_insert(arg_set, &templ, sizeof(templ), hash); + (void)set_insert(perm_proj_t, arg_set, &templ, sizeof(templ), hash); } } @@ -161,31 +152,26 @@ static void insert_all_perms_walker(ir_node *bl, void *data) * above in the arg_set and insert it into the schedule. */ in = XMALLOCN(ir_node*, n_projs); - foreach_set(arg_set, perm_proj_t*, pp) { + foreach_set(arg_set, perm_proj_t, pp) { in[pp->pos] = pp->arg; } perm = be_new_Perm(chordal_env->cls, pred_bl, n_projs, in); - be_stat_ev("phi_perm", n_projs); + stat_ev_int("phi_perm", n_projs); - insert_after = pred_bl; - do { - insert_after = sched_prev(insert_after); - } while (is_cfop(insert_after)); - sched_add_after(insert_after, perm); + ir_node *const schedpoint = be_get_end_of_block_insertion_point(pred_bl); + sched_add_before(schedpoint, perm); /* * Make the Projs for the Perm and insert into schedule. * Register allocation is copied from the former phi * arguments to the projs (new phi arguments). */ - insert_after = perm; - foreach_set(arg_set, perm_proj_t*, pp) { + foreach_set(arg_set, perm_proj_t, pp) { ir_node *proj = new_r_Proj(perm, get_irn_mode(pp->arg), pp->pos); pp->proj = proj; assert(arch_get_irn_register(pp->arg)); arch_set_irn_register(proj, arch_get_irn_register(pp->arg)); - insert_after = proj; DBG((dbg, LEVEL_2, "Copy register assignment %s from %+F to %+F\n", arch_get_irn_register(pp->arg)->name, pp->arg, pp->proj)); } @@ -197,7 +183,7 @@ static void insert_all_perms_walker(ir_node *bl, void *data) perm_proj_t templ; templ.arg = get_irn_n(phi, i); - pp = (perm_proj_t*)set_find(arg_set, &templ, sizeof(templ), hash_irn(templ.arg)); + perm_proj_t *const pp = set_find(perm_proj_t, arg_set, &templ, sizeof(templ), hash_irn(templ.arg)); /* If not found, it was an interfering argument */ if (pp) { @@ -213,9 +199,6 @@ static void insert_all_perms_walker(ir_node *bl, void *data) be_liveness_update(lv, in[i]); } free(in); - - /* register in perm map */ - pmap_insert(perm_map, pred_bl, perm); } del_set(arg_set); @@ -260,7 +243,6 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) DBG((dbg, LEVEL_1, " for %+F(%s) -- %+F(%s)\n", phi, phi_reg->name, arg, arg_reg->name)); if (phi_reg == arg_reg - || (arg_reg->type & arch_register_type_joker) || (arg_reg->type & arch_register_type_virtual)) { /* Phi and arg have the same register, so pin and continue */ pin_irn(arg, phi_block); @@ -269,8 +251,6 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) } if (be_values_interfere(lv, phi, arg)) { - ir_node *schedpoint; - /* Insert a duplicate in arguments block, make it the new phi arg, @@ -282,11 +262,8 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) set_irn_n(phi, i, dupl); arch_set_irn_register(dupl, phi_reg); - schedpoint = arg_block; - do { - schedpoint = sched_prev(schedpoint); - } while (is_cfop(schedpoint)); - sched_add_after(schedpoint, dupl); + ir_node *const schedpoint = be_get_end_of_block_insertion_point(arg_block); + sched_add_before(schedpoint, dupl); pin_irn(dupl, phi_block); be_liveness_introduce(lv, dupl); be_liveness_update(lv, arg); @@ -335,14 +312,10 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) */ ir_node *perm = get_Proj_pred(arg); ir_node *dupl = be_new_Copy(arg_block, arg); - ir_node *ins; set_irn_n(phi, i, dupl); arch_set_irn_register(dupl, phi_reg); - /* skip the Perm's Projs and insert the copies behind. */ - for (ins = sched_next(perm); is_Proj(ins); ins = sched_next(ins)) { - } - sched_add_before(ins, dupl); + sched_add_after(perm, dupl); pin_irn(dupl, phi_block); be_liveness_introduce(lv, dupl); be_liveness_update(lv, arg); @@ -362,42 +335,31 @@ 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; - be_lv_t *lv = be_assure_liveness(irg); + ir_graph *irg = chordal_env->irg; FIRM_DBG_REGISTER(dbg, "ir.be.ssadestr"); - be_liveness_invalidate(lv); + be_invalidate_live_sets(irg); /* create a map for fast lookup of perms: block --> perm */ irg_walk_graph(irg, clear_link, collect_phis_walker, chordal_env); DBG((dbg, LEVEL_1, "Placing perms...\n")); - insert_perms_env.chordal_env = 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); + irg_block_walk_graph(irg, insert_all_perms_walker, NULL, chordal_env); if (chordal_env->opts->dump_flags & BE_CH_DUMP_SSADESTR) dump_ir_graph(irg, "ssa_destr_perms_placed"); - be_liveness_assure_chk(lv); + be_assure_live_chk(irg); 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: unfortunately updating doesn't work yet. */ - be_liveness_invalidate(lv); + /* unfortunately updating doesn't work yet. */ + be_invalidate_live_chk(irg); if (chordal_env->opts->dump_flags & BE_CH_DUMP_SSADESTR) dump_ir_graph(irg, "ssa_destr_regs_set"); - - pmap_destroy(perm_map); } static void ssa_destruction_check_walker(ir_node *bl, void *data) @@ -415,8 +377,7 @@ 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); const arch_register_req_t *req = arch_get_irn_register_req(arg); - - if (req->type & arch_register_req_type_ignore) + if (arch_register_req_is(req, ignore)) continue; arg_reg = arch_get_irn_register(arg);