X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyheur4.c;h=9a608fda9efb4a4abddf1a0e3bc330065827f589;hb=70481aa342e22f5f285dc863b366a56393d888af;hp=68948882e7b0726e0006e10640b1b1c35bd0262d;hpb=03b48071790f04bb70af40476828a21196bd19a6;p=libfirm diff --git a/ir/be/becopyheur4.c b/ir/be/becopyheur4.c index 68948882e..9a608fda9 100644 --- a/ir/be/becopyheur4.c +++ b/ir/be/becopyheur4.c @@ -29,9 +29,9 @@ * (also known as "heur3" :) * Performs simple copy minimization. */ -#ifdef HAVE_CONFIG_H -#include "config.h" -#endif /* HAVE_CONFIG_H */ +#include "config.h" /* HAVE_CONFIG_H */ + +#define DISABLE_STATEV #include @@ -82,7 +82,7 @@ typedef float real_t; #define REAL(C) (C ## f) static unsigned last_chunk_id = 0; -static int recolor_limit = 4; +static int recolor_limit = 7; static real_t dislike_influence = REAL(0.1); typedef struct _col_cost_t { @@ -119,10 +119,9 @@ typedef struct _co_mst_env_t { int k; /**< number of non-ignore registers in class */ bitset_t *ignore_regs; /**< set containing all global ignore registers */ ir_phase ph; /**< phase object holding data for nodes */ - pqueue *chunks; /**< priority queue for chunks */ + pqueue_t *chunks; /**< priority queue for chunks */ pset *chunkset; /**< set holding all chunks */ be_ifg_t *ifg; /**< the interference graph */ - const arch_env_t *aenv; /**< the arch environment */ copy_opt_t *co; /**< the copy opt object */ unsigned chunk_visited; col_cost_t **single_cols; @@ -254,7 +253,7 @@ static int cmp_col_cost_gt(const void *a, const void *b) { * Creates a new affinity chunk */ static INLINE aff_chunk_t *new_aff_chunk(co_mst_env_t *env) { - aff_chunk_t *c = xmalloc(sizeof(*c) + (env->n_regs - 1) * sizeof(c->color_affinity[0])); + aff_chunk_t *c = XMALLOCF(aff_chunk_t, color_affinity, env->n_regs); c->n = NEW_ARR_F(const ir_node *, 0); c->interfere = NEW_ARR_F(const ir_node *, 0); c->weight = -1; @@ -369,7 +368,7 @@ static void *co_mst_irn_init(ir_phase *ph, const ir_node *irn, void *old) { res->tmp_col = -1; res->int_neighs = NULL; res->int_aff_neigh = 0; - res->col = arch_register_get_index(arch_get_irn_register(env->aenv, irn)); + res->col = arch_register_get_index(arch_get_irn_register(irn)); res->init_col = res->col; INIT_LIST_HEAD(&res->list); @@ -379,7 +378,7 @@ static void *co_mst_irn_init(ir_phase *ph, const ir_node *irn, void *old) { res->adm_colors = bitset_obstack_alloc(phase_obst(ph), env->n_regs); /* Exclude colors not assignable to the irn */ - req = arch_get_register_req(env->aenv, irn, -1); + req = arch_get_register_req(irn, -1); if (arch_register_req_is(req, limited)) rbitset_copy_to_bitset(req->limited, res->adm_colors); else @@ -397,7 +396,7 @@ static void *co_mst_irn_init(ir_phase *ph, const ir_node *irn, void *old) { /* build list of interfering neighbours */ len = 0; be_ifg_foreach_neighbour(env->ifg, nodes_it, irn, neigh) { - if (! arch_irn_is(env->aenv, neigh, ignore)) { + if (!arch_irn_is(neigh, ignore)) { obstack_ptr_grow(phase_obst(ph), neigh); ++len; } @@ -556,7 +555,7 @@ static void aff_chunk_assure_weight(co_mst_env_t *env, aff_chunk_t *c) { const ir_node *m = neigh->irn; /* skip ignore nodes */ - if (arch_irn_is(env->aenv, m, ignore)) + if (arch_irn_is(m, ignore)) continue; w += node_contains(c->n, m) ? neigh->costs : 0; @@ -587,7 +586,7 @@ static int count_interfering_aff_neighs(co_mst_env_t *env, const affinity_node_t int i; /* skip ignore nodes */ - if (arch_irn_is(env->aenv, n, ignore)) + if (arch_irn_is(n, ignore)) continue; /* check if the affinity neighbour interfere */ @@ -623,7 +622,7 @@ static void build_affinity_chunks(co_mst_env_t *env) { affinity_node_t *an; /* skip ignore nodes */ - if (arch_irn_is(env->aenv, n, ignore)) + if (arch_irn_is(n, ignore)) continue; n1 = get_co_mst_irn(env, n); @@ -646,7 +645,7 @@ static void build_affinity_chunks(co_mst_env_t *env) { aff_edge_t edge; /* skip ignore nodes */ - if (arch_irn_is(env->aenv, m, ignore)) + if (arch_irn_is(m, ignore)) continue; edge.src = n; @@ -711,7 +710,7 @@ static void build_affinity_chunks(co_mst_env_t *env) { static __attribute__((unused)) void chunk_order_nodes(co_mst_env_t *env, aff_chunk_t *chunk) { - pqueue *grow = new_pqueue(); + pqueue_t *grow = new_pqueue(); const ir_node *max_node = NULL; int max_weight = 0; int i; @@ -722,7 +721,7 @@ static __attribute__((unused)) void chunk_order_nodes(co_mst_env_t *env, aff_chu int w = 0; neighb_t *neigh; - if (arch_irn_is(env->aenv, irn, ignore)) + if (arch_irn_is(irn, ignore)) continue; if (an) { @@ -746,11 +745,11 @@ static __attribute__((unused)) void chunk_order_nodes(co_mst_env_t *env, aff_chu bitset_remv_irn(visited, max_node); i = 0; while (!pqueue_empty(grow)) { - ir_node *irn = pqueue_get(grow); + ir_node *irn = pqueue_pop_front(grow); affinity_node_t *an = get_affinity_info(env->co, irn); neighb_t *neigh; - if (arch_irn_is(env->aenv, irn, ignore)) + if (arch_irn_is(irn, ignore)) continue; assert(i <= ARR_LEN(chunk->n)); @@ -804,7 +803,7 @@ static void expand_chunk_from(co_mst_env_t *env, co_mst_irn_t *node, bitset_t *v co_mst_irn_t *n2; /* skip ignore nodes */ - if (arch_irn_is(env->aenv, m, ignore)) + if (arch_irn_is(m, ignore)) continue; n2 = get_co_mst_irn(env, m); @@ -862,12 +861,12 @@ static aff_chunk_t *fragment_chunk(co_mst_env_t *env, int col, aff_chunk_t *c, w if (get_mst_irn_col(node) == col) { decider = decider_has_color; check_for_best = 1; - DBG((dbg, LEVEL_4, "\tcolor %d wanted", col)); + DBG((dbg, LEVEL_4, "\tcolor %d wanted\n", col)); } else { decider = decider_hasnot_color; check_for_best = 0; - DBG((dbg, LEVEL_4, "\tcolor %d forbidden", col)); + DBG((dbg, LEVEL_4, "\tcolor %d forbidden\n", col)); } /* create a new chunk starting at current node */ @@ -1013,21 +1012,25 @@ static int recolor_nodes(co_mst_env_t *env, co_mst_irn_t *node, col_cost_t *cost if (depth > *max_depth) *max_depth = depth; - if (depth >= recolor_limit) - return 0; - DBG((dbg, LEVEL_4, "\tRecoloring %+F with color-costs", node->irn)); DBG_COL_COST(env, LEVEL_4, costs); DB((dbg, LEVEL_4, "\n")); + if (depth >= recolor_limit) { + DBG((dbg, LEVEL_4, "\tHit recolor limit\n")); + return 0; + } + for (i = 0; i < env->n_regs; ++i) { int tgt_col = costs[i].col; int neigh_ok = 1; int j; /* If the costs for that color (and all successive) are infinite, bail out we won't make it anyway. */ - if (costs[i].cost == REAL(0.0)) + if (costs[i].cost == REAL(0.0)) { + DBG((dbg, LEVEL_4, "\tAll further colors forbidden\n")); return 0; + } /* Set the new color of the node and mark the node as temporarily fixed. */ assert(node->tmp_col < 0 && "Node must not have been temporary fixed."); @@ -1043,7 +1046,7 @@ static int recolor_nodes(co_mst_env_t *env, co_mst_irn_t *node, col_cost_t *cost neigh = node->int_neighs[j]; /* skip ignore nodes */ - if (arch_irn_is(env->aenv, neigh, ignore)) + if (arch_irn_is(neigh, ignore)) continue; nn = get_co_mst_irn(env, neigh); @@ -1080,6 +1083,7 @@ static int recolor_nodes(co_mst_env_t *env, co_mst_irn_t *node, col_cost_t *cost } } + DBG((dbg, LEVEL_4, "\tAll colors failed\n")); return 0; } @@ -1406,7 +1410,6 @@ int co_solve_heuristic_mst(copy_opt_t *co) { mst_env.co = co; mst_env.ignore_regs = ignore_regs; mst_env.ifg = co->cenv->ifg; - mst_env.aenv = co->aenv; mst_env.chunkset = pset_new_ptr(512); mst_env.chunk_visited = 0; mst_env.single_cols = phase_alloc(&mst_env.ph, sizeof(*mst_env.single_cols) * n_regs); @@ -1433,7 +1436,7 @@ int co_solve_heuristic_mst(copy_opt_t *co) { /* color chunks as long as there are some */ while (! pqueue_empty(mst_env.chunks)) { - aff_chunk_t *chunk = pqueue_get(mst_env.chunks); + aff_chunk_t *chunk = pqueue_pop_front(mst_env.chunks); color_aff_chunk(&mst_env, chunk); DB((dbg, LEVEL_4, "<<<====== Coloring chunk (%u) done\n", chunk->id)); @@ -1445,7 +1448,7 @@ int co_solve_heuristic_mst(copy_opt_t *co) { co_mst_irn_t *mirn; const arch_register_t *reg; - if (arch_irn_is(mst_env.aenv, irn, ignore)) + if (arch_irn_is(irn, ignore)) continue; mirn = get_co_mst_irn(&mst_env, irn); @@ -1456,7 +1459,7 @@ int co_solve_heuristic_mst(copy_opt_t *co) { continue; reg = arch_register_for_index(co->cls, mirn->col); - arch_set_irn_register(co->aenv, irn, reg); + arch_set_irn_register(irn, reg); DB((dbg, LEVEL_1, "%+F set color from %d to %d\n", irn, mirn->init_col, mirn->col)); }