Added insertion of duplicates for operands of phi nodes that interfere

[libfirm] / ir / be / becopyoptmain.c

diff --git a/ir/be/becopyoptmain.c b/ir/be/becopyoptmain.c
index 26828d8..ee0954e 100644 (file)
--- a/ir/be/becopyoptmain.c
+++ b/ir/be/becopyoptmain.c
@@ -12,34 +12,34 @@
 #include "config.h"
 #endif
 
+#include "debug.h"
 #include "becopyopt.h"
 #include "becopystat.h"
 #include "becopyoptmain.h"
 
 #define DO_HEUR
-#define DO_ILP
+#undef DO_ILP
 
 #define DEBUG_LVL SET_LEVEL_1
 static firm_dbg_module_t *dbg = NULL;
 
 void be_copy_opt_init(void) {
+       dbg = firm_dbg_register("ir.be.copyoptmain");
+       firm_dbg_set_mask(dbg, LEVEL_1);
 }
 
 void be_copy_opt(be_chordal_env_t *chordal_env) {
        copy_opt_t *co;
        int lb, copies;
 
-       dbg = firm_dbg_register("ir.be.copyopt");
-       firm_dbg_set_mask(dbg, DEBUG_LVL);
-
        co = new_copy_opt(chordal_env);
-       DBG((dbg, LEVEL_1, "\n\n    ===>  %s  <===\n\n", co->name));
+       DBG((dbg, LEVEL_1, "===>  %s  <===\n", co->name));
        co_check_allocation(co);
 
 #ifdef DO_STAT
        copies = co_get_copy_count(co);
        curr_vals[I_COPIES_INIT] += copies;
-       DBG((dbg, 1, "Init copies: %3d\n", copies));
+       DBG((dbg, LEVEL_1, "Init copies: %3d\n", copies));
 #endif
 
 #ifdef DO_HEUR
@@ -48,31 +48,26 @@ void be_copy_opt(be_chordal_env_t *chordal_env) {
 #ifdef DO_STAT
        copies = co_get_copy_count(co);
        curr_vals[I_COPIES_HEUR] += copies;
-       DBG((dbg, 1, "Heur copies: %3d\n", copies));
+       DBG((dbg, LEVEL_1, "Heur copies: %3d\n", copies));
 #endif
-       DBG((dbg, 1, "Heur copies: %3d\n", co_get_copy_count(co)));
 #endif
 
 #ifdef DO_ILP
        lb = co_get_lower_bound(co);
        copies = co_get_copy_count(co);
-//TODO remove checks and enable lb
-       if (copies<lb)
-               DBG((dbg, 0, "\n\nAt least one computation of these two is boooogy %d < %d\n\n", lb, copies));
+       assert(copies>=lb && "At least one computation of these two is boooogy");
 
-//     if (copies > lb) {
+       if (copies > lb) {
                co_ilp_opt(co);
                co_check_allocation(co);
-//     }
-       copies = co_get_copy_count(co);
-       assert(copies>=lb && "At least one computation of these two is boooogy");
+       }
 
 #ifdef DO_STAT
        copies = co_get_copy_count(co);
-       curr_vals[I_COPIES_HEUR] += copies;
-       DBG((dbg, 1, "Opt  copies: %3d\n", copies));
+       curr_vals[I_COPIES_OPT] += copies;
+       DBG((dbg, LEVEL_1, "Opt  copies: %3d\n", copies));
+       assert(copies>=lb && "At least one computation of these two is boooogy");
 #endif
-       DBG((dbg, 1, "Opt  copies: %3d\n", co_get_copy_count(co)));
 #endif
 
        free_copy_opt(co);