start register allocator again, fix typo

[libfirm] / ir / be / beschedrss.c

diff --git a/ir/be/beschedrss.c b/ir/be/beschedrss.c
index cad9322..f8d54ed 100644 (file)
--- a/ir/be/beschedrss.c
+++ b/ir/be/beschedrss.c
@@ -34,6 +34,7 @@
 #include "height.h"
 
 #include "beabi.h"
+#include "bemodule.h"
 #include "benode_t.h"
 #include "besched_t.h"
 
@@ -297,12 +298,14 @@ static ir_node **build_sorted_array_from_list(plist_t *irn_list, struct obstack
  *
  *****************************************************/
 
+#ifdef DEBUG_libfirm
 static void dump_nodeset(nodeset *ns, const char *prefix) {
        ir_node *irn;
        foreach_nodeset(ns, irn) {
                ir_fprintf(stderr, "%s%+F\n", prefix, irn);
        }
 }
+#endif
 
 static void build_file_name(rss_t *rss, const char *suffix, size_t suf_len, char *buf, size_t len) {
        const char *irg_name;
@@ -598,7 +601,11 @@ static void collect_descendants(rss_t *rss, rss_irn_t *rirn, ir_node *irn, int *
                        if (arch_irn_is(rss->arch_env, user, ignore))
                                continue;
 
-                       if (get_irn_mode(user) == mode_X) {
+                       /*
+                               (a) mode_X means Jump            -> out_edge
+                               (b) Phi as user of a normal node -> out-edge
+                       */
+                       if (get_irn_mode(user) == mode_X || is_Phi(user)) {
                                if (! *got_sink)
                                        goto force_sink;
                                else
@@ -639,7 +646,7 @@ static void collect_single_consumer(rss_t *rss, rss_irn_t *rss_irn, ir_node *con
 
        assert(! is_Proj(consumer) && "Cannot handle Projs");
 
-       if (! is_Block(consumer) && get_nodes_block(consumer) == block) {
+       if (! is_Phi(consumer) && ! is_Block(consumer) && get_nodes_block(consumer) == block) {
                if (! arch_irn_is(rss->arch_env, consumer, ignore) && ! plist_has_value(rss_irn->consumer_list, consumer)) {
                        plist_insert_back(rss_irn->consumer_list, consumer);
                        DBG((rss->dbg, LEVEL_2, "\t\tconsumer %+F\n", consumer));
@@ -850,6 +857,7 @@ static void build_kill_edges(rss_t *rss, pset *epk) {
        }
 }
 
+#ifdef DEBUG_libfirm
 /* print the given cbc for debugging purpose */
 static void debug_print_cbc(firm_dbg_module_t *mod, cbc_t *cbc) {
        ir_node    *n;
@@ -868,6 +876,7 @@ static void debug_print_cbc(firm_dbg_module_t *mod, cbc_t *cbc) {
                DBG((mod, LEVEL_3, "\t\t\t%+F -> %+F\n", ke->src, ke->tgt));
        }
 }
+#endif
 
 /**
  * Construct the bipartite decomposition.
@@ -1666,8 +1675,8 @@ static serialization_t *compute_best_admissible_serialization(rss_t *rss, nodese
        ir_node    *irn;
        rss_edge_t min_benefit_edge;
        rss_edge_t min_omega20_edge;
-       rss_irn_t  *ser_u_omega1, *ser_v_omega1;
-       rss_irn_t  *ser_u_omega20, *ser_v_omega20;
+       rss_irn_t  *ser_u_omega1 = NULL, *ser_v_omega1 = NULL;
+       rss_irn_t  *ser_u_omega20 = NULL, *ser_v_omega20 = NULL;
 
        DBG((rss->dbg, LEVEL_1, "\tcomputing admissible serializations:\n"));
 
@@ -1886,7 +1895,7 @@ static serialization_t *compute_best_admissible_serialization(rss_t *rss, nodese
 static void perform_value_serialization_heuristic(rss_t *rss) {
        bitset_t *arch_nonign_bs = bitset_alloca(arch_register_class_n_regs(rss->cls));
        bitset_t *abi_ign_bs     = bitset_alloca(arch_register_class_n_regs(rss->cls));
-       int      available_regs, iteration, num_live;
+       int      available_regs, iteration;
        dvg_t    dvg;
        nodeset  *sat_vals;
        pset *ser_set = new_pset(cmp_rss_edges, 20);
@@ -1896,7 +1905,7 @@ static void perform_value_serialization_heuristic(rss_t *rss) {
        be_abi_put_ignore_regs(rss->abi, rss->cls, abi_ign_bs);
        bitset_andnot(arch_nonign_bs, abi_ign_bs);
        available_regs  = bitset_popcnt(arch_nonign_bs);
-       //um_live = pset_count(rss->live_block);
+       //num_live = pset_count(rss->live_block);
        //available_regs -= num_live < available_regs ? num_live : 0;
 
        DBG((rss->dbg, LEVEL_1, "\n\t#available regs: %d\n\n", available_regs));
@@ -2067,17 +2076,15 @@ static void process_block(ir_node *block, void *env) {
 /**
  * Register the options.
  */
-void rss_register_options(lc_opt_entry_t *grp) {
-       static int     run_once = 0;
-       lc_opt_entry_t *rss_grp;
+void be_init_schedrss(void) {
+       lc_opt_entry_t *be_grp = lc_opt_get_grp(firm_opt_get_root(), "be");
+       lc_opt_entry_t *sched_grp = lc_opt_get_grp(be_grp, "sched");
+       lc_opt_entry_t *rss_grp = lc_opt_get_grp(sched_grp, "rss");
 
-       if (! run_once) {
-               run_once = 1;
-               rss_grp  = lc_opt_get_grp(grp, "rss");
-
-               lc_opt_add_table(rss_grp, rss_option_table);
-       }
+       lc_opt_add_table(rss_grp, rss_option_table);
 }
+
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_schedrss);
 #endif /* WITH_LIBCORE */
 
 /**