X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyheur2.c;h=60f8b6646cf736f51cfd89b4f7fa99a736590d1f;hb=662fc44c951bdb45a9b7d9563e9ffbb87101b9e4;hp=3b9b3bcdccf1beb2816b8a3afe41163a23c717ff;hpb=423c859509f75769c66d1509110d7c678c6158d4;p=libfirm diff --git a/ir/be/becopyheur2.c b/ir/be/becopyheur2.c index 3b9b3bcdc..60f8b6646 100644 --- a/ir/be/becopyheur2.c +++ b/ir/be/becopyheur2.c @@ -1,18 +1,35 @@ +/* + * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. + * + * This file is part of libFirm. + * + * This file may be distributed and/or modified under the terms of the + * GNU General Public License version 2 as published by the Free Software + * Foundation and appearing in the file LICENSE.GPL included in the + * packaging of this file. + * + * Licensees holding valid libFirm Professional Edition licenses may use + * this file in accordance with the libFirm Commercial License. + * Agreement provided with the Software. + * + * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE + * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE. + */ /** - * More experiments on coalescing. - * @author Sebastian Hack - * @date 14.04.2006 + * @file + * @brief More experiments on coalescing. + * @author Sebastian Hack + * @date 14.04.2006 + * @version $Id$ */ - #ifdef HAVE_CONFIG_H #include "config.h" #endif -#ifdef WITH_LIBCORE -#include -#include -#endif /* WITH_LIBCORE */ +#include "lc_opts.h" +#include "lc_opts_enum.h" #include #include @@ -20,6 +37,7 @@ #include "list.h" #include "pdeq.h" #include "bitset.h" +#include "raw_bitset.h" #include "debug.h" #include "bitfiddle.h" @@ -30,11 +48,13 @@ #include "irprintf.h" #include "irtools.h" +#include "bemodule.h" #include "beabi.h" #include "benode_t.h" #include "becopyopt.h" #include "becopyopt_t.h" #include "bechordal_t.h" +#include "beirg_t.h" #define DUMP_BEFORE 1 #define DUMP_AFTER 2 @@ -46,9 +66,6 @@ static int subtree_iter = 4; static int max_depth = 20; static double constr_factor = 0.9; -/* Options using libcore */ -#ifdef WITH_LIBCORE - static const lc_opt_enum_mask_items_t dump_items[] = { { "before", DUMP_BEFORE }, { "after", DUMP_AFTER }, @@ -66,15 +83,20 @@ static const lc_opt_table_entry_t options[] = { LC_OPT_ENT_INT ("iter", "iterations for subtree nodes", &subtree_iter), LC_OPT_ENT_DBL ("cf", "factor of constraint importance (between 0.0 and 1.0)", &constr_factor), LC_OPT_ENT_INT ("max", "maximum recursion depth", &max_depth), - { NULL } + LC_OPT_LAST }; -void be_co2_register_options(lc_opt_entry_t *grp) +void be_init_copyheur2(void) { - lc_opt_entry_t *co2_grp = lc_opt_get_grp(grp, "co2"); + 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); } -#endif + +BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copyheur2); /* ____ _ _ @@ -101,7 +123,7 @@ typedef struct { } col_cost_pair_t; typedef struct { - phase_t ph; + ir_phase ph; copy_opt_t *co; bitset_t *ignore_regs; co2_irn_t *touched; @@ -112,7 +134,7 @@ typedef struct { } co2_t; struct _co2_irn_t { - ir_node *irn; + const ir_node *irn; affinity_node_t *aff; co2_irn_t *touched_next; col_t tmp_col; @@ -172,7 +194,7 @@ typedef struct { #define get_co2_irn(co2, irn) ((co2_irn_t *) phase_get_or_set_irn_data(&co2->ph, irn)) #define get_co2_cloud_irn(co2, irn) ((co2_cloud_irn_t *) phase_get_or_set_irn_data(&co2->ph, irn)) -static void *co2_irn_init(phase_t *ph, ir_node *irn, void *data) +static void *co2_irn_init(ir_phase *ph, const ir_node *irn, void *data) { co2_t *env = (co2_t *) ph; affinity_node_t *a = get_affinity_info(env->co, irn); @@ -227,13 +249,13 @@ int cmp_edges(const void *a, const void *b) return QSORT_CMP(q->costs, p->costs); } -static col_t get_col(co2_t *env, ir_node *irn) +static col_t get_col(co2_t *env, const ir_node *irn) { co2_irn_t *ci = get_co2_irn(env, irn); return ci->tmp_fixed ? ci->tmp_col : ci->orig_col; } -static INLINE int color_is_fix(co2_t *env, 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; @@ -241,15 +263,21 @@ static INLINE int color_is_fix(co2_t *env, ir_node *irn) static INLINE bitset_t *get_adm(co2_t *env, co2_irn_t *ci) { - if(!ci->adm_cache) { - arch_register_req_t req; + if(ci->adm_cache == NULL) { + const arch_register_req_t *req; ci->adm_cache = bitset_obstack_alloc(phase_obst(&env->ph), env->n_regs); - arch_get_register_req(env->co->aenv, &req, ci->irn, BE_OUT_POS(0)); - if(arch_register_req_is(&req, limited)) { - req.limited(req.limited_env, ci->adm_cache); + req = arch_get_register_req(env->co->aenv, ci->irn, BE_OUT_POS(0)); + + if(arch_register_req_is(req, limited)) { + int i, n; + + n = env->n_regs; + for(i = 0; i < n; ++i) { + if(rbitset_is_set(req->limited, i)) + bitset_set(ci->adm_cache, i); + } ci->is_constrained = 1; - } - else { + } else { bitset_copy(ci->adm_cache, env->ignore_regs); bitset_flip_all(ci->adm_cache); } @@ -277,21 +305,22 @@ static INLINE int is_constrained(co2_t *env, co2_irn_t *ci) return ci->is_constrained; } -static void incur_constraint_costs(co2_t *env, ir_node *irn, col_cost_pair_t *col_costs, int costs) +static void incur_constraint_costs(co2_t *env, const ir_node *irn, col_cost_pair_t *col_costs, int costs) { - bitset_t *aux = bitset_alloca(env->co->cls->n_regs); - arch_register_req_t req; + const arch_register_req_t *req; - arch_get_register_req(env->co->aenv, &req, irn, BE_OUT_POS(0)); + req = arch_get_register_req(env->co->aenv, irn, BE_OUT_POS(0)); - if(arch_register_req_is(&req, limited)) { - bitset_pos_t elm; - int n_constr; + if (arch_register_req_is(req, limited)) { + unsigned n_regs = env->co->cls->n_regs; + unsigned n_constr = 0; + unsigned i; - req.limited(req.limited_env, aux); - n_constr = bitset_popcnt(aux); - bitset_foreach(aux, elm) { - col_costs[elm].costs = add_saturated(col_costs[elm].costs, costs / n_constr); + n_constr = rbitset_popcnt(req->limited, n_regs); + for (i = 0; i < n_regs; ++i) { + if (rbitset_is_set(req->limited, i)) { + col_costs[i].costs = add_saturated(col_costs[i].costs, costs / n_constr); + } } } } @@ -308,14 +337,14 @@ static void incur_constraint_costs(co2_t *env, ir_node *irn, col_cost_pair_t *co */ static void determine_color_costs(co2_t *env, co2_irn_t *ci, col_cost_pair_t *col_costs) { - ir_node *irn = ci->irn; + const ir_node *irn = ci->irn; be_ifg_t *ifg = env->co->cenv->ifg; int n_regs = env->co->cls->n_regs; bitset_t *forb = bitset_alloca(n_regs); affinity_node_t *a = ci->aff; bitset_pos_t elm; - ir_node *pos; + const ir_node *pos; void *it; int i; @@ -371,6 +400,7 @@ static void single_color_cost(co2_t *env, co2_irn_t *ci, col_t col, col_cost_pai seq[i].costs = INT_MAX; } + (void) ci; assert(is_color_admissible(env, ci, col)); seq[col].col = 0; seq[0].col = col; @@ -395,9 +425,9 @@ static void materialize_coloring(struct list_head *h) } } -static int change_color_not(co2_t *env, ir_node *irn, col_t not_col, struct list_head *parent_changed, int depth); +static int change_color_not(co2_t *env, const ir_node *irn, col_t not_col, struct list_head *parent_changed, int depth); -static int recolor(co2_t *env, ir_node *irn, col_cost_pair_t *col_list, struct list_head *parent_changed, int depth) +static int recolor(co2_t *env, const ir_node *irn, col_cost_pair_t *col_list, struct list_head *parent_changed, int depth) { int n_regs = env->co->cls->n_regs; be_ifg_t *ifg = env->co->cenv->ifg; @@ -415,7 +445,7 @@ static int recolor(co2_t *env, ir_node *irn, col_cost_pair_t *col_list, struct l int neigh_ok = 1; struct list_head changed; - ir_node *n; + const ir_node *n; void *it; DBG((env->dbg, LEVEL_3, "\t\t%2{firm:indent}trying color %d(%d) on %+F\n", depth, tgt_col, costs, irn)); @@ -482,7 +512,7 @@ static int recolor(co2_t *env, ir_node *irn, col_cost_pair_t *col_list, struct l return res; } -static int change_color_not(co2_t *env, ir_node *irn, col_t not_col, struct list_head *parent_changed, int depth) +static int change_color_not(co2_t *env, const ir_node *irn, col_t not_col, struct list_head *parent_changed, int depth) { co2_irn_t *ci = get_co2_irn(env, irn); int res = 0; @@ -523,7 +553,7 @@ static int change_color_not(co2_t *env, ir_node *irn, col_t not_col, struct list return res; } -static int change_color_single(co2_t *env, ir_node *irn, col_t tgt_col, struct list_head *parent_changed, int depth) +static int change_color_single(co2_t *env, const ir_node *irn, col_t tgt_col, struct list_head *parent_changed, int depth) { co2_irn_t *ci = get_co2_irn(env, irn); col_t col = get_col(env, irn); @@ -601,7 +631,7 @@ static void node_color_badness(co2_cloud_irn_t *ci, int *badness) bitset_t *bs = bitset_alloca(n_regs); bitset_pos_t elm; - ir_node *irn; + const ir_node *irn; void *it; admissible_colors(env, &ci->inh, bs); @@ -672,7 +702,7 @@ 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])); int is_root = ci->mst_parent == ci; - col_t parent_col = is_root ? -1 : get_col(env, ci->mst_parent->inh.irn); + col_t parent_col = is_root ? (col_t) -1 : get_col(env, ci->mst_parent->inh.irn); int min_badness = INT_MAX; int best_col_costs = INT_MAX; int best_col = -1; @@ -832,7 +862,7 @@ static co2_cloud_t *new_cloud(co2_t *env, affinity_node_t *a) static void apply_coloring(co2_cloud_irn_t *ci, col_t col, int depth) { - ir_node *irn = ci->inh.irn; + const ir_node *irn = ci->inh.irn; int *front = FRONT_BASE(ci, col); int i, ok; struct list_head changed; @@ -1073,7 +1103,7 @@ static void writeback_colors(co2_t *env) 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, irn->irn, reg); + arch_set_irn_register(aenv, (ir_node *) irn->irn, reg); } } @@ -1087,7 +1117,7 @@ static void writeback_colors(co2_t *env) |_| |___/ */ -static const char *get_dot_color_name(int col) +static const char *get_dot_color_name(size_t col) { static const char *names[] = { "blue", @@ -1123,15 +1153,15 @@ static const char *get_dot_color_name(int col) "palevioletred" }; - return col < sizeof(names)/sizeof(names[0]) ? names[col] : "white"; + return col < (sizeof(names)/sizeof(names[0])) ? names[col] : "white"; } static const char *get_dot_shape_name(co2_t *env, co2_irn_t *ci) { - arch_register_req_t req; + const arch_register_req_t *req; - arch_get_register_req(env->co->aenv, &req, ci->irn, BE_OUT_POS(0)); - if(arch_register_req_is(&req, limited)) + req = arch_get_register_req(env->co->aenv, ci->irn, BE_OUT_POS(0)); + if(arch_register_req_is(req, limited)) return "diamond"; if(ci->fixed) @@ -1145,6 +1175,7 @@ static const char *get_dot_shape_name(co2_t *env, co2_irn_t *ci) static void ifg_dump_graph_attr(FILE *f, void *self) { + (void) self; fprintf(f, "overlay=false"); } @@ -1220,11 +1251,11 @@ static be_ifg_dump_dot_cb_t ifg_dot_cb = { int co_solve_heuristic_new(copy_opt_t *co) { - char buf[256]; + char buf[256]; co2_t env; - FILE *f; + FILE *f; - phase_init(&env.ph, "co2", co->cenv->birg->irg, PHASE_DEFAULT_GROWTH, co2_irn_init); + phase_init(&env.ph, "co2", co->cenv->birg->irg, PHASE_DEFAULT_GROWTH, co2_irn_init, NULL); env.touched = NULL; env.visited = 0; env.co = co;