X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbestat.c;h=847c3b7d9e0a9c77ec54e76fede500bd44959977;hb=9276447aec4972df060349e162f583c4898dfec8;hp=9cdbad61f7d068be4ec53ada81621f4349d7cdcd;hpb=c086f22114dc14527f8e04a0493142b1e5aa81f3;p=libfirm

diff --git a/ir/be/bestat.c b/ir/be/bestat.c
index 9cdbad61f..847c3b7d9 100644
--- a/ir/be/bestat.c
+++ b/ir/be/bestat.c
@@ -1,8 +1,27 @@
+/*
+ * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
+ */
+
 /**
- * This file calls the corresponding statistic functions for
- * some backend statistics.
- * @author Christian Wuerdig
- * $Id$
+ * @file
+ * @brief       Provides several statistic functions for the backend.
+ * @author      Christian Wuerdig
+ * @version     $Id$
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -14,11 +33,13 @@
 #include "irprintf.h"
 #include "irgwalk.h"
 #include "irhooks.h"
+#include "execfreq.h"
 #include "dbginfo_t.h"
 #include "firmstat_t.h"
 #include "irtools.h"
 #include "pset.h"
 
+#include "bearch_t.h"
 #include "bestat.h"
 #include "belive_t.h"
 #include "besched.h"
@@ -101,7 +122,8 @@ struct a_pressure_walker {
 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;
+	ir_graph         *irg  = be_get_birg_irg(birg);
+	const arch_env_t *aenv = be_get_birg_arch_env(birg);
 	int i, n = arch_isa_get_n_reg_class(aenv->isa);
 
 	for (i = 0; i < n; i++) {
@@ -124,18 +146,20 @@ static void stat_reg_pressure_block(ir_node *block, void *data) {
 			max_live   = cnt < max_live ? max_live : cnt;
 		}
 
-		stat_be_block_regpressure(birg->irg, block, max_live, cls->name);
+		stat_be_block_regpressure(irg, block, max_live, cls->name);
 	}
 }
 
 void be_do_stat_reg_pressure(be_irg_t *birg) {
+	ir_graph *irg = be_get_birg_irg(birg);
+
 	if (stat_is_active()) {
 		struct a_pressure_walker w;
 
 		w.birg = birg;
-		w.lv   = be_liveness(birg->irg);
+		w.lv   = be_liveness(irg);
 		/* Collect register pressure information for each block */
-		irg_block_walk_graph(birg->irg, stat_reg_pressure_block, NULL, &w);
+		irg_block_walk_graph(irg, stat_reg_pressure_block, NULL, &w);
 		be_liveness_free(w.lv);
 	}
 }
@@ -143,9 +167,9 @@ void be_do_stat_reg_pressure(be_irg_t *birg) {
 /**
  * Notify statistic module about amount of ready nodes.
  */
-void be_do_stat_sched_ready(ir_node *block, nodeset *ready_set) {
+void be_do_stat_sched_ready(ir_node *block, const ir_nodeset_t *ready_set) {
 	if (stat_is_active()) {
-		stat_be_block_sched_ready(get_irn_irg(block), block, MIN(nodeset_count(ready_set), 5));
+		stat_be_block_sched_ready(get_irn_irg(block), block, MIN(ir_nodeset_size(ready_set), 5));
 	}
 }
 
@@ -302,19 +326,19 @@ void be_stat_init_irg(const arch_env_t *arch_env, ir_graph *irg) {
 		}
 	}
 }
-#endif
+#endif /* FIRM_STATISTICS */
 
 typedef struct _estimate_irg_costs_env_t {
 	const arch_env_t *arch_env;
-	ir_exec_freq *execfreqs;
-	double costs;
+	ir_exec_freq     *execfreqs;
+	double           costs;
 } estimate_irg_costs_env_t;
 
 static void estimate_block_costs(ir_node *block, void *data)
 {
 	estimate_irg_costs_env_t *env = data;
 	ir_node *node;
-	double costs = 0;
+	double  costs = 0.0;
 
 	sched_foreach(block, node) {
 		costs += arch_get_op_estimated_cost(env->arch_env, node);
@@ -326,9 +350,10 @@ static void estimate_block_costs(ir_node *block, void *data)
 double be_estimate_irg_costs(ir_graph *irg, const arch_env_t *arch_env, ir_exec_freq *execfreqs)
 {
 	estimate_irg_costs_env_t env;
-	env.arch_env = arch_env;
+
+	env.arch_env  = arch_env;
 	env.execfreqs = execfreqs;
-	env.costs = 0;
+	env.costs     = 0.0;
 
 	irg_block_walk_graph(irg, estimate_block_costs, NULL, &env);
 
@@ -336,8 +361,9 @@ double be_estimate_irg_costs(ir_graph *irg, const arch_env_t *arch_env, ir_exec_
 }
 
 #ifdef FIRM_STATISTICS
+
 const char *be_stat_tags[STAT_TAG_LAST];
-FILE *be_stat_file = NULL;
+FILE       *be_stat_file = NULL;
 
 void be_init_stat_file(const char *stat_file_name, const char *sourcefilename)
 {
@@ -346,11 +372,11 @@ void be_init_stat_file(const char *stat_file_name, const char *sourcefilename)
 	assert(be_stat_file == NULL);
 
 	/* if we want to do some statistics, push the environment. */
-	if(strlen(stat_file_name) == 0)
+	if (strlen(stat_file_name) == 0)
 		return;
 
 	be_stat_file = fopen(stat_file_name, "at");
-	if(be_stat_file == NULL) {
+	if (be_stat_file == NULL) {
 		fprintf(stderr, "Warning couldn't open statfile '%s'\n", stat_file_name);
 		return;
 	}
@@ -369,19 +395,18 @@ void be_init_stat_file(const char *stat_file_name, const char *sourcefilename)
 void be_close_stat_file()
 {
 	be_stat_ev_pop();
-	if(be_stat_file != NULL) {
+	if (be_stat_file != NULL) {
 		fclose(be_stat_file);
 		be_stat_file = NULL;
 	}
 }
 
-
-#else
+#else /* FIRM_STATISTICS */
 
 void (be_stat_init_irg)(const arch_env_t *arch_env, ir_graph *irg) {}
 void (be_do_stat_nodes)(ir_graph *irg, const char *phase) {}
 void (be_do_stat_reg_pressure)(be_irg_t *birg) {}
-void (be_do_stat_sched_ready)(ir_node *block, nodeset *ready_set) {}
+void (be_do_stat_sched_ready)(ir_node *block, ir_nodeset_t *ready_set) {}
 void (be_do_stat_perm)(const char *class_name, int n_regs, ir_node *perm, ir_node *block, int n, int real_size) {}
 
 #endif /* FIRM_STATISTICS */