Various fixes
[libfirm] / ir / stat / firmstat.c
index 8d4d475..3c7170e 100644 (file)
@@ -1,14 +1,28 @@
 /*
- * Project:     libFIRM
- * File name:   ir/ir/firmstat.c
- * Purpose:     Statistics for Firm.
- * Author:      Michael Beck
- * Created:
- * CVS-ID:      $Id$
- * Copyright:   (c) 2004 Universität Karlsruhe
- * Licence:     This file protected by GPL -  GNU GENERAL PUBLIC LICENSE.
+ * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ *
+ * This file is part of libFirm.
+ *
+ * This file may be distributed and/or modified under the terms of the
+ * GNU General Public License version 2 as published by the Free Software
+ * Foundation and appearing in the file LICENSE.GPL included in the
+ * packaging of this file.
+ *
+ * Licensees holding valid libFirm Professional Edition licenses may use
+ * this file in accordance with the libFirm Commercial License.
+ * Agreement provided with the Software.
+ *
+ * This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+ * WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE.
  */
 
+/**
+ * @file
+ * @brief   Statistics for Firm.
+ * @author  Michael Beck
+ * @version $Id$
+ */
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
@@ -228,7 +242,7 @@ static node_entry_t *opcode_get_entry(const ir_op *op, hmap_node_entry_t *hmap)
  * @param code  the IR opcode
  * @param hmap  the hash map containing opcode -> ir_op*
  */
