- stack alignment is now power of two

[libfirm] / ir / be / bestat.c

diff --git a/ir/be/bestat.c b/ir/be/bestat.c
index ad6e65d..2c1fe6d 100644 (file)
--- a/ir/be/bestat.c
+++ b/ir/be/bestat.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -113,57 +113,99 @@ static be_stat_irg_t *get_stat_irg_entry(ir_graph *irg) {
        return entry;
 }
 
-struct a_pressure_walker {
+typedef struct pressure_walker_env_t pressure_walker_env_t;
+struct pressure_walker_env_t {
        be_irg_t *birg;
-       be_lv_t *lv;
+       be_lv_t  *lv;
+       double    insn_count;
+       double    regpressure;
+       int       max_pressure;
+       const arch_register_class_t *cls;
 };
 
-/**
- * Collect reg pressure statistics per block and per class.
- */
-static void stat_reg_pressure_block(ir_node *block, void *data) {
-       struct a_pressure_walker *env = data;
+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);
-       int i, n = arch_isa_get_n_reg_class(aenv->isa);
+       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);
+       max_live = ir_nodeset_size(&live_nodes);
+       env->regpressure += max_live;
+
+       sched_foreach_reverse(block, irn) {
+               int cnt;
+
+               if(is_Phi(irn))
+                       break;
+
+               be_liveness_transfer(aenv, cls, irn, &live_nodes);
+               cnt      = ir_nodeset_size(&live_nodes);
+               max_live = cnt < max_live ? max_live : cnt;
+               env->regpressure += cnt;
+               env->insn_count++;
+       }
 
-       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;
+       if(max_live > env->max_pressure)
+               env->max_pressure = max_live;
+
+       stat_be_block_regpressure(irg, block, max_live, cls->name);
+       ir_nodeset_destroy(&live_nodes);
+}
 
-               live_nodes = be_liveness_end_of_block(env->lv, aenv, cls, block, live_nodes);
-               max_live   = pset_count(live_nodes);
+/**
+ * Collect reg pressure statistics per block and per class.
+ */
+static void stat_reg_pressure_block(ir_node *block, void *data) {
+       pressure_walker_env_t *env = data;
 
-               sched_foreach_reverse(block, irn) {
-                       int cnt;
+       if(env->cls != NULL) {
+               check_reg_pressure_class(env, block, env->cls);
+       } else {
+               const arch_env_t *arch_env = be_get_birg_arch_env(env->birg);
+               int i, n;
 
-                       if(is_Phi(irn))
-                               break;
+               n = arch_env_get_n_reg_class(arch_env);
+               for (i = 0; i < n; i++) {
+                       const arch_register_class_t *cls
+                               = arch_env_get_reg_class(arch_env, i);
 
-                       live_nodes = be_liveness_transfer(aenv, cls, irn, live_nodes);
-                       cnt        = pset_count(live_nodes);
-                       max_live   = cnt < max_live ? max_live : cnt;
+                       check_reg_pressure_class(env, block, cls);
                }
-
-               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);
+       pressure_walker_env_t  env;
+       ir_graph              *irg = be_get_birg_irg(birg);
+       double                 average_pressure;
+
+       env.birg         = birg;
+       env.insn_count   = 0;
+       env.max_pressure = 0;
+       env.regpressure  = 0;
+       be_liveness_assure_sets(be_assure_liveness(birg));
+       env.lv           = be_get_birg_liveness(birg);
+
+       // hack for now, TODO: remove me later
+#if 0
+       env.cls          = NULL;
+#else
+       env.cls          = arch_env_get_reg_class(be_get_birg_arch_env(birg), 2);
+#endif
 
-       if (stat_is_active()) {
-               struct a_pressure_walker w;
+       /* Collect register pressure information for each block */
+       irg_block_walk_graph(irg, stat_reg_pressure_block, NULL, &env);
 
-               w.birg = birg;
-               w.lv   = be_liveness(irg);
-               /* Collect register pressure information for each block */
-               irg_block_walk_graph(irg, stat_reg_pressure_block, NULL, &w);
-               be_liveness_free(w.lv);
-       }
+       average_pressure = env.regpressure / env.insn_count;
+       stat_ev_emit("average_register_pressure", average_pressure);
+       stat_ev_emit("maximum_register_pressure", env.max_pressure);
 }
 
 /**