dowhile problem

[libfirm] / ir / be / bestat.c

diff --git a/ir/be/bestat.c b/ir/be/bestat.c
index 48336b8..ab57808 100644 (file)
--- a/ir/be/bestat.c
+++ b/ir/be/bestat.c
@@ -88,11 +88,17 @@ static be_stat_irg_t *get_stat_irg_entry(ir_graph *irg) {
        return entry;
 }
 
+struct a_pressure_walker {
+       be_irg_t *birg;
+       be_lv_t *lv;
+};
+
 /**
  * Collect reg pressure statistics per block and per class.
  */
-static void stat_reg_pressure_block(ir_node *block, void *env) {
-       be_irg_t         *birg = env;
+static void stat_reg_pressure_block(ir_node *block, void *data) {
+       struct a_pressure_walker *env = data;
+       be_irg_t         *birg = env->birg;
        const arch_env_t *aenv = birg->main_env->arch_env;
        int i, n = arch_isa_get_n_reg_class(aenv->isa);
 
@@ -102,27 +108,33 @@ static void stat_reg_pressure_block(ir_node *block, void *env) {
                pset     *live_nodes = pset_new_ptr(64);
                int       max_live;
 
-               live_nodes = be_liveness_end_of_block(aenv, cls, block, live_nodes);
+               live_nodes = be_liveness_end_of_block(env->lv, aenv, cls, block, live_nodes);
                max_live   = pset_count(live_nodes);
 
                sched_foreach_reverse(block, irn) {
                        int cnt;
 
+                       if(is_Phi(irn))
+                               break;
+
                        live_nodes = be_liveness_transfer(aenv, cls, irn, live_nodes);
                        cnt        = pset_count(live_nodes);
-
-                       max_live = cnt < max_live ? max_live : cnt;
+                       max_live   = cnt < max_live ? max_live : cnt;
                }
 
-               stat_be_block_regpressure(birg->irg, block, MIN(max_live, 5), cls->name);
+               stat_be_block_regpressure(birg->irg, block, max_live, cls->name);
        }
 }
 
 void be_do_stat_reg_pressure(be_irg_t *birg) {
        if (stat_is_active()) {
-               be_liveness(birg->irg);
+               struct a_pressure_walker w;
+
+               w.birg = birg;
+               w.lv   = be_liveness(birg->irg);
                /* Collect register pressure information for each block */
-               irg_block_walk_graph(birg->irg, stat_reg_pressure_block, NULL, birg);
+               irg_block_walk_graph(birg->irg, stat_reg_pressure_block, NULL, &w);
+               be_liveness_free(w.lv);
        }
 }
 
@@ -131,7 +143,7 @@ void be_do_stat_reg_pressure(be_irg_t *birg) {
  */
 void be_do_stat_sched_ready(ir_node *block, nodeset *ready_set) {
        if (stat_is_active()) {
-               stat_be_block_sched_ready(get_irn_irg(block), block, nodeset_count(ready_set));
+               stat_be_block_sched_ready(get_irn_irg(block), block, MIN(nodeset_count(ready_set), 5));
        }
 }
 
@@ -176,7 +188,7 @@ static void do_nodes_stat(ir_node *irn, void *env) {
                opc == iro_End)
                return;
 
-       if (is_Proj(irn)) {
+       if (is_Proj(irn) && (mode != mode_X)) {
                phase->num_proj++;
                return;
        }
@@ -184,7 +196,7 @@ static void do_nodes_stat(ir_node *irn, void *env) {
                phase->num_phi++;
                return;
        }
-       else if (mode_is_datab(mode) || (mode == mode_T && ! is_be_node(irn)))
+       else if (mode_is_datab(mode) || ((mode == mode_T) && ! is_be_node(irn)) || (is_Proj(irn) && (mode == mode_X)))
                phase->num_data++;
 
        if (opc == iro_Load)