}
unit->nodes = xrealloc(unit->nodes, unit->node_count * sizeof(*unit->nodes));
unit->costs = xrealloc(unit->costs, unit->node_count * sizeof(*unit->costs));
- } else
-
- /* Proj of a perm with corresponding arg */
- if (is_Perm_Proj(co->aenv, irn)) {
+ } else if (is_Perm_Proj(co->aenv, irn)) {
+ /* Proj of a perm with corresponding arg */
assert(!nodes_interfere(co->cenv, irn, get_Perm_src(irn)));
unit->nodes = xmalloc(2 * sizeof(*unit->nodes));
unit->costs = xmalloc(2 * sizeof(*unit->costs));
/* Src == Tgt of a 2-addr-code instruction */
if (is_2addr_code(req)) {
- ir_node *other = get_irn_n(skip_Proj(irn), req->other_same);
- if (!arch_irn_is(co->aenv, other, ignore) &&
- !nodes_interfere(co->cenv, irn, other)) {
- unit->nodes = xmalloc(2 * sizeof(*unit->nodes));
- unit->costs = xmalloc(2 * sizeof(*unit->costs));
- unit->node_count = 2;
- unit->nodes[0] = irn;
- unit->nodes[1] = other;
- unit->costs[1] = co->get_costs(co, irn, other, -1);
+ ir_node *other = get_irn_n(skip_Proj(irn), req->other_same[0]);
+ ir_node *other2 = NULL;
+ int count;
+
+ if (arch_irn_is(co->aenv, other, ignore) ||
+ nodes_interfere(co->cenv, irn, other)) {
+ other = NULL;
+ }
+ if (req->other_same[1] != -1) {
+ other2 = get_irn_n(skip_Proj(irn), req->other_same[1]);
+ if (arch_irn_is(co->aenv, other2, ignore) ||
+ nodes_interfere(co->cenv, irn, other2)) {
+ other2 = NULL;
+ }
+ }
+ count = 1 + (other != NULL) + (other2 != NULL && other != other2);
+
+ if (count > 1) {
+ int i = 0;
+
+ unit->nodes = xmalloc(count * sizeof(*unit->nodes));
+ unit->costs = xmalloc(count * sizeof(*unit->costs));
+ unit->node_count = count;
+ unit->nodes[i] = irn;
+ if (other != NULL) {
+ ++i;
+ unit->nodes[i] = other;
+ unit->costs[i] = co->get_costs(co, irn, other, -1);
+ }
+ if (other2 != NULL) {
+ if (other == other2) {
+ unit->costs[i] += co->get_costs(co, irn, other2, -1);
+ } else {
+ ++i;
+ unit->nodes[i] = other2;
+ unit->costs[i] = co->get_costs(co, irn, other2, -1);
+ }
+ }
}
} else {
assert(0 && "This is not an optimizable node!");
if (arch_register_type_is(reg, ignore))
return;
- /* Phis */
- if (is_Reg_Phi(irn))
+ if (is_Reg_Phi(irn)) { /* Phis */
for (pos=0, max=get_irn_arity(irn); pos<max; ++pos) {
ir_node *arg = get_irn_n(irn, pos);
add_edges(co, irn, arg, co->get_costs(co, irn, arg, pos));
}
-
- /* Perms */
- else if (is_Perm_Proj(co->aenv, irn)) {
+ }
+ else if (is_Perm_Proj(co->aenv, irn)) { /* Perms */
ir_node *arg = get_Perm_src(irn);
add_edges(co, irn, arg, co->get_costs(co, irn, arg, 0));
}
-
- /* 2-address code */
- else {
- const arch_register_req_t *req =
- arch_get_register_req(co->aenv, irn, -1);
+ else { /* 2-address code */
+ const arch_register_req_t *req = arch_get_register_req(co->aenv, irn, -1);
if (is_2addr_code(req)) {
- ir_node *other = get_irn_n(skip_Proj(irn), req->other_same);
- if (! arch_irn_is(co->aenv, other, ignore))
- add_edges(co, irn, other, co->get_costs(co, irn, other, 0));
+ const int *i;
+ for (i = req->other_same; i != ENDOF(req->other_same); ++i) {
+ ir_node *other;
+
+ if (*i == -1) break;
+
+ other = get_irn_n(skip_Proj(irn), *i);
+ if (! arch_irn_is(co->aenv, other, ignore))
+ add_edges(co, irn, other, co->get_costs(co, irn, other, 0));
+ }
}
}
}
ir_node *irn;
void *it, *nit;
- int i, n, n_regs;
+ int n, n_regs;
+ unsigned i;
n_regs = 0;
for(i = 0; i < co->cls->n_regs; ++i) {
return -1;
}
-static int appel_dump_clique(appel_clique_walker_t *env, pset *live, ir_node *bl, int curr_nr, int start_nr)
+static int appel_dump_clique(appel_clique_walker_t *env, const ir_nodeset_t *live, ir_node *bl, int curr_nr, int start_nr)
{
ir_node **live_arr = alloca(env->co->cls->n_regs * sizeof(live_arr[0]));
ir_node *irn;
int n_live;
int j;
+ ir_nodeset_iterator_t iter;
n_live = 0;
- foreach_pset(live, irn)
+ foreach_ir_nodeset(live, irn, iter)
live_arr[n_live++] = irn;
/* dump the live after clique */
appel_block_info_t *bli = phase_get_or_set_irn_data(&env->ph, bl);
struct obstack *obst = &env->obst;
void *base = obstack_base(obst);
- pset *live = pset_new_ptr_default();
+ ir_nodeset_t live;
+ ir_nodeset_iterator_t iter;
be_lv_t *lv = env->co->cenv->birg->lv;
int n_insns = 0;
}
DBG((dbg, LEVEL_2, "%+F\n", bl));
- be_liveness_end_of_block(lv, env->co->aenv, env->co->cls, bl, live);
+ ir_nodeset_init(&live);
+ be_liveness_end_of_block(lv, env->co->aenv, env->co->cls, bl, &live);
/* Generate the bad and ugly. */
for(i = n_insns - 1; i >= 0; --i) {
/* The first live set has to be saved in the block border set. */
if(i == n_insns - 1) {
j = 0;
- foreach_pset(live, irn) {
+ foreach_ir_nodeset(&live, irn, iter) {
bli->live_end[j] = irn;
bli->live_end_nr[j] = curr_nr + j;
++j;
for(j = 0; j < insn->use_start; ++j) {
ir_node *op = insn->ops[j].carrier;
bitset_t *adm = insn->ops[j].regs;
- int k;
- int nr;
+ unsigned k;
+ size_t nr;
if(!insn->ops[j].has_constraints)
continue;
nr = 0;
- foreach_pset(live, irn) {
+ foreach_ir_nodeset(&live, irn, iter) {
if(irn == op) {
- pset_break(live);
break;
}
++nr;
}
- assert(nr < pset_count(live));
+ assert(nr < ir_nodeset_size(&live));
for(k = 0; k < env->co->cls->n_regs; ++k) {
int mapped_col = env->color_map[k];
}
/* dump the clique and update the stuff. */
- curr_nr = appel_dump_clique(env, live, bl, curr_nr, start_nr);
+ curr_nr = appel_dump_clique(env, &live, bl, curr_nr, start_nr);
/* remove all defs. */
for(j = 0; j < insn->use_start; ++j)
- pset_remove_ptr(live, insn->ops[j].carrier);
+ ir_nodeset_remove(&live, insn->ops[j].carrier);
if(is_Phi(insn->irn) && arch_irn_consider_in_reg_alloc(env->co->aenv, env->co->cls, insn->irn)) {
bli->phi[bli->n_phi] = insn->irn;
/* add all uses */
else
for(j = insn->use_start; j < insn->n_ops; ++j)
- pset_insert_ptr(live, insn->ops[j].carrier);
+ ir_nodeset_insert(&live, insn->ops[j].carrier);
}
/* print the start clique. */
- curr_nr = appel_dump_clique(env, live, bl, curr_nr, start_nr);
+ curr_nr = appel_dump_clique(env, &live, bl, curr_nr, start_nr);
i = 0;
- foreach_pset(live, irn) {
+ foreach_ir_nodeset(&live, irn, iter) {
bli->live_in[i] = irn;
bli->live_in_nr[i] = PTR_TO_INT(get_irn_link(irn));
++i;
}
bli->n_live_in = i;
- del_pset(live);
+ ir_nodeset_destroy(&live);
free(insns);
obstack_free(obst, base);
env->curr_nr = curr_nr;
void co_dump_appel_graph_cliques(const copy_opt_t *co, FILE *f)
{
- int i;
- int n_colors;
+ unsigned i;
+ unsigned n_colors;
appel_clique_walker_t env;
bitset_t *adm = bitset_alloca(co->cls->n_regs);
be_lv_t *lv = co->cenv->birg->lv;
env.color_map = alloca(co->cls->n_regs * sizeof(env.color_map[0]));
for(i = 0, n_colors = 0; i < co->cls->n_regs; ++i) {
const arch_register_t *reg = &co->cls->regs[i];
- env.color_map[i] = arch_register_type_is(reg, ignore) ? -1 : n_colors++;
+ env.color_map[i] = arch_register_type_is(reg, ignore) ? -1 : (int) n_colors++;
}
env.dumb = 1;
/* make the first k nodes interfere */
for(i = 0; i < n_colors; ++i) {
- int j;
+ unsigned j;
for(j = i + 1; j < n_colors; ++j)
fprintf(f, "%d %d -1 ", i, j);
fprintf(f, "\n");
projects / libfirm / blobdiff