-static ir_op *opcode_find_entry(opcode code, hmap_ir_op *hmap) {
+static ir_op *opcode_find_entry(ir_opcode code, hmap_ir_op *hmap) {
        ir_op key;
 
        key.code = code;
@@ -242,20 +256,12 @@ static ir_op *opcode_find_entry(opcode code, hmap_ir_op *hmap) {
  * @param all   if non-zero, clears all counters, else leave accumulated ones
  */
 static void graph_clear_entry(graph_entry_t *elem, int all) {
-       if (all) {
-               cnt_clr(&elem->cnt_walked);
-               cnt_clr(&elem->cnt_walked_blocks);
-               cnt_clr(&elem->cnt_was_inlined);
-               cnt_clr(&elem->cnt_got_inlined);
-               cnt_clr(&elem->cnt_strength_red);
-               cnt_clr(&elem->cnt_real_func_call);
-       }  /* if */
-       cnt_clr(&elem->cnt_edges);
-       cnt_clr(&elem->cnt_all_calls);
-       cnt_clr(&elem->cnt_call_with_cnst_arg);
-       cnt_clr(&elem->cnt_indirect_calls);
-       cnt_clr(&elem->cnt_pure_adr_ops);
-       cnt_clr(&elem->cnt_all_adr_ops);
+       int i;
+
+       /* clear accumulated / non-acumulated counter */
+       for (i = all ? 0 : _gcnt_non_acc; i < _gcnt_last; ++i) {
+               cnt_clr(&elem->cnt[i]);
+       }  /* for */
 
        if (elem->block_hash) {
                del_pset(elem->block_hash);
@@ -357,11 +363,10 @@ static opt_entry_t *opt_get_entry(const ir_op *op, hmap_opt_entry_t *hmap)
  * clears all counter in a block_entry_t
  */
 static void block_clear_entry(block_entry_t *elem) {
-       cnt_clr(&elem->cnt_nodes);
-       cnt_clr(&elem->cnt_edges);
-       cnt_clr(&elem->cnt_in_edges);
-       cnt_clr(&elem->cnt_out_edges);
-       cnt_clr(&elem->cnt_phi_data);
+       int i;
+
+       for (i = 0; i < _bcnt_last; ++i)
+               cnt_clr(&elem->cnt[i]);
 }  /* block_clear_entry */
 
 /**
@@ -529,38 +534,61 @@ static perm_stat_entry_t *perm_stat_get_entry(struct obstack *obst, ir_node *per
 static ir_op *stat_get_irn_op(ir_node *node)
 {
        ir_op *op = get_irn_op(node);
-
-       if (op == op_Phi && get_irn_arity(node) == 0) {
-               /* special case, a Phi0 node, count on extra counter */
-               op = status->op_Phi0 ? status->op_Phi0 : op;
-       } else if (op == op_Phi && get_irn_mode(node) == mode_M) {
-               /* special case, a Memory Phi node, count on extra counter */
-               op = status->op_PhiM ? status->op_PhiM : op;
-       } else if (op == op_Proj && get_irn_mode(node) == mode_M) {
-               /* special case, a Memory Proj node, count on extra counter */
-               op = status->op_ProjM ? status->op_ProjM : op;
-       } else if (op == op_Mul &&
-               (get_irn_op(get_Mul_left(node)) == op_Const || get_irn_op(get_Mul_right(node)) == op_Const)) {
-               /* special case, a Multiply by a const, count on extra counter */
-               op = status->op_MulC ? status->op_MulC : op;
-       } else if (op == op_Div && get_irn_op(get_Div_right(node)) == op_Const) {
-               /* special case, a division by a const, count on extra counter */
-               op = status->op_DivC ? status->op_DivC : op;
-       } else if (op == op_Mod && get_irn_op(get_Mod_right(node)) == op_Const) {
-               /* special case, a module by a const, count on extra counter */
-               op = status->op_ModC ? status->op_ModC : op;
-       } else if (op == op_DivMod && get_irn_op(get_DivMod_right(node)) == op_Const) {
-               /* special case, a division/modulo by a const, count on extra counter */
-               op = status->op_DivModC ? status->op_DivModC : op;
-       } else if (op == op_Sel && get_irn_op(get_Sel_ptr(node)) == op_Sel) {
-               /* special case, a Sel of a Sel, count on extra counter */
-               op = status->op_SelSel ? status->op_SelSel : op;
-
-               if (get_irn_op(get_Sel_ptr(get_Sel_ptr(node))) == op_Sel) {
-                       /* special case, a Sel of a Sel of a Sel, count on extra counter */
-                       op = status->op_SelSelSel ? status->op_SelSelSel : op;
+       ir_opcode opc = op->code;
+
+       switch (opc) {
+       case iro_Phi:
+               if (get_irn_arity(node) == 0) {
+                       /* special case, a Phi0 node, count on extra counter */
+                       op = status->op_Phi0 ? status->op_Phi0 : op;
+               } else if (get_irn_mode(node) == mode_M) {
+                       /* special case, a Memory Phi node, count on extra counter */
+                       op = status->op_PhiM ? status->op_PhiM : op;
                }  /* if */
-       }  /* if */
+               break;
+       case iro_Proj:
+               if (get_irn_mode(node) == mode_M) {
+                       /* special case, a Memory Proj node, count on extra counter */
+                       op = status->op_ProjM ? status->op_ProjM : op;
+               }  /* if */
+               break;
+       case iro_Mul:
+               if (get_irn_op(get_Mul_left(node)) == op_Const || get_irn_op(get_Mul_right(node)) == op_Const) {
+                       /* special case, a Multiply by a const, count on extra counter */
+                       op = status->op_MulC ? status->op_MulC : op;
+               }  /* if */
+               break;
+       case iro_Div:
+               if (get_irn_op(get_Div_right(node)) == op_Const) {
+                       /* special case, a division by a const, count on extra counter */
+                       op = status->op_DivC ? status->op_DivC : op;
+               }  /* if */
+               break;
+       case iro_Mod:
+               if (get_irn_op(get_Mod_right(node)) == op_Const) {
+                       /* special case, a module by a const, count on extra counter */
+                       op = status->op_ModC ? status->op_ModC : op;
+               }  /* if */
+               break;
+       case iro_DivMod:
+               if (get_irn_op(get_DivMod_right(node)) == op_Const) {
+                       /* special case, a division/modulo by a const, count on extra counter */
+                       op = status->op_DivModC ? status->op_DivModC : op;
+               }  /* if */
+               break;
+       case iro_Sel:
+               if (get_irn_op(get_Sel_ptr(node)) == op_Sel) {
+                       /* special case, a Sel of a Sel, count on extra counter */
+                       op = status->op_SelSel ? status->op_SelSel : op;
+                       if (get_irn_op(get_Sel_ptr(get_Sel_ptr(node))) == op_Sel) {
+                               /* special case, a Sel of a Sel of a Sel, count on extra counter */
+                               op = status->op_SelSelSel ? status->op_SelSelSel : op;
+                       }  /* if */
+               }  /* if */
+               break;
+       default:
+               ;
+       }  /* switch */
 
        return op;
 }  /* stat_get_irn_op */
@@ -586,8 +614,8 @@ static void undate_block_info(ir_node *node, graph_entry_t *graph)
                        ir_node *other_block = get_nodes_block(pred);
                        block_entry_t *b_entry_other = block_get_entry(&graph->recalc_cnts, get_irn_node_nr(other_block), graph->block_hash);
 
-                       cnt_inc(&b_entry->cnt_in_edges);        /* an edge coming from another block */
-                       cnt_inc(&b_entry_other->cnt_out_edges);
+                       cnt_inc(&b_entry->cnt[bcnt_in_edges]);  /* an edge coming from another block */
+                       cnt_inc(&b_entry_other->cnt[bcnt_out_edges]);
                }  /* for */
                return;
        }  /* if */
@@ -597,11 +625,11 @@ static void undate_block_info(ir_node *node, graph_entry_t *graph)
 
        if (op == op_Phi && mode_is_datab(get_irn_mode(node))) {
                /* count data Phi per block */
-               cnt_inc(&b_entry->cnt_phi_data);
+               cnt_inc(&b_entry->cnt[bcnt_phi_data]);
        }  /* if */
 
        /* we have a new node in our block */
-       cnt_inc(&b_entry->cnt_nodes);
+       cnt_inc(&b_entry->cnt[bcnt_nodes]);
 
        /* don't count keep-alive edges */
        if (get_irn_op(node) == op_End)
@@ -616,12 +644,12 @@ static void undate_block_info(ir_node *node, graph_entry_t *graph)
                other_block = get_nodes_block(pred);
 
                if (other_block == block)
-                       cnt_inc(&b_entry->cnt_edges);   /* a in block edge */
+                       cnt_inc(&b_entry->cnt[bcnt_edges]);     /* a in block edge */
                else {
                        block_entry_t *b_entry_other = block_get_entry(&graph->recalc_cnts, get_irn_node_nr(other_block), graph->block_hash);
 
-                       cnt_inc(&b_entry->cnt_in_edges);        /* an edge coming from another block */
-                       cnt_inc(&b_entry_other->cnt_out_edges);
+                       cnt_inc(&b_entry->cnt[bcnt_in_edges]);  /* an edge coming from another block */
+                       cnt_inc(&b_entry_other->cnt[bcnt_out_edges]);
                }  /* if */
        }  /* for */
 }  /* undate_block_info */
