#define DEBUG_LVL 1
typedef struct _local_env_t {
double time_limit;
int first_x_var, last_x_var;
#define DEBUG_LVL 1
typedef struct _local_env_t {
double time_limit;
int first_x_var, last_x_var;
- int curr_node_color = get_irn_col(ienv->co, irn);
- int node_nr = (int)get_irn_node_nr(irn);
+ int curr_node_color = get_irn_col(irn);
+ int node_nr = (int)get_irn_idx(irn);
local_env_t *lenv = ienv->env;
pmap_insert(lenv->nr_2_irn, INT_TO_PTR(node_nr), irn);
local_env_t *lenv = ienv->env;
pmap_insert(lenv->nr_2_irn, INT_TO_PTR(node_nr), irn);
- req = arch_get_register_req(ienv->co->aenv, irn, -1);
+ req = arch_get_register_req(irn, -1);
+
+ bitset_clear_all(colors);
/* get assignable colors */
if (arch_register_req_is(req, limited)) {
rbitset_copy_to_bitset(req->limited, colors);
} else {
/* get assignable colors */
if (arch_register_req_is(req, limited)) {
rbitset_copy_to_bitset(req->limited, colors);
} else {
- arch_register_class_put(req->cls, colors);
- // bitset_andnot(colors, ienv->co->cenv->ignore_colors);
+ bitset_copy(colors, lenv->normal_colors);
- lpp_t *lpp = ienv->lp;
- be_ifg_t *ifg = ienv->co->cenv->ifg;
- int n_colors = arch_register_class_n_regs(ienv->co->cls);
+ lpp_t *lpp = ienv->lp;
+ local_env_t *lenv = ienv->env;
+ be_ifg_t *ifg = ienv->co->cenv->ifg;
+ int n_colors = lenv->n_colors;
ir_node *irn = clique[i];
if (!sr_is_removed(ienv->sr, irn)) {
ir_node *irn = clique[i];
if (!sr_is_removed(ienv->sr, irn)) {
- int var_idx = lpp_get_var_idx(lpp, name_cdd(buf, 'x', (int)get_irn_node_nr(irn), col));
+ int var_idx = lpp_get_var_idx(lpp, name_cdd(buf, 'x', (int)get_irn_idx(irn), col));
lpp_set_factor_fast(lpp, cst_idx, var_idx, 1);
}
}
lpp_set_factor_fast(lpp, cst_idx, var_idx, 1);
}
}
* does not provide this walker, yet.
*/
static void build_affinity_cstr(ilp_env_t *ienv) {
* does not provide this walker, yet.
*/
static void build_affinity_cstr(ilp_env_t *ienv) {
/* for all optimization units */
list_for_each_entry(unit_t, curr, &ienv->co->units, units) {
/* for all optimization units */
list_for_each_entry(unit_t, curr, &ienv->co->units, units) {
- root_nr = (int) get_irn_node_nr(root);
- root_col = get_irn_col(ienv->co, root);
+ root_nr = (int) get_irn_idx(root);
+ root_col = get_irn_col(root);
- arg_nr = (int) get_irn_node_nr(arg);
- arg_col = get_irn_col(ienv->co, arg);
+ arg_nr = (int) get_irn_idx(arg);
+ arg_col = get_irn_col(arg);
/* add a new affinity variable */
y_idx = lpp_add_var(ienv->lp, name_cdd_sorted(buf, 'y', root_nr, arg_nr), lpp_binary, curr->costs[i]);
/* add a new affinity variable */
y_idx = lpp_add_var(ienv->lp, name_cdd_sorted(buf, 'y', root_nr, arg_nr), lpp_binary, curr->costs[i]);
static INLINE edge_t *add_edge(set *edges, ir_node *n1, ir_node *n2, int *counter) {
edge_t new_edge;
static INLINE edge_t *add_edge(set *edges, ir_node *n1, ir_node *n2, int *counter) {
edge_t new_edge;
ir_node **nodes;
set *edges;
int i, o, n_nodes, n_edges;
ir_node **nodes;
set *edges;
int i, o, n_nodes, n_edges;
obstack_init(&ob);
edges = new_set(compare_edge_t, 8);
/* get all affinity neighbours */
n_nodes = 0;
co_gs_foreach_neighb(aff, nbr) {
obstack_init(&ob);
edges = new_set(compare_edge_t, 8);
/* get all affinity neighbours */
n_nodes = 0;
co_gs_foreach_neighb(aff, nbr) {
- obstack_ptr_grow(&ob, nbr->irn);
- ++n_nodes;
+ if (!arch_irn_is(nbr->irn, ignore)) {
+ obstack_ptr_grow(&ob, nbr->irn);
+ ++n_nodes;
+ }
char buf[16];
cst_idx = lpp_add_cst(ienv->lp, NULL, lpp_greater, pset_count(clique)-1);
char buf[16];
cst_idx = lpp_add_cst(ienv->lp, NULL, lpp_greater, pset_count(clique)-1);
var_idx = lpp_get_var_idx(ienv->lp, name_cdd_sorted(buf, 'y', center_nr, member_nr));
lpp_set_factor_fast(ienv->lp, cst_idx, var_idx, 1.0);
}
var_idx = lpp_get_var_idx(ienv->lp, name_cdd_sorted(buf, 'y', center_nr, member_nr));
lpp_set_factor_fast(ienv->lp, cst_idx, var_idx, 1.0);
}
int cst_idx = lpp_add_cst(ienv->lp, NULL, lpp_greater, 1.0);
for (i=1; i<len; ++i) {
char buf[16];
int cst_idx = lpp_add_cst(ienv->lp, NULL, lpp_greater, 1.0);
for (i=1; i<len; ++i) {
char buf[16];
int var_idx = lpp_get_var_idx(ienv->lp, name_cdd_sorted(buf, 'y', nr_1, nr_2));
lpp_set_factor_fast(ienv->lp, cst_idx, var_idx, 1.0);
}
int var_idx = lpp_get_var_idx(ienv->lp, name_cdd_sorted(buf, 'y', nr_1, nr_2));
lpp_set_factor_fast(ienv->lp, cst_idx, var_idx, 1.0);
}
+ int count = lenv->last_x_var - lenv->first_x_var + 1;
+ double *sol = XMALLOCN(double, count);
+ lpp_sol_state_t state = lpp_get_solution(ienv->lp, sol, lenv->first_x_var, lenv->last_x_var);
- count = lenv->last_x_var - lenv->first_x_var + 1;
- sol = xmalloc(count * sizeof(sol[0]));
- state = lpp_get_solution(ienv->lp, sol, lenv->first_x_var, lenv->last_x_var);
if (state != lpp_optimal) {
printf("WARNING %s: Solution state is not 'optimal': %d\n", ienv->co->name, state);
assert(state >= lpp_feasible && "The solution should at least be feasible!");
if (state != lpp_optimal) {
printf("WARNING %s: Solution state is not 'optimal': %d\n", ienv->co->name, state);
assert(state >= lpp_feasible && "The solution should at least be feasible!");
my.nr_2_irn = pmap_create();
FIRM_DBG_REGISTER(my.dbg, "firm.be.coilp2");
my.nr_2_irn = pmap_create();
FIRM_DBG_REGISTER(my.dbg, "firm.be.coilp2");
+ my.normal_colors = bitset_alloca(arch_register_class_n_regs(co->cls));
+ bitset_clear_all(my.normal_colors);
+ arch_put_non_ignore_regs(co->cls, my.normal_colors);
+ my.n_colors = bitset_popcnt(my.normal_colors);
+
ienv = new_ilp_env(co, ilp2_build, ilp2_apply, &my);
sol_state = ilp_go(ienv);
ienv = new_ilp_env(co, ilp2_build, ilp2_apply, &my);
sol_state = ilp_go(ienv);