Remove the unused parameter const arch_env_t *env from arch_irn_get_flags(), arch_irn...

[libfirm] / ir / be / becopyilp2.c

diff --git a/ir/be/becopyilp2.c b/ir/be/becopyilp2.c
index befc618..db68195 100644 (file)
--- 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.
  *
@@ -61,7 +61,6 @@
 #include "becopyilp_t.h"
 #include "beifg_t.h"
 #include "besched_t.h"
-#include "benodesets.h"
 
 #define DEBUG_LVL 1
 
@@ -75,7 +74,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;
@@ -89,13 +87,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(irn, -1);
 
                        bitset_clear_all(colors);
 
@@ -164,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);
                                }
                        }
@@ -191,13 +189,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]);
@@ -232,7 +230,7 @@ static int compare_edge_t(const void *k1, const void *k2, size_t 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;
@@ -293,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(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(nbr->irn, ignore)) {
+                               obstack_ptr_grow(&ob, nbr->irn);
+                               ++n_nodes;
+                       }
                }
                nodes = obstack_finish(&ob);
 
@@ -377,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);
                                }
@@ -395,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;
@@ -406,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(irn, ignore))
+               return;
+
        /* insert the new irn */
        pdeq_putr(path, irn);
 
@@ -432,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; i<len; ++i) {
                                char buf[16];
-                               int nr_1    = get_irn_node_nr(curr_path[i-1]);
-                               int nr_2    = get_irn_node_nr(curr_path[i]);
+                               int nr_1    = get_irn_idx(curr_path[i-1]);
+                               int nr_2    = get_irn_idx(curr_path[i]);
                                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);
                        }
@@ -494,16 +500,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!");
@@ -525,6 +529,8 @@ static void ilp2_apply(ilp_env_t *ienv) {
                                        assert(0 && "This should be a x-var");
                        }
                }
+
+               xfree(sol);
        }
 
 #ifdef COPYOPT_STAT
@@ -552,7 +558,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);