@@ -650,8 +678,8 @@ static void update_extbb_info(ir_node *node, graph_entry_t *graph)
                        if (extbb != other_extbb) {
                                extbb_entry_t *eb_entry_other = block_get_entry(&graph->recalc_cnts, get_extbb_node_nr(other_extbb), graph->extbb_hash);
 
-                               cnt_inc(&eb_entry->cnt_in_edges);       /* an edge coming from another extbb */
-                               cnt_inc(&eb_entry_other->cnt_out_edges);
+                               cnt_inc(&eb_entry->cnt[bcnt_in_edges]); /* an edge coming from another extbb */
+                               cnt_inc(&eb_entry_other->cnt[bcnt_out_edges]);
                        }  /* if */
                }  /* for */
                return;
@@ -662,11 +690,11 @@ static void update_extbb_info(ir_node *node, graph_entry_t *graph)
 
        if (op == op_Phi && mode_is_datab(get_irn_mode(node))) {
                /* count data Phi per extbb */
-               cnt_inc(&eb_entry->cnt_phi_data);
+               cnt_inc(&eb_entry->cnt[bcnt_phi_data]);
        }  /* if */
 
        /* we have a new node in our block */
-       cnt_inc(&eb_entry->cnt_nodes);
+       cnt_inc(&eb_entry->cnt[bcnt_nodes]);
 
        /* don't count keep-alive edges */
        if (get_irn_op(node) == op_End)
@@ -679,30 +707,51 @@ static void update_extbb_info(ir_node *node, graph_entry_t *graph)
                ir_extblk *other_extbb = get_nodes_extbb(pred);
 
                if (other_extbb == extbb)
