X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbessadestr.c;h=532dc731b8a12c5920375a0db00da52fe77473f5;hb=a6888dd0c74a74aa5ec89d4542e402bda7cd61cb;hp=6d697033617f4a2846deddd424b862b24128e38f;hpb=c79fe4adc914d8d867772053bedf449a4f85645d;p=libfirm diff --git a/ir/be/bessadestr.c b/ir/be/bessadestr.c index 6d6970336..532dc731b 100644 --- a/ir/be/bessadestr.c +++ b/ir/be/bessadestr.c @@ -22,7 +22,6 @@ * @brief Performs SSA-Destruction. * @author Daniel Grund * @date 25.05.2005 - * @version $Id$ */ #include "config.h" @@ -52,9 +51,6 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;) -#define get_reg(irn) arch_get_irn_register(irn) -#define set_reg(irn, reg) arch_set_irn_register(irn, reg) - static void clear_link(ir_node *irn, void *data) { (void) data; @@ -69,7 +65,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 = data; + be_chordal_env_t *env = (be_chordal_env_t*)data; if (is_Phi(irn) && chordal_has_class(env, irn)) { ir_node *bl = get_nodes_block(irn); set_irn_link(irn, get_irn_link(bl)); @@ -92,27 +88,20 @@ 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; + const perm_proj_t *p = (const perm_proj_t*)a; + const perm_proj_t *q = (const perm_proj_t*)b; (void) 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 = data; - be_chordal_env_t *chordal_env = env->chordal_env; - pmap *perm_map = env->perm_map; - be_lv_t *lv = chordal_env->birg->lv; + 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; assert(is_Block(bl)); @@ -129,24 +118,19 @@ static void insert_all_perms_walker(ir_node *bl, void *data) 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. */ - for (phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) { + for (phi = (ir_node*)get_irn_link(bl); phi != NULL; + phi = (ir_node*)get_irn_link(phi)) { ir_node *arg = get_irn_n(phi, i); - const arch_register_req_t *req = arch_get_register_req_out(arg); unsigned hash; perm_proj_t templ; - if (req->type & arch_register_req_type_ignore) - continue; - hash = hash_irn(arg); templ.arg = arg; - pp = set_find(arg_set, &templ, sizeof(templ), hash); + pp = (perm_proj_t*)set_find(arg_set, &templ, sizeof(templ), hash); /* * If a proj_perm_t entry has not been made in the argument set, @@ -168,13 +152,17 @@ 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); - for (pp = set_first(arg_set); pp; pp = set_next(arg_set)) + 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); - insert_after = sched_skip(sched_last(pred_bl), 0, sched_skip_cf_predicator, NULL); + insert_after = pred_bl; + do { + insert_after = sched_prev(insert_after); + } while (is_cfop(insert_after)); sched_add_after(insert_after, perm); /* @@ -183,23 +171,24 @@ static void insert_all_perms_walker(ir_node *bl, void *data) * arguments to the projs (new phi arguments). */ insert_after = perm; - for (pp = set_first(arg_set); pp; pp = set_next(arg_set)) { + 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(get_reg(pp->arg)); - set_reg(proj, get_reg(pp->arg)); + 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", get_reg(pp->arg)->name, pp->arg, pp->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)); } /* * Set the phi nodes to their new arguments: The Projs of the Perm */ - for (phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) { + for (phi = (ir_node*)get_irn_link(bl); phi != NULL; + phi = (ir_node*)get_irn_link(phi)) { perm_proj_t templ; templ.arg = get_irn_n(phi, i); - pp = set_find(arg_set, &templ, sizeof(templ), hash_irn(templ.arg)); + pp = (perm_proj_t*)set_find(arg_set, &templ, sizeof(templ), hash_irn(templ.arg)); /* If not found, it was an interfering argument */ if (pp) { @@ -215,9 +204,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); @@ -232,17 +218,17 @@ static void insert_all_perms_walker(ir_node *bl, void *data) * Adjusts the register allocation for the (new) phi-operands * and insert duplicates iff necessary. */ -static void set_regs_or_place_dupls_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; + be_chordal_env_t *chordal_env = (be_chordal_env_t*)data; + be_lv_t *lv = be_get_irg_liveness(chordal_env->irg); ir_node *phi; /* Consider all phis of this block */ - for (phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) { + for (phi = (ir_node*)get_irn_link(bl); phi != NULL; + phi = (ir_node*)get_irn_link(phi)) { ir_node *phi_block = get_nodes_block(phi); - const arch_register_t *phi_reg = get_reg(phi); - const arch_register_class_t *cls = phi_reg->reg_class; + const arch_register_t *phi_reg = arch_get_irn_register(phi); int max; int i; @@ -251,21 +237,28 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) /* process all arguments of the phi */ 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_register_req_out(arg); const arch_register_t *arg_reg; ir_node *arg_block; - if (req->type & arch_register_req_type_ignore) - continue; - arg_block = get_Block_cfgpred_block(phi_block, i); - arg_reg = get_reg(arg); + arg_reg = arch_get_irn_register(arg); 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)); + 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); + DBG((dbg, LEVEL_1, " arg has same reg: pin %+F(%s)\n", arg, arch_get_irn_register(arg)->name)); + continue; + } + if (be_values_interfere(lv, phi, arg)) { + ir_node *schedpoint; + /* Insert a duplicate in arguments block, make it the new phi arg, @@ -273,38 +266,22 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) insert it into schedule, pin it */ - ir_node *dupl = be_new_Copy(cls, arg_block, arg); - - /* this is commented out because it will fail in case of unknown float */ -#if 0 - ir_mode *m_phi = get_irn_mode(phi), *m_dupl = get_irn_mode(dupl); - - /* - Conv signed <-> unsigned is killed on ia32 - check for: (both int OR both float) AND equal mode sizes - */ - assert(((mode_is_int(m_phi) && mode_is_int(m_dupl)) || - (mode_is_float(m_phi) && mode_is_float(m_dupl))) && - (get_mode_size_bits(m_phi) == get_mode_size_bits(m_dupl))); -#endif /* if 0 */ + ir_node *dupl = be_new_Copy(arg_block, arg); set_irn_n(phi, i, dupl); - set_reg(dupl, phi_reg); - sched_add_after(sched_skip(sched_last(arg_block), 0, sched_skip_cf_predicator, NULL), 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); 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)); + DBG((dbg, LEVEL_1, " they do interfere: insert %+F(%s)\n", dupl, arch_get_irn_register(dupl)->name)); continue; /* with next argument */ } - if (phi_reg == arg_reg) { - /* Phi and arg have the same register, so pin and continue */ - pin_irn(arg, phi_block); - DBG((dbg, LEVEL_1, " arg has same reg: pin %+F(%s)\n", arg, get_reg(arg)->name)); - continue; - } - DBG((dbg, LEVEL_1, " they do not interfere\n")); assert(is_Proj(arg)); /* @@ -320,14 +297,16 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) DBG((dbg, LEVEL_1, " searching for phi with same arg having args register\n")); - for (other_phi = get_irn_link(phi_block); other_phi; other_phi = get_irn_link(other_phi)) { + for (other_phi = (ir_node*)get_irn_link(phi_block); + other_phi != NULL; + other_phi = (ir_node*)get_irn_link(other_phi)) { assert(is_Phi(other_phi) && get_nodes_block(phi) == get_nodes_block(other_phi) && "link fields are screwed up"); - if (get_irn_n(other_phi, i) == arg && get_reg(other_phi) == arg_reg) { - DBG((dbg, LEVEL_1, " found %+F(%s)\n", other_phi, get_reg(other_phi)->name)); + if (get_irn_n(other_phi, i) == arg && arch_get_irn_register(other_phi) == arg_reg) { + DBG((dbg, LEVEL_1, " found %+F(%s)\n", other_phi, arch_get_irn_register(other_phi)->name)); pin_irn(arg, phi_block); break; } @@ -343,25 +322,11 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) pin it */ ir_node *perm = get_Proj_pred(arg); - ir_node *dupl = be_new_Copy(cls, arg_block, arg); + ir_node *dupl = be_new_Copy(arg_block, arg); ir_node *ins; - /* this is commented out because it will fail in case of unknown float */ -#if 0 - ir_mode *m_phi = get_irn_mode(phi); - ir_mode *m_dupl = get_irn_mode(dupl); - - /* - Conv signed <-> unsigned is killed on ia32 - check for: (both int OR both float) AND equal mode sizes - */ - assert(((mode_is_int(m_phi) && mode_is_int(m_dupl)) || - (mode_is_float(m_phi) && mode_is_float(m_dupl))) && - (get_mode_size_bits(m_phi) == get_mode_size_bits(m_dupl))); -#endif /* if 0 */ - set_irn_n(phi, i, dupl); - set_reg(dupl, phi_reg); + 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)) { } @@ -369,15 +334,15 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) 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)); + DBG((dbg, LEVEL_1, " arg is pinned: insert %+F(%s)\n", dupl, arch_get_irn_register(dupl)->name)); } else { /* No other phi has the same color (else arg would have been pinned), so just set the register and pin */ - set_reg(arg, phi_reg); + arch_set_irn_register(arg, phi_reg); pin_irn(arg, phi_block); - DBG((dbg, LEVEL_1, " arg is not pinned: so pin %+F(%s)\n", arg, get_reg(arg)->name)); + DBG((dbg, LEVEL_1, " arg is not pinned: so pin %+F(%s)\n", arg, arch_get_irn_register(arg)->name)); } } } @@ -385,42 +350,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(chordal_env->birg); + 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) - be_dump(irg, "-ssa_destr_perms_placed", dump_ir_block_graph_sched); + 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) - be_dump(irg, "-ssa_destr_regs_set", dump_ir_block_graph_sched); - - pmap_destroy(perm_map); + dump_ir_graph(irg, "ssa_destr_regs_set"); } static void ssa_destruction_check_walker(ir_node *bl, void *data) @@ -429,19 +383,20 @@ static void ssa_destruction_check_walker(ir_node *bl, void *data) int i, max; (void)data; - for (phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) { + for (phi = (ir_node*)get_irn_link(bl); phi != NULL; + phi = (ir_node*)get_irn_link(phi)) { const arch_register_t *phi_reg, *arg_reg; - phi_reg = get_reg(phi); + phi_reg = arch_get_irn_register(phi); /* iterate over all args of phi */ 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_register_req_out(arg); + const arch_register_req_t *req = arch_get_irn_register_req(arg); if (req->type & arch_register_req_type_ignore) continue; - arg_reg = get_reg(arg); + arg_reg = arch_get_irn_register(arg); if (phi_reg != arg_reg) { DBG((dbg, 0, "Error: Registers of %+F and %+F differ: %s %s\n", phi, arg, phi_reg->name, arg_reg->name));