X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyilp2.c;h=7208ae627b1283f7f6a74bcc452c0eaf9f40f9f4;hb=dd4cd761ab637d4488c7e29f49843b1b02366acf;hp=8054f48ece682bcafa1c1a5cb227a5822d2d6936;hpb=d6768d8d4427959eb045aafb1d15bd189beaa5dd;p=libfirm diff --git a/ir/be/becopyilp2.c b/ir/be/becopyilp2.c index 8054f48ec..7208ae627 100644 --- a/ir/be/becopyilp2.c +++ b/ir/be/becopyilp2.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 1995-2007 University of Karlsruhe. All right reserved. + * Copyright (C) 1995-2008 University of Karlsruhe. All right reserved. * * This file is part of libFirm. * @@ -48,6 +48,8 @@ #include "config.h" #endif /* HAVE_CONFIG_H */ +#include "firm_config.h" + #ifdef WITH_ILP #include "bitset.h" @@ -59,20 +61,21 @@ #include "becopyilp_t.h" #include "beifg_t.h" #include "besched_t.h" -#include "benodesets.h" #define DEBUG_LVL 1 typedef struct _local_env_t { double time_limit; int first_x_var, last_x_var; + int n_colors; + bitset_t *normal_colors; pmap *nr_2_irn; DEBUG_ONLY(firm_dbg_module_t *dbg;) } local_env_t; static void build_coloring_cstr(ilp_env_t *ienv) { - be_ifg_t *ifg = ienv->co->cenv->ifg; - void *iter = be_ifg_nodes_iter_alloca(ifg); + be_ifg_t *ifg = ienv->co->cenv->ifg; + void *iter = be_ifg_nodes_iter_alloca(ifg); bitset_t *colors; ir_node *irn; char buf[16]; @@ -81,22 +84,24 @@ static void build_coloring_cstr(ilp_env_t *ienv) { be_ifg_foreach_node(ifg, iter, irn) if (!sr_is_removed(ienv->sr, irn)) { - int col, cst_idx; + bitset_pos_t col; + int cst_idx; const arch_register_req_t *req; int curr_node_color = get_irn_col(ienv->co, irn); - int node_nr = (int)get_irn_node_nr(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); req = arch_get_register_req(ienv->co->aenv, irn, -1); + bitset_clear_all(colors); + /* 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); } /* add the coloring constraint */ @@ -104,7 +109,7 @@ static void build_coloring_cstr(ilp_env_t *ienv) { bitset_foreach(colors, col) { int var_idx = lpp_add_var(ienv->lp, name_cdd(buf, 'x', node_nr, col), lpp_binary, 0.0); - lpp_set_start_value(ienv->lp, var_idx, (col == curr_node_color) ? 1.0 : 0.0); + lpp_set_start_value(ienv->lp, var_idx, (col == (unsigned) curr_node_color) ? 1.0 : 0.0); lpp_set_factor_fast(ienv->lp, cst_idx, var_idx, 1); lenv->last_x_var = var_idx; @@ -125,9 +130,10 @@ static void build_coloring_cstr(ilp_env_t *ienv) { } static void build_interference_cstr(ilp_env_t *ienv) { - 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; int i, col; void *iter = be_ifg_cliques_iter_alloca(ifg); @@ -156,7 +162,7 @@ static void build_interference_cstr(ilp_env_t *ienv) { 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); } } @@ -171,8 +177,9 @@ static void build_interference_cstr(ilp_env_t *ienv) { * does not provide this walker, yet. */ static void build_affinity_cstr(ilp_env_t *ienv) { + local_env_t *lenv = ienv->env; + int n_colors = lenv->n_colors; unit_t *curr; - int n_colors = arch_register_class_n_regs(ienv->co->cls); /* for all optimization units */ list_for_each_entry(unit_t, curr, &ienv->co->units, units) { @@ -182,12 +189,12 @@ static void build_affinity_cstr(ilp_env_t *ienv) { int root_col, arg_col; root = curr->nodes[0]; - root_nr = (int) get_irn_node_nr(root); + root_nr = (int) get_irn_idx(root); root_col = get_irn_col(ienv->co, root); for (i = 1; i < curr->node_count; ++i) { arg = curr->nodes[i]; - arg_nr = (int) get_irn_node_nr(arg); + arg_nr = (int) get_irn_idx(arg); arg_col = get_irn_col(ienv->co, arg); /* add a new affinity variable */ @@ -218,11 +225,12 @@ typedef struct _edge_t { static int compare_edge_t(const void *k1, const void *k2, size_t size) { const edge_t *e1 = k1; const edge_t *e2 = k2; + (void) size; return ! (e1->n1 == e2->n1 && e1->n2 == e2->n2); } -#define HASH_EDGE(e) (nodeset_hash((e)->n1) ^ nodeset_hash((e)->n2)) +#define HASH_EDGE(e) (hash_irn((e)->n1) ^ hash_irn((e)->n2)) static INLINE edge_t *add_edge(set *edges, ir_node *n1, ir_node *n2, int *counter) { edge_t new_edge; @@ -283,19 +291,24 @@ static void build_clique_star_cstr(ilp_env_t *ienv) { co_gs_foreach_aff_node(ienv->co, aff) { struct obstack ob; neighb_t *nbr; - ir_node *center = aff->irn; + const ir_node *center = aff->irn; ir_node **nodes; set *edges; int i, o, n_nodes, n_edges; + if (arch_irn_is(ienv->co->aenv, aff->irn, ignore)) + continue; + 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(ienv->co->aenv, nbr->irn, ignore)) { + obstack_ptr_grow(&ob, nbr->irn); + ++n_nodes; + } } nodes = obstack_finish(&ob); @@ -367,10 +380,10 @@ static void build_clique_star_cstr(ilp_env_t *ienv) { char buf[16]; cst_idx = lpp_add_cst(ienv->lp, NULL, lpp_greater, pset_count(clique)-1); - center_nr = get_irn_node_nr(center); + center_nr = get_irn_idx(center); pset_foreach(clique, member) { - member_nr = get_irn_node_nr(member); + member_nr = get_irn_idx(member); 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); } @@ -385,7 +398,7 @@ static void build_clique_star_cstr(ilp_env_t *ienv) { } -static void extend_path(ilp_env_t *ienv, pdeq *path, ir_node *irn) { +static void extend_path(ilp_env_t *ienv, pdeq *path, const ir_node *irn) { be_ifg_t *ifg = ienv->co->cenv->ifg; int i, len; ir_node **curr_path; @@ -396,6 +409,9 @@ static void extend_path(ilp_env_t *ienv, pdeq *path, ir_node *irn) { if (pdeq_contains(path, irn)) return; + if (arch_irn_is(ienv->co->aenv, irn, ignore)) + return; + /* insert the new irn */ pdeq_putr(path, irn); @@ -422,8 +438,8 @@ static void extend_path(ilp_env_t *ienv, pdeq *path, ir_node *irn) { int cst_idx = lpp_add_cst(ienv->lp, NULL, lpp_greater, 1.0); for (i=1; ilp, name_cdd_sorted(buf, 'y', nr_1, nr_2)); lpp_set_factor_fast(ienv->lp, cst_idx, var_idx, 1.0); } @@ -540,6 +556,11 @@ int co_solve_ilp2(copy_opt_t *co) { 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->aenv, 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);