#include "belive_t.h"
#include "beinsn_t.h"
#include "besched_t.h"
-#include "benodesets.h"
#include "bejavacoal.h"
#include "bestatevent.h"
#include "beirg_t.h"
{ "none", CO_ALGO_NONE },
{ "heur", CO_ALGO_HEUR },
{ "heur2", CO_ALGO_HEUR2 },
-#ifdef WITH_JVM
{ "heur3", CO_ALGO_HEUR3 },
-#endif /* WITH_JVM */
{ "heur4", CO_ALGO_HEUR4 },
-#ifdef WITH_ILP
{ "ilp", CO_ALGO_ILP },
-#endif /* WITH_ILP */
{ NULL, 0 }
};
/* 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[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;
+ const unsigned other = req->other_same;
+ int count = 0;
+ int i;
+
+ for (i = 0; (1U << i) <= other; ++i) {
+ if (other & (1U << i)) {
+ ir_node *o = get_irn_n(skip_Proj(irn), i);
+ if (!arch_irn_is(co->aenv, o, ignore) &&
+ !nodes_interfere(co->cenv, irn, o)) {
+ ++count;
+ }
}
}
- count = 1 + (other != NULL) + (other2 != NULL && other != other2);
-
- if (count > 1) {
- int i = 0;
+ if (count != 0) {
+ int k = 0;
+ ++count;
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);
+ unit->nodes[k++] = irn;
+
+ for (i = 0; 1U << i <= other; ++i) {
+ if (other & (1U << i)) {
+ ir_node *o = get_irn_n(skip_Proj(irn), i);
+ if (!arch_irn_is(co->aenv, o, ignore) &&
+ !nodes_interfere(co->cenv, irn, o)) {
+ unit->nodes[k] = o;
+ unit->costs[k] = co->get_costs(co, irn, o, -1);
+ ++k;
+ }
}
}
}
new_node.irn = n1;
new_node.degree = 0;
new_node.neighbours = NULL;
- node = set_insert(co->nodes, &new_node, sizeof(new_node), nodeset_hash(new_node.irn));
+ node = set_insert(co->nodes, &new_node, sizeof(new_node), hash_irn(new_node.irn));
for (nbr = node->neighbours; nbr; nbr = nbr->next)
if (nbr->irn == n2) {
else { /* 2-address code */
const arch_register_req_t *req = arch_get_register_req(co->aenv, irn, -1);
if (is_2addr_code(req)) {
- 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));
+ const unsigned other = req->other_same;
+ int i;
+
+ for (i = 0; 1U << i <= other; ++i) {
+ if (other & (1U << i)) {
+ ir_node *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));
+ }
}
}
}
ASSERT_GS_AVAIL(co);
new_node.irn = irn;
- n = set_find(co->nodes, &new_node, sizeof(new_node), nodeset_hash(new_node.irn));
+ n = set_find(co->nodes, &new_node, sizeof(new_node), hash_irn(new_node.irn));
if (n) {
return (n->degree > 0);
} else
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) {
for(j = 0; j < insn->use_start; ++j) {
ir_node *op = insn->ops[j].carrier;
bitset_t *adm = insn->ops[j].regs;
- int k;
+ unsigned k;
size_t nr;
if(!insn->ops[j].has_constraints)
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");
{ void_algo, "none", 0 },
{ co_solve_heuristic, "heur1", 0 },
{ co_solve_heuristic_new, "heur2", 0 },
+#ifdef WITH_JVM
{ co_solve_heuristic_java, "heur3", 0 },
+#else
+ { NULL, "heur3", 0 },
+#endif
{ co_solve_heuristic_mst, "heur4", 0 },
#ifdef WITH_ILP
{ co_solve_ilp2, "ilp", 1 },
+#else
+ { NULL, "ilp", 1 },
#endif
{ NULL, "", 0 }
};