-                       cnt_inc(&eb_entry->cnt_edges);  /* a in extbb edge */
+                       cnt_inc(&eb_entry->cnt[bcnt_edges]);    /* a in extbb edge */
                else {
                        extbb_entry_t *eb_entry_other = block_get_entry(&graph->recalc_cnts, get_extbb_node_nr(other_extbb), graph->extbb_hash);
 
-                       cnt_inc(&eb_entry->cnt_in_edges);       /* an edge coming from another extbb */
-                       cnt_inc(&eb_entry_other->cnt_out_edges);
+                       cnt_inc(&eb_entry->cnt[bcnt_in_edges]); /* an edge coming from another extbb */
+                       cnt_inc(&eb_entry_other->cnt[bcnt_out_edges]);
                }  /* if */
        }  /* for */
 }  /* update_extbb_info */
 
-/** Calculates how many arguments of the call are const. */
-static int cnt_const_args(ir_node *call) {
-       int i, res = 0;
+/**
+ * Calculates how many arguments of the call are const, updates
+ * param distribution.
+ */
+static void analyse_params_of_Call(graph_entry_t *graph, ir_node *call) {
+       int i, num_const_args = 0, num_local_adr = 0;
        int n = get_Call_n_params(call);
 
        for (i = 0; i < n; ++i) {
                ir_node *param = get_Call_param(call, i);
-               ir_op   *op = get_irn_op(param);
 
-               if (op == op_Const || op == op_SymConst)
-                       ++res;
+               if (is_irn_constlike(param))
+                       ++num_const_args;
+               else if (is_Sel(param)) {
+                       ir_node *base = param;
+
+                       do {
+                               base = get_Sel_ptr(base);
+                       } while (is_Sel(base));
+
+                       if (base == get_irg_frame(current_ir_graph))
+                               ++num_local_adr;
+               }
+
        }  /* for */
-       return res;
-}  /* cnt_const_args */
+
+       if (num_const_args > 0)
+               cnt_inc(&graph->cnt[gcnt_call_with_cnst_arg]);
+       if (num_const_args == n)
+               cnt_inc(&graph->cnt[gcnt_call_with_all_cnst_arg]);
+       if (num_local_adr > 0)
+               cnt_inc(&graph->cnt[gcnt_call_with_local_adr]);
+
+       stat_inc_int_distrib_tbl(status->dist_param_cnt, n);
+}  /* analyse_params_of_Call */
 
 /**
  * Update info on calls.
@@ -716,7 +765,6 @@ static void stat_update_call(ir_node *call, graph_entry_t *graph)
        ir_node   *ptr = get_Call_ptr(call);
        ir_entity *ent = NULL;
        ir_graph  *callee = NULL;
-       int       num_const_args;
 
        /*
         * If the block is bad, the whole subgraph will collapse later
@@ -726,7 +774,7 @@ static void stat_update_call(ir_node *call, graph_entry_t *graph)
        if (is_Bad(block))
                return;
 
-       cnt_inc(&graph->cnt_all_calls);
+       cnt_inc(&graph->cnt[gcnt_all_calls]);
 
        /* found a call, this function is not a leaf */
        graph->is_leaf = 0;
@@ -743,7 +791,7 @@ static void stat_update_call(ir_node *call, graph_entry_t *graph)
                }  /* if */
        } else {
                /* indirect call, be could not predict */
-               cnt_inc(&graph->cnt_indirect_calls);
+               cnt_inc(&graph->cnt[gcnt_indirect_calls]);
 
                /* NOT a leaf call */
                graph->is_leaf_call = LCS_NON_LEAF_CALL;
@@ -776,11 +824,7 @@ static void stat_update_call(ir_node *call, graph_entry_t *graph)
                }  /* if */
        }  /* if */
 
-       /* check, if arguments of the call are const */
-       num_const_args = cnt_const_args(call);
-
-       if (num_const_args > 0)
-               cnt_inc(&graph->cnt_call_with_cnst_arg);
+       analyse_params_of_Call(graph, call);
 }  /* stat_update_call */
 
 /**
@@ -821,6 +865,75 @@ static void stat_update_call_2(ir_node *call, graph_entry_t *graph)
                graph->is_leaf_call = LCS_NON_LEAF_CALL;
 }  /* stat_update_call_2 */
 
