X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal.c;h=221974288bc4c6a5c5d630b3e10ff69007508db2;hb=24d4d90a8a18fd1e2157787efc06fb3c9c7f2380;hp=9f17809417d7a4b212cce97515aaed8e45ed903f;hpb=7a178059678ff6c6094a7cd8fac5644367417102;p=libfirm diff --git a/ir/be/bechordal.c b/ir/be/bechordal.c index 9f1780941..221974288 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" @@ -44,7 +43,6 @@ #include "irdump.h" #include "irdom.h" #include "irtools.h" -#include "irbitset.h" #include "debug.h" #include "iredges.h" @@ -69,17 +67,15 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;) -#define NO_COLOR (-1) - #define DUMP_INTERVALS -typedef struct _be_chordal_alloc_env_t { +typedef struct be_chordal_alloc_env_t { be_chordal_env_t *chordal_env; pset *pre_colored; /**< Set of precolored nodes. */ - bitset_t *live; /**< A liveness bitset. */ + bitset_t *live; /**< A liveness bitset. */ bitset_t *tmp_colors; /**< An auxiliary bitset which is as long as the number of colors in the class. */ - bitset_t *colors; /**< The color mask. */ + bitset_t *colors; /**< The color mask. */ bitset_t *in_colors; /**< Colors used by live in values. */ int colors_n; /**< The number of colors. */ } be_chordal_alloc_env_t; @@ -88,8 +84,9 @@ static int get_next_free_reg(const be_chordal_alloc_env_t *alloc_env, bitset_t * { bitset_t *tmp = alloc_env->tmp_colors; bitset_copy(tmp, colors); - bitset_or(tmp, alloc_env->chordal_env->ignore_colors); - return bitset_next_clear(tmp, 0); + bitset_flip_all(tmp); + bitset_and(tmp, alloc_env->chordal_env->allocatable_regs); + return bitset_next_set(tmp, 0); } static bitset_t *get_decisive_partner_regs(bitset_t *bs, const be_operand_t *o1, const be_operand_t *o2) @@ -129,17 +126,17 @@ static void pair_up_operands(const be_chordal_alloc_env_t *alloc_env, be_insn_t /* * For each out operand, try to find an in operand which can be assigned the * same register as the out operand. - */ + */ for (j = 0; j < insn->use_start; ++j) { - int smallest = -1; - int smallest_n_regs = 2 * env->cls->n_regs + 1; - be_operand_t *out_op = &insn->ops[j]; + be_operand_t *smallest = NULL; + int smallest_n_regs = env->cls->n_regs + 1; + be_operand_t *out_op = &insn->ops[j]; /* Try to find an in operand which has ... */ for (i = insn->use_start; i < insn->n_ops; ++i) { - int n_total; - const be_operand_t *op = &insn->ops[i]; - be_lv_t *lv; + int n_total; + be_operand_t *op = &insn->ops[i]; + be_lv_t *lv; if (op->partner != NULL) continue; @@ -147,32 +144,30 @@ static void pair_up_operands(const be_chordal_alloc_env_t *alloc_env, be_insn_t if (be_values_interfere(lv, op->irn, op->carrier)) continue; - bitset_clear_all(bs); bitset_copy(bs, op->regs); bitset_and(bs, out_op->regs); - n_total = bitset_popcount(op->regs) + bitset_popcount(out_op->regs); + n_total = bitset_popcount(op->regs); if (!bitset_is_empty(bs) && n_total < smallest_n_regs) { - smallest = i; + smallest = op; smallest_n_regs = n_total; } } - if (smallest >= 0) { - be_operand_t *partner = &insn->ops[smallest]; + if (smallest != NULL) { for (i = insn->use_start; i < insn->n_ops; ++i) { - if (insn->ops[i].carrier == partner->carrier) + if (insn->ops[i].carrier == smallest->carrier) insn->ops[i].partner = out_op; } - out_op->partner = partner; - partner->partner = out_op; + out_op->partner = smallest; + smallest->partner = out_op; } } } 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; @@ -181,7 +176,7 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, int *assignment; pmap *partners; int i, n_alloc; - unsigned col; + size_t col; const ir_edge_t *edge; ir_node *perm = NULL; //int match_res, cost; @@ -189,7 +184,6 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_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) { @@ -198,24 +192,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; @@ -317,10 +298,7 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, alloc_nodes[n_alloc] = proj; pmap_insert(partners, proj, NULL); - bitset_clear_all(bs); - arch_put_non_ignore_regs(env->cls, bs); - bitset_andnot(bs, env->ignore_colors); - bitset_foreach(bs, col) { + bitset_foreach(env->allocatable_regs, col) { //hungarian_add(bp, n_alloc, col, 1); bipartite_add(bp, n_alloc, col); } @@ -346,7 +324,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) { @@ -355,7 +332,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 = (ir_node*)pmap_get(partners, alloc_nodes[i]); if (irn != NULL) { arch_set_irn_register(irn, reg); (void) pset_hinsert_ptr(alloc_env->pre_colored, irn); @@ -412,27 +389,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; @@ -496,7 +463,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); @@ -506,7 +473,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); @@ -524,11 +490,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); @@ -540,16 +501,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; @@ -559,6 +516,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 */ @@ -591,7 +557,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 = {