use more IR_RESOURCE_TYPE_VISITED, remove pointless inc_master_type_visited calls

[libfirm] / ir / be / bestat.c

diff --git a/ir/be/bestat.c b/ir/be/bestat.c
index 03a16a6..69e89b6 100644 (file)
--- a/ir/be/bestat.c
+++ b/ir/be/bestat.c
@@ -23,9 +23,7 @@
  * @author      Christian Wuerdig, Matthias Braun
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include <time.h>
 
@@ -39,12 +37,12 @@
 #include "statev.h"
 #include "error.h"
 
-#include "bearch_t.h"
-#include "beirg_t.h"
+#include "bearch.h"
+#include "beirg.h"
 #include "bestat.h"
 #include "belive_t.h"
 #include "besched.h"
-#include "benode_t.h"
+#include "benode.h"
 
 
 
@@ -62,15 +60,14 @@ static void check_reg_pressure_class(pressure_walker_env_t *env,
                                      ir_node *block,
                                      const arch_register_class_t *cls)
 {
-       be_irg_t         *birg = env->birg;
-       ir_graph         *irg  = be_get_birg_irg(birg);
-       const arch_env_t *aenv = be_get_birg_arch_env(birg);
-       ir_node          *irn;
-       ir_nodeset_t      live_nodes;
-       int               max_live;
+       be_irg_t     *birg = env->birg;
+       ir_graph     *irg  = be_get_birg_irg(birg);
+       ir_node      *irn;
+       ir_nodeset_t  live_nodes;
+       int           max_live;
 
        ir_nodeset_init(&live_nodes);
-       be_liveness_end_of_block(env->lv, aenv, cls, block, &live_nodes);
+       be_liveness_end_of_block(env->lv, cls, block, &live_nodes);
        max_live = ir_nodeset_size(&live_nodes);
        env->regpressure += max_live;
 
@@ -80,7 +77,7 @@ static void check_reg_pressure_class(pressure_walker_env_t *env,
                if(is_Phi(irn))
                        break;
 
-               be_liveness_transfer(aenv, cls, irn, &live_nodes);
+               be_liveness_transfer(cls, irn, &live_nodes);
                cnt      = ir_nodeset_size(&live_nodes);
                max_live = cnt < max_live ? max_live : cnt;
                env->regpressure += cnt;
@@ -90,7 +87,9 @@ static void check_reg_pressure_class(pressure_walker_env_t *env,
        if(max_live > env->max_pressure)
                env->max_pressure = max_live;
 
+#ifdef FIRM_STATISTICS
        stat_be_block_regpressure(irg, block, max_live, cls->name);
+#endif
        ir_nodeset_destroy(&live_nodes);
 }
 
@@ -125,7 +124,6 @@ void be_do_stat_reg_pressure(be_irg_t *birg, const arch_register_class_t *cls) {
 
 
 typedef struct _estimate_irg_costs_env_t {
-       const arch_env_t *arch_env;
        ir_exec_freq     *execfreqs;
        double           costs;
 } estimate_irg_costs_env_t;
@@ -143,11 +141,10 @@ static void estimate_block_costs(ir_node *block, void *data)
        env->costs += costs * get_block_execfreq(env->execfreqs, block);
 }
 
-double be_estimate_irg_costs(ir_graph *irg, const arch_env_t *arch_env, ir_exec_freq *execfreqs)
+double be_estimate_irg_costs(ir_graph *irg, ir_exec_freq *execfreqs)
 {
        estimate_irg_costs_env_t env;
 
-       env.arch_env  = arch_env;
        env.execfreqs = execfreqs;
        env.costs     = 0.0;
 
@@ -158,11 +155,9 @@ double be_estimate_irg_costs(ir_graph *irg, const arch_env_t *arch_env, ir_exec_
 
 
 
-static be_node_stats_t *stats;
-
 static void node_stat_walker(ir_node *irn, void *data)
 {
-       (void) data;
+       be_node_stats_t *const stats = data;
 
        /* if the node is a normal phi */
        if(is_Phi(irn)) {
@@ -171,7 +166,7 @@ static void node_stat_walker(ir_node *irn, void *data)
                } else {
                        (*stats)[BE_STAT_PHIS]++;
                }
-       } else {
+       } else if (!is_Proj(irn)) {
                arch_irn_class_t classify = arch_irn_classify(irn);
 
                if(classify & arch_irn_class_spill)
@@ -189,10 +184,8 @@ static void node_stat_walker(ir_node *irn, void *data)
 
 void be_collect_node_stats(be_node_stats_t *new_stats, be_irg_t *birg)
 {
-       stats = new_stats;
-
-       memset(stats, 0, sizeof(*stats));
-       irg_walk_graph(birg->irg, NULL, node_stat_walker, NULL);
+       memset(new_stats, 0, sizeof(*new_stats));
+       irg_walk_graph(birg->irg, NULL, node_stat_walker, new_stats);
 }
 
 void be_subtract_node_stats(be_node_stats_t *stats, be_node_stats_t *sub)
@@ -242,7 +235,7 @@ static void insn_count_walker(ir_node *irn, void *data)
        switch(get_irn_opcode(irn)) {
        case iro_Proj:
        case iro_Phi:
-       case iro_Start:
+       case beo_Start:
        case iro_End:
                break;
        default: