remove old be_get_IncSP_mem, improve be node dumping

[libfirm] / ir / be / bestat.c

diff --git a/ir/be/bestat.c b/ir/be/bestat.c
index 3bb3a88..86a0196 100644 (file)
--- a/ir/be/bestat.c
+++ b/ir/be/bestat.c
@@ -38,6 +38,7 @@
 #include "firmstat_t.h"
 #include "irtools.h"
 #include "pset.h"
+#include "statev.h"
 
 #include "bearch_t.h"
 #include "bestat.h"
@@ -129,12 +130,13 @@ static void stat_reg_pressure_block(ir_node *block, void *data) {
 
        for (i = 0; i < n; i++) {
                const arch_register_class_t *cls = arch_isa_get_reg_class(aenv->isa, i);
-               ir_node  *irn;
-               pset     *live_nodes = pset_new_ptr(64);
-               int       max_live;
+               ir_node      *irn;
+               ir_nodeset_t  live_nodes;
+               int           max_live;
 
-               live_nodes = be_liveness_end_of_block(env->lv, aenv, cls, block, live_nodes);
-               max_live   = pset_count(live_nodes);
+               ir_nodeset_init(&live_nodes);
+               be_liveness_end_of_block(env->lv, aenv, cls, block, &live_nodes);
+               max_live = ir_nodeset_size(&live_nodes);
 
                sched_foreach_reverse(block, irn) {
                        int cnt;
@@ -142,12 +144,13 @@ static void stat_reg_pressure_block(ir_node *block, void *data) {
                        if(is_Phi(irn))
                                break;
 
-                       live_nodes = be_liveness_transfer(aenv, cls, irn, live_nodes);
-                       cnt        = pset_count(live_nodes);
+                       be_liveness_transfer(aenv, cls, irn, &live_nodes);
+                       cnt        = ir_nodeset_size(&live_nodes);
                        max_live   = cnt < max_live ? max_live : cnt;
                }
 
                stat_be_block_regpressure(irg, block, max_live, cls->name);
+               ir_nodeset_destroy(&live_nodes);
        }
 }
 
@@ -158,7 +161,7 @@ void be_do_stat_reg_pressure(be_irg_t *birg) {
                struct a_pressure_walker w;
 
                w.birg = birg;
-               w.lv   = be_liveness(irg);
+               w.lv   = be_liveness(birg);
                /* Collect register pressure information for each block */
                irg_block_walk_graph(irg, stat_reg_pressure_block, NULL, &w);
                be_liveness_free(w.lv);
@@ -363,44 +366,6 @@ 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;
-
-void be_init_stat_file(const char *stat_file_name, const char *sourcefilename)
-{
-       static char time_str[32];
-
-       assert(be_stat_file == NULL);
-
-       /* if we want to do some statistics, push the environment. */
-       if (strlen(stat_file_name) == 0)
-               return;
-
-       be_stat_file = fopen(stat_file_name, "at");
-       if (be_stat_file == NULL) {
-               fprintf(stderr, "Warning couldn't open statfile '%s'\n", stat_file_name);
-               return;
-       }
-
-       /* initialize the statistics tags */
-       ir_snprintf(time_str, sizeof(time_str),"%u", time(NULL));
-
-       be_stat_tags[STAT_TAG_FILE] = sourcefilename;
-       be_stat_tags[STAT_TAG_TIME] = time_str;
-       be_stat_tags[STAT_TAG_IRG]  = "<all>";
-       be_stat_tags[STAT_TAG_CLS]  = "<all>";
-
-       be_stat_ev_push(be_stat_tags, STAT_TAG_LAST, be_stat_file);
-}
-
-void be_close_stat_file()
-{
-       be_stat_ev_pop();
-       if (be_stat_file != NULL) {
-               fclose(be_stat_file);
-               be_stat_file = NULL;
-       }
-}
 
 #else /* FIRM_STATISTICS */