DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
+/** Defines an invalid register index. */
+#define NO_COLOR (-1)
+
#define SEARCH_FREE_COLORS
#define SLOTS_PINNED_GLOBAL 64
/**
* Modeling additional conflicts between nodes. NOT live range interference
*/
-typedef struct _conflict_t {
+typedef struct conflict_t {
const ir_node *n1, *n2;
} conflict_t;
* If an irn is changed, the changes first get stored in a node_stat_t,
* to allow undo of changes (=drop new data) in case of conflicts.
*/
-typedef struct _node_stat_t {
+typedef struct node_stat_t {
ir_node *irn;
int new_color;
int pinned_local :1;
/**
* Represents a node in the optimization queue.
*/
-typedef struct _qnode_t {
+typedef struct qnode_t {
struct list_head queue; /**< chaining of unit_t->queue */
const unit_t *ou; /**< the opt unit this node belongs to */
int color; /**< target color */
set *changed_nodes; /**< contains node_stat_t's. */
} qnode_t;
-static pset *pinned_global; /**< optimized nodes should not be altered any more */
+static pset *pinned_global; /**< optimized nodes should not be altered any more */
static inline int nodes_interfere(const be_chordal_env_t *env, const ir_node *a, const ir_node *b)
{
if (env->ifg)
return be_ifg_connected(env->ifg, a, b);
- else
- return be_values_interfere(env->birg->lv, a, b);
+ else {
+ be_lv_t *lv = be_get_irg_liveness(env->irg);
+ return be_values_interfere(lv, a, b);
+ }
}
static int set_cmp_conflict_t(const void *x, const void *y, size_t size)
{
- const conflict_t *xx = x;
- const conflict_t *yy = y;
+ const conflict_t *xx = (const conflict_t*)x;
+ const conflict_t *yy = (const conflict_t*)y;
(void) size;
return xx->n1 != yy->n1 || xx->n2 != yy->n2;
{
node_stat_t find;
find.irn = irn;
- return set_find(qn->changed_nodes, &find, sizeof(find), hash_irn(irn));
+ return (const node_stat_t*)set_find(qn->changed_nodes, &find, sizeof(find), hash_irn(irn));
}
/**
find.irn = irn;
find.new_color = NO_COLOR;
find.pinned_local = 0;
- return set_insert(qn->changed_nodes, &find, sizeof(find), hash_irn(irn));
+ return (node_stat_t*)set_insert(qn->changed_nodes, &find, sizeof(find), hash_irn(irn));
}
/**
int irn_col = qnode_get_new_color(qn, irn);
ir_node *sub_res, *curr;
be_ifg_t *ifg = chordal_env->ifg;
- void *iter = be_ifg_neighbours_iter_alloca(ifg);
+ neighbours_iter_t iter;
DBG((dbg, LEVEL_3, "\t %+F \tcaused col(%+F) \t%2d --> %2d\n", trigger, irn, irn_col, col));
int free_col;
/* Get all possible colors */
- bitset_copy(free_cols, co->cenv->ignore_colors);
- bitset_flip_all(free_cols);
+ bitset_copy(free_cols, co->cenv->allocatable_regs);
/* Exclude colors not assignable to the irn */
req = arch_get_register_req_out(irn);
bitset_clear(free_cols, irn_col);
/* Exclude all colors used by adjacent nodes */
- be_ifg_foreach_neighbour(ifg, iter, irn, curr)
+ be_ifg_foreach_neighbour(ifg, &iter, irn, curr)
bitset_clear(free_cols, qnode_get_new_color(qn, curr));
free_col = bitset_next_set(free_cols, 0);
* If we arrive here changing color may be possible, but there may be conflicts.
* Try to color all conflicting nodes 'curr' with the color of the irn itself.
*/
- be_ifg_foreach_neighbour(ifg, iter, irn, curr) {
+ be_ifg_foreach_neighbour(ifg, &iter, irn, curr) {
DBG((dbg, LEVEL_3, "\t Confl %+F(%d)\n", curr, qnode_get_new_color(qn, curr)));
if (qnode_get_new_color(qn, curr) == col && curr != trigger) {
sub_res = qnode_color_irn(qn, curr, irn_col, irn);
if (sub_res != CHANGE_SAVE) {
- be_ifg_neighbours_break(ifg, iter);
+ be_ifg_neighbours_break(&iter);
return sub_res;
}
}
ir_node **safe, **unsafe;
int i, o, safe_count, safe_costs, unsafe_count, *unsafe_costs;
bitset_t *curr, *best;
- bitset_pos_t pos;
+ size_t pos;
int next, curr_weight, best_weight = 0;
/* assign the nodes into two groups.
goto no_stable_set;
/* if we arrive here, we have a stable set */
- /* compute the weigth of the stable set*/
+ /* compute the weight of the stable set*/
curr_weight = 0;
bitset_foreach(curr, pos)
curr_weight += unsafe_costs[pos];
}
/* transfer the best set into the qn */
- qn->mis_size = 1+safe_count+bitset_popcnt(best);
+ qn->mis_size = 1+safe_count+bitset_popcount(best);
qn->mis_costs = safe_costs+best_weight;
qn->mis[0] = ou->nodes[0]; /* the root is always in a max stable set */
next = 1;
qnode_t *curr = NULL;
qnode_t *tmp;
const arch_register_req_t *req;
- bitset_t const* ignore;
- bitset_pos_t n_regs;
- bitset_pos_t idx;
+ bitset_t const* allocatable_regs;
+ unsigned n_regs;
+ unsigned idx;
int i;
DBG((dbg, LEVEL_1, "\tOptimizing unit:\n"));
/* init queue */
INIT_LIST_HEAD(&ou->queue);
- req = arch_get_register_req_out(ou->nodes[0]);
- ignore = ou->co->cenv->ignore_colors;
- n_regs = req->cls->n_regs;
+ req = arch_get_register_req_out(ou->nodes[0]);
+ allocatable_regs = ou->co->cenv->allocatable_regs;
+ n_regs = req->cls->n_regs;
if (arch_register_req_is(req, limited)) {
- rawbs_base_t const* limited = req->limited;
+ unsigned const* limited = req->limited;
for (idx = 0; idx != n_regs; ++idx) {
- if (bitset_is_set(ignore, idx))
+ if (!bitset_is_set(allocatable_regs, idx))
continue;
if (!rbitset_is_set(limited, idx))
continue;
}
} else {
for (idx = 0; idx != n_regs; ++idx) {
- if (bitset_is_set(ignore, idx))
+ if (!bitset_is_set(allocatable_regs, idx))
continue;
ou_insert_qnode(ou, new_qnode(ou, idx));
}
/* set color of all changed nodes */
- for (ns = set_first(curr->changed_nodes); ns; ns = set_next(curr->changed_nodes)) {
+ for (ns = (node_stat_t*)set_first(curr->changed_nodes); ns != NULL;
+ ns = (node_stat_t*)set_next(curr->changed_nodes)) {
/* NO_COLOR is possible, if we had an undo */
if (ns->new_color != NO_COLOR) {
DBG((dbg, LEVEL_1, "\t color(%+F) := %d\n", ns->irn, ns->new_color));
return 0;
}
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copyheur);
void be_init_copyheur(void)
{
static co_algo_info copyheur = {
be_register_copyopt("heur1", ©heur);
FIRM_DBG_REGISTER(dbg, "ir.be.copyoptheur");
}
-
-BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copyheur);
projects / libfirm / blobdiff