X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbecopyilp2.c;h=e3d7963adbdf550ffd297409e4d736d0a269c11b;hb=f2e9c62bb64e082f4734c460e121cb75f09faf88;hp=98ce4e32f4a317e754e7cc2bcf412491df560537;hpb=294764ce7bb590e7714ef1378d7eda9608dbef6e;p=libfirm diff --git a/ir/be/becopyilp2.c b/ir/be/becopyilp2.c index 98ce4e32f..e3d7963ad 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. * @@ -44,11 +44,7 @@ * * x_nc, y_ij \in N, w_ij \in R^+ */ -#ifdef HAVE_CONFIG_H #include "config.h" -#endif /* HAVE_CONFIG_H */ - -#include "firm_config.h" #ifdef WITH_ILP @@ -74,7 +70,6 @@ typedef struct _local_env_t { } local_env_t; static void build_coloring_cstr(ilp_env_t *ienv) { - local_env_t *lenv = ienv->env; be_ifg_t *ifg = ienv->co->cenv->ifg; void *iter = be_ifg_nodes_iter_alloca(ifg); bitset_t *colors; @@ -88,13 +83,13 @@ static void build_coloring_cstr(ilp_env_t *ienv) { 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 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); - req = arch_get_register_req(ienv->co->aenv, irn, -1); + req = arch_get_register_req_out(irn); bitset_clear_all(colors); @@ -130,16 +125,17 @@ static void build_coloring_cstr(ilp_env_t *ienv) { } } -static void build_interference_cstr(ilp_env_t *ienv) { - 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); - ir_node **clique = alloca(sizeof(*clique) * n_colors); - int size; +static void build_interference_cstr(ilp_env_t *ienv) +{ + 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; + void *iter = be_ifg_cliques_iter_alloca(ifg); + ir_node **clique = ALLOCAN(ir_node*, n_colors); + int size; + int col; + int i; char buf[16]; @@ -163,7 +159,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); } } @@ -190,13 +186,13 @@ 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_col = get_irn_col(ienv->co, root); + root_nr = (int) get_irn_idx(root); + root_col = get_irn_col(root); for (i = 1; i < curr->node_count; ++i) { arg = curr->nodes[i]; - 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]); @@ -233,7 +229,7 @@ static int compare_edge_t(const void *k1, const void *k2, size_t size) { #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) { +static inline edge_t *add_edge(set *edges, ir_node *n1, ir_node *n2, int *counter) { edge_t new_edge; if (PTR_TO_INT(n1) < PTR_TO_INT(n2)) { @@ -247,7 +243,7 @@ static INLINE edge_t *add_edge(set *edges, ir_node *n1, ir_node *n2, int *counte return set_insert(edges, &new_edge, sizeof(new_edge), HASH_EDGE(&new_edge)); } -static INLINE edge_t *find_edge(set *edges, ir_node *n1, ir_node *n2) { +static inline edge_t *find_edge(set *edges, ir_node *n1, ir_node *n2) { edge_t new_edge; if (PTR_TO_INT(n1) < PTR_TO_INT(n2)) { @@ -260,7 +256,7 @@ static INLINE edge_t *find_edge(set *edges, ir_node *n1, ir_node *n2) { return set_find(edges, &new_edge, sizeof(new_edge), HASH_EDGE(&new_edge)); } -static INLINE void remove_edge(set *edges, ir_node *n1, ir_node *n2, int *counter) { +static inline void remove_edge(set *edges, ir_node *n1, ir_node *n2, int *counter) { edge_t new_edge, *e; if (PTR_TO_INT(n1) < PTR_TO_INT(n2)) { @@ -292,19 +288,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_ignore(aff->irn)) + 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_ignore(nbr->irn)) { + obstack_ptr_grow(&ob, nbr->irn); + ++n_nodes; + } } nodes = obstack_finish(&ob); @@ -376,10 +377,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); } @@ -394,7 +395,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; @@ -405,14 +406,17 @@ static void extend_path(ilp_env_t *ienv, pdeq *path, ir_node *irn) { if (pdeq_contains(path, irn)) return; + if (arch_irn_is_ignore(irn)) + return; + /* insert the new irn */ pdeq_putr(path, irn); /* check for forbidden interferences */ - len = pdeq_len(path); - curr_path = alloca(len * sizeof(*curr_path)); + len = pdeq_len(path); + curr_path = ALLOCAN(ir_node*, len); pdeq_copyl(path, (const void **)curr_path); for (i=1; ilp, 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); } @@ -493,16 +497,14 @@ static void ilp2_build(ilp_env_t *ienv) { static void ilp2_apply(ilp_env_t *ienv) { local_env_t *lenv = ienv->env; - double *sol; - lpp_sol_state_t state; - int i, count; + int i; /* first check if there was sth. to optimize */ if (lenv->first_x_var >= 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!"); @@ -524,6 +526,8 @@ static void ilp2_apply(ilp_env_t *ienv) { assert(0 && "This should be a x-var"); } } + + xfree(sol); } #ifdef COPYOPT_STAT @@ -551,7 +555,7 @@ int co_solve_ilp2(copy_opt_t *co) { 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); + 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); @@ -566,7 +570,7 @@ int co_solve_ilp2(copy_opt_t *co) { #else /* WITH_ILP */ -static INLINE void only_that_you_can_compile_without_WITH_ILP_defined(void) { +static inline void only_that_you_can_compile_without_WITH_ILP_defined(void) { } #endif /* WITH_ILP */