More missing config.h

[libfirm] / ir / be / beschedrss.c

diff --git a/ir/be/beschedrss.c b/ir/be/beschedrss.c
index 578a4b3..f56937f 100644 (file)
--- a/ir/be/beschedrss.c
+++ b/ir/be/beschedrss.c
@@ -365,11 +365,13 @@ static void debug_vcg_dump_kill(rss_t *rss) {
        fprintf(f, "layoutalgorithm: mindepth\n");
        fprintf(f, "manhattan_edges: yes\n\n");
 
-       /* first: reset dumped flag of all nodes */
-       foreach_plist(rss->nodes, el) {
-               ir_node   *irn  = plist_element_get_value(el);
-               rss_irn_t *rirn = get_rss_irn(rss, irn);
-               rirn->dumped = 0;
+       {
+               /* reset dump_flag */
+               ir_node *irn;
+               foreach_phase_irn(&rss->ph, irn) {
+                       rss_irn_t *node = get_rss_irn(rss, irn);
+                       node->dumped = 0;
+               }
        }
 
        /* dump all nodes and their killers */
@@ -420,6 +422,15 @@ static void debug_vcg_dump_pkg(rss_t *rss, nodeset *max_ac, int iteration) {
        fprintf(f, "layoutalgorithm: mindepth\n");
        fprintf(f, "manhattan_edges: yes\n\n");
 
+       {
+               /* reset dump_flag */
+               ir_node *irn;
+               foreach_phase_irn(&rss->ph, irn) {
+                       rss_irn_t *node = get_rss_irn(rss, irn);
+                       node->dumped = 0;
+               }
+       }
+
        foreach_plist(rss->nodes, el) {
                ir_node   *irn  = plist_element_get_value(el);
                rss_irn_t *rirn = get_rss_irn(rss, irn);
@@ -430,11 +441,13 @@ static void debug_vcg_dump_pkg(rss_t *rss, nodeset *max_ac, int iteration) {
                if (max_ac && nodeset_find(max_ac, irn))
                        c1 = "color:yellow";
 
-               if (rirn->chain)
-                       ir_fprintf(f, "node: { title: \"n%d\" label: \"%+F   c%d\" %s }\n", get_irn_node_nr(irn), irn, rirn->chain->nr, c1);
-               else
-                       ir_fprintf(f, "node: { title: \"n%d\" label: \"%+F\" %s }\n", get_irn_node_nr(irn), irn, c1);
-               rirn->dumped = 1;
+               if (! rirn->dumped) {
+                       if (rirn->chain)
+                               ir_fprintf(f, "node: { title: \"n%d\" label: \"%+F   c%d\" %s }\n", get_irn_node_nr(irn), irn, rirn->chain->nr, c1);
+                       else
+                               ir_fprintf(f, "node: { title: \"n%d\" label: \"%+F\" %s }\n", get_irn_node_nr(irn), irn, c1);
+                       rirn->dumped = 1;
+               }
 
                foreach_plist(rirn->pkiller_list, k_el) {
                        ir_node   *pkiller = plist_element_get_value(k_el);
@@ -585,7 +598,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
@@ -626,7 +643,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));
@@ -876,6 +893,7 @@ static void compute_bipartite_decomposition(rss_t *rss) {
                rss_irn_t *u       = get_rss_irn(rss, u_irn);
                int       p_change = 1;
                int       c_change = 1;
+               int       vrfy_ok  = 1;
 
                cbc_t           *cbc;
                plist_element_t *el2;
@@ -924,7 +942,7 @@ static void compute_bipartite_decomposition(rss_t *rss) {
                                        if (k_edge->tgt == t_irn && ! nodeset_find(cbc->parents, val)) {
                                                nodeset_insert(cbc->parents, val);
                                                p_change = 1;
-                                               DBG((rss->dbg, LEVEL_3, "\t\t\t%+F added to parents\n", val));
+                                               DBG((rss->dbg, LEVEL_3, "\t\t\t%+F added to parents (killed by %+F)\n", val, t_irn));
                                        }
                                }
                        }
@@ -937,7 +955,7 @@ static void compute_bipartite_decomposition(rss_t *rss) {
                                        if (k_edge->src == s_irn  && ! nodeset_find(cbc->children, val)) {
                                                nodeset_insert(cbc->children, val);
                                                c_change = 1;
-                                               DBG((rss->dbg, LEVEL_3, "\t\t\t%+F added to children\n", val));
+                                               DBG((rss->dbg, LEVEL_3, "\t\t\t%+F added to children (kills %+F)\n", val, s_irn));
                                        }
                                }
                        }
@@ -948,10 +966,12 @@ static void compute_bipartite_decomposition(rss_t *rss) {
                        rss_irn_t *s = get_rss_irn(rss, s_irn);
                        s->visited = 1;
                        /* assure bipartite property */
+#if 0
                        if (nodeset_find(cbc->children, s_irn)) {
                                nodeset_remove(cbc->children, s_irn);
                                DBG((rss->dbg, LEVEL_3, "\t\t\t%+F removed from to children\n", s_irn));
                        }
+#endif
                }
 
                /* update edges */
@@ -972,6 +992,25 @@ static void compute_bipartite_decomposition(rss_t *rss) {
                        pset_remove(epk, kedge_root, HASH_RSS_EDGE(kedge_root));
                }
 
+               /* verify the cbc */
+               foreach_nodeset(cbc->parents, s_irn) {
+                       int is_killed = 0;
+
+                       foreach_pset(cbc->kill_edges, k_edge) {
+                               if (k_edge->src == s_irn) {
+                                       is_killed = 1;
+                                       pset_break(cbc->kill_edges);
+                                       break;
+                               }
+                       }
+
+                       if (! is_killed) {
+                               vrfy_ok = 0;
+                               ir_fprintf(stderr, "Warning: parent %+F is not killed in current cbc\n", s_irn);
+                       }
+               }
+               assert(vrfy_ok && "Verification of CBC failed");
+
                /* add the connected bipartite component */
                if (nodeset_count(cbc->parents) > 0 && nodeset_count(cbc->children) > 0 && pset_count(cbc->kill_edges) > 0)
                        pset_insert(rss->cbc_set, cbc, (unsigned)cbc->nr);
@@ -1851,7 +1890,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);
@@ -1861,7 +1900,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));