X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyilp.c;h=69684b433c2cdb4e724f0b706c4eab90ab827616;hb=0ed495da32589b78283d9ede3cb9e33727316006;hp=199ff96cd90ee18af4c1bf03026e19f0cdd73169;hpb=32ea6ea0320f551448bb66e534e3351977464d42;p=libfirm diff --git a/ir/be/becopyilp.c b/ir/be/becopyilp.c index 199ff96cd..69684b433 100644 --- a/ir/be/becopyilp.c +++ b/ir/be/becopyilp.c @@ -22,10 +22,11 @@ * @brief Common stuff used by all ILP formulations. * @author Daniel Grund * @date 28.02.2006 - * @version $Id$ */ #include "config.h" +#include + #include "irtools.h" #include "irprintf.h" @@ -34,16 +35,15 @@ #include "bemodule.h" #include "error.h" +#include "lpp.h" + #include "lc_opts.h" #include "lc_opts_enum.h" -#ifdef WITH_ILP - #define DUMP_ILP 1 #define DUMP_SOL 2 static int time_limit = 60; -static int solve_net = 1; static int solve_log = 0; static unsigned dump_flags = 0; @@ -59,12 +59,12 @@ static lc_opt_enum_mask_var_t dump_var = { static const lc_opt_table_entry_t options[] = { LC_OPT_ENT_INT ("limit", "time limit for solving in seconds (0 for unlimited)", &time_limit), - LC_OPT_ENT_BOOL ("net", "solve over the net", &solve_net), LC_OPT_ENT_BOOL ("log", "show ilp solving log", &solve_log), LC_OPT_ENT_ENUM_MASK("dump", "dump flags", &dump_var), LC_OPT_LAST }; +BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copyilp) void be_init_copyilp(void) { lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be"); @@ -76,10 +76,8 @@ void be_init_copyilp(void) lc_opt_add_table(ilp_grp, options); } -BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copyilp); - #include "becopyilp_t.h" -#include "beifg_t.h" +#include "beifg.h" /****************************************************************************** _____ _ _ _ _ @@ -107,10 +105,10 @@ size_red_t *new_size_red(copy_opt_t *co) /** * Checks if a node is simplicial in the graph heeding the already removed nodes. */ -static inline int sr_is_simplicial(size_red_t *sr, const ir_node *ifn) +static inline bool sr_is_simplicial(size_red_t *sr, const ir_node *ifn) { be_ifg_t *ifg = sr->co->cenv->ifg; - void *iter = be_ifg_neighbours_iter_alloca(ifg); + neighbours_iter_t iter; ir_node **all = ALLOCAN(ir_node*, be_ifg_degree(ifg, ifn)); ir_node *curr; int size = 0; @@ -118,7 +116,7 @@ static inline int sr_is_simplicial(size_red_t *sr, const ir_node *ifn) int o; /* get all non-removed neighbors */ - be_ifg_foreach_neighbour(ifg, iter, ifn, curr) + be_ifg_foreach_neighbour(ifg, &iter, ifn, curr) if (!sr_is_removed(sr, curr)) all[size++] = curr; @@ -126,37 +124,40 @@ static inline int sr_is_simplicial(size_red_t *sr, const ir_node *ifn) for (i=0; ico->cenv->ifg; - void *iter = be_ifg_nodes_iter_alloca(ifg); + nodes_iter_t iter; while (redo) { - redo = 0; - be_ifg_foreach_node(ifg, iter, irn) { - const arch_register_req_t *req = arch_get_register_req_out(irn); - - if (!arch_register_req_is(req, limited) && !sr_is_removed(sr, irn) && !co_gs_is_optimizable(sr->co, irn)) { - if (sr_is_simplicial(sr, irn)) { - coloring_suffix_t *cs = OALLOC(&sr->ob, coloring_suffix_t); - - cs->irn = irn; - cs->next = sr->col_suff; - sr->col_suff = cs; - - pset_insert_ptr(sr->all_removed, irn); - - redo = 1; - } - } + redo = false; + be_ifg_foreach_node(ifg, &iter, irn) { + const arch_register_req_t *req = arch_get_irn_register_req(irn); + coloring_suffix_t *cs; + + if (arch_register_req_is(req, limited) || sr_is_removed(sr, irn)) + continue; + if (co_gs_is_optimizable(sr->co, irn)) + continue; + if (!sr_is_simplicial(sr, irn)) + continue; + + cs = OALLOC(&sr->ob, coloring_suffix_t); + cs->irn = irn; + cs->next = sr->col_suff; + sr->col_suff = cs; + + pset_insert_ptr(sr->all_removed, irn); + + redo = true; } } } @@ -164,28 +165,38 @@ void sr_remove(size_red_t *sr) void sr_reinsert(size_red_t *sr) { coloring_suffix_t *cs; + ir_graph *irg = sr->co->irg; be_ifg_t *ifg = sr->co->cenv->ifg; - bitset_t *used_cols = bitset_alloca(arch_register_class_n_regs(sr->co->cls)); - void *iter = be_ifg_neighbours_iter_alloca(ifg); + unsigned n_regs = arch_register_class_n_regs(sr->co->cls); + unsigned *possible_cols; + unsigned *allocatable_cols; + + rbitset_alloca(allocatable_cols, n_regs); + be_set_allocatable_regs(irg, sr->co->cls, allocatable_cols); + + rbitset_alloca(possible_cols, n_regs); + neighbours_iter_t iter; /* color the removed nodes in right order */ for (cs = sr->col_suff; cs; cs = cs->next) { - int free_col; - ir_node *other, *irn; + unsigned free_col; + ir_node *other; + ir_node *irn = cs->irn; - /* get free color by inspecting all neighbors */ - irn = cs->irn; - bitset_clear_all(used_cols); + rbitset_copy(possible_cols, allocatable_cols, n_regs); - be_ifg_foreach_neighbour(ifg, iter, irn, other) { - if (!sr_is_removed(sr, other)) /* only inspect nodes which are in graph right now */ - bitset_set(used_cols, get_irn_col(other)); + /* get free color by inspecting all neighbors */ + be_ifg_foreach_neighbour(ifg, &iter, irn, other) { + /* only inspect nodes which are in graph right now */ + if (sr_is_removed(sr, other)) + continue; + rbitset_clear(possible_cols, get_irn_col(other)); } /* now all bits not set are possible colors */ - free_col = bitset_next_clear(used_cols, 0); - assert(free_col != -1 && "No free color found. This can not be."); - set_irn_col(sr->co, irn, free_col); + free_col = (unsigned)rbitset_next(possible_cols, 0, true); + assert(!rbitset_is_empty(possible_cols, n_regs) && "No free color found. This can not be."); + set_irn_col(sr->co->cls, irn, free_col); pset_remove_ptr(sr->all_removed, irn); /* irn is back in graph again */ } } @@ -224,45 +235,38 @@ ilp_env_t *new_ilp_env(copy_opt_t *co, ilp_callback build, ilp_callback apply, v lpp_sol_state_t ilp_go(ilp_env_t *ienv) { - be_main_env_t *main_env = ienv->co->cenv->birg->main_env; + ir_graph *irg = ienv->co->irg; + be_options_t *options = be_get_irg_options(irg); sr_remove(ienv->sr); ienv->build(ienv); - lpp_set_time_limit(ienv->lp, time_limit); - - if(solve_log) - lpp_set_log(ienv->lp, stdout); - - if(solve_net) - lpp_solve_net(ienv->lp, main_env->options->ilp_server, main_env->options->ilp_solver); - else { -#ifdef LPP_SOLVE_NET - fprintf(stderr, "can only solve ilp over the net\n"); -#else - lpp_solve_cplex(ienv->lp); -#endif - } - - be_stat_ev_dbl("co_ilp_objval", ienv->lp->objval); - be_stat_ev_dbl("co_ilp_best_bound", ienv->lp->best_bound); - be_stat_ev ("co_ilp_iter", ienv->lp->iterations); - be_stat_ev_dbl("co_ilp_sol_time", ienv->lp->sol_time); - if(dump_flags & DUMP_ILP) { + if (dump_flags & DUMP_ILP) { char buf[128]; FILE *f; - ir_snprintf(buf, sizeof(buf), "%F_%s-co.ilp", ienv->co->cenv->irg, + ir_snprintf(buf, sizeof(buf), "%F_%s-co.ilp", irg, ienv->co->cenv->cls->name); f = fopen(buf, "wt"); - if(f == NULL) { + if (f == NULL) { panic("Couldn't open '%s' for writing", buf); } lpp_dump_plain(ienv->lp, f); fclose(f); } + lpp_set_time_limit(ienv->lp, time_limit); + if (solve_log) + lpp_set_log(ienv->lp, stdout); + + lpp_solve(ienv->lp, options->ilp_server, options->ilp_solver); + + //be_stat_ev_dbl("co_ilp_objval", ienv->lp->objval); + //be_stat_ev_dbl("co_ilp_best_bound", ienv->lp->best_bound); + be_stat_ev ("co_ilp_iter", lpp_get_iter_cnt(ienv->lp)); + be_stat_ev_dbl("co_ilp_sol_time", lpp_get_sol_time(ienv->lp)); + ienv->apply(ienv); sr_reinsert(ienv->sr); @@ -273,14 +277,6 @@ lpp_sol_state_t ilp_go(ilp_env_t *ienv) void free_ilp_env(ilp_env_t *ienv) { free_size_red(ienv->sr); - free_lpp(ienv->lp); + lpp_free(ienv->lp); free(ienv); } - -#else /* WITH_ILP */ - -static inline void only_that_you_can_compile_without_WITH_ILP_defined(void) -{ -} - -#endif /* WITH_ILP */