be: inline arch_env_begin_codegeneration() into its only caller.
[libfirm] / ir / stat / stat_dmp.c
index 3790f11..a41df26 100644 (file)
@@ -114,7 +114,7 @@ static const struct {
        { (hook_opt_kind)FS_OPT_MUX_TO_MIN,     "algebraic simplification: Mux(a < b, a, b) = Min(a,b)" },
        { (hook_opt_kind)FS_OPT_MUX_TO_MAX,     "algebraic simplification: Mux(a > b, a, b) = Max(a,b)" },
        { (hook_opt_kind)FS_OPT_MUX_TO_BITOP,   "algebraic simplification: Mux((a & 2^x) ==/!= 0, 2^x, 0) = (a & 2^x) (xor 2^x)" },
-       { (hook_opt_kind)FS_OPT_IDEM_UNARY,     "algebraic simplification: Idempotent unary operation" },
+       { (hook_opt_kind)FS_OPT_INVOLUTION,     "algebraic simplification: OP(OP(x)) = x" },
        { (hook_opt_kind)FS_OPT_MINUS_NOT,      "algebraic simplification: -(~x) = x + 1" },
        { (hook_opt_kind)FS_OPT_NOT_MINUS_1,    "algebraic simplification: ~(x - 1) = -x" },
        { (hook_opt_kind)FS_OPT_NOT_PLUS_1,     "algebraic simplification: ~x + 1 = -x" },
@@ -193,7 +193,6 @@ static const char *if_conv_names[IF_RESULT_LAST] = {
  */
 static void simple_dump_opcode_hash(dumper_t *dmp, pset *set)
 {
-       node_entry_t *entry;
        counter_t f_alive;
        counter_t f_new_node;
        counter_t f_Id;
@@ -205,7 +204,7 @@ static void simple_dump_opcode_hash(dumper_t *dmp, pset *set)
        cnt_clr(&f_normlized);
 
        fprintf(dmp->f, "%-16s %-8s %-8s %-8s %-8s\n", "Opcode", "alive", "created", "->Id", "normalized");
-       foreach_pset(set, node_entry_t*, entry) {
+       foreach_pset(set, node_entry_t, entry) {
                fprintf(dmp->f, "%-16s %8u %8u %8u %8u\n",
                        get_id_str(entry->op->name),
                        cnt_to_uint(&entry->cnt_alive),
@@ -244,13 +243,12 @@ static const char *get_opt_name(int index)
 static void simple_dump_opt_hash(dumper_t *dmp, pset *set, int index)
 {
        if (pset_count(set) > 0) {
-               opt_entry_t *entry;
                const char *name = get_opt_name(index);
 
                fprintf(dmp->f, "\n%s:\n", name);
                fprintf(dmp->f, "%-16s %-8s\n", "Opcode", "deref");
 
-               foreach_pset(set, opt_entry_t*, entry) {
+               foreach_pset(set, opt_entry_t, entry) {
                        fprintf(dmp->f, "%-16s %8u\n",
                                get_id_str(entry->op->name), cnt_to_uint(&entry->count));
                }  /* foreach_pset */
@@ -262,28 +260,24 @@ static void simple_dump_opt_hash(dumper_t *dmp, pset *set, int index)
  */
 static void simple_dump_be_block_reg_pressure(dumper_t *dmp, graph_entry_t *entry)
 {
-       be_block_entry_t     *b_entry = (be_block_entry_t*)pset_first(entry->be_block_hash);
-       reg_pressure_entry_t *rp_entry;
-
        /* return if no be statistic information available */
-       if (! b_entry)
+       be_block_entry_t *const b_first = pset_first(be_block_entry_t, entry->be_block_hash);
+       if (!b_first)
                return;
 
        fprintf(dmp->f, "\nREG PRESSURE:\n");
        fprintf(dmp->f, "%12s", "Block Nr");
 
        /* print table head (register class names) */
-       foreach_pset(b_entry->reg_pressure, reg_pressure_entry_t*, rp_entry)
+       foreach_pset(b_first->reg_pressure, reg_pressure_entry_t, 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 = (be_block_entry_t*)pset_next(entry->be_block_hash)) {
+       foreach_pset(entry->block_hash, be_block_entry_t, b_entry) {
                fprintf(dmp->f, "BLK   %6ld", b_entry->block_nr);
 
-               foreach_pset(b_entry->reg_pressure, reg_pressure_entry_t*, rp_entry)
+               foreach_pset(b_entry->reg_pressure, reg_pressure_entry_t, rp_entry)
                        fprintf(dmp->f, "%15d", rp_entry->pressure);
                fprintf(dmp->f, "\n");
        }  /* for */
@@ -302,14 +296,13 @@ static void simple_dump_distrib_entry(const distrib_entry_t *entry, void *env)
 static void simple_dump_be_block_sched_ready(dumper_t *dmp, graph_entry_t *entry)
 {
        if (pset_count(entry->be_block_hash) > 0) {
-               be_block_entry_t *b_entry;
-               int              i;
+               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, be_block_entry_t*, b_entry) {
+               foreach_pset(entry->be_block_hash, be_block_entry_t, 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);
@@ -337,11 +330,10 @@ static void add_distrib_entry(const distrib_entry_t *entry, void *env)
  */
 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;
+       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",
@@ -352,7 +344,7 @@ static void simple_dump_be_block_permstat_class(dumper_t *dmp, perm_class_entry_
                "# exchanges"
        );
 
-       foreach_pset(entry->perm_stat, perm_stat_entry_t*, ps_ent) {
+       foreach_pset(entry->perm_stat, perm_stat_entry_t, ps_ent) {
                fprintf(dmp->f, "%12d %12d %12d %12d %12d %12d\n",
                        ps_ent->size,
                        ps_ent->real_size,
@@ -407,16 +399,12 @@ 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)
 {
        if (pset_count(entry->be_block_hash) > 0) {
-               be_block_entry_t *b_entry;
-
                fprintf(dmp->f, "\nPERMUTATION STATISTICS BEGIN:\n");
-               foreach_pset(entry->be_block_hash, be_block_entry_t*, b_entry) {
-                       perm_class_entry_t *pc_ent;
-
+               foreach_pset(entry->be_block_hash, be_block_entry_t, b_entry) {
                        fprintf(dmp->f, "BLOCK %ld:\n", b_entry->block_nr);
 
                        if (b_entry->perm_class_stat) {
-                               foreach_pset(b_entry->perm_class_stat, perm_class_entry_t*, pc_ent) {
+                               foreach_pset(b_entry->perm_class_stat, perm_class_entry_t, pc_ent) {
                                        fprintf(dmp->f, "register class %s:\n", pc_ent->class_name);
                                        simple_dump_be_block_permstat_class(dmp, pc_ent);
                                }  /* foreach_pset */
@@ -472,7 +460,6 @@ static void simple_dump_edges(dumper_t *dmp, counter_t *cnt)
 static void simple_dump_graph(dumper_t *dmp, graph_entry_t *entry)
 {
        int dump_opts = 1;
-       block_entry_t *b_entry;
 
        if (! dmp->f)
                return;
@@ -564,7 +551,7 @@ 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");
-               foreach_pset(entry->block_hash, block_entry_t*, b_entry) {
+               foreach_pset(entry->block_hash, block_entry_t, b_entry) {
                        fprintf(dmp->f, "BLK   %6ld %12u %12u %12u %12u %12u %4.8f %s\n",
                                b_entry->block_nr,
                                cnt_to_uint(&b_entry->cnt[bcnt_nodes]),
@@ -730,13 +717,12 @@ const dumper_t simple_dumper = {
  */
 static void csv_count_nodes(dumper_t *dmp, graph_entry_t *graph, counter_t cnt[])
 {
-       node_entry_t *entry;
        int i;
 
        for (i = 0; i < 4; ++i)
                cnt_clr(&cnt[i]);
 
-       foreach_pset(graph->opcode_hash, node_entry_t*, entry) {
+       foreach_pset(graph->opcode_hash, node_entry_t, entry) {
                if (entry->op == op_Phi) {
                        /* normal Phi */
                        cnt_add(&cnt[1], &entry->cnt_alive);
@@ -768,7 +754,6 @@ static void csv_dump_graph(dumper_t *dmp, graph_entry_t *entry)
                ir_graph *const_irg = get_const_code_irg();
 
                if (entry->irg == const_irg) {
-                       name = "<Const code Irg>";
                        return;
                } else {
                        if (entry->ent)