X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbestat.c;h=8ac3d6dba06b4ac1c4c2ef4ef24c6d08ae1f9ca9;hb=cbfbedae75798a9830fb0ef090189345ede85dc8;hp=48336b8f8786c721fe430ab86a55d2cbdfcb8d1e;hpb=e7beaf766b2079cb988bb3532badb9116983f265;p=libfirm

diff --git a/ir/be/bestat.c b/ir/be/bestat.c
index 48336b8f8..8ac3d6dba 100644
--- 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));
 	}
 }
 
@@ -157,9 +169,10 @@ void be_do_stat_permcycle(const char *class_name, ir_node *perm, ir_node *block,
  * Updates nodes statistics.
  */
 static void do_nodes_stat(ir_node *irn, void *env) {
-	be_stat_phase_t *phase = env;
-	ir_mode         *mode;
-	opcode          opc;
+	be_stat_phase_t  *phase = env;
+	ir_mode          *mode;
+	opcode           opc;
+	arch_irn_class_t irn_class;
 
 	if (is_Block(irn))
 		return;
@@ -176,7 +189,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 +197,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)
@@ -192,23 +205,17 @@ static void do_nodes_stat(ir_node *irn, void *env) {
 	else if (opc == iro_Store)
 		phase->num_store++;
 
-	switch (arch_irn_classify(phase->arch_env, irn)) {
-		case arch_irn_class_spill:
-			phase->num_spill++;
-			break;
-		case arch_irn_class_reload:
-			phase->num_reload++;
-			break;
-		case arch_irn_class_stackparam:
-		case arch_irn_class_load:
-			phase->num_load++;
-			break;
-		case arch_irn_class_store:
-			phase->num_store++;
-			break;
-		default:
-			break;
-	}
+	irn_class = arch_irn_classify(phase->arch_env, irn);
+	if (irn_class & arch_irn_class_spill)
+		phase->num_spill++;
+	else if (irn_class & arch_irn_class_reload)
+		phase->num_reload++;
+	else if (irn_class & arch_irn_class_stackparam)
+		phase->num_load++;
+	else if (irn_class & arch_irn_class_load)
+		phase->num_load++;
+	else if (irn_class & arch_irn_class_store)
+		phase->num_store++;
 }
 
 /**