X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbessadestr.c;h=860802533e73bd056c55cae237a4cdc4b142ec07;hb=80fd56ac0ffd1de6c526a5c820a1ff31f659104b;hp=6cd9f04756e8a1a3389eb46f6b8aac3083ec1820;hpb=0446ca437434c82a25f7fdee01403a08237f4182;p=libfirm diff --git a/ir/be/bessadestr.c b/ir/be/bessadestr.c index 6cd9f0475..860802533 100644 --- a/ir/be/bessadestr.c +++ b/ir/be/bessadestr.c @@ -16,6 +16,7 @@ #include "irnode_t.h" #include "ircons_t.h" #include "iredges_t.h" +#include "irgwalk.h" #include "irgmod.h" #include "irdump.h" #include "irprintf.h" @@ -28,10 +29,10 @@ #include "benode_t.h" #include "besched_t.h" -static firm_dbg_module_t *dbg = NULL; +DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;) #define DUMP_GRAPHS -#define get_chordal_arch(ce) ((ce)->main_env->arch_env) +#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) @@ -39,31 +40,23 @@ static firm_dbg_module_t *dbg = NULL; #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) -static void clear_link(ir_node *irn, void *data) -{ - set_irn_link(irn, NULL); +static void clear_link(ir_node *irn, void *data) { + set_irn_link(irn, NULL); } /** - * Build a list of phis of a block. + * For each block build a linked list of phis that + * - are in that block + * - have the current register class + * The list is rooted at get_irn_link(BB). */ -static void collect_phis(ir_node *irn, void *data) -{ - be_chordal_env_t *env = 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)); - set_irn_link(bl, irn); - } -} - -/** - * Build a ring of phis for each block in the link field. - * @param env The chordal env. - */ -static INLINE void build_phi_rings(be_chordal_env_t *env) -{ - irg_walk_graph(env->irg, clear_link, collect_phis, env); +static void collect_phis_walker(ir_node *irn, void *data) { + be_chordal_env_t *env = 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)); + set_irn_link(bl, irn); + } } /** @@ -79,89 +72,91 @@ typedef struct { ir_node *proj; /**< The proj created for @p arg. */ } perm_proj_t; -static int cmp_perm_proj(const void *a, const void *b, size_t n) -{ +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; return !(p->arg == q->arg); } -static void insert_all_perms_walker(ir_node *bl, void *data) -{ - be_chordal_env_t *chordal_env = data; - pmap *perm_map = chordal_env->data; - ir_graph *irg = chordal_env->irg; - const be_node_factory_t *fact = chordal_env->main_env->node_factory; +/** + * Insert Perms in all predecessors of a block containing a phi + */ +static void insert_all_perms_walker(ir_node *bl, void *data) { + be_chordal_env_t *chordal_env = data; + pmap *perm_map = chordal_env->data; + ir_graph *irg = chordal_env->irg; + int i, n; - /* Dummy targets for the projs */ - ir_node *dummy = new_rd_Unknown(irg, mode_T); + assert(is_Block(bl)); - assert(is_Block(bl)); + /* If the link flag is NULL, this block has no phis. */ + if(!get_irn_link(bl)) + return; - /* If the link flag is NULL, this block has no phis. */ - if(get_irn_link(bl)) { - int i, n; + /* 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; + 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; - /* 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; + assert(!pmap_contains(perm_map, pred_bl) && "Already permed that block"); - 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; + /* + * 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)) { + perm_proj_t templ; + ir_node *arg = get_irn_n(phi, i); + unsigned hash = HASH_PTR(arg); - assert(!pmap_contains(perm_map, pred_bl) && "Already permed that block"); + templ.arg = arg; + pp = set_find(arg_set, &templ, sizeof(templ), hash); /* - * Note that all phis in the list are in the same register class - * by construction. + * If a proj_perm_t entry has not been made in the argument set, + * create one. The only restriction is, that the phi argument + * may not be live in at the current block, since this argument + * interferes with the phi and must thus not be member of a + * Perm. A copy will be inserted for this argument alter on. */ - for(phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) { - perm_proj_t templ; - ir_node *arg = get_irn_n(phi, i); - unsigned hash = HASH_PTR(arg); - - templ.arg = arg; - pp = set_find(arg_set, &templ, sizeof(templ), hash); - - /* - * If a proj_perm_t entry has not been made in the argument set, - * create one. The only restriction is, that the phi argument - * mey not be live in at the current block, since this argument - * 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)) { - templ.pos = n_projs++; - set_insert(arg_set, &templ, sizeof(templ), hash); - } + if(!pp && !is_live_in(bl, arg)) { + templ.pos = n_projs++; + set_insert(arg_set, &templ, sizeof(templ), hash); } + } + + if (n_projs) { /* - * set the in array of the Perm to the arguments of the phis - * recorded above + * Create a new Perm with the arguments just collected + * above in the arg_set and insert it into the schedule. */ - in = malloc(n_projs * sizeof(in[0])); + in = xmalloc(n_projs * sizeof(in[0])); for(pp = set_first(arg_set); pp; pp = set_next(arg_set)) in[pp->pos] = pp->arg; - perm = new_Perm(fact, chordal_env->cls, irg, pred_bl, n_projs, in); - insert_after = sched_skip(sched_last(pred_bl), 0, sched_skip_cf_predicator, - chordal_env->main_env->arch_env); + perm = be_new_Perm(chordal_env->cls, irg, pred_bl, n_projs, in); + 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); - exchange(dummy, perm); /* - * Make the Projs for the Perm. - * register allocation is copied form former phi arguments - * to the projs (new phi arguments) + * 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; for(pp = set_first(arg_set); pp; pp = set_next(arg_set)) { - pp->proj = new_r_Proj(irg, pred_bl, perm, get_irn_mode(pp->arg), pp->pos); - set_reg(pp->proj, get_reg(pp->arg)); - DBG((dbg, LEVEL_2, "Copy register assignment %s from %+F to %+F\n", - get_reg(pp->arg)->name, pp->arg, pp->proj)); + ir_node *proj = new_r_Proj(irg, pred_bl, perm, get_irn_mode(pp->arg), pp->pos); + pp->proj = proj; + assert(get_reg(pp->arg)); + set_reg(proj, get_reg(pp->arg)); + sched_add_after(insert_after, proj); + 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)); } /* @@ -173,80 +168,89 @@ static void insert_all_perms_walker(ir_node *bl, void *data) templ.arg = get_irn_n(phi, i); pp = set_find(arg_set, &templ, sizeof(templ), HASH_PTR(templ.arg)); - assert(pp && "A Perm Proj must be created for this Phi argument"); - set_irn_n(phi, i, pp->proj); + /* If not found, it was an interfering argument */ + if (pp) + set_irn_n(phi, i, pp->proj); } - free(in); - del_set(arg_set); - /* register in perm map */ pmap_insert(perm_map, pred_bl, perm); } - } -} -static void insert_all_perms(be_chordal_env_t *chordal_env) { - DBG((dbg, LEVEL_1, "Placing perms...\n")); - irg_block_walk_graph(chordal_env->irg, insert_all_perms_walker, NULL, chordal_env); + del_set(arg_set); + } } #define is_pinned(irn) (get_irn_link(irn)) #define get_pinning_block(irn) ((ir_node *)get_irn_link(irn)) #define pin_irn(irn, lock) (set_irn_link(irn, lock)) - /** - * Adjusts the register allocation for the phi-operands - * by inserting perm nodes, if necessary. - * @param phi The phi node to adjust operands for + * Adjusts the register allocation for the (new) phi-operands + * and insert duplicates iff necessary. */ -static void adjust_phi_arguments(be_chordal_env_t *chordal_env, ir_node *phi) { - int i, max; - ir_node *arg, *phi_block, *arg_block; - const arch_register_t *phi_reg, *arg_reg; - const arch_register_class_t *cls; - - 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); - - /* 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 - */ - ir_node *dupl = new_Copy(chordal_env->main_env->node_factory, cls, chordal_env->irg, arg_block, arg); - assert(get_irn_mode(phi) == get_irn_mode(dupl)); - 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, chordal_env->main_env->arch_env), dupl); - pin_irn(dupl, phi_block); - DBG((dbg, LEVEL_1, " they do interfere: insert %+F(%s)\n", dupl, get_reg(dupl)->name)); - } else { +static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) { + be_chordal_env_t *chordal_env = data; + ir_node *phi; + + /* Consider all phis of this block */ + 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; + const arch_register_class_t *cls; + + 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); + + /* 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 + */ + ir_node *dupl = be_new_Copy(cls, chordal_env->irg, arg_block, arg); + assert(get_irn_mode(phi) == get_irn_mode(dupl)); + 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, chordal_env->birg->main_env->arch_env), dupl); + pin_irn(dupl, phi_block); + DBG((dbg, LEVEL_1, " they do interfere: insert %+F(%s)\n", dupl, get_reg(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)); /* - * First check if there is a phi + * 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 + * If found, then pin the arg (for that phi) */ - DBG((dbg, LEVEL_1, " they do not interfere\n")); - assert(is_Proj(arg)); if (!is_pinned(arg)) { ir_node *other_phi; DBG((dbg, LEVEL_1, " searching for phi with same arg having args register\n")); @@ -255,6 +259,7 @@ static void adjust_phi_arguments(be_chordal_env_t *chordal_env, ir_node *phi) { 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); + break; } } } @@ -268,7 +273,7 @@ static void adjust_phi_arguments(be_chordal_env_t *chordal_env, ir_node *phi) { */ ir_node *perm = get_Proj_pred(arg); ir_node *orig_val = get_irn_n(perm, get_Proj_proj(arg)); - ir_node *dupl = new_Copy(chordal_env->main_env->node_factory, cls, chordal_env->irg, arg_block, orig_val); + ir_node *dupl = be_new_Copy(cls, chordal_env->irg, arg_block, orig_val); assert(get_irn_mode(phi) == get_irn_mode(dupl)); set_irn_n(phi, i, dupl); set_reg(dupl, phi_reg); @@ -276,7 +281,7 @@ static void adjust_phi_arguments(be_chordal_env_t *chordal_env, ir_node *phi) { 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 be pinned), + /* 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); @@ -287,45 +292,34 @@ static void adjust_phi_arguments(be_chordal_env_t *chordal_env, ir_node *phi) { } } -static void set_regs_or_place_dupls_walker(ir_node *bl, void *data) { - be_chordal_env_t *chordal_env = data; - ir_node *phi; - - for(phi = get_irn_link(bl); phi; phi = get_irn_link(phi)) - adjust_phi_arguments(chordal_env, phi); -} - -static void set_regs_or_place_dupls(be_chordal_env_t *chordal_env) -{ - DBG((dbg, LEVEL_1, "Setting regs and placing dupls...\n")); - irg_block_walk_graph(chordal_env->irg, set_regs_or_place_dupls_walker, NULL, chordal_env); -} - - void be_ssa_destruction(be_chordal_env_t *chordal_env) { pmap *perm_map = pmap_create(); ir_graph *irg = chordal_env->irg; - dbg = firm_dbg_register("ir.be.ssadestr"); + FIRM_DBG_REGISTER(dbg, "ir.be.ssadestr"); /* create a map for fast lookup of perms: block --> perm */ chordal_env->data = perm_map; + irg_walk_graph(irg, clear_link, collect_phis_walker, chordal_env); - build_phi_rings(chordal_env); - insert_all_perms(chordal_env); + DBG((dbg, LEVEL_1, "Placing perms...\n")); + irg_block_walk_graph(irg, insert_all_perms_walker, NULL, chordal_env); #ifdef DUMP_GRAPHS - dump_ir_block_graph_sched(irg, "-ssa_destr_perms_placed"); + be_dump(irg, "-ssa_destr_perms_placed", dump_ir_block_graph_sched); #endif - set_regs_or_place_dupls(chordal_env); + + be_liveness(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); #ifdef DUMP_GRAPHS - dump_ir_block_graph_sched(irg, "-ssa_destr_regs_set"); + be_dump(irg, "-ssa_destr_regs_set", dump_ir_block_graph_sched); #endif pmap_destroy(perm_map); } -static void ssa_destruction_check_walker(ir_node *bl, void *data) -{ +static void ssa_destruction_check_walker(ir_node *bl, void *data) { be_chordal_env_t *chordal_env = data; ir_node *phi; int i, max;