Add Sub(Sub(x, y), b) -> Sub(x, Add(y,b)) Transformation
[libfirm] / ir / stat / stat_dmp.c
index e6a2101..36bf98b 100644 (file)
  * names of the optimizations
  */
 static const struct {
-  hook_opt_kind kind;
-  const char    *name;
+       hook_opt_kind kind;
+       const char    *name;
 } opt_names[] = {
-  { HOOK_OPT_DEAD_BLOCK,   "dead block elimination" },
-  { HOOK_OPT_STG,          "straightening optimization" },
-  { HOOK_OPT_IFSIM,        "if simplification" },
-  { HOOK_OPT_CONST_EVAL,   "constant evaluation" },
-  { HOOK_OPT_ALGSIM,       "algebraic simplification" },
-  { HOOK_OPT_PHI,          "Phi optmization" },
-  { HOOK_OPT_SYNC,         "Sync optmization" },
-  { HOOK_OPT_WAW,          "Write-After-Write optimization" },
-  { HOOK_OPT_WAR,          "Write-After-Read optimization" },
-  { HOOK_OPT_RAW,          "Read-After-Write optimization" },
-  { HOOK_OPT_RAR,          "Read-After-Read optimization" },
-  { HOOK_OPT_RC,           "Read-a-Const optimization" },
-  { HOOK_OPT_TUPLE,        "Tuple optimization" },
-  { HOOK_OPT_ID,           "ID optimization" },
-  { HOOK_OPT_CSE,          "Common subexpression elimination" },
-  { HOOK_OPT_STRENGTH_RED, "Strength reduction" },
-  { HOOK_OPT_ARCH_DEP,     "Architecture dependant optimization" },
-  { HOOK_OPT_REASSOC,      "Reassociation optimization" },
-  { HOOK_OPT_POLY_CALL,    "Polymorphic call optimization" },
-  { HOOK_OPT_IF_CONV,      "an if conversion was tried" },
-  { HOOK_OPT_FUNC_CALL,    "Real function call optimization" },
-  { HOOK_OPT_CONFIRM,      "Confirm-based optimization: replacement" },
-  { HOOK_OPT_CONFIRM_C,    "Confirm-based optimization: replaced by const" },
-  { HOOK_OPT_CONFIRM_E,    "Confirm-based optimization: evaluated" },
-  { HOOK_OPT_EXC_REM,      "a exception edge was removed due to a Confirmation prove" },
-  { HOOK_LOWERED,          "Lowered" },
-  { HOOK_BACKEND,          "Backend transformation" },
-  { FS_OPT_NEUTRAL_0,      "algebraic simplification: a op 0 = 0 op a = a" },
-  { FS_OPT_NEUTRAL_1,      "algebraic simplification: a op 1 = 1 op a = a" },
-  { FS_OPT_ADD_A_A,        "algebraic simplification: a + a = a * 2" },
-  { FS_OPT_ADD_A_MINUS_B,  "algebraic simplification: a + -b = a - b" },
-  { FS_OPT_ADD_SUB,        "algebraic simplification: (a + x) - x = (a - x) + x = a" },
-  { FS_OPT_ADD_MUL_A_X_A,  "algebraic simplification: a * x + a = a * (x + 1)" },
-  { FS_OPT_SUB_0_A,        "algebraic simplification: 0 - a = -a" },
-  { FS_OPT_SUB_MUL_A_X_A,  "algebraic simplification: a * x - a = a * (x - 1)" },
-  { FS_OPT_MUL_MINUS_1,    "algebraic simplification: a * -1 = -a" },
-  { FS_OPT_OR,             "algebraic simplification: a | a = a | 0 = 0 | a = a" },
-  { FS_OPT_AND,            "algebraic simplification: a & 0b1...1 = 0b1...1 & a =  a & a = a" },
-  { FS_OPT_EOR_A_A,        "algebraic simplification: a ^ a = 0" },
-  { FS_OPT_EOR_TO_NOT_BOOL,"algebraic simplification: bool ^ 1 = !bool" },
-  { FS_OPT_EOR_TO_NOT,     "algebraic simplification: x ^ 0b1..1 = ~x" },
-  { FS_OPT_NOT_CMP,        "algebraic simplification: !(a cmp b) = a !cmp b" },
-  { FS_OPT_OR_SHFT_TO_ROT, "algebraic simplification: (x << c) | (x >> (bits - c)) == Rot(x, c)" },
-  { FS_OPT_REASSOC_SHIFT,  "algebraic simplification: (x SHF c1) SHF c2 = x SHF (c1+c2)" },
-  { FS_OPT_CONV,           "algebraic simplification: Conv could be removed" },
-  { FS_OPT_CAST,           "algebraic simplification: a Cast could be removed" },
-  { FS_OPT_MIN_MAX_EQ,     "algebraic simplification: Min(a,a) = Max(a,a) = a" },
-  { FS_OPT_MUX_C,          "algebraic simplification: Mux(C, f, t) = C ? t : f" },
-  { FS_OPT_MUX_EQ,         "algebraic simplification: Mux(v, x, x) = x" },
-  { FS_OPT_MUX_TRANSFORM,  "algebraic simplification: Mux(a, b, c) = b OR Mux(a,b, c) = c" },
-  { FS_OPT_MUX_TO_MIN,     "algebraic simplification: Mux(a < b, a, b) = Min(a,b)" },
-  { FS_OPT_MUX_TO_MAX,     "algebraic simplification: Mux(a > b, a, b) = Max(a,b)" },
-  { FS_OPT_MUX_TO_ABS,     "algebraic simplification: Mux(a > b, a, b) = Abs(a,b)" },
-  { FS_OPT_MUX_TO_SHR,     "algebraic simplification: Mux(a > b, a, b) = a >> b" },
-  { FS_BE_IA32_LEA,        "ia32 Backend transformation: Lea was created" },
-  { FS_BE_IA32_LOAD_LEA,   "ia32 Backend transformation: Load merged with a Lea" },
-  { FS_BE_IA32_STORE_LEA,  "ia32 Backend transformation: Store merged with a Lea" },
-  { FS_BE_IA32_AM_S,       "ia32 Backend transformation: Source address mode node created" },
-  { FS_BE_IA32_AM_D,       "ia32 Backend transformation: Destination address mode node created" },
-  { FS_BE_IA32_CJMP,       "ia32 Backend transformation: CJmp created to save a cmp/test" },
-  { FS_BE_IA32_2ADDRCPY,   "ia32 Backend transformation: Copy created due to 2-Addresscode constraints" },
-  { FS_BE_IA32_SPILL2ST,   "ia32 Backend transformation: Created Store for a Spill" },
-  { FS_BE_IA32_RELOAD2LD,  "ia32 Backend transformation: Created Load for a Reload" },
-  { FS_BE_IA32_SUB2NEGADD, "ia32 Backend transformation: Created Neg-Add for a Sub due to 2-Addresscode constraints" },
-  { FS_BE_IA32_LEA2ADD,    "ia32 Backend transformation: Transformed Lea back into Add" },
+       { HOOK_OPT_DEAD_BLOCK,   "dead block elimination" },
+       { HOOK_OPT_STG,          "straightening optimization" },
+       { HOOK_OPT_IFSIM,        "if simplification" },
+       { HOOK_OPT_CONST_EVAL,   "constant evaluation" },
+       { HOOK_OPT_ALGSIM,       "algebraic simplification" },
+       { HOOK_OPT_PHI,          "Phi optmization" },
+       { HOOK_OPT_SYNC,         "Sync optmization" },
+       { HOOK_OPT_WAW,          "Write-After-Write optimization" },
+       { HOOK_OPT_WAR,          "Write-After-Read optimization" },
+       { HOOK_OPT_RAW,          "Read-After-Write optimization" },
+       { HOOK_OPT_RAR,          "Read-After-Read optimization" },
+       { HOOK_OPT_RC,           "Read-a-Const optimization" },
+       { HOOK_OPT_TUPLE,        "Tuple optimization" },
+       { HOOK_OPT_ID,           "ID optimization" },
+       { HOOK_OPT_CSE,          "Common subexpression elimination" },
+       { HOOK_OPT_STRENGTH_RED, "Strength reduction" },
+       { HOOK_OPT_ARCH_DEP,     "Architecture dependant optimization" },
+       { HOOK_OPT_REASSOC,      "Reassociation optimization" },
+       { HOOK_OPT_POLY_CALL,    "Polymorphic call optimization" },
+       { HOOK_OPT_IF_CONV,      "an if conversion was tried" },
+       { HOOK_OPT_FUNC_CALL,    "Real function call optimization" },
+       { HOOK_OPT_CONFIRM,      "Confirm-based optimization: replacement" },
+       { HOOK_OPT_CONFIRM_C,    "Confirm-based optimization: replaced by const" },
+       { HOOK_OPT_CONFIRM_E,    "Confirm-based optimization: evaluated" },
+       { HOOK_OPT_EXC_REM,      "a exception edge was removed due to a Confirmation prove" },
+       { HOOK_LOWERED,          "Lowered" },
+       { HOOK_BACKEND,          "Backend transformation" },
+       { FS_OPT_NEUTRAL_0,      "algebraic simplification: a op 0 = 0 op a = a" },
+       { FS_OPT_NEUTRAL_1,      "algebraic simplification: a op 1 = 1 op a = a" },
+       { FS_OPT_ADD_A_A,        "algebraic simplification: a + a = a * 2" },
+       { FS_OPT_ADD_A_MINUS_B,  "algebraic simplification: a + -b = a - b" },
+       { FS_OPT_ADD_SUB,        "algebraic simplification: (a + x) - x = (a - x) + x = a" },
+       { FS_OPT_ADD_MUL_A_X_A,  "algebraic simplification: a * x + a = a * (x + 1)" },
+       { FS_OPT_SUB_0_A,        "algebraic simplification: 0 - a = -a" },
+       { FS_OPT_SUB_MUL_A_X_A,  "algebraic simplification: a * x - a = a * (x - 1)" },
+       { FS_OPT_SUB_SUB_X_Y_Z,  "algebraic simplification: (x - y) - z = x - (y + z)" },
+       { FS_OPT_MUL_MINUS_1,    "algebraic simplification: a * -1 = -a" },
+       { FS_OPT_OR,             "algebraic simplification: a | a = a | 0 = 0 | a = a" },
+       { FS_OPT_AND,            "algebraic simplification: a & 0b1...1 = 0b1...1 & a =  a & a = a" },
+       { FS_OPT_EOR_A_A,        "algebraic simplification: a ^ a = 0" },
+       { FS_OPT_EOR_TO_NOT_BOOL,"algebraic simplification: bool ^ 1 = !bool" },
+       { FS_OPT_EOR_TO_NOT,     "algebraic simplification: x ^ 0b1..1 = ~x" },
+       { FS_OPT_NOT_CMP,        "algebraic simplification: !(a cmp b) = a !cmp b" },
+       { FS_OPT_OR_SHFT_TO_ROT, "algebraic simplification: (x << c) | (x >> (bits - c)) == Rot(x, c)" },
+       { FS_OPT_REASSOC_SHIFT,  "algebraic simplification: (x SHF c1) SHF c2 = x SHF (c1+c2)" },
+       { FS_OPT_CONV,           "algebraic simplification: Conv could be removed" },
+       { FS_OPT_CAST,           "algebraic simplification: a Cast could be removed" },
+       { FS_OPT_MIN_MAX_EQ,     "algebraic simplification: Min(a,a) = Max(a,a) = a" },
+       { FS_OPT_MUX_C,          "algebraic simplification: Mux(C, f, t) = C ? t : f" },
+       { FS_OPT_MUX_EQ,         "algebraic simplification: Mux(v, x, x) = x" },
+       { FS_OPT_MUX_TRANSFORM,  "algebraic simplification: Mux(a, b, c) = b OR Mux(a,b, c) = c" },
+       { FS_OPT_MUX_TO_MIN,     "algebraic simplification: Mux(a < b, a, b) = Min(a,b)" },
+       { FS_OPT_MUX_TO_MAX,     "algebraic simplification: Mux(a > b, a, b) = Max(a,b)" },
+       { FS_OPT_MUX_TO_ABS,     "algebraic simplification: Mux(a > b, a, b) = Abs(a,b)" },
+       { FS_OPT_MUX_TO_SHR,     "algebraic simplification: Mux(a > b, a, b) = a >> b" },
+       { FS_BE_IA32_LEA,        "ia32 Backend transformation: Lea was created" },
+       { FS_BE_IA32_LOAD_LEA,   "ia32 Backend transformation: Load merged with a Lea" },
+       { FS_BE_IA32_STORE_LEA,  "ia32 Backend transformation: Store merged with a Lea" },
+       { FS_BE_IA32_AM_S,       "ia32 Backend transformation: Source address mode node created" },
+       { FS_BE_IA32_AM_D,       "ia32 Backend transformation: Destination address mode node created" },
+       { FS_BE_IA32_CJMP,       "ia32 Backend transformation: CJmp created to save a cmp/test" },
+       { FS_BE_IA32_2ADDRCPY,   "ia32 Backend transformation: Copy created due to 2-Addresscode constraints" },
+       { FS_BE_IA32_SPILL2ST,   "ia32 Backend transformation: Created Store for a Spill" },
+       { FS_BE_IA32_RELOAD2LD,  "ia32 Backend transformation: Created Load for a Reload" },
+       { FS_BE_IA32_SUB2NEGADD, "ia32 Backend transformation: Created Neg-Add for a Sub due to 2-Addresscode constraints" },
+       { FS_BE_IA32_LEA2ADD,    "ia32 Backend transformation: Transformed Lea back into Add" },
 };
 
 static const char *if_conv_names[IF_RESULT_LAST] = {
@@ -113,12 +114,12 @@ static void simple_dump_opcode_hash(dumper_t *dmp, pset *set)
        cnt_clr(&f_Id);
 
        fprintf(dmp->f, "%-16s %-8s %-8s %-8s\n", "Opcode", "alive", "created", "->Id");
-       for (entry = pset_first(set); entry; entry = pset_next(set)) {
+       foreach_pset(set, entry) {
                fprintf(dmp->f, "%-16s %8u %8u %8u\n",
                        get_id_str(entry->op->name),
-                       cnt_to_int(&entry->cnt_alive),
-                       cnt_to_int(&entry->new_node),
-                       cnt_to_int(&entry->into_Id)
+                       cnt_to_uint(&entry->cnt_alive),
+                       cnt_to_uint(&entry->new_node),
+                       cnt_to_uint(&entry->into_Id)
                );
 
                cnt_add(&f_alive,    &entry->cnt_alive);
@@ -127,9 +128,9 @@ static void simple_dump_opcode_hash(dumper_t *dmp, pset *set)
        }
        fprintf(dmp->f, "-------------------------------------------\n");
        fprintf(dmp->f, "%-16s %8u %8u %8u\n", "Sum",
-               cnt_to_int(&f_alive),
-               cnt_to_int(&f_new_node),
-               cnt_to_int(&f_Id)
+               cnt_to_uint(&f_alive),
+               cnt_to_uint(&f_new_node),
+               cnt_to_uint(&f_Id)
        );
 }
 
@@ -138,17 +139,18 @@ static void simple_dump_opcode_hash(dumper_t *dmp, pset *set)
  */
 static void simple_dump_opt_hash(dumper_t *dmp, pset *set, int index)
 {
-       opt_entry_t *entry = pset_first(set);
-
        assert(index < ARR_SIZE(opt_names) && "index out of range");
        assert(opt_names[index].kind == index && "opt_names broken");
-       if (entry) {
+
+       if (pset_count(set) > 0) {
+               opt_entry_t *entry;
+
                fprintf(dmp->f, "\n%s:\n", opt_names[index].name);
                fprintf(dmp->f, "%-16s %-8s\n", "Opcode", "deref");
 
-               for (; entry; entry = pset_next(set)) {
+               foreach_pset(set, entry) {
                        fprintf(dmp->f, "%-16s %8u\n",
-                               get_id_str(entry->op->name), cnt_to_int(&entry->count));
+                               get_id_str(entry->op->name), cnt_to_uint(&entry->count));
                }
        }
 }
@@ -169,36 +171,27 @@ static void simple_dump_be_block_reg_pressure(dumper_t *dmp, graph_entry_t *entr
        fprintf(dmp->f, "%12s", "Block Nr");
 
        /* print table head (register class names) */
-       for (rp_entry = pset_first(b_entry->reg_pressure);
-            rp_entry;
-            rp_entry = pset_next(b_entry->reg_pressure))
-       {
+       foreach_pset(b_entry->reg_pressure, rp_entry)
                fprintf(dmp->f, "%15s", rp_entry->class_name);
-       }
        fprintf(dmp->f, "\n");
 
        /* print the reg pressure for all blocks and register classes */
        for (/* b_entry is already initialized */ ;
-         b_entry;
-            b_entry = pset_next(entry->be_block_hash))
-       {
+            b_entry;
+            b_entry = pset_next(entry->be_block_hash)) {
                fprintf(dmp->f, "BLK   %6ld", b_entry->block_nr);
 
-               for (rp_entry = pset_first(b_entry->reg_pressure);
-                    rp_entry;
-                    rp_entry = pset_next(b_entry->reg_pressure))
-               {
+               foreach_pset(b_entry->reg_pressure, rp_entry)
                        fprintf(dmp->f, "%15d", rp_entry->pressure);
-               }
                fprintf(dmp->f, "\n");
        }
 }
 
 /** prints a distribution entry */
-void dump_block_sched_ready_distrib(const distrib_entry_t *entry, void *env)
+static void simple_dump_distrib_entry(const distrib_entry_t *entry, void *env)
 {
        FILE *dmp_f = env;
-       fprintf(dmp_f, "%12d", cnt_to_int(&entry->cnt));
+       fprintf(dmp_f, "%12d", cnt_to_uint(&entry->cnt));
 }
 
 /**
@@ -206,30 +199,34 @@ void dump_block_sched_ready_distrib(const distrib_entry_t *entry, void *env)
  */
 static void simple_dump_be_block_sched_ready(dumper_t *dmp, graph_entry_t *entry)
 {
-       be_block_entry_t *b_entry = pset_first(entry->be_block_hash);
-       int               i;
-
-       /* return if no be statistic information available */
-       if (! b_entry)
-               return;
-
-       fprintf(dmp->f, "\nSCHEDULING: NUMBER OF READY NODES\n");
-       fprintf(dmp->f, "%12s %12s %12s %12s %12s %12s %12s\n",
-               "Block Nr", "1 node", "2 nodes", "3 nodes", "4 nodes", "5 or more", "AVERAGE");
+       if (pset_count(entry->be_block_hash) > 0) {
+               be_block_entry_t *b_entry;
+               int              i;
+
+               fprintf(dmp->f, "\nSCHEDULING: NUMBER OF READY NODES\n");
+               fprintf(dmp->f, "%12s %12s %12s %12s %12s %12s %12s\n",
+                       "Block Nr", "1 node", "2 nodes", "3 nodes", "4 nodes", "5 or more", "AVERAGE");
+
+               foreach_pset(entry->be_block_hash, b_entry) {
+                       /* this ensures that all keys from 1 to 5 are in the table */
+                       for (i = 1; i < 6; ++i)
+                               stat_insert_int_distrib_tbl(b_entry->sched_ready, i);
+
+                       fprintf(dmp->f, "BLK   %6ld", b_entry->block_nr);
+                       stat_iterate_distrib_tbl(b_entry->sched_ready, simple_dump_distrib_entry, dmp->f);
+                       fprintf(dmp->f, "%12.2lf", stat_calc_avg_distrib_tbl(b_entry->sched_ready));
+                       fprintf(dmp->f, "\n");
+               }
+       }
+}
 
-       for (/* b_entry is already initialized */ ;
-            b_entry;
-            b_entry = pset_next(entry->be_block_hash))
-       {
-               /* this ensures that all keys from 1 to 5 are in the table */
-               for (i = 1; i < 6; i++)
-                       stat_insert_int_distrib_tbl(b_entry->sched_ready, i);
+/**
+ * Adds the counter for given entry to another distribution table.
+ */
+static void add_distrib_entry(const distrib_entry_t *entry, void *env) {
+       distrib_tbl_t *sum_tbl = env;
 
-               fprintf(dmp->f, "BLK   %6ld", b_entry->block_nr);
-               stat_iterate_distrib_tbl(b_entry->sched_ready, dump_block_sched_ready_distrib, dmp->f);
-               fprintf(dmp->f, "%12.2lf", stat_calc_avg_distrib_tbl(b_entry->sched_ready));
-               fprintf(dmp->f, "\n");
-       }
+       stat_add_int_distrib_tbl(sum_tbl, (int)(entry->object), &entry->cnt);
 }
 
 /**
@@ -238,19 +235,67 @@ static void simple_dump_be_block_sched_ready(dumper_t *dmp, graph_entry_t *entry
 static void simple_dump_be_block_permstat_class(dumper_t *dmp, perm_class_entry_t *entry)
 {
        perm_stat_entry_t *ps_ent;
+       distrib_tbl_t     *sum_chains = stat_new_int_distrib_tbl();
+       distrib_tbl_t     *sum_cycles = stat_new_int_distrib_tbl();
+       char              buf[16];
+       int               i;
+
+       fprintf(dmp->f, "%12s %12s %12s %12s %12s %12s\n",
+               "size",
+               "real size",
+               "# chains",
+               "# cycles",
+               "# copies",
+               "# exchanges"
+       );
 
-       fprintf(dmp->f, "%12s %12s %12s %12s\n", "size", "real size", "# chains", "# cycles");
-       for (ps_ent = pset_first(entry->perm_stat);
-            ps_ent;
-            ps_ent = pset_next(entry->perm_stat))
-       {
-               fprintf(dmp->f, "%12d %12d %12d %12d\n",
+       foreach_pset(entry->perm_stat, ps_ent) {
+               fprintf(dmp->f, "%12d %12d %12d %12d %12d %12d\n",
                        ps_ent->size,
                        ps_ent->real_size,
                        stat_get_count_distrib_tbl(ps_ent->chains),
-                       stat_get_count_distrib_tbl(ps_ent->cycles)
+                       stat_get_count_distrib_tbl(ps_ent->cycles),
+                       ps_ent->n_copies,
+                       ps_ent->n_exchg
                );
+
+               /* sum up distribution table for chains */
+               stat_iterate_distrib_tbl(ps_ent->chains, add_distrib_entry, sum_chains);
+
+               /* sum up distribution table for cycles */
+               stat_iterate_distrib_tbl(ps_ent->cycles, add_distrib_entry, sum_cycles);
+       }
+
+       /* print chain distribution for all perms of this class in this block */
+       fprintf(dmp->f, "chain distribution:\n");
+
+       /* add all missing entries to chain distribution table */
+       for (i = 1; i <= entry->n_regs; i++) {
+               snprintf(buf, sizeof(buf), "length %d", i);
+               fprintf(dmp->f, "%12s", buf);
+               stat_insert_int_distrib_tbl(sum_chains, i);
+       }
+       fprintf(dmp->f, "\n");
+       stat_iterate_distrib_tbl(sum_chains, simple_dump_distrib_entry, dmp->f);
+       fprintf(dmp->f, "\n");
+
+       /* print cycle distribution for all perms of this class in this block */
+       fprintf(dmp->f, "cycle distribution:\n");
+
+       /* add all missing entries to cycle distribution table */
+       for (i = 1; i <= entry->n_regs; i++) {
+               snprintf(buf, sizeof(buf), "length %d", i);
+               fprintf(dmp->f, "%12s", buf);
+               stat_insert_int_distrib_tbl(sum_cycles, i);
        }
+       fprintf(dmp->f, "\n");
+       stat_iterate_distrib_tbl(sum_cycles, simple_dump_distrib_entry, dmp->f);
+       fprintf(dmp->f, "\n");
+
+       /* delete temporary sum distribution tables */
+       stat_delete_distrib_tbl(sum_chains);
+       stat_delete_distrib_tbl(sum_cycles);
+
 }
 
 /**
@@ -258,34 +303,24 @@ static void simple_dump_be_block_permstat_class(dumper_t *dmp, perm_class_entry_
  */
 static void simple_dump_be_block_permstat(dumper_t *dmp, graph_entry_t *entry)
 {
-       be_block_entry_t *b_entry = pset_first(entry->be_block_hash);
-
-       /* return if no be statistic information available */
-       if (! b_entry)
-               return;
-
-       fprintf(dmp->f, "\nPERMUTATION STATISTICS BEGIN:\n");
-       for (/* b_entry is already initialized */ ;
-            b_entry;
-            b_entry = pset_next(entry->be_block_hash))
-       {
-               perm_class_entry_t *pc_ent;
+       if (pset_count(entry->be_block_hash) > 0) {
+               be_block_entry_t *b_entry;
 
-               fprintf(dmp->f, "BLOCK %ld:\n", b_entry->block_nr);
+               fprintf(dmp->f, "\nPERMUTATION STATISTICS BEGIN:\n");
+               foreach_pset(entry->be_block_hash, b_entry) {
+                       perm_class_entry_t *pc_ent;
 
-               if (! b_entry->perm_class_stat)
-                       continue;
+                       fprintf(dmp->f, "BLOCK %ld:\n", b_entry->block_nr);
 
-               for (pc_ent = pset_first(b_entry->perm_class_stat);
-                    pc_ent;
-                    pc_ent = pset_next(b_entry->perm_class_stat))
-               {
-                       fprintf(dmp->f, "register class %s:\n", pc_ent->class_name);
-                       simple_dump_be_block_permstat_class(dmp, pc_ent);
+                       if (b_entry->perm_class_stat)
+                               foreach_pset(b_entry->perm_class_stat, pc_ent) {
+                                       fprintf(dmp->f, "register class %s:\n", pc_ent->class_name);
+                                       simple_dump_be_block_permstat_class(dmp, pc_ent);
+                               }
                }
-       }
 
-       fprintf(dmp->f, "PERMUTATION STATISTICS END\n");
+               fprintf(dmp->f, "PERMUTATION STATISTICS END\n");
+       }
 }
 
 /**
@@ -298,7 +333,7 @@ static void simple_dump_real_func_calls(dumper_t *dmp, counter_t *cnt)
 
        if (! cnt_eq(cnt, 0)) {
                fprintf(dmp->f, "\nReal Function Calls optimized:\n");
-               fprintf(dmp->f, "%-16s %8u\n", "Call", cnt_to_int(cnt));
+               fprintf(dmp->f, "%-16s %8u\n", "Call", cnt_to_uint(cnt));
        }
 }
 
@@ -324,7 +359,7 @@ static void simple_dump_edges(dumper_t *dmp, counter_t *cnt)
        if (! dmp->f)
                return;
 
-       fprintf(dmp->f, "%-16s %8d\n", "Edges", cnt_to_int(cnt));
+       fprintf(dmp->f, "%-16s %8d\n", "Edges", cnt_to_uint(cnt));
 }
 
 /**
@@ -342,9 +377,8 @@ static void simple_dump_graph(dumper_t *dmp, graph_entry_t *entry)
        if (entry->irg) {
                ir_graph *const_irg = get_const_code_irg();
 
-               if (entry->irg == const_irg) {
+               if (entry->irg == const_irg)
                        fprintf(dmp->f, "\nConst code Irg %p", (void *)entry->irg);
-               }
                else {
                        if (entry->ent)
                                fprintf(dmp->f, "\nEntity %s, Irg %p", get_entity_ld_name(entry->ent), (void *)entry->irg);
@@ -363,22 +397,21 @@ static void simple_dump_graph(dumper_t *dmp, graph_entry_t *entry)
                        " calls                     : %u\n"
                        " indirect calls            : %u\n",
                        entry->is_deleted ? "DELETED " : "",
-                       cnt_to_int(&entry->cnt_walked), cnt_to_int(&entry->cnt_walked_blocks),
-                       cnt_to_int(&entry->cnt_was_inlined),
-                       cnt_to_int(&entry->cnt_got_inlined),
-                       cnt_to_int(&entry->cnt_strength_red),
+                       cnt_to_uint(&entry->cnt_walked), cnt_to_uint(&entry->cnt_walked_blocks),
+                       cnt_to_uint(&entry->cnt_was_inlined),
+                       cnt_to_uint(&entry->cnt_got_inlined),
+                       cnt_to_uint(&entry->cnt_strength_red),
                        entry->is_leaf ? "YES" : "NO",
                        entry->is_leaf_call == LCS_NON_LEAF_CALL ? "NO" : (entry->is_leaf_call == LCS_LEAF_CALL ? "Yes" : "Maybe"),
                        entry->is_recursive ? "YES" : "NO",
                        entry->is_chain_call ? "YES" : "NO",
-                       cnt_to_int(&entry->cnt_all_calls),
-                       cnt_to_int(&entry->cnt_indirect_calls)
+                       cnt_to_uint(&entry->cnt_all_calls),
+                       cnt_to_uint(&entry->cnt_indirect_calls)
                );
 
                for (i = 0; i < sizeof(entry->cnt_if_conv)/sizeof(entry->cnt_if_conv[0]); ++i) {
-                       fprintf(dmp->f, " %s : %u\n", if_conv_names[i], cnt_to_int(&entry->cnt_if_conv[i]));
+                       fprintf(dmp->f, " %s : %u\n", if_conv_names[i], cnt_to_uint(&entry->cnt_if_conv[i]));
                }
-
        }
        else {
                fprintf(dmp->f, "\nGlobals counts:\n");
@@ -402,17 +435,14 @@ static void simple_dump_graph(dumper_t *dmp, graph_entry_t *entry)
 
                /* dump block info */
                fprintf(dmp->f, "\n%12s %12s %12s %12s %12s %12s %12s\n", "Block Nr", "Nodes", "intern E", "incoming E", "outgoing E", "Phi", "quot");
-               for (b_entry = pset_first(entry->block_hash);
-                    b_entry;
-                    b_entry = pset_next(entry->block_hash))
-               {
+               foreach_pset(entry->block_hash, b_entry) {
                        fprintf(dmp->f, "BLK   %6ld %12u %12u %12u %12u %12u %4.8f\n",
                                b_entry->block_nr,
-                               cnt_to_int(&b_entry->cnt_nodes),
-                               cnt_to_int(&b_entry->cnt_edges),
-                               cnt_to_int(&b_entry->cnt_in_edges),
-                               cnt_to_int(&b_entry->cnt_out_edges),
-                               cnt_to_int(&b_entry->cnt_phi_data),
+                               cnt_to_uint(&b_entry->cnt_nodes),
+                               cnt_to_uint(&b_entry->cnt_edges),
+                               cnt_to_uint(&b_entry->cnt_in_edges),
+                               cnt_to_uint(&b_entry->cnt_out_edges),
+                               cnt_to_uint(&b_entry->cnt_phi_data),
                                cnt_to_dbl(&b_entry->cnt_edges) / cnt_to_dbl(&b_entry->cnt_nodes)
                        );
                }
@@ -426,20 +456,17 @@ static void simple_dump_graph(dumper_t *dmp, graph_entry_t *entry)
                /* dump block permutation statistics */
                simple_dump_be_block_permstat(dmp, entry);
 
-               if (dmp->status->stat_options & FIRMSTAT_COUNT_EXTBB) {
+               if (dmp->status->stat_options & FIRMSTAT_COUNT_EXTBB && entry->extbb_hash) {
                        /* dump extended block info */
                        fprintf(dmp->f, "\n%12s %12s %12s %12s %12s %12s %12s\n", "Extbb Nr", "Nodes", "intern E", "incoming E", "outgoing E", "Phi", "quot");
-                       for (eb_entry = pset_first(entry->extbb_hash);
-                            eb_entry;
-                            eb_entry = pset_next(entry->extbb_hash))
-                       {
+                       foreach_pset(entry->extbb_hash, eb_entry) {
                                fprintf(dmp->f, "ExtBB %6ld %12u %12u %12u %12u %12u %4.8f\n",
                                        eb_entry->block_nr,
-                                       cnt_to_int(&eb_entry->cnt_nodes),
-                                       cnt_to_int(&eb_entry->cnt_edges),
-                                       cnt_to_int(&eb_entry->cnt_in_edges),
-                                       cnt_to_int(&eb_entry->cnt_out_edges),
-                                       cnt_to_int(&eb_entry->cnt_phi_data),
+                                       cnt_to_uint(&eb_entry->cnt_nodes),
+                                       cnt_to_uint(&eb_entry->cnt_edges),
+                                       cnt_to_uint(&eb_entry->cnt_in_edges),
+                                       cnt_to_uint(&eb_entry->cnt_out_edges),
+                                       cnt_to_uint(&eb_entry->cnt_phi_data),
                                        cnt_to_dbl(&eb_entry->cnt_edges) / cnt_to_dbl(&eb_entry->cnt_nodes)
                                );
                        }
@@ -467,7 +494,7 @@ static void simple_dump_const_tbl(dumper_t *dmp, const constant_info_t *tbl)
        fprintf(dmp->f, "-------------------------------\n");
 
        for (i = 0; i < ARR_SIZE(tbl->int_bits_count); ++i) {
-               fprintf(dmp->f, "%5d %12u\n", i + 1, cnt_to_int(&tbl->int_bits_count[i]));
+               fprintf(dmp->f, "%5d %12u\n", i + 1, cnt_to_uint(&tbl->int_bits_count[i]));
                cnt_add(&sum, &tbl->int_bits_count[i]);
        }
        fprintf(dmp->f, "-------------------------------\n");
@@ -475,16 +502,16 @@ static void simple_dump_const_tbl(dumper_t *dmp, const constant_info_t *tbl)
        fprintf(dmp->f, "\nFloating point constants classification\n");
        fprintf(dmp->f, "--------------------------------------\n");
        for (i = 0; i < ARR_SIZE(tbl->floats); ++i) {
-               fprintf(dmp->f, "%-10s %12u\n", stat_fc_name(i), cnt_to_int(&tbl->floats[i]));
+               fprintf(dmp->f, "%-10s %12u\n", stat_fc_name(i), cnt_to_uint(&tbl->floats[i]));
                cnt_add(&sum, &tbl->floats[i]);
        }
        fprintf(dmp->f, "--------------------------------------\n");
 
-       fprintf(dmp->f, "other %12u\n", cnt_to_int(&tbl->others));
+       fprintf(dmp->f, "other %12u\n", cnt_to_uint(&tbl->others));
        cnt_add(&sum, &tbl->others);
        fprintf(dmp->f, "-------------------------------\n");
 
-       fprintf(dmp->f, "sum   %12u\n", cnt_to_int(&sum));
+       fprintf(dmp->f, "sum   %12u\n", cnt_to_uint(&sum));
 }
 
 /**
@@ -522,6 +549,8 @@ const dumper_t simple_dumper = {
        NULL,
        NULL,
        NULL,
+       NULL,
+       FOURCC('S', 'M', 'P', 'L'),
 };
 
 /* ---------------------------------------------------------------------- */
@@ -542,7 +571,7 @@ static void csv_count_nodes(dumper_t *dmp, graph_entry_t *graph, counter_t cnt[]
        for (i = 0; i < 4; ++i)
                cnt_clr(&cnt[i]);
 
-       for (entry = pset_first(graph->opcode_hash); entry; entry = pset_next(graph->opcode_hash)) {
+       foreach_pset(graph->opcode_hash, entry) {
                if (entry->op == op_Phi) {
                        /* normal Phi */
                        cnt_add(&cnt[1], &entry->cnt_alive);
@@ -592,10 +621,10 @@ static void csv_dump_graph(dumper_t *dmp, graph_entry_t *entry)
                fprintf(dmp->f, "%-40s, %p, %d, %d, %d, %d\n",
                        name,
                        (void *)entry->irg,
-                       cnt_to_int(&cnt[0]),
-                       cnt_to_int(&cnt[1]),
-                       cnt_to_int(&cnt[2]),
-                       cnt_to_int(&cnt[3])
+                       cnt_to_uint(&cnt[0]),
+                       cnt_to_uint(&cnt[1]),
+                       cnt_to_uint(&cnt[2]),
+                       cnt_to_uint(&cnt[3])
                );
        }
 }
@@ -617,9 +646,8 @@ static void csv_init(dumper_t *dmp, const char *name)
 
        snprintf(fname, sizeof(fname), "%s.csv", name);
        dmp->f = fopen(fname, "a");
-       if (! dmp->f) {
+       if (! dmp->f)
                perror(fname);
-       }
 }
 
 /**
@@ -643,4 +671,6 @@ const dumper_t csv_dumper = {
        NULL,
        NULL,
        NULL,
+       NULL,
+       FOURCC('C', 'S', 'V', '\0')
 };