X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal.c;h=ba9df02fd0fcedd9e8510ebc76fe6b41416e7e30;hb=0a7d7324b9baa076d1322e82b92f8fc2c8f1892e;hp=26f76f1f50cf85393eab5cec75637a82a79665a3;hpb=6c3146b96bc65d9de18f3f2b59faf33b8b9935d6;p=libfirm diff --git a/ir/be/bechordal.c b/ir/be/bechordal.c index 26f76f1f5..ba9df02fd 100644 --- a/ir/be/bechordal.c +++ b/ir/be/bechordal.c @@ -22,7 +22,6 @@ * @brief Chordal register allocation. * @author Sebastian Hack * @date 08.12.2004 - * @version $Id$ */ #include "config.h" @@ -33,7 +32,6 @@ #include "list.h" #include "bitset.h" #include "raw_bitset.h" -#include "iterator.h" #include "bipartite.h" #include "hungarian.h" @@ -44,7 +42,6 @@ #include "irdump.h" #include "irdom.h" #include "irtools.h" -#include "irbitset.h" #include "debug.h" #include "iredges.h" @@ -69,8 +66,6 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;) -#define NO_COLOR (-1) - #define DUMP_INTERVALS typedef struct be_chordal_alloc_env_t { @@ -171,7 +166,7 @@ static void pair_up_operands(const be_chordal_alloc_env_t *alloc_env, be_insn_t } static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, - ir_node *irn, int *silent) + ir_node *irn) { int n_regs; bitset_t *bs; @@ -180,15 +175,12 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, int *assignment; pmap *partners; int i, n_alloc; - unsigned col; - const ir_edge_t *edge; ir_node *perm = NULL; //int match_res, cost; be_chordal_env_t *env = alloc_env->chordal_env; void *base = obstack_base(env->obst); be_insn_t *insn = chordal_scan_insn(env, irn); ir_node *res = insn->next_insn; - int be_silent = *silent; bipartite_t *bp; if (insn->pre_colored) { @@ -197,24 +189,11 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, pset_insert_ptr(alloc_env->pre_colored, insn->ops[i].carrier); } - /* - * If the current node is a barrier toggle the silent flag. - * If we are in the start block, we are ought to be silent at the beginning, - * so the toggling activates the constraint handling but skips the barrier. - * If we are in the end block we handle the in requirements of the barrier - * and set the rest to silent. - */ - if (be_is_Barrier(irn)) - *silent = !*silent; - - if (be_silent) - goto end; - /* * Perms inserted before the constraint handling phase are considered to be * correctly precolored. These Perms arise during the ABI handling phase. */ - if (!insn->has_constraints) + if (!insn->has_constraints || is_Phi(irn)) goto end; n_regs = env->cls->n_regs; @@ -342,7 +321,6 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, assert(assignment[i] >= 0 && "there must have been a register assigned (node not register pressure faithful?)"); reg = arch_register_for_index(env->cls, assignment[i]); - assert(! (reg->type & arch_register_type_ignore)); irn = alloc_nodes[i]; if (irn != NULL) { @@ -351,7 +329,7 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, DBG((dbg, LEVEL_2, "\tsetting %+F to register %s\n", irn, reg->name)); } - irn = pmap_get(partners, alloc_nodes[i]); + irn = pmap_get(ir_node, partners, alloc_nodes[i]); if (irn != NULL) { arch_set_irn_register(irn, reg); (void) pset_hinsert_ptr(alloc_env->pre_colored, irn); @@ -380,7 +358,7 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, DBG((dbg, LEVEL_2, "\tchecking reg of %+F: %s\n", proj, reg ? reg->name : "")); if (reg == NULL) { - col = get_next_free_reg(alloc_env, bs); + size_t const col = get_next_free_reg(alloc_env, bs); reg = arch_register_for_index(env->cls, col); bitset_set(bs, reg->index); arch_set_irn_register(proj, reg); @@ -408,27 +386,17 @@ end: */ static void constraints(ir_node *bl, void *data) { - /* - * Start silent in the start block. - * The silence remains until the first barrier is seen. - * Each other block is begun loud. - */ - int silent = bl == get_irg_start_block(get_irn_irg(bl)); - be_chordal_alloc_env_t *env = data; + be_chordal_alloc_env_t *env = (be_chordal_alloc_env_t*)data; ir_node *irn; - /* - * If the block is the start block search the barrier and - * start handling constraints from there. - */ for (irn = sched_first(bl); !sched_is_end(irn);) { - irn = handle_constraints(env, irn, &silent); + irn = handle_constraints(env, irn); } } static void assign(ir_node *block, void *env_ptr) { - be_chordal_alloc_env_t *alloc_env = env_ptr; + be_chordal_alloc_env_t *alloc_env = (be_chordal_alloc_env_t*)env_ptr; be_chordal_env_t *env = alloc_env->chordal_env; bitset_t *live = alloc_env->live; bitset_t *colors = alloc_env->colors; @@ -436,10 +404,6 @@ static void assign(ir_node *block, void *env_ptr) struct list_head *head = get_block_border_head(env, block); be_lv_t *lv = be_get_irg_liveness(env->irg); - const ir_node *irn; - border_t *b; - int idx; - bitset_clear_all(colors); bitset_clear_all(live); bitset_clear_all(in_colors); @@ -456,8 +420,7 @@ static void assign(ir_node *block, void *env_ptr) * Since their colors have already been assigned (The dominators were * allocated before), we have to mark their colors as used also. */ - be_lv_foreach(lv, block, be_lv_state_in, idx) { - irn = be_lv_get_irn(lv, block, idx); + be_lv_foreach(lv, block, be_lv_state_in, irn) { if (has_reg_class(env, irn)) { const arch_register_t *reg = arch_get_irn_register(irn); int col; @@ -492,7 +455,7 @@ static void assign(ir_node *block, void *env_ptr) */ if (b->is_def && !be_is_live_in(lv, block, irn)) { const arch_register_t *reg; - int col = NO_COLOR; + int col; if (ignore || pset_find_ptr(alloc_env->pre_colored, irn)) { reg = arch_get_irn_register(irn); @@ -502,7 +465,6 @@ static void assign(ir_node *block, void *env_ptr) col = get_next_free_reg(alloc_env, colors); reg = arch_register_for_index(env->cls, col); assert(arch_get_irn_register(irn) == NULL && "This node must not have been assigned a register yet"); - assert(!arch_register_type_is(reg, ignore) && "Must not assign ignore register"); } bitset_set(colors, col); @@ -520,11 +482,6 @@ static void assign(ir_node *block, void *env_ptr) assert(reg && "Register must have been assigned"); col = arch_register_get_index(reg); -#ifndef NDEBUG - if (!arch_register_type_is(reg, ignore)) { - assert(bitset_is_set(live, nr) && "Cannot have a non live use"); - } -#endif bitset_clear(colors, col); bitset_clear(live, nr); @@ -536,16 +493,12 @@ void be_ra_chordal_color(be_chordal_env_t *chordal_env) { be_chordal_alloc_env_t env; char buf[256]; - be_lv_t *lv; const arch_register_class_t *cls = chordal_env->cls; - int colors_n = arch_register_class_n_regs(cls); - ir_graph *irg = chordal_env->irg; - - lv = be_assure_liveness(irg); - be_liveness_assure_sets(lv); - be_liveness_assure_chk(lv); + int colors_n = arch_register_class_n_regs(cls); + ir_graph *irg = chordal_env->irg; + be_assure_live_sets(irg); assure_doms(irg); env.chordal_env = chordal_env; @@ -555,6 +508,15 @@ void be_ra_chordal_color(be_chordal_env_t *chordal_env) env.in_colors = bitset_alloca(colors_n); env.pre_colored = pset_new_ptr_default(); + be_timer_push(T_SPLIT); + + if (chordal_env->opts->dump_flags & BE_CH_DUMP_SPLIT) { + snprintf(buf, sizeof(buf), "%s-split", chordal_env->cls->name); + dump_ir_graph(chordal_env->irg, buf); + } + + be_timer_pop(T_SPLIT); + be_timer_push(T_CONSTR); /* Handle register targeting constraints */ @@ -587,7 +549,7 @@ void be_ra_chordal_color(be_chordal_env_t *chordal_env) del_pset(env.pre_colored); } -BE_REGISTER_MODULE_CONSTRUCTOR(be_init_chordal); +BE_REGISTER_MODULE_CONSTRUCTOR(be_init_chordal) void be_init_chordal(void) { static be_ra_chordal_coloring_t coloring = {