DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
-typedef struct be_chordal_alloc_env_t {
- be_chordal_env_t *chordal_env;
- bitset_t *colors; /**< The color mask. */
-} be_chordal_alloc_env_t;
-
static int get_next_free_reg(bitset_t *const available)
{
return bitset_next_set(available, 0);
}
-static bitset_t const *get_decisive_partner_regs(be_operand_t const *const o1)
+static unsigned const *get_decisive_partner_regs(be_operand_t const *const o1, size_t const n_regs)
{
be_operand_t const *const o2 = o1->partner;
- assert(!o2 || o1->req->cls == o2->req->cls);
-
- if (!o2 || bitset_contains(o1->regs, o2->regs)) {
+ if (!o2 || rbitset_contains(o1->regs, o2->regs, n_regs)) {
return o1->regs;
- } else if (bitset_contains(o2->regs, o1->regs)) {
+ } else if (rbitset_contains(o2->regs, o1->regs, n_regs)) {
return o2->regs;
} else {
return NULL;
/* For each out operand, try to find an in operand which can be assigned the
* same register as the out operand. */
int const n_regs = env->cls->n_regs;
- bitset_t *const bs = bitset_alloca(n_regs);
+ unsigned *const bs = rbitset_alloca(n_regs);
be_lv_t *const lv = be_get_irg_liveness(env->irg);
for (int j = 0; j < insn->use_start; ++j) {
/* Try to find an in operand which has ... */
be_operand_t *const out_op = &insn->ops[j];
for (int i = insn->use_start; i < insn->n_ops; ++i) {
be_operand_t *const op = &insn->ops[i];
- if (op->partner || be_values_interfere(lv, op->irn, op->carrier))
+ if (op->partner || be_values_interfere(lv, insn->irn, op->carrier))
continue;
- bitset_copy(bs, op->regs);
- bitset_and(bs, out_op->regs);
- int const n_total = bitset_popcount(op->regs);
- if (!bitset_is_empty(bs) && n_total < smallest_n_regs) {
+ rbitset_copy(bs, op->regs, n_regs);
+ rbitset_and(bs, out_op->regs, n_regs);
+ int const n_total = rbitset_popcount(op->regs, n_regs);
+ if (!rbitset_is_empty(bs, n_regs) && n_total < smallest_n_regs) {
smallest = op;
smallest_n_regs = n_total;
}
static void handle_constraints(be_chordal_env_t *const env, ir_node *const irn)
{
- void *const base = obstack_base(env->obst);
+ void *const base = obstack_base(&env->obst);
be_insn_t *insn = be_scan_insn(env, irn);
/* 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 || is_Phi(irn))
+ if (!insn || is_Phi(irn))
goto end;
/* Prepare the constraint handling of this node.
DBG((dbg, LEVEL_2, "\tassociating %+F and %+F\n", op->carrier, partner));
- bitset_t const *const bs = get_decisive_partner_regs(op);
+ unsigned const *const bs = get_decisive_partner_regs(op, n_regs);
if (bs) {
DBG((dbg, LEVEL_2, "\tallowed registers for %+F: %B\n", op->carrier, bs));
- bitset_foreach(bs, col) {
+ rbitset_foreach(bs, n_regs, col) {
#if USE_HUNGARIAN
hungarian_add(bp, n_alloc, col, 1);
#else
pmap_destroy(partners);
end:
- obstack_free(env->obst, base);
+ obstack_free(&env->obst, base);
}
/**
static void assign(ir_node *const block, void *const env_ptr)
{
- be_chordal_alloc_env_t *const alloc_env = (be_chordal_alloc_env_t*)env_ptr;
- be_chordal_env_t *const env = alloc_env->chordal_env;
- struct list_head *const head = get_block_border_head(env, block);
- be_lv_t *const lv = be_get_irg_liveness(env->irg);
+ be_chordal_env_t *const env = (be_chordal_env_t*)env_ptr;
+ struct list_head *const head = get_block_border_head(env, block);
+ be_lv_t *const lv = be_get_irg_liveness(env->irg);
DBG((dbg, LEVEL_4, "Assigning colors for block %+F\n", block));
DBG((dbg, LEVEL_4, "\tusedef chain for block\n"));
b->irn, get_irn_idx(b->irn)));
}
- bitset_t *const available = alloc_env->colors;
+ bitset_t *const available = bitset_alloca(env->allocatable_regs->size);
bitset_copy(available, env->allocatable_regs);
/* Add initial defs for all values live in.
* 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, irn) {
- if (arch_irn_consider_in_reg_alloc(env->cls, irn)) {
- arch_register_t const *const reg = arch_get_irn_register(irn);
+ be_lv_foreach_cls(lv, block, be_lv_state_in, env->cls, irn) {
+ arch_register_t const *const reg = arch_get_irn_register(irn);
- assert(reg && "Node must have been assigned a register");
- DBG((dbg, LEVEL_4, "%+F has reg %s\n", irn, reg->name));
+ assert(reg && "Node must have been assigned a register");
+ DBG((dbg, LEVEL_4, "%+F has reg %s\n", irn, reg->name));
- /* Mark the color of the live in value as used. */
- bitset_clear(available, reg->index);
- }
+ /* Mark the color of the live in value as used. */
+ bitset_clear(available, reg->index);
}
/* Mind that the sequence of defs from back to front defines a perfect
be_assure_live_sets(irg);
assure_doms(irg);
- arch_register_class_t const *const cls = chordal_env->cls;
- int const colors_n = arch_register_class_n_regs(cls);
- be_chordal_alloc_env_t env;
- env.chordal_env = chordal_env;
- env.colors = bitset_alloca(colors_n);
-
- be_timer_push(T_SPLIT);
- if (chordal_env->opts->dump_flags & BE_CH_DUMP_SPLIT) {
- snprintf(buf, sizeof(buf), "%s-split", cls->name);
- dump_ir_graph(irg, buf);
- }
- be_timer_pop(T_SPLIT);
-
be_timer_push(T_CONSTR);
/* Handle register targeting constraints */
dom_tree_walk_irg(irg, constraints, NULL, chordal_env);
if (chordal_env->opts->dump_flags & BE_CH_DUMP_CONSTR) {
- snprintf(buf, sizeof(buf), "%s-constr", cls->name);
+ snprintf(buf, sizeof(buf), "%s-constr", chordal_env->cls->name);
dump_ir_graph(irg, buf);
}
dom_tree_walk_irg(irg, create_borders, NULL, chordal_env);
/* Assign the colors */
- dom_tree_walk_irg(irg, assign, NULL, &env);
+ dom_tree_walk_irg(irg, assign, NULL, chordal_env);
if (chordal_env->opts->dump_flags & BE_CH_DUMP_TREE_INTV) {
- ir_snprintf(buf, sizeof(buf), "ifg_%s_%F.eps", cls->name, irg);
+ ir_snprintf(buf, sizeof(buf), "ifg_%s_%F.eps", chordal_env->cls->name, irg);
plotter_t *const plotter = new_plotter_ps(buf);
draw_interval_tree(&draw_chordal_def_opts, chordal_env, plotter);
plotter_free(plotter);
projects / libfirm / blobdiff