X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;ds=sidebyside;f=ir%2Fbe%2Fbecopyopt.c;h=e9e0e9cc9bb524c2041d4d221d97577fccd0de5f;hb=1a3b7d363474ab544c13093a2f0b578718d37c7a;hp=930233ee35e3d2ddf03c2232941dbd5f70bdb98a;hpb=1a26f4853c07d1ecd68a097409dd602edfe29eff;p=libfirm diff --git a/ir/be/becopyopt.c b/ir/be/becopyopt.c index 930233ee3..e9e0e9cc9 100644 --- a/ir/be/becopyopt.c +++ b/ir/be/becopyopt.c @@ -50,7 +50,7 @@ #include "bearch.h" #include "benode.h" #include "beutil.h" -#include "beifg_t.h" +#include "beifg.h" #include "beintlive_t.h" #include "becopyopt_t.h" #include "becopystat.h" @@ -136,6 +136,7 @@ void be_register_copyopt(const char *name, co_algo_info *copyopt) be_add_module_to_list(©opts, name, copyopt); } +BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copyopt); void be_init_copyopt(void) { lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be"); @@ -148,14 +149,13 @@ void be_init_copyopt(void) ©opts, (void**) &selected_copyopt); } -BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copyopt); - static int void_algo(copy_opt_t *co) { (void) co; return 0; } +BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copynone); void be_init_copynone(void) { static co_algo_info copyheur = { @@ -165,16 +165,16 @@ void be_init_copynone(void) be_register_copyopt("none", ©heur); } -BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copynone); - #undef QUICK_AND_DIRTY_HACK static 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); + } } @@ -194,7 +194,7 @@ DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;) copy_opt_t *new_copy_opt(be_chordal_env_t *chordal_env, cost_fct_t get_costs) { const char *s1, *s2, *s3; - int len; + size_t len; copy_opt_t *co; FIRM_DBG_REGISTER(dbg, "ir.be.copyopt"); @@ -228,15 +228,10 @@ void free_copy_opt(copy_opt_t *co) static int co_is_optimizable_root(ir_node *irn) { const arch_register_req_t *req; - const arch_register_t *reg; if (arch_irn_is_ignore(irn)) return 0; - reg = arch_get_irn_register(irn); - if (arch_register_type_is(reg, ignore)) - return 0; - if (is_Reg_Phi(irn) || is_Perm_Proj(irn)) return 1; @@ -274,8 +269,9 @@ int co_get_costs_exec_freq(const copy_opt_t *co, ir_node *root, ir_node* arg, in int res; ir_node *root_bl = get_nodes_block(root); ir_node *copy_bl = is_Phi(root) ? get_Block_cfgpred_block(root_bl, pos) : root_bl; + ir_exec_freq *exec_freq = be_get_irg_exec_freq(co->cenv->irg); (void) arg; - res = get_block_execfreq_ulong(co->cenv->birg->exec_freq, copy_bl); + res = get_block_execfreq_ulong(exec_freq, copy_bl); /* don't allow values smaller than one. */ return res < 1 ? 1 : res; @@ -312,8 +308,8 @@ static int ou_max_ind_set_costs(unit_t *ou) ir_node **safe, **unsafe; int i, o, safe_count, safe_costs, unsafe_count, *unsafe_costs; bitset_t *curr; - bitset_pos_t pos; - int max, curr_weight, best_weight = 0; + size_t pos; + int curr_weight, best_weight = 0; /* assign the nodes into two groups. * safe: node has no interference, hence it is in every max stable set. @@ -348,7 +344,7 @@ static int ou_max_ind_set_costs(unit_t *ou) /* now compute the best set out of the unsafe nodes*/ if (unsafe_count > MIS_HEUR_TRIGGER) { bitset_t *best = bitset_alloca(unsafe_count); - /* Heuristik: Greedy trial and error form index 0 to unsafe_count-1 */ + /* Heuristic: Greedy trial and error form index 0 to unsafe_count-1 */ for (i=0; icls != co->cls) return; if (!co_is_optimizable_root(irn)) @@ -749,8 +748,8 @@ void co_complete_stats(const copy_opt_t *co, co_complete_stats_t *stat) static int compare_affinity_node_t(const void *k1, const void *k2, size_t size) { - const affinity_node_t *n1 = k1; - const affinity_node_t *n2 = k2; + const affinity_node_t *n1 = (const affinity_node_t*)k1; + const affinity_node_t *n2 = (const affinity_node_t*)k2; (void) size; return (n1->irn != n2->irn); @@ -765,7 +764,7 @@ static void add_edge(copy_opt_t *co, ir_node *n1, ir_node *n2, int costs) new_node.irn = n1; new_node.degree = 0; new_node.neighbours = NULL; - node = set_insert(co->nodes, &new_node, sizeof(new_node), hash_irn(new_node.irn)); + node = (affinity_node_t*)set_insert(co->nodes, &new_node, sizeof(new_node), hash_irn(new_node.irn)); for (nbr = node->neighbours; nbr; nbr = nbr->next) if (nbr->irn == n2) { @@ -798,16 +797,14 @@ static inline void add_edges(copy_opt_t *co, ir_node *n1, ir_node *n2, int costs static void build_graph_walker(ir_node *irn, void *env) { - const arch_register_req_t *req = arch_get_register_req_out(irn); - copy_opt_t *co = env; + const arch_register_req_t *req; + copy_opt_t *co = (copy_opt_t*)env; int pos, max; - const arch_register_t *reg; - if (req->cls != co->cls || arch_irn_is_ignore(irn)) + if (get_irn_mode(irn) == mode_T) return; - - reg = arch_get_irn_register(irn); - if (arch_register_type_is(reg, ignore)) + req = arch_get_register_req_out(irn); + if (req->cls != co->cls || arch_irn_is_ignore(irn)) return; if (is_Reg_Phi(irn)) { /* Phis */ @@ -851,8 +848,6 @@ void co_free_graph_structure(copy_opt_t *co) co->nodes = NULL; } -/* co_solve_ilp1() co_solve_ilp2() are implemented in becopyilpX.c */ - int co_gs_is_optimizable(copy_opt_t *co, ir_node *irn) { affinity_node_t new_node, *n; @@ -860,7 +855,7 @@ int co_gs_is_optimizable(copy_opt_t *co, ir_node *irn) ASSERT_GS_AVAIL(co); new_node.irn = irn; - n = set_find(co->nodes, &new_node, sizeof(new_node), hash_irn(new_node.irn)); + n = (affinity_node_t*)set_find(co->nodes, &new_node, sizeof(new_node), hash_irn(new_node.irn)); if (n) { return (n->degree > 0); } else @@ -893,16 +888,23 @@ void co_dump_appel_graph(const copy_opt_t *co, FILE *f) be_ifg_t *ifg = co->cenv->ifg; int *color_map = ALLOCAN(int, co->cls->n_regs); int *node_map = XMALLOCN(int, get_irg_last_idx(co->irg) + 1); + ir_graph *irg = co->irg; + be_irg_t *birg = be_birg_from_irg(irg); ir_node *irn; - void *it, *nit; + nodes_iter_t it; + neighbours_iter_t nit; int n, n_regs; unsigned i; n_regs = 0; for (i = 0; i < co->cls->n_regs; ++i) { const arch_register_t *reg = &co->cls->regs[i]; - color_map[i] = arch_register_type_is(reg, ignore) ? -1 : n_regs++; + if (rbitset_is_set(birg->allocatable_regs, reg->global_index)) { + color_map[i] = n_regs++; + } else { + color_map[i] = -1; + } } /* @@ -910,11 +912,8 @@ void co_dump_appel_graph(const copy_opt_t *co, FILE *f) * the values below n are the pre-colored register nodes */ - it = be_ifg_nodes_iter_alloca(ifg); - nit = be_ifg_neighbours_iter_alloca(ifg); - n = n_regs; - be_ifg_foreach_node(ifg, it, irn) { + be_ifg_foreach_node(ifg, &it, irn) { if (arch_irn_is_ignore(irn)) continue; node_map[get_irn_idx(irn)] = n++; @@ -922,7 +921,7 @@ void co_dump_appel_graph(const copy_opt_t *co, FILE *f) fprintf(f, "%d %d\n", n, n_regs); - be_ifg_foreach_node(ifg, it, irn) { + be_ifg_foreach_node(ifg, &it, irn) { if (!arch_irn_is_ignore(irn)) { int idx = node_map[get_irn_idx(irn)]; affinity_node_t *a = get_affinity_info(co, irn); @@ -936,7 +935,7 @@ void co_dump_appel_graph(const copy_opt_t *co, FILE *f) } } - be_ifg_foreach_neighbour(ifg, nit, irn, adj) { + be_ifg_foreach_neighbour(ifg, &nit, irn, adj) { if (!arch_irn_is_ignore(adj) && !co_dump_appel_disjoint_constraints(co, irn, adj)) { int adj_idx = node_map[get_irn_idx(adj)]; @@ -1010,7 +1009,7 @@ static const char *get_dot_color_name(size_t col) return col < sizeof(names)/sizeof(names[0]) ? names[col] : "white"; } -typedef struct _co_ifg_dump_t { +typedef struct co_ifg_dump_t { const copy_opt_t *co; unsigned flags; } co_ifg_dump_t; @@ -1029,7 +1028,7 @@ static int ifg_is_dump_node(void *self, ir_node *irn) static void ifg_dump_node_attr(FILE *f, void *self, ir_node *irn) { - co_ifg_dump_t *env = self; + co_ifg_dump_t *env = (co_ifg_dump_t*)self; const arch_register_t *reg = arch_get_irn_register(irn); const arch_register_req_t *req = arch_get_register_req_out(irn); int limited = arch_register_req_is(req, limited); @@ -1056,7 +1055,7 @@ static void ifg_dump_node_attr(FILE *f, void *self, ir_node *irn) static void ifg_dump_at_end(FILE *file, void *self) { - co_ifg_dump_t *env = self; + co_ifg_dump_t *env = (co_ifg_dump_t*)self; affinity_node_t *a; co_gs_foreach_aff_node(env->co, a) { @@ -1070,7 +1069,7 @@ static void ifg_dump_at_end(FILE *file, void *self) if (aidx < nidx) { const char *color = nr == ar ? "blue" : "red"; - fprintf(file, "\tn%d -- n%d [weight=0.01 ", aidx, nidx); + fprintf(file, "\tn%u -- n%u [weight=0.01 ", aidx, nidx); if (env->flags & CO_IFG_DUMP_LABELS) fprintf(file, "label=\"%d\" ", n->costs); if (env->flags & CO_IFG_DUMP_COLORS) @@ -1125,10 +1124,11 @@ static FILE *my_open(const be_chordal_env_t *env, const char *prefix, const char char buf[1024]; size_t i, n; char *tu_name; + const char *cup_name = be_get_irg_main_env(env->irg)->cup_name; - n = strlen(env->birg->main_env->cup_name); + n = strlen(cup_name); tu_name = XMALLOCN(char, n + 1); - strcpy(tu_name, env->birg->main_env->cup_name); + strcpy(tu_name, cup_name); for (i = 0; i < n; ++i) if (tu_name[i] == '.') tu_name[i] = '_'; @@ -1157,7 +1157,7 @@ void co_driver(be_chordal_env_t *cenv) if (selected_copyopt->copyopt == void_algo) return; - be_liveness_assure_chk(be_get_birg_liveness(cenv->birg)); + be_liveness_assure_chk(be_get_irg_liveness(cenv->irg)); co = new_copy_opt(cenv, cost_func); co_build_ou_structure(co); @@ -1225,7 +1225,7 @@ void co_driver(be_chordal_env_t *cenv) /* Dump the interference graph in Appel's format. */ if (dump_flags & DUMP_APPEL) { FILE *f = my_open(cenv, "", ".apl"); - fprintf(f, "# %lld %lld\n", after.costs, after.unsatisfied_edges); + fprintf(f, "# %llu %llu\n", after.costs, after.unsatisfied_edges); co_dump_appel_graph(co, f); fclose(f); }