X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyheur2.c;h=bad56eb10c14665e56e46e8b595e6f4d1603d33e;hb=d081119723f6f0fdff8c0a6ca93492c1a7ed6a6f;hp=9065efe1e5a3525b18cd13a42e46c7a76594ad48;hpb=4a4a64bc6a7bec26b2870746a2873a16579bf413;p=libfirm diff --git a/ir/be/becopyheur2.c b/ir/be/becopyheur2.c index 9065efe1e..bad56eb10 100644 --- a/ir/be/becopyheur2.c +++ b/ir/be/becopyheur2.c @@ -24,9 +24,7 @@ * @date 14.04.2006 * @version $Id$ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif #include "lc_opts.h" #include "lc_opts_enum.h" @@ -50,11 +48,11 @@ #include "bemodule.h" #include "beabi.h" -#include "benode_t.h" +#include "benode.h" #include "becopyopt.h" #include "becopyopt_t.h" #include "bechordal_t.h" -#include "beirg_t.h" +#include "beirg.h" #define DUMP_BEFORE 1 #define DUMP_AFTER 2 @@ -86,18 +84,6 @@ static const lc_opt_table_entry_t options[] = { LC_OPT_LAST }; -void be_init_copyheur2(void) -{ - lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be"); - lc_opt_entry_t *ra_grp = lc_opt_get_grp(be_grp, "ra"); - lc_opt_entry_t *chordal_grp = lc_opt_get_grp(ra_grp, "chordal"); - lc_opt_entry_t *co2_grp = lc_opt_get_grp(chordal_grp, "co2"); - - lc_opt_add_table(co2_grp, options); -} - -BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copyheur2); - /* ____ _ _ / ___|| |_ __ _ _ __| |_ @@ -204,7 +190,7 @@ static void *co2_irn_init(ir_phase *ph, const ir_node *irn, void *data) memset(ci, 0, size); INIT_LIST_HEAD(&ci->changed_list); ci->touched_next = env->touched; - ci->orig_col = get_irn_col(env->co, irn); + ci->orig_col = get_irn_col(irn); env->touched = ci; ci->irn = irn; ci->aff = a; @@ -255,18 +241,18 @@ static col_t get_col(co2_t *env, const ir_node *irn) return ci->tmp_fixed ? ci->tmp_col : ci->orig_col; } -static INLINE int color_is_fix(co2_t *env, const ir_node *irn) +static inline int color_is_fix(co2_t *env, const ir_node *irn) { co2_irn_t *ci = get_co2_irn(env, irn); return ci->fixed || ci->tmp_fixed; } -static INLINE bitset_t *get_adm(co2_t *env, co2_irn_t *ci) +static inline bitset_t *get_adm(co2_t *env, co2_irn_t *ci) { if(ci->adm_cache == NULL) { const arch_register_req_t *req; ci->adm_cache = bitset_obstack_alloc(phase_obst(&env->ph), env->n_regs); - req = arch_get_register_req(env->co->aenv, ci->irn, BE_OUT_POS(0)); + req = arch_get_register_req_out(ci->irn); if(arch_register_req_is(req, limited)) { int i, n; @@ -286,19 +272,19 @@ static INLINE bitset_t *get_adm(co2_t *env, co2_irn_t *ci) return ci->adm_cache; } -static INLINE bitset_t *admissible_colors(co2_t *env, co2_irn_t *ci, bitset_t *bs) +static inline bitset_t *admissible_colors(co2_t *env, co2_irn_t *ci, bitset_t *bs) { bitset_copy(bs, get_adm(env, ci)); return bs; } -static INLINE int is_color_admissible(co2_t *env, co2_irn_t *ci, col_t col) +static inline int is_color_admissible(co2_t *env, co2_irn_t *ci, col_t col) { bitset_t *bs = get_adm(env, ci); return bitset_is_set(bs, col); } -static INLINE int is_constrained(co2_t *env, co2_irn_t *ci) +static inline int is_constrained(co2_t *env, co2_irn_t *ci) { if(!ci->adm_cache) get_adm(env, ci); @@ -307,9 +293,7 @@ static INLINE int is_constrained(co2_t *env, co2_irn_t *ci) static void incur_constraint_costs(co2_t *env, const ir_node *irn, col_cost_pair_t *col_costs, int costs) { - const arch_register_req_t *req; - - req = arch_get_register_req(env->co->aenv, irn, BE_OUT_POS(0)); + const arch_register_req_t *req = arch_get_register_req_out(irn); if (arch_register_req_is(req, limited)) { unsigned n_regs = env->co->cls->n_regs; @@ -534,7 +518,7 @@ static int change_color_not(co2_t *env, const ir_node *irn, col_t not_col, struc /* The node has the color it should not have _and_ has not been visited yet. */ if(!color_is_fix(env, irn)) { int n_regs = env->co->cls->n_regs; - col_cost_pair_t *csts = alloca(n_regs * sizeof(csts[0])); + col_cost_pair_t *csts = ALLOCAN(col_cost_pair_t, n_regs); /* Get the costs for giving the node a specific color. */ determine_color_costs(env, ci, csts); @@ -575,7 +559,7 @@ static int change_color_single(co2_t *env, const ir_node *irn, col_t tgt_col, st if(!color_is_fix(env, irn) && is_color_admissible(env, ci, tgt_col)) { int n_regs = env->co->cls->n_regs; - col_cost_pair_t *seq = alloca(n_regs * sizeof(seq[0])); + col_cost_pair_t *seq = ALLOCAN(col_cost_pair_t, n_regs); /* Get the costs for giving the node a specific color. */ single_color_cost(env, ci, tgt_col, seq); @@ -700,7 +684,7 @@ static void unfix_subtree(co2_cloud_irn_t *ci) static int coalesce_top_down(co2_cloud_irn_t *ci, int child_nr, int depth) { co2_t *env = ci->cloud->env; - col_cost_pair_t *seq = alloca(env->n_regs * sizeof(seq[0])); + col_cost_pair_t *seq = ALLOCAN(col_cost_pair_t, env->n_regs); int is_root = ci->mst_parent == ci; col_t parent_col = is_root ? (col_t) -1 : get_col(env, ci->mst_parent->inh.irn); int min_badness = INT_MAX; @@ -892,15 +876,13 @@ static void process_cloud(co2_cloud_t *cloud) co2_t *env = cloud->env; int n_regs = env->n_regs; int n_edges = 0; - int *mst_edges = xmalloc(cloud->n_memb * cloud->n_memb * sizeof(mst_edges[0])); + int *mst_edges = XMALLOCNZ(int, cloud->n_memb * cloud->n_memb); pdeq *q; edge_t *edges; int i; int best_col; - memset(mst_edges, 0, cloud->n_memb * cloud->n_memb * sizeof(mst_edges[0])); - /* Collect all edges in the cloud on an obstack and sort the increasingly */ obstack_init(&cloud->obst); for(i = 0; i < cloud->n_memb; ++i) { @@ -992,18 +974,13 @@ static void process_cloud(co2_cloud_t *cloud) int n_childs = ci->mst_n_childs; int j; - ci->col_costs = obstack_alloc(&cloud->obst, n_regs * sizeof(ci->col_costs[0])); - ci->tmp_coloring = obstack_alloc(&cloud->obst, n_regs * sizeof(ci->tmp_coloring[0])); - ci->fronts = obstack_alloc(&cloud->obst, n_regs * n_childs * sizeof(ci->fronts[0])); - ci->color_badness = obstack_alloc(&cloud->obst, n_regs * sizeof(ci->fronts[0])); - memset(ci->color_badness, 0, n_regs * sizeof(ci->color_badness[0])); - memset(ci->col_costs, 0, n_regs * sizeof(ci->col_costs[0])); - memset(ci->tmp_coloring, 0, n_regs * sizeof(ci->tmp_coloring[0])); - memset(ci->fronts, 0, n_regs * n_childs * sizeof(ci->fronts[0])); + ci->col_costs = OALLOCNZ(&cloud->obst, int, n_regs); + ci->tmp_coloring = OALLOCNZ(&cloud->obst, col_cost_pair_t, n_regs); + ci->fronts = OALLOCNZ(&cloud->obst, int, n_regs * n_childs); + ci->color_badness = OALLOCNZ(&cloud->obst, int, n_regs); for(j = 0; j < env->n_regs; j++) ci->col_costs[j] = INT_MAX; - } determine_color_badness(cloud->mst_root, 0); @@ -1063,7 +1040,7 @@ static void process(co2_t *env) } i = 0; - clouds = xmalloc(n_clouds * sizeof(clouds[0])); + clouds = XMALLOCN(co2_cloud_t*, n_clouds); list_for_each_entry(co2_cloud_t, pos, &env->cloud_head, list) clouds[i++] = pos; qsort(clouds, n_clouds, sizeof(clouds[0]), cmp_clouds_gt); @@ -1098,12 +1075,11 @@ static void process(co2_t *env) static void writeback_colors(co2_t *env) { - const arch_env_t *aenv = env->co->aenv; co2_irn_t *irn; for(irn = env->touched; irn; irn = irn->touched_next) { const arch_register_t *reg = arch_register_for_index(env->co->cls, irn->orig_col); - arch_set_irn_register(aenv, (ir_node *) irn->irn, reg); + arch_set_irn_register((ir_node*)irn->irn, reg); } } @@ -1119,7 +1095,7 @@ static void writeback_colors(co2_t *env) static const char *get_dot_color_name(size_t col) { - static const char *names[] = { + static const char *const names[] = { "blue", "red", "green", @@ -1156,11 +1132,10 @@ static const char *get_dot_color_name(size_t col) return col < (sizeof(names)/sizeof(names[0])) ? names[col] : "white"; } -static const char *get_dot_shape_name(co2_t *env, co2_irn_t *ci) +static const char *get_dot_shape_name(co2_irn_t *ci) { - const arch_register_req_t *req; + const arch_register_req_t *req = arch_get_register_req_out(ci->irn); - req = arch_get_register_req(env->co->aenv, ci->irn, BE_OUT_POS(0)); if(arch_register_req_is(req, limited)) return "diamond"; @@ -1181,8 +1156,9 @@ static void ifg_dump_graph_attr(FILE *f, void *self) static int ifg_is_dump_node(void *self, ir_node *irn) { - co2_t *env = self; - return !arch_irn_is(env->co->aenv, irn, ignore); + const arch_register_req_t *req = arch_get_register_req_out(irn); + (void)self; + return !(req->type & arch_register_req_type_ignore); } static void ifg_dump_node_attr(FILE *f, void *self, ir_node *irn) @@ -1203,7 +1179,7 @@ static void ifg_dump_node_attr(FILE *f, void *self, ir_node *irn) } ir_fprintf(f, "label=\"%+F%s\" style=filled peripheries=%d color=%s shape=%s", irn, buf, peri, - get_dot_color_name(get_col(env, irn)), get_dot_shape_name(env, ci)); + get_dot_color_name(get_col(env, irn)), get_dot_shape_name(ci)); } static void ifg_dump_at_end(FILE *file, void *self) @@ -1248,7 +1224,6 @@ static be_ifg_dump_dot_cb_t ifg_dot_cb = { ifg_dump_at_end }; - int co_solve_heuristic_new(copy_opt_t *co) { char buf[256]; @@ -1289,3 +1264,20 @@ int co_solve_heuristic_new(copy_opt_t *co) phase_free(&env.ph); return 0; } + +void be_init_copyheur2(void) +{ + lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be"); + lc_opt_entry_t *ra_grp = lc_opt_get_grp(be_grp, "ra"); + lc_opt_entry_t *chordal_grp = lc_opt_get_grp(ra_grp, "chordal"); + lc_opt_entry_t *co2_grp = lc_opt_get_grp(chordal_grp, "co2"); + + static co_algo_info copyheur = { + co_solve_heuristic_new, 0 + }; + + lc_opt_add_table(co2_grp, options); + be_register_copyopt("heur2", ©heur); +} + +BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copyheur2);