X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbelower.c;h=e0936889e2d9435c6684622270bf550e5c08511e;hb=1161999117f5c0f56b3af2dc9bb7150e03761905;hp=fafc9b188c1bf9b99a781c8d17bab9ca0c19a6e2;hpb=317e5e57774f7af9c5819c94afee4d9a4ac9b7b6;p=libfirm diff --git a/ir/be/belower.c b/ir/be/belower.c index fafc9b188..e0936889e 100644 --- a/ir/be/belower.c +++ b/ir/be/belower.c @@ -15,34 +15,34 @@ #include "ircons.h" #include "debug.h" +#include "irhooks.h" #include "bearch.h" #include "belower.h" #include "benode_t.h" #include "bechordal_t.h" #include "besched_t.h" +#include "bestat.h" #include "irgmod.h" #include "iredges_t.h" #include "irgwalk.h" -#ifdef _WIN32 -#include -#else -#include +#ifdef HAVE_MALLOC_H + #include +#endif +#ifdef HAVE_ALLOCA_H + #include #endif #undef is_Perm #define is_Perm(arch_env, irn) (arch_irn_classify(arch_env, irn) == arch_irn_class_perm) -#undef is_Call -#define is_Call(arch_env, irn) (arch_irn_classify(arch_env, irn) == arch_irn_class_call) - /* lowering walker environment */ typedef struct _lower_env_t { be_chordal_env_t *chord_env; - int do_copy; - firm_dbg_module_t *dbg_module; + unsigned do_copy:1; + DEBUG_ONLY(firm_dbg_module_t *dbg_module;) } lower_env_t; /* holds a perm register pair */ @@ -247,19 +247,20 @@ static perm_cycle_t *get_perm_cycle(perm_cycle_t *cycle, reg_pair_t *pairs, int static void lower_perm_node(ir_node *irn, void *walk_env) { const arch_register_class_t *reg_class; const arch_env_t *arch_env; - firm_dbg_module_t *mod; - lower_env_t *env = walk_env; + lower_env_t *env = walk_env; + int real_size = 0; + int n, i, pn, do_copy, j, n_ops; reg_pair_t *pairs; const ir_edge_t *edge; perm_cycle_t *cycle; - int n, i, pn, do_copy, j; ir_node *sched_point, *block, *in[2]; ir_node *arg1, *arg2, *res1, *res2; ir_node *cpyxchg = NULL; + DEBUG_ONLY(firm_dbg_module_t *mod;) arch_env = env->chord_env->birg->main_env->arch_env; do_copy = env->do_copy; - mod = env->dbg_module; + DEBUG_ONLY(mod = env->dbg_module;) block = get_nodes_block(irn); /* @@ -324,9 +325,13 @@ static void lower_perm_node(ir_node *irn, void *walk_env) { do_copy = 0; } + real_size = n - get_n_checked_pairs(pairs, n); + + be_do_stat_perm(reg_class->name, reg_class->n_regs, irn, block, n, real_size); + /* check for cycles and chains */ while (get_n_checked_pairs(pairs, n) < n) { - i = 0; + i = n_ops = 0; /* go to the first not-checked pair */ while (pairs[i].checked) i++; @@ -357,7 +362,6 @@ static void lower_perm_node(ir_node *irn, void *walk_env) { res1 = get_node_for_register(pairs, n, cycle->elems[i], 1); res2 = get_node_for_register(pairs, n, cycle->elems[i + 1], 1); - /* If we have a cycle and don't copy: we need to create exchange nodes NOTE: An exchange node is a perm node with 2 INs and 2 OUTs @@ -403,22 +407,23 @@ static void lower_perm_node(ir_node *irn, void *walk_env) { irn, res1, cycle->elems[i]->name, res2, cycle->elems[i + 1]->name)); cpyxchg = be_new_Perm(reg_class, env->chord_env->irg, block, 2, in); + n_ops++; if (i > 0) { /* cycle is not done yet */ int pidx = get_pairidx_for_regidx(pairs, n, cycle->elems[i]->index, 0); /* create intermediate proj */ - res2 = new_r_Proj(get_irn_irg(irn), block, cpyxchg, get_irn_mode(res1), 0); + res1 = new_r_Proj(get_irn_irg(irn), block, cpyxchg, get_irn_mode(res1), 0); /* set as in for next Perm */ - pairs[pidx].in_node = res2; + pairs[pidx].in_node = res1; } else { - sched_remove(res2); + sched_remove(res1); } - sched_remove(res1); + sched_remove(res2); set_Proj_pred(res2, cpyxchg); set_Proj_proj(res2, 0); @@ -430,6 +435,14 @@ static void lower_perm_node(ir_node *irn, void *walk_env) { arch_set_irn_register(arch_env, res2, cycle->elems[i + 1]); arch_set_irn_register(arch_env, res1, cycle->elems[i]); + + /* insert the copy/exchange node in schedule after the magic schedule node (see above) */ + sched_add_after(sched_point, cpyxchg); + + DBG((mod, LEVEL_1, "replacing %+F with %+F, placed new node after %+F\n", irn, cpyxchg, sched_point)); + + /* set the new scheduling point */ + sched_point = res1; } else { DBG((mod, LEVEL_1, "%+F creating copy node (%+F, %s) -> (%+F, %s)\n", @@ -437,26 +450,30 @@ static void lower_perm_node(ir_node *irn, void *walk_env) { cpyxchg = be_new_Copy(reg_class, env->chord_env->irg, block, arg1); arch_set_irn_register(arch_env, cpyxchg, cycle->elems[i + 1]); + n_ops++; /* remove the proj from the schedule */ sched_remove(res2); /* exchange copy node and proj */ exchange(res2, cpyxchg); - } - /* insert the copy/exchange node in schedule after the magic schedule node (see above) */ - sched_add_after(sched_point, cpyxchg); - /* set the new scheduling point */ - sched_point = cpyxchg; + /* insert the copy/exchange node in schedule after the magic schedule node (see above) */ + sched_add_after(sched_point, cpyxchg); - DBG((mod, LEVEL_1, "replacing %+F with %+F, placed new node after %+F\n", irn, cpyxchg, sched_point)); + /* set the new scheduling point */ + sched_point = cpyxchg; + } } + be_do_stat_permcycle(reg_class->name, irn, block, cycle->type == PERM_CHAIN, cycle->n_elems, n_ops); + free((void *) cycle->elems); free(cycle); } + + /* remove the perm from schedule */ sched_remove(irn); } @@ -498,11 +515,11 @@ static void gen_assure_different_pattern(ir_node *irn, be_irg_t *birg, ir_node * const arch_env_t *arch_env = birg->main_env->arch_env; ir_node *in[2], *keep, *cpy, *temp; ir_node *block = get_nodes_block(irn); - firm_dbg_module_t *mod = firm_dbg_register("firm.be.lower"); const arch_register_class_t *cls = arch_get_irn_reg_class(arch_env, other_different, -1); + FIRM_DBG_REGISTER(firm_dbg_module_t *mod, "firm.be.lower"); - if (arch_irn_is_ignore(arch_env, other_different)) { - DBG((mod, LEVEL_1, "ignore constraint for %+F because other_irn is ignore\n", irn)); + if (arch_irn_is(arch_env, other_different, ignore) || ! mode_is_datab(get_irn_mode(other_different))) { + DBG((mod, LEVEL_1, "ignore constraint for %+F because other_irn is ignore or not a datab node\n", irn)); return; } @@ -527,7 +544,8 @@ static void gen_assure_different_pattern(ir_node *irn, be_irg_t *birg, ir_node * keep = be_new_Keep(cls, birg->irg, block, 2, in); } else { - keep = be_new_CopyKeep(cls, birg->irg, block, cpy, 2, in, get_irn_mode(other_different)); + keep = be_new_CopyKeep_single(cls, birg->irg, block, cpy, irn, get_irn_mode(other_different)); + be_node_set_reg_class(keep, 1, cls); edges_reroute(other_different, keep, birg->irg); } @@ -612,8 +630,6 @@ static void lower_nodes_after_ra_walker(ir_node *irn, void *walk_env) { return; } - - /** * Walks over all blocks in an irg and performs lowering need to be * done after register allocation (e.g. perm lowering). @@ -626,10 +642,9 @@ void lower_nodes_after_ra(be_chordal_env_t *chord_env, int do_copy) { env.chord_env = chord_env; env.do_copy = do_copy; - env.dbg_module = firm_dbg_register("firm.be.lower"); + FIRM_DBG_REGISTER(env.dbg_module, "firm.be.lower"); irg_walk_blkwise_graph(chord_env->irg, NULL, lower_nodes_after_ra_walker, &env); } #undef is_Perm -#undef is_Call