X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyheur.c;h=165db4ae62e71fd34e14401b7abd777d7623c628;hb=7e4c680661ca3e15ae8d58fb50b4e8e9c10d5f4c;hp=6303f9d29f922e5d727db22aa33683e207ab149c;hpb=66752b5a7557a98b7655cf84678f1a07e082d728;p=libfirm diff --git a/ir/be/becopyheur.c b/ir/be/becopyheur.c index 6303f9d29..165db4ae6 100644 --- a/ir/be/becopyheur.c +++ b/ir/be/becopyheur.c @@ -47,6 +47,9 @@ 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 @@ -59,7 +62,7 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;) /** * Modeling additional conflicts between nodes. NOT live range interference */ -typedef struct _conflict_t { +typedef struct conflict_t { const ir_node *n1, *n2; } conflict_t; @@ -67,7 +70,7 @@ typedef struct _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; @@ -76,7 +79,7 @@ typedef struct _node_stat_t { /** * 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 */ @@ -87,20 +90,22 @@ typedef struct _qnode_t { 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; @@ -158,7 +163,7 @@ static inline const node_stat_t *qnode_find_node(const qnode_t *qn, ir_node *irn { 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)); } /** @@ -171,7 +176,7 @@ static inline node_stat_t *qnode_find_or_insert_node(const qnode_t *qn, ir_node 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)); } /** @@ -255,8 +260,8 @@ static ir_node *qnode_color_irn(const qnode_t *qn, ir_node *irn, int col, const 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; + const arch_register_req_t *req; DBG((dbg, LEVEL_3, "\t %+F \tcaused col(%+F) \t%2d --> %2d\n", trigger, irn, irn_col, col)); @@ -272,22 +277,20 @@ static ir_node *qnode_color_irn(const qnode_t *qn, ir_node *irn, int col, const return irn; } + req = arch_get_irn_register_req(irn); #ifdef SEARCH_FREE_COLORS /* If we resolve conflicts (recursive calls) we can use any unused color. * In case of the first call @p col must be used. */ if (irn != trigger) { bitset_t *free_cols = bitset_alloca(cls->n_regs); - const arch_register_req_t *req; ir_node *curr; 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); if (arch_register_req_is(req, limited)) { bitset_t *limited = bitset_alloca(cls->n_regs); rbitset_copy_to_bitset(req->limited, limited); @@ -298,7 +301,7 @@ static ir_node *qnode_color_irn(const qnode_t *qn, ir_node *irn, int col, const 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); @@ -311,7 +314,7 @@ static ir_node *qnode_color_irn(const qnode_t *qn, ir_node *irn, int col, const #endif /* SEARCH_FREE_COLORS */ /* If target color is not allocatable changing color is impossible */ - if (!arch_reg_out_is_allocatable(irn, arch_register_for_index(cls, col))) { + if (!arch_reg_is_allocatable(req, arch_register_for_index(cls, col))) { DBG((dbg, LEVEL_3, "\t %+F impossible\n", irn)); return CHANGE_IMPOSSIBLE; } @@ -320,12 +323,12 @@ static ir_node *qnode_color_irn(const qnode_t *qn, ir_node *irn, int col, const * 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; } } @@ -397,7 +400,7 @@ static inline void qnode_max_ind_set(qnode_t *qn, const unit_t *ou) 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. @@ -460,7 +463,7 @@ static inline void qnode_max_ind_set(qnode_t *qn, const unit_t *ou) 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]; @@ -551,9 +554,9 @@ static void ou_optimize(unit_t *ou) 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")); @@ -563,14 +566,14 @@ static void ou_optimize(unit_t *ou) /* 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_irn_register_req(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; @@ -579,7 +582,7 @@ static void ou_optimize(unit_t *ou) } } 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)); @@ -619,7 +622,8 @@ static void ou_optimize(unit_t *ou) } /* 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)); @@ -653,7 +657,7 @@ int co_solve_heuristic(copy_opt_t *co) return 0; } -BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copyheur); +BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copyheur) void be_init_copyheur(void) { static co_algo_info copyheur = {