Do not warn about wrong register for a Phi input if that register is a joker (i.e...

[libfirm] / ir / be / becopystat.c

diff --git a/ir/be/becopystat.c b/ir/be/becopystat.c
index f63541e..a095a20 100644 (file)
--- a/ir/be/becopystat.c
+++ b/ir/be/becopystat.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.
  *
@@ -29,8 +29,8 @@
 #endif
 
 #include <string.h>
-#include <libcore/lc_timing.h>
 
+#include "timing.h"
 #include "xmalloc.h"
 #include "irgraph.h"
 #include "irgwalk.h"
@@ -45,7 +45,7 @@
 #include "becopystat.h"
 #include "beirg_t.h"
 #include "bemodule.h"
-#include "bera.h"
+#include "beintlive_t.h"
 
 #define DEBUG_LVL SET_LEVEL_1
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
@@ -188,10 +188,12 @@ static INLINE int was_edge_critical(const ir_node *bl, int pos) {
 /**
  * Collect phi node data
  */
-static void stat_phi_node(be_chordal_env_t *chordal_env, ir_node *phi) {
+static void stat_phi_node(be_chordal_env_t *chordal_env, ir_node *phi)
+{
        int arity, i;
        ir_node *phi_bl;
        assert(is_Phi(phi));
+       (void) chordal_env;
 
        /* count all phi phis */
        curr_vals[I_PHI_CNT]++;
@@ -239,10 +241,9 @@ static void stat_phi_node(be_chordal_env_t *chordal_env, ir_node *phi) {
  * Collect register-constrained node data
  */
 static void stat_copy_node(be_chordal_env_t *chordal_env, ir_node *root) {
-       be_lv_t *lv = be_get_birg_liveness(chordal_env->birg);
        curr_vals[I_CPY_CNT]++;
        curr_vals[I_COPIES_MAX]++;
-       if (values_interfere(lv, root, get_Perm_src(root))) {
+       if (values_interfere(chordal_env->birg, root, get_Perm_src(root))) {
                curr_vals[I_COPIES_IF]++;
                assert(0 && "A Perm pair (in/out) should never interfere!");
        }
@@ -253,7 +254,6 @@ static void stat_copy_node(be_chordal_env_t *chordal_env, ir_node *root) {
  */
 static void stat_phi_class(be_chordal_env_t *chordal_env, ir_node **pc) {
        int i, o, size, if_free, phis;
-       be_lv_t *lv = be_get_birg_liveness(chordal_env->birg);
 
        /* phi class count */
        curr_vals[I_CLS_CNT]++;
@@ -279,7 +279,7 @@ static void stat_phi_class(be_chordal_env_t *chordal_env, ir_node **pc) {
        curr_vals[I_CLS_IF_MAX] += size * (size - 1) / 2;
        for (if_free = 1, i = 0; i < size - 1; ++i)
                for (o = i + 1; o < size; ++o)
-                       if (values_interfere(lv, pc[i], pc[o])) {
+                       if (values_interfere(chordal_env->birg, pc[i], pc[o])) {
                                if_free = 0;
                                curr_vals[I_CLS_IF_CNT]++;
                        }
@@ -478,7 +478,7 @@ static void load_colors(color_save_t *color_saver) {
  */
 void co_compare_solvers(be_chordal_env_t *chordal_env) {
        copy_opt_t    *co;
-       lc_timer_t    *timer;
+       ir_timer_t    *timer;
        color_save_t  saver;
        int costs_inevit, costs_init, costs_solved, lower_bound;
 
@@ -509,44 +509,44 @@ void co_compare_solvers(be_chordal_env_t *chordal_env) {
        copystat_add_max_costs(co_get_max_copy_costs(co));
 
        /* heuristic 1 (Daniel Grund) */
-       timer = lc_timer_register("heur1", NULL);
-       lc_timer_reset_and_start(timer);
+       timer = ir_timer_register("heur1", NULL);
+       ir_timer_reset_and_start(timer);
 
        co_solve_heuristic(co);
 
-       lc_timer_stop(timer);
+       ir_timer_stop(timer);
 
        costs_solved = co_get_copy_costs(co);
        DBG((dbg, LEVEL_1, "HEUR1 costs: %3d\n", costs_solved));
-       copystat_add_heur_time(lc_timer_elapsed_msec(timer));
+       copystat_add_heur_time(ir_timer_elapsed_msec(timer));
        copystat_add_heur_costs(costs_solved);
        assert(lower_bound <= costs_solved);
 
        /* heuristic 2 (Sebastian Hack) */
-       timer = lc_timer_register("heur2", NULL);
-       lc_timer_reset_and_start(timer);
+       timer = ir_timer_register("heur2", NULL);
+       ir_timer_reset_and_start(timer);
 
        co_solve_heuristic_new(co);
 
-       lc_timer_stop(timer);
+       ir_timer_stop(timer);
 
        costs_solved = co_get_copy_costs(co);
        DBG((dbg, LEVEL_1, "HEUR2 costs: %3d\n", costs_solved));
-       copystat_add_heur_time(lc_timer_elapsed_msec(timer));
+       copystat_add_heur_time(ir_timer_elapsed_msec(timer));
        copystat_add_heur_costs(costs_solved);
        assert(lower_bound <= costs_solved);
 
        /* Park & Moon register coalescing (Kimon Hoffmann) */
-       timer = lc_timer_register("park", NULL);
-       lc_timer_reset_and_start(timer);
+       timer = ir_timer_register("park", NULL);
+       ir_timer_reset_and_start(timer);
 
        co_solve_park_moon(co);
 
-       lc_timer_stop(timer);
+       ir_timer_stop(timer);
 
        costs_solved = co_get_copy_costs(co);
        DBG((dbg, LEVEL_1, "Park/Moon costs: %3d\n", costs_solved));
-       copystat_add_heur_time(lc_timer_elapsed_msec(timer));
+       copystat_add_heur_time(ir_timer_elapsed_msec(timer));
        copystat_add_heur_costs(costs_solved);
        assert(lower_bound <= costs_solved);