X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal.c;h=a83c52a897e862deb4bcf8be5feed340206bf1eb;hb=6e3e499d6c68aee0c6a9ada6a99f16c4f6f8445b;hp=721a1765e76fd9abb9818877f5f1be245d1d753a;hpb=6760fa51d54112059342d9d892630e1eb91bff31;p=libfirm diff --git a/ir/be/bechordal.c b/ir/be/bechordal.c index 721a1765e..a83c52a89 100644 --- a/ir/be/bechordal.c +++ b/ir/be/bechordal.c @@ -286,10 +286,8 @@ static insn_t *scan_insn(be_chordal_alloc_env_t *alloc_env, ir_node *irn, struct assert(op->req.cls == env->cls); op->regs = bitset_obstack_alloc(obst, env->cls->n_regs); - if(arch_register_req_is(&op->req, limited)) { + if(arch_register_req_is(&op->req, limited)) op->req.limited(op->req.limited_env, op->regs); - bitset_andnot(op->regs, alloc_env->ignore_regs); - } else arch_put_non_ignore_regs(env->birg->main_env->arch_env, env->cls, op->regs); } @@ -326,12 +324,9 @@ static bitset_t *get_decisive_partner_regs(bitset_t *bs, const operand_t *o1, co static void pair_up_operands(const be_chordal_alloc_env_t *alloc_env, insn_t *insn) { const be_chordal_env_t *env = alloc_env->chordal_env; - const arch_env_t *aenv = env->birg->main_env->arch_env; - firm_dbg_module_t *dbg = alloc_env->constr_dbg; int n_uses = insn_n_uses(insn); int n_defs = insn_n_defs(insn); - int max_pairs = MIN(n_uses, n_defs); bitset_t *bs = bitset_alloca(env->cls->n_regs); bipartite_t *bp = bipartite_new(n_defs, n_uses); int *pairing = alloca(MAX(n_defs, n_uses) * sizeof(pairing[0])); @@ -477,12 +472,13 @@ static ir_node *pre_process_constraints(be_chordal_alloc_env_t *alloc_env, insn_ return perm; } -static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *irn) +static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *irn, int *silent) { be_chordal_env_t *env = alloc_env->chordal_env; void *base = obstack_base(&env->obst); insn_t *insn = scan_insn(alloc_env, irn, &env->obst); ir_node *res = insn->next_insn; + int be_silent = *silent; if(insn->pre_colored) { int i; @@ -490,7 +486,17 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *i pset_insert_ptr(alloc_env->pre_colored, insn->ops[i].carrier); } - if(be_is_Perm(irn) || be_is_RegParams(irn) || (be_is_Barrier(irn) && !insn->in_constraints)) + /* + 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; /* @@ -502,7 +508,6 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *i const arch_env_t *aenv = env->birg->main_env->arch_env; int n_regs = env->cls->n_regs; bitset_t *bs = bitset_alloca(n_regs); - bitset_t *non_ignore = bitset_alloca(n_regs); ir_node **alloc_nodes = alloca(n_regs * sizeof(alloc_nodes[0])); bipartite_t *bp = bipartite_new(n_regs, n_regs); int *assignment = alloca(n_regs * sizeof(assignment[0])); @@ -565,7 +570,7 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *i assert(is_Proj(proj)); - if(values_interfere(proj, irn)) { + if(values_interfere(proj, irn) && !pmap_contains(partners, proj)) { assert(n_alloc < n_regs); alloc_nodes[n_alloc] = proj; pmap_insert(partners, proj, NULL); @@ -648,20 +653,30 @@ end: /** * Handle constraint nodes in each basic block. - * be_insert_constr_perms() inserts Perm nodes which perm + * handle_constraints() inserts Perm nodes which perm * over all values live at the constrained node right in front * of the constrained node. These Perms signal a constrained node. - * For further comments, refer to handle_constraints_at_perm(). + * For further comments, refer to handle_constraints(). */ static void constraints(ir_node *bl, void *data) { - firm_dbg_module_t *dbg = firm_dbg_register("firm.be.chordal.constr"); be_chordal_alloc_env_t *env = data; - arch_env_t *arch_env = env->chordal_env->birg->main_env->arch_env; + + /* + 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)); 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); + irn = handle_constraints(env, irn, &silent); } } @@ -683,7 +698,6 @@ static void pressure(ir_node *block, void *env_ptr) be_chordal_alloc_env_t *alloc_env = env_ptr; be_chordal_env_t *env = alloc_env->chordal_env; - const arch_env_t *arch_env = env->birg->main_env->arch_env; bitset_t *live = alloc_env->live; firm_dbg_module_t *dbg = env->dbg; ir_node *irn; @@ -853,11 +867,10 @@ 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(arch_env, 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); - - assert(!arch_register_type_is(reg, ignore) && "Must not assign ignore register"); arch_set_irn_register(arch_env, irn, reg); DBG((dbg, LEVEL_1, "\tassigning register %s(%d) to %+F\n", @@ -905,7 +918,7 @@ void be_ra_chordal_color(be_chordal_env_t *chordal_env) env.in_colors = bitset_alloca(colors_n); env.ignore_regs = bitset_alloca(colors_n); env.pre_colored = pset_new_ptr_default(); - env.constr_dbg = firm_dbg_register("firm.be.chordal.constr"); + FIRM_DBG_REGISTER(env.constr_dbg, "firm.be.chordal.constr"); for(i = 0; i < colors_n; ++i) if(arch_register_type_is(&chordal_env->cls->regs[i], ignore))