X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbechordal.c;h=6d32c1c0635f4a9b3a938f44eaf65ff0a1d80f7a;hb=24e5c853385fc57131a491cb80ad7a8eaaeb0a5c;hp=416b48d3f67f077593b1a5b5426d64160fce067d;hpb=c2fcdf7cddd0c74d5b6562e7ddce316f1695d800;p=libfirm diff --git a/ir/be/bechordal.c b/ir/be/bechordal.c index 416b48d3f..6d32c1c06 100644 --- a/ir/be/bechordal.c +++ b/ir/be/bechordal.c @@ -24,9 +24,7 @@ * @date 08.12.2004 * @version $Id$ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include @@ -120,7 +118,7 @@ static void check_heads(be_chordal_env_t *env) * @param is_def Is the border a use or a def. * @return The created border. */ -static INLINE border_t *border_add(be_chordal_env_t *env, struct list_head *head, +static inline border_t *border_add(be_chordal_env_t *env, struct list_head *head, ir_node *irn, unsigned step, unsigned pressure, unsigned is_def, unsigned is_real) { @@ -177,9 +175,9 @@ static INLINE border_t *border_add(be_chordal_env_t *env, struct list_head *head * @param irn The node. * @return 1, if the node is of that register class, 0 if not. */ -static INLINE int has_reg_class(const be_chordal_env_t *env, const ir_node *irn) +static inline int has_reg_class(const be_chordal_env_t *env, const ir_node *irn) { - return arch_irn_consider_in_reg_alloc(env->birg->main_env->arch_env, env->cls, irn); + return arch_irn_consider_in_reg_alloc(env->cls, irn); } static int get_next_free_reg(const be_chordal_alloc_env_t *alloc_env, bitset_t *colors) @@ -221,7 +219,6 @@ static be_insn_t *chordal_scan_insn(be_chordal_env_t *env, ir_node *irn) be_insn_env_t ie; ie.ignore_colors = env->ignore_colors; - ie.aenv = env->birg->main_env->arch_env; ie.obst = env->obst; ie.cls = env->cls; return be_scan_insn(&ie, irn); @@ -229,12 +226,11 @@ static be_insn_t *chordal_scan_insn(be_chordal_env_t *env, ir_node *irn) static ir_node *prepare_constr_insn(be_chordal_env_t *env, ir_node *irn) { - const be_irg_t *birg = env->birg; - const arch_env_t *aenv = birg->main_env->arch_env; bitset_t *tmp = bitset_alloca(env->cls->n_regs); bitset_t *def_constr = bitset_alloca(env->cls->n_regs); ir_node *bl = get_nodes_block(irn); - be_lv_t *lv = env->birg->lv; + const be_irg_t *birg = env->birg; + be_lv_t *lv = birg->lv; be_insn_t *insn; int i, j; @@ -245,17 +241,17 @@ static ir_node *prepare_constr_insn(be_chordal_env_t *env, ir_node *irn) const arch_register_t *reg; const arch_register_req_t *req; - if (arch_get_irn_reg_class(irn, i) != env->cls) + req = arch_get_register_req(irn, i); + if (req->cls != env->cls) continue; - reg = arch_get_irn_register(aenv, op); + reg = arch_get_irn_register(op); if (reg == NULL || !arch_register_type_is(reg, ignore)) continue; if(arch_register_type_is(reg, joker)) continue; - req = arch_get_register_req(irn, i); if (!arch_register_req_is(req, limited)) continue; @@ -373,13 +369,9 @@ void be_pre_spill_prepare_constr(be_chordal_env_t *cenv) { static void pair_up_operands(const be_chordal_alloc_env_t *alloc_env, be_insn_t *insn) { const be_chordal_env_t *env = alloc_env->chordal_env; - - int n_uses = be_insn_n_uses(insn); - int n_defs = be_insn_n_defs(insn); - bitset_t *bs = bitset_alloca(env->cls->n_regs); - int *pairing = alloca(MAX(n_defs, n_uses) * sizeof(pairing[0])); - - int i, j; + bitset_t *bs = bitset_alloca(env->cls->n_regs); + int i; + int j; /* For each out operand, try to find an in operand which can be assigned the @@ -429,7 +421,6 @@ static ir_node *pre_process_constraints(be_chordal_alloc_env_t *alloc_env, be_insn_t **the_insn) { be_chordal_env_t *env = alloc_env->chordal_env; - const arch_env_t *aenv = env->birg->main_env->arch_env; be_insn_t *insn = *the_insn; ir_node *perm = NULL; bitset_t *out_constr = bitset_alloca(env->cls->n_regs); @@ -463,7 +454,7 @@ static ir_node *pre_process_constraints(be_chordal_alloc_env_t *alloc_env, be_stat_ev("constr_perm", get_irn_arity(perm)); foreach_out_edge(perm, edge) { ir_node *proj = get_edge_src_irn(edge); - arch_set_irn_register(aenv, proj, NULL); + arch_set_irn_register(proj, NULL); } /* @@ -496,7 +487,6 @@ static ir_node *pre_process_constraints(be_chordal_alloc_env_t *alloc_env, static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, ir_node *irn, int *silent) { - const arch_env_t *aenv; int n_regs; bitset_t *bs; ir_node **alloc_nodes; @@ -542,13 +532,12 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, if(!insn->has_constraints) goto end; - aenv = env->birg->main_env->arch_env; n_regs = env->cls->n_regs; bs = bitset_alloca(n_regs); - alloc_nodes = alloca(n_regs * sizeof(alloc_nodes[0])); + alloc_nodes = ALLOCAN(ir_node*, n_regs); //bp = hungarian_new(n_regs, n_regs, 2, HUNGARIAN_MATCH_PERFECT); bp = bipartite_new(n_regs, n_regs); - assignment = alloca(n_regs * sizeof(assignment[0])); + assignment = ALLOCAN(int, n_regs); partners = pmap_create(); /* @@ -672,14 +661,14 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, irn = alloc_nodes[i]; if (irn != NULL) { - arch_set_irn_register(aenv, irn, reg); + arch_set_irn_register(irn, reg); (void) pset_hinsert_ptr(alloc_env->pre_colored, irn); DBG((dbg, LEVEL_2, "\tsetting %+F to register %s\n", irn, reg->name)); } irn = pmap_get(partners, alloc_nodes[i]); if (irn != NULL) { - arch_set_irn_register(aenv, irn, reg); + arch_set_irn_register(irn, reg); (void) pset_hinsert_ptr(alloc_env->pre_colored, irn); DBG((dbg, LEVEL_2, "\tsetting %+F to register %s\n", irn, reg->name)); } @@ -692,7 +681,7 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, /* Put the colors of all Projs in a bitset. */ foreach_out_edge(perm, edge) { ir_node *proj = get_edge_src_irn(edge); - const arch_register_t *reg = arch_get_irn_register(aenv, proj); + const arch_register_t *reg = arch_get_irn_register(proj); if(reg != NULL) bitset_set(bs, reg->index); @@ -701,7 +690,7 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, /* Assign the not yet assigned Projs of the Perm a suitable color. */ foreach_out_edge(perm, edge) { ir_node *proj = get_edge_src_irn(edge); - const arch_register_t *reg = arch_get_irn_register(aenv, proj); + const arch_register_t *reg = arch_get_irn_register(proj); DBG((dbg, LEVEL_2, "\tchecking reg of %+F: %s\n", proj, reg ? reg->name : "")); @@ -709,7 +698,7 @@ static ir_node *handle_constraints(be_chordal_alloc_env_t *alloc_env, 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(aenv, proj, reg); + arch_set_irn_register(proj, reg); pset_insert_ptr(alloc_env->pre_colored, proj); DBG((dbg, LEVEL_2, "\tsetting %+F to register %s\n", proj, reg->name)); } @@ -881,7 +870,6 @@ static void assign(ir_node *block, void *env_ptr) bitset_t *live = alloc_env->live; bitset_t *colors = alloc_env->colors; bitset_t *in_colors = alloc_env->in_colors; - const arch_env_t *arch_env = env->birg->main_env->arch_env; struct list_head *head = get_block_border_head(env, block); be_lv_t *lv = env->birg->lv; @@ -908,7 +896,7 @@ static void assign(ir_node *block, void *env_ptr) be_lv_foreach(lv, block, be_lv_state_in, idx) { irn = be_lv_get_irn(lv, block, idx); if(has_reg_class(env, irn)) { - const arch_register_t *reg = arch_get_irn_register(arch_env, irn); + const arch_register_t *reg = arch_get_irn_register(irn); int col; assert(reg && "Node must have been assigned a register"); @@ -933,7 +921,7 @@ static void assign(ir_node *block, void *env_ptr) list_for_each_entry_reverse(border_t, b, head, list) { ir_node *irn = b->irn; int nr = get_irn_idx(irn); - int ignore = arch_irn_is(arch_env, irn, ignore); + int ignore = arch_irn_is_ignore(irn); /* * Assign a color, if it is a local def. Global defs already have a @@ -944,18 +932,18 @@ static void assign(ir_node *block, void *env_ptr) int col = NO_COLOR; if(ignore || pset_find_ptr(alloc_env->pre_colored, irn)) { - reg = arch_get_irn_register(arch_env, irn); + reg = arch_get_irn_register(irn); col = reg->index; assert(!bitset_is_set(colors, col) && "pre-colored register must be free"); } else { 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_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); - arch_set_irn_register(arch_env, irn, reg); + arch_set_irn_register(irn, reg); DBG((dbg, LEVEL_1, "\tassigning register %s(%d) to %+F\n", arch_register_get_name(reg), col, irn)); @@ -965,7 +953,7 @@ static void assign(ir_node *block, void *env_ptr) /* Clear the color upon a use. */ else if(!b->is_def) { - const arch_register_t *reg = arch_get_irn_register(arch_env, irn); + const arch_register_t *reg = arch_get_irn_register(irn); int col; assert(reg && "Register must have been assigned");