+/**
+ * Find the base address and entity of an Sel node.
+ *
+ * @param sel  the node
+ *
+ * @return the base address.
+ */
+static ir_node *find_base_adr(ir_node *sel) {
+       ir_node *ptr = get_Sel_ptr(sel);
+
+       while (is_Sel(ptr)) {
+               sel = ptr;
+               ptr = get_Sel_ptr(sel);
+       }
+       return ptr;
+}  /* find_base_adr */
+
+/**
+ * Update info on Load/Store address statistics.
+ */
+static void stat_update_address(ir_node *node, graph_entry_t *graph) {
+       ir_opcode opc = get_irn_opcode(node);
+       ir_node *base;
+       ir_graph *irg;
+
+       switch (opc) {
+       case iro_SymConst:
+               /* a global address */
+               cnt_inc(&graph->cnt[gcnt_global_adr]);
+               break;
+       case iro_Sel:
+               base = find_base_adr(node);
+               irg = current_ir_graph;
+               if (base == get_irg_tls(irg)) {
+                       /* a TLS variable, like a global. */
+                       cnt_inc(&graph->cnt[gcnt_global_adr]);
+               } else if (base == get_irg_frame(irg)) {
+                       /* a local Variable. */
+                       cnt_inc(&graph->cnt[gcnt_local_adr]);
+               } else {
+                       /* Pointer access */
+                       if (is_Proj(base) && skip_Proj(get_Proj_pred(base)) == get_irg_start(irg)) {
+                               /* pointer access through parameter, check for THIS */
+                               ir_entity *ent = get_irg_entity(irg);
+
+                               if (ent != NULL) {
+                                       ir_type *ent_tp = get_entity_type(ent);
+
+                                       if (get_method_calling_convention(ent_tp) & cc_this_call) {
+                                               if (get_Proj_proj(base) == 0) {
+                                                       /* THIS pointer */
+                                                       cnt_inc(&graph->cnt[gcnt_this_adr]);
+                                                       goto end_parameter;
+                                               }  /* if */
+                                       }  /* if */
+                               }  /* if */
+                               /* other parameter */
+                               cnt_inc(&graph->cnt[gcnt_param_adr]);
+end_parameter: ;
+                       } else {
+                               /* unknown Pointer access */
+                               cnt_inc(&graph->cnt[gcnt_other_adr]);
+                       }  /* if */
+               }  /* if */
+       default:
+               ;
+       }  /* switch */
+}  /* stat_update_address */
+
 /**
  * Walker for reachable nodes count.
  */
@@ -835,7 +948,7 @@ static void update_node_stat(ir_node *node, void *env)
        entry = opcode_get_entry(op, graph->opcode_hash);
 
        cnt_inc(&entry->cnt_alive);
-       cnt_add_i(&graph->cnt_edges, arity);
+       cnt_add_i(&graph->cnt[gcnt_edges], arity);
 
        /* count block edges */
        undate_block_info(node, graph);
@@ -848,15 +961,28 @@ static void update_node_stat(ir_node *node, void *env)
 
        /* handle statistics for special node types */
 
