adapted to new callback

[libfirm] / ir / be / becopyopt.c

diff --git a/ir/be/becopyopt.c b/ir/be/becopyopt.c
index d738993..b206eaa 100644 (file)
--- a/ir/be/becopyopt.c
+++ b/ir/be/becopyopt.c
@@ -38,6 +38,7 @@
 #include "belive_t.h"
 #include "beinsn_t.h"
 #include "besched_t.h"
+#include "benodesets.h"
 
 #define DUMP_BEFORE 1
 #define DUMP_AFTER  2
@@ -73,6 +74,7 @@ static const lc_opt_enum_mask_items_t style_items[] = {
 };
 
 static const lc_opt_enum_mask_items_t algo_items[] = {
+       { "none",   CO_ALGO_NONE  },
        { "heur",   CO_ALGO_HEUR  },
        { "heur2",  CO_ALGO_HEUR2 },
        { "heur3",  CO_ALGO_HEUR3 },
@@ -655,7 +657,7 @@ static void add_edge(copy_opt_t *co, ir_node *n1, ir_node *n2, int costs) {
        new_node.irn        = n1;
        new_node.degree     = 0;
        new_node.neighbours = NULL;
-       node = set_insert(co->nodes, &new_node, sizeof(new_node), HASH_PTR(new_node.irn));
+       node = set_insert(co->nodes, &new_node, sizeof(new_node), nodeset_hash(new_node.irn));
 
        allocnew = 1;
        for (nbr = node->neighbours; nbr; nbr = nbr->next)
@@ -740,7 +742,7 @@ int co_gs_is_optimizable(copy_opt_t *co, ir_node *irn) {
        ASSERT_GS_AVAIL(co);
 
        new_node.irn = irn;
-       n = set_find(co->nodes, &new_node, sizeof(new_node), HASH_PTR(new_node.irn));
+       n = set_find(co->nodes, &new_node, sizeof(new_node), nodeset_hash(new_node.irn));
        if (n) {
                return (n->degree > 0);
        } else
@@ -1073,7 +1075,6 @@ static void appel_inter_block_aff(ir_node *bl, void *data)
 
                for(j = 0, n = get_Block_n_cfgpreds(bl); j < n; ++j) {
                        ir_node *pred  = get_Block_cfgpred_block(bl, j);
-                       appel_block_info_t *pred_bli = phase_get_irn_data(&env->ph, pred);
 
                        int nr = appel_get_live_end_nr(env, pred, irn);
                        assert(nr >= 0);
@@ -1086,7 +1087,6 @@ static void appel_inter_block_aff(ir_node *bl, void *data)
 
                for(j = 0, n = get_Block_n_cfgpreds(bl); j < n; ++j) {
                        ir_node *pred  = get_Block_cfgpred_block(bl, j);
-                       appel_block_info_t *pred_bli = phase_get_irn_data(&env->ph, pred);
                        ir_node *op = get_irn_n(irn, j);
 
                        int nr = appel_get_live_end_nr(env, pred, op);
@@ -1230,7 +1230,7 @@ static void ifg_dump_node_attr(FILE *f, void *self, ir_node *irn)
        }
 
        else
-               fprintf(f, "label=\"\"" );
+               fprintf(f, "label=\"\" shape=point " );
 
        if(env->flags & CO_IFG_DUMP_SHAPE)
                fprintf(f, "shape=%s ", limited ? "diamond" : "ellipse");
@@ -1332,6 +1332,7 @@ void co_driver(be_chordal_env_t *cenv)
 {
        copy_opt_t *co;
        co_algo_t  *algo_func;
+       int init_costs;
 
        if(algo < 0 || algo >= CO_ALGO_LAST)
                return;
@@ -1339,11 +1340,7 @@ void co_driver(be_chordal_env_t *cenv)
        co = new_copy_opt(cenv, cost_func);
        co_build_ou_structure(co);
        co_build_graph_structure(co);
-       if(do_stats) {
-               ir_printf("%30F %10s %7d%7d%7d%7d", cenv->irg, cenv->cls->name,
-                               co_get_max_copy_costs(co), co_get_copy_costs(co),
-                               co_get_inevit_copy_costs(co), co_get_lower_bound(co));
-       }
+       init_costs = co_get_copy_costs(co);
 
        /* Dump the interference graph in Appel's format. */
        if(dump_flags & DUMP_APPEL) {
@@ -1372,10 +1369,14 @@ void co_driver(be_chordal_env_t *cenv)
                int remaining         = co_get_copy_costs(co);
                int evitable          = remaining - co_get_lower_bound(co);
 
+               ir_printf("%30F %10s %10d%10d%10d%10d", cenv->irg, cenv->cls->name,
+                               co_get_max_copy_costs(co), init_costs,
+                               co_get_inevit_copy_costs(co), co_get_lower_bound(co));
+
                if(optimizable_costs > 0)
-                       printf("%5d %5.2f\n", remaining, (evitable * 100.0) / optimizable_costs);
+                       printf("%10d %5.2f\n", remaining, (evitable * 100.0) / optimizable_costs);
                else
-                       printf("%5d %5s\n", remaining, "-");
+                       printf("%10d %5s\n", remaining, "-");
        }
 
        co_free_graph_structure(co);