X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyilp.c;h=340d97de53ac8e299aa56040e21dc596fb417a9a;hb=df2faee01a5832057bb3ca0ba5f67e979c916e19;hp=b3806f7ae7a98651ca3e858f7b7010a4c4880667;hpb=f8cc15664f571aa7ef89d6f6bc8d5bd2b8ca7d53;p=libfirm diff --git a/ir/be/becopyilp.c b/ir/be/becopyilp.c index b3806f7ae..340d97de5 100644 --- a/ir/be/becopyilp.c +++ b/ir/be/becopyilp.c @@ -25,11 +25,13 @@ */ #include "config.h" +#include + +#include "be_t.h" #include "irtools.h" #include "irprintf.h" -#include "bestatevent.h" -#include "beirg.h" +#include "statev_t.h" #include "bemodule.h" #include "error.h" @@ -103,7 +105,7 @@ 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; neighbours_iter_t iter; @@ -122,37 +124,40 @@ static inline int sr_is_simplicial(size_red_t *sr, const ir_node *ifn) for (i=0; ico->cenv->ifg; nodes_iter_t iter; while (redo) { - redo = 0; + 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) && !co_gs_is_optimizable(sr->co, irn)) { - if (sr_is_simplicial(sr, irn)) { - coloring_suffix_t *cs = OALLOC(&sr->ob, coloring_suffix_t); + 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->irn = irn; - cs->next = sr->col_suff; - sr->col_suff = cs; + 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); + pset_insert_ptr(sr->all_removed, irn); - redo = 1; - } - } + redo = true; } } } @@ -160,28 +165,55 @@ 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)); + unsigned n_regs = arch_register_class_n_regs(sr->co->cls); + + unsigned *const allocatable_cols = rbitset_alloca(n_regs); + be_set_allocatable_regs(irg, sr->co->cls, allocatable_cols); + + unsigned *const possible_cols = rbitset_alloca(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); + /* get free color by inspecting all neighbors */ 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)); + const arch_register_req_t *cur_req; + unsigned cur_col; + + /* only inspect nodes which are in graph right now */ + if (sr_is_removed(sr, other)) + continue; + + cur_req = arch_get_irn_register_req(other); + cur_col = get_irn_col(other); + + /* Invalidate all single size register when it is a large one */ + do { + rbitset_clear(possible_cols, cur_col); + ++cur_col; + } while ((cur_col % cur_req->width) != 0); } /* 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); + /* take one that matches the alignment constraint */ + free_col = 0; + assert(!rbitset_is_empty(possible_cols, n_regs) && "No free color found. This can not be."); + while (true) { + free_col = (unsigned)rbitset_next(possible_cols, free_col, true); + if (free_col % arch_get_irn_register_req(irn)->width == 0) + break; + ++free_col; + assert(free_col < n_regs); + } + set_irn_col(sr->co->cls, irn, free_col); pset_remove_ptr(sr->all_removed, irn); /* irn is back in graph again */ } } @@ -220,28 +252,17 @@ 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_options_t *options = be_get_irg_options(ienv->co->irg); + ir_graph *irg = ienv->co->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); - - 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)); 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) { @@ -251,6 +272,17 @@ lpp_sol_state_t ilp_go(ilp_env_t *ienv) fclose(f); } + lpp_set_time_limit(ienv->lp, time_limit); + if (solve_log) + lpp_set_log(ienv->lp, stdout); + + lpp_solve(ienv->lp, be_options.ilp_server, be_options.ilp_solver); + + //stat_ev_dbl("co_ilp_objval", ienv->lp->objval); + //stat_ev_dbl("co_ilp_best_bound", ienv->lp->best_bound); + stat_ev_int("co_ilp_iter", lpp_get_iter_cnt(ienv->lp)); + stat_ev_dbl("co_ilp_sol_time", lpp_get_sol_time(ienv->lp)); + ienv->apply(ienv); sr_reinsert(ienv->sr);