-       if (op == op_Const) {
+       switch (op->code) {
+       case iro_Const:
                if (status->stat_options & FIRMSTAT_COUNT_CONSTS) {
                        /* check properties of constants */
                        stat_update_const(status, node, graph);
                }  /* if */
-       } else if (op == op_Call) {
+               break;
+       case iro_Call:
                /* check for properties that depends on calls like recursion/leaf/indirect call */
                stat_update_call(node, graph);
-       }  /* if */
+               break;
+       case iro_Load:
+               /* check address properties */
+               stat_update_address(get_Load_ptr(node), graph);
+               break;
+       case iro_Store:
+               /* check address properties */
+               stat_update_address(get_Store_ptr(node), graph);
+               break;
+       default:
+               ;
+       }  /* switch */
 }  /* update_node_stat */
 
 /**
@@ -996,11 +1122,11 @@ static void count_adr_ops(ir_node *node, void *env) {
        unsigned mark        = get_adr_mark(graph, node);
 
        if (mark & MARK_ADDRESS_CALC)
-               cnt_inc(&graph->cnt_pure_adr_ops);
+               cnt_inc(&graph->cnt[gcnt_pure_adr_ops]);
        else if ((mark & (MARK_REF_ADR | MARK_REF_NON_ADR)) == MARK_REF_ADR)
-               cnt_inc(&graph->cnt_pure_adr_ops);
+               cnt_inc(&graph->cnt[gcnt_pure_adr_ops]);
        else if ((mark & (MARK_REF_ADR | MARK_REF_NON_ADR)) == (MARK_REF_ADR|MARK_REF_NON_ADR))
-               cnt_inc(&graph->cnt_all_adr_ops);
+               cnt_inc(&graph->cnt[gcnt_all_adr_ops]);
 }  /* count_adr_ops */
 
 /**
@@ -1013,11 +1139,12 @@ static void count_adr_ops(ir_node *node, void *env) {
 static void update_graph_stat(graph_entry_t *global, graph_entry_t *graph)
 {
        node_entry_t *entry;
+       int i;
 
        /* clear first the alive counter in the graph */
-       for (entry = pset_first(graph->opcode_hash); entry; entry = pset_next(graph->opcode_hash)) {
+       foreach_pset(graph->opcode_hash, entry) {
                cnt_clr(&entry->cnt_alive);
-       }  /* for */
+       }  /* foreach_pset */
 
        /* set pessimistic values */
        graph->is_leaf       = 1;
@@ -1058,15 +1185,12 @@ static void update_graph_stat(graph_entry_t *global, graph_entry_t *graph)
                graph->is_chain_call = 0;
 
        /* assume we walk every graph only ONCE, we could sum here the global count */
-       for (entry = pset_first(graph->opcode_hash); entry; entry = pset_next(graph->opcode_hash)) {
+       foreach_pset(graph->opcode_hash, entry) {
                node_entry_t *g_entry = opcode_get_entry(entry->op, global->opcode_hash);
 
                /* update the node counter */
                cnt_add(&g_entry->cnt_alive, &entry->cnt_alive);
-       }  /* for */
-
-       /* update the edge counter */
-       cnt_add(&global->cnt_edges, &graph->cnt_edges);
+       }  /* foreach_pset */
 
        /* count the number of address calculation */
        if (graph->irg != get_const_code_irg()) {
@@ -1106,6 +1230,10 @@ static void update_graph_stat(graph_entry_t *global, graph_entry_t *graph)
 
        /* we have analyzed this graph */
        graph->is_analyzed = 1;
+
+       /* accumulate all counter's */
+       for (i = 0; i < _gcnt_last; ++i)
+               cnt_add(&global->cnt[i], &graph->cnt[i]);
 }  /* update_graph_stat */
 
 /**
@@ -1188,6 +1316,18 @@ static void stat_dump_consts(const constant_info_t *tbl) {
        }  /* for */
 }  /* stat_dump_consts */
 
+/**
+ * Dumps the parameter distribution
+ */
+static void stat_dump_param_tbl(const distrib_tbl_t *tbl, graph_entry_t *global) {
+       dumper_t *dumper;
+
+       for (dumper = status->dumper; dumper; dumper = dumper->next) {
+               if (dumper->dump_const_tbl)
+                       dumper->dump_param_tbl(dumper, tbl, global);
+       }  /* for */
+}
+
 /**
  * Initialize the dumper.
  */
