start register allocator again, fix typo

[libfirm] / ir / be / becopystat.c

diff --git a/ir/be/becopystat.c b/ir/be/becopystat.c
index 16f02d3..fc1df4e 100644 (file)
--- a/ir/be/becopystat.c
+++ b/ir/be/becopystat.c
@@ -21,6 +21,8 @@
 #include "beutil.h"
 #include "becopyopt_t.h"
 #include "becopystat.h"
+#include "beirg_t.h"
+#include "bemodule.h"
 
 #define DEBUG_LVL SET_LEVEL_1
 DEBUG_ONLY(static firm_dbg_module_t *dbg = NULL;)
@@ -67,8 +69,8 @@ enum vals_t {
        /* ilp values */
        I_HEUR_TIME,            /* solving time in milli seconds */
        I_ILP_TIME,                     /* solving time in milli seconds */
-    I_ILP_VARS,
-    I_ILP_CSTR,
+       I_ILP_VARS,
+       I_ILP_CSTR,
        I_ILP_ITER,                     /* number of simplex iterations */
 
        /* copy instructions */
@@ -93,24 +95,26 @@ static pset *all_phi_classes;
 static pset *all_copy_nodes;
 static ir_graph *last_irg;
 
-void copystat_init(void) {
+void be_init_copystat(void) {
        FIRM_DBG_REGISTER(dbg, "firm.be.copystat");
 
        all_phi_nodes   = pset_new_ptr_default();
        all_phi_classes = pset_new_ptr_default();
        all_copy_nodes  = pset_new_ptr_default();
+       memset(curr_vals, 0, sizeof(curr_vals));
 }
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_copystat);
 
-void copystat_reset(void) {
-       int i;
-       for (i = 0; i < ASIZE; ++i)
-               curr_vals[i] = 0;
+void be_quit_copystat(void) {
        del_pset(all_phi_nodes);
        del_pset(all_phi_classes);
        del_pset(all_copy_nodes);
-       all_phi_nodes = pset_new_ptr_default();
-       all_phi_classes = pset_new_ptr_default();
-       all_copy_nodes = pset_new_ptr_default();
+}
+BE_REGISTER_MODULE_DESTRUCTOR(be_quit_copystat);
+
+void copystat_reset(void) {
+       be_quit_copystat();
+       be_init_copystat();
 }
 
 /**
@@ -120,14 +124,14 @@ static void irg_stat_walker(ir_node *node, void *env) {
        arch_env_t *arch_env = env;
        curr_vals[I_ALL_NODES]++; /* count all nodes */
 
-       if (is_Block(node)) /* count all blocks */
-               curr_vals[I_BLOCKS]++;
+       if (is_Block(node)) /* count all blocks */
+               curr_vals[I_BLOCKS]++;
 
-       if (is_Reg_Phi(node)) /* collect phis */
-               pset_insert_ptr(all_phi_nodes, node);
+       if (is_Reg_Phi(node)) /* collect phis */
+               pset_insert_ptr(all_phi_nodes, node);
 
-       if (is_Perm_Proj(arch_env, node))
-               pset_insert_ptr(all_copy_nodes, node);
+       if (is_Perm_Proj(arch_env, node))
+               pset_insert_ptr(all_copy_nodes, node);
 
        /* TODO: Add 2-Addr-Code nodes */
 }
@@ -156,7 +160,7 @@ static INLINE int was_edge_critical(const ir_node *bl, int pos) {
        if (get_irn_arity(bl_at_pos) != 1)
                return 0;
 
-       /* Does the pred of the pred have several sucsecessors */
+       /* Does the pred of the pred have several successors */
        bl_before = get_irn_n(bl_at_pos, 0);
        edge = get_block_succ_first(bl_before);
        return get_block_succ_next(bl_before, edge) ? 1 : 0;
@@ -349,6 +353,7 @@ void copystat_dump(ir_graph *irg) {
        FILE *out;
 
        snprintf(buf, sizeof(buf), "%s__%s", get_irp_prog_name(), get_entity_name(get_irg_entity(irg)));
+       buf[sizeof(buf) - 1] = '\0';
        out = ffopen(buf, "stat", "wt");
 
        fprintf(out, "%d\n", ASIZE);
@@ -363,7 +368,7 @@ void copystat_dump(ir_graph *irg) {
                        fprintf(out, "%i\n", curr_vals[i]);
        }
 
-    fclose(out);
+       fclose(out);
 }
 
 void copystat_dump_pretty(ir_graph *irg) {
@@ -372,6 +377,7 @@ void copystat_dump_pretty(ir_graph *irg) {
        FILE *out;
 
        snprintf(buf, sizeof(buf), "%s__%s", get_irp_prog_name(), get_entity_name(get_irg_entity(irg)));
+       buf[sizeof(buf) - 1] = '\0';
        out = ffopen(buf, "pstat", "wt");
 
        fprintf(out, "Nodes     %4d\n", curr_vals[I_ALL_NODES]);
@@ -442,10 +448,12 @@ static void save_colors(color_save_t *color_saver) {
        irg_walk_graph(color_saver->chordal_env->irg, save_load, NULL, color_saver);
 }
 
+#ifdef WITH_ILP
 static void load_colors(color_save_t *color_saver) {
        color_saver->flag = 1;
        irg_walk_graph(color_saver->chordal_env->irg, save_load, NULL, color_saver);
 }
+#endif
 
 /**
  * Main compare routine
@@ -484,7 +492,6 @@ void co_compare_solvers(be_chordal_env_t *chordal_env) {
        copystat_add_init_costs(costs_init);
        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);
@@ -515,6 +522,21 @@ void co_compare_solvers(be_chordal_env_t *chordal_env) {
        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);
+
+       co_solve_park_moon(co);
+
+       lc_timer_stop(timer);
+
+       be_ra_chordal_check(co->cenv);
+       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_costs(costs_solved);
+       assert(lower_bound <= costs_solved);
+
 
 #ifdef WITH_ILP
 
@@ -533,7 +555,7 @@ void co_compare_solvers(be_chordal_env_t *chordal_env) {
        /* ILP 2 */
        load_colors(&saver);
 
-       co_solve_ilp2(co, 60.0);
+       co_solve_ilp2(co);
 
        be_ra_chordal_check(co->cenv);
        costs_solved = co_get_copy_costs(co);