#include "irtools.h"
#include "irprintf.h"
-#include "bestatevent.h"
+#include "statev_t.h"
#include "beirg.h"
#include "bemodule.h"
#include "error.h"
/* get free color by inspecting all neighbors */
be_ifg_foreach_neighbour(ifg, &iter, irn, 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;
- rbitset_clear(possible_cols, get_irn_col(other));
+
+ 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 = (unsigned)rbitset_next(possible_cols, 0, true);
+ /* 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 */
}
lpp_sol_state_t ilp_go(ilp_env_t *ienv)
{
- ir_graph *irg = ienv->co->irg;
- be_options_t *options = be_get_irg_options(irg);
+ ir_graph *irg = ienv->co->irg;
sr_remove(ienv->sr);
if (solve_log)
lpp_set_log(ienv->lp, stdout);
- lpp_solve(ienv->lp, options->ilp_server, options->ilp_solver);
+ lpp_solve(ienv->lp, be_options.ilp_server, be_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));
+ //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);