@@ -1230,7 +1370,7 @@ void stat_register_dumper_func(dump_graph_FUNC func) {
 /*
  * Helper: get an ir_op from an opcode.
  */
-ir_op *stat_get_op_from_opcode(opcode code) {
+ir_op *stat_get_op_from_opcode(ir_opcode code) {
        return opcode_find_entry(code, status->ir_op_hash);
 }  /* stat_get_op_from_opcode */
 
@@ -1284,7 +1424,7 @@ static void stat_new_node(void *ctx, ir_graph *irg, ir_node *node) {
                return;
 
        /* do NOT count during dead node elimination */
-       if (status->in_dead_node_elim > 0)
+       if (status->in_dead_node_elim)
                return;
 
        STAT_ENTER;
@@ -1408,7 +1548,7 @@ static void stat_irg_walk(void *ctx, ir_graph *irg, generic_func *pre, generic_f
        {
                graph_entry_t *graph = graph_get_entry(irg, status->irg_hash);
 
-               cnt_inc(&graph->cnt_walked);
+               cnt_inc(&graph->cnt[gcnt_acc_walked]);
        }
        STAT_LEAVE;
 }  /* stat_irg_walk */
@@ -1445,7 +1585,7 @@ static void stat_irg_block_walk(void *ctx, ir_graph *irg, ir_node *node, generic
        {
                graph_entry_t *graph = graph_get_entry(irg, status->irg_hash);
 
-               cnt_inc(&graph->cnt_walked_blocks);
+               cnt_inc(&graph->cnt[gcnt_acc_walked_blocks]);
        }
        STAT_LEAVE;
 }  /* stat_irg_block_walk */
@@ -1566,8 +1706,8 @@ static void stat_inline(void *ctx, ir_node *call, ir_graph *called_irg)
                graph_entry_t *i_graph = graph_get_entry(called_irg, status->irg_hash);
                graph_entry_t *graph   = graph_get_entry(irg, status->irg_hash);
 
-               cnt_inc(&graph->cnt_got_inlined);
-               cnt_inc(&i_graph->cnt_was_inlined);
+               cnt_inc(&graph->cnt[gcnt_acc_got_inlined]);
+               cnt_inc(&i_graph->cnt[gcnt_acc_was_inlined]);
        }
        STAT_LEAVE;
 }  /* stat_inline */
@@ -1602,7 +1742,7 @@ static void stat_strength_red(void *ctx, ir_graph *irg, ir_node *strong) {
        STAT_ENTER;
        {
                graph_entry_t *graph = graph_get_entry(irg, status->irg_hash);
-               cnt_inc(&graph->cnt_strength_red);
+               cnt_inc(&graph->cnt[gcnt_acc_strength_red]);
 
                removed_due_opt(strong, graph->opt_hash[HOOK_OPT_STRENGTH_RED]);
        }
@@ -1618,10 +1758,7 @@ static void stat_dead_node_elim(void *ctx, ir_graph *irg, int start) {
        if (! status->stat_options)
                return;
 
-       if (start)
-               ++status->in_dead_node_elim;
-       else
-               --status->in_dead_node_elim;
+       status->in_dead_node_elim = (start != 0);
 }  /* stat_dead_node_elim */
 
 /**
@@ -1637,7 +1774,7 @@ static void stat_if_conversion(void *context, ir_graph *irg, ir_node *phi,
        {
                graph_entry_t *graph = graph_get_entry(irg, status->irg_hash);
 
-               cnt_inc(&graph->cnt_if_conv[reason]);
+               cnt_inc(&graph->cnt[gcnt_if_conv + reason]);
        }
        STAT_LEAVE;
 }  /* stat_if_conversion */
@@ -1654,7 +1791,7 @@ static void stat_func_call(void *context, ir_graph *irg, ir_node *call)
        {
                graph_entry_t *graph = graph_get_entry(irg, status->irg_hash);
 
-               cnt_inc(&graph->cnt_real_func_call);
+               cnt_inc(&graph->cnt[gcnt_acc_real_func_call]);
        }
        STAT_LEAVE;
 }  /* stat_func_call */
@@ -1924,6 +2061,9 @@ void stat_dump_snapshot(const char *name, const char *phase)
                if (status->stat_options & FIRMSTAT_COUNT_CONSTS)
                        stat_dump_consts(&status->const_info);
 
+               /* dump the parameter distribution */
+               stat_dump_param_tbl(status->dist_param_cnt, global);
+
                stat_dump_finish();
 
                stat_finish_pattern_history(fname);
@@ -2063,6 +2203,9 @@ void firm_init_stat(unsigned enable_options)
        if (enable_options & FIRMSTAT_COUNT_CONSTS)
                stat_init_const_cnt(status);
 
+       /* distribution table for parameter counts */
+       status->dist_param_cnt = stat_new_int_distrib_tbl();
+
 #undef HOOK
 #undef X
 }  /* firm_init_stat */