X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbessadestr.c;h=4ef0fae5e3148799d6b141888630b88703c961f1;hb=e492520ea4bf269acd8421c602f7df4b1b6b1004;hp=ec293c838d400bda2f7fc80051b64f751b63965f;hpb=7efb6059a68405b38dc55c55714258da813cdc38;p=libfirm diff --git a/ir/be/bessadestr.c b/ir/be/bessadestr.c index ec293c838..4ef0fae5e 100644 --- a/ir/be/bessadestr.c +++ b/ir/be/bessadestr.c @@ -30,13 +30,12 @@ #include "besched_t.h" DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;) -#define DUMP_GRAPHS #define get_chordal_arch(ce) ((ce)->birg->main_env->arch_env) #define get_reg(irn) arch_get_irn_register(get_chordal_arch(chordal_env), irn) #define set_reg(irn, reg) arch_set_irn_register(get_chordal_arch(chordal_env), irn, reg) -#define is_Perm(irn) (arch_irn_classify(arch_env, irn) == arch_irn_class_perm) +#define is_Perm(irn) (arch_irn_class_is(arch_env, irn, perm)) #define get_reg_cls(irn) (arch_get_irn_reg_class(arch_env, irn, -1)) #define is_curr_reg_class(irn) (get_reg_cls(p) == chordal_env->cls) @@ -122,7 +121,7 @@ static void insert_all_perms_walker(ir_node *bl, void *data) { * interferes with the phi and must thus not be member of a * Perm. A copy will be inserted for this argument alter on. */ - if(!pp && !is_live_in(bl, arg)) { + if(!pp && !be_is_live_in(chordal_env->lv, bl, arg)) { templ.pos = n_projs++; set_insert(arg_set, &templ, sizeof(templ), hash); } @@ -194,7 +193,7 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) { ir_node *phi; /* Consider all phis of this block */ - for(phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) { + for (phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) { int i, max; ir_node *arg, *phi_block, *arg_block; const arch_register_t *phi_reg, *arg_reg; @@ -203,31 +202,41 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) { assert(is_Phi(phi) && "Can only handle phi-destruction :)"); phi_block = get_nodes_block(phi); - phi_reg = get_reg(phi); - cls = arch_get_irn_reg_class(get_chordal_arch(chordal_env), phi, -1); + phi_reg = get_reg(phi); + cls = arch_get_irn_reg_class(get_chordal_arch(chordal_env), phi, -1); /* process all arguments of the phi */ - for(i=0, max=get_irn_arity(phi); iname, arg, arg_reg->name)); - if(nodes_interfere(chordal_env, phi, arg)) { - /* Insert a duplicate in arguments block, - * make it the new phi arg, - * set its register, - * insert it into schedule, - * pin it - */ + if(values_interfere(chordal_env->lv, phi, arg)) { + /* + Insert a duplicate in arguments block, + make it the new phi arg, + set its register, + insert it into schedule, + pin it + */ ir_node *dupl = be_new_Copy(cls, chordal_env->irg, 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 */ set_irn_n(phi, i, dupl); set_reg(dupl, phi_reg); @@ -238,9 +247,7 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) { } if (phi_reg == arg_reg) { - /* Phi and arg have the same register, - * so pin and continue - */ + /* 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; @@ -249,18 +256,24 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) { DBG((dbg, LEVEL_1, " they do not interfere\n")); assert(is_Proj(arg)); /* - * First check if there is an other phi - * - in the same block - * - having arg at the current pos in its arg-list - * - having the same color as arg - * - * If found, then pin the arg (for that phi) - */ - if (!is_pinned(arg)) { + First check if there is an other phi + - in the same block + - having arg at the current pos in its arg-list + - having the same color as arg + + If found, then pin the arg (for that phi) + */ + if (! is_pinned(arg)) { ir_node *other_phi; + 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)) { - assert(is_Phi(other_phi) && get_nodes_block(phi) == get_nodes_block(other_phi) && "link fields are screwed up"); + + 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)); pin_irn(arg, phi_block); @@ -270,25 +283,43 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) { } if (is_pinned(arg)) { - /* Insert a duplicate of the original value in arguments block, - * make it the new phi arg, - * set its register, - * insert it into schedule, - * pin it - */ - ir_node *perm = get_Proj_pred(arg); - ir_node *orig_val = get_irn_n(perm, get_Proj_proj(arg)); - ir_node *dupl = be_new_Copy(cls, chordal_env->irg, arg_block, orig_val); - assert(get_irn_mode(phi) == get_irn_mode(dupl)); + /* + Insert a duplicate of the original value in arguments block, + make it the new phi arg, + set its register, + insert it into schedule, + pin it + */ + ir_node *perm = get_Proj_pred(arg); + ir_node *dupl = be_new_Copy(cls, chordal_env->irg, 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); - sched_add_before(perm, dupl); + /* 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); pin_irn(dupl, phi_block); DBG((dbg, LEVEL_1, " arg is pinned: insert %+F(%s)\n", dupl, get_reg(dupl)->name)); } else { - /* No other phi has the same color (else arg would have been pinned), - * so just set the register and pin - */ + /* + 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); pin_irn(arg, phi_block); DBG((dbg, LEVEL_1, " arg is not pinned: so pin %+F(%s)\n", arg, get_reg(arg)->name)); @@ -299,7 +330,7 @@ static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) { void be_ssa_destruction(be_chordal_env_t *chordal_env) { pmap *perm_map = pmap_create(); - ir_graph *irg = chordal_env->irg; + ir_graph *irg = chordal_env->irg; FIRM_DBG_REGISTER(dbg, "ir.be.ssadestr"); @@ -309,17 +340,17 @@ void be_ssa_destruction(be_chordal_env_t *chordal_env) { DBG((dbg, LEVEL_1, "Placing perms...\n")); irg_block_walk_graph(irg, insert_all_perms_walker, NULL, chordal_env); -#ifdef DUMP_GRAPHS - be_dump(irg, "-ssa_destr_perms_placed", dump_ir_block_graph_sched); -#endif - be_liveness(irg); + if (chordal_env->opts->dump_flags & BE_CH_DUMP_SSADESTR) + be_dump(irg, "-ssa_destr_perms_placed", dump_ir_block_graph_sched); + + be_liveness_recompute(chordal_env->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); -#ifdef DUMP_GRAPHS - be_dump(irg, "-ssa_destr_regs_set", dump_ir_block_graph_sched); -#endif + + 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); } @@ -329,19 +360,22 @@ static void ssa_destruction_check_walker(ir_node *bl, void *data) { ir_node *phi; int i, max; - for(phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) { + for (phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) { const arch_register_t *phi_reg, *arg_reg; phi_reg = get_reg(phi); /* iterate over all args of phi */ - for(i=0, max=get_irn_arity(phi); iname, arg_reg->name)); assert(0); } - if(!is_pinned(arg)) { + + if (! is_pinned(arg)) { DBG((dbg, 0, "Warning: Phi argument %+F is not pinned.\n", arg)); assert(0); }