X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fstat%2Ffirmstat.c;h=d78489a834ab1a2742f81d18c193adeb14664b66;hb=7498ed3766f3f98604d96d1b75978a3a9e6768ed;hp=a81af00b8d05806e46f0de8bdb9124efaabadfe5;hpb=0a9a6a5d9e6f4ec5f77a97c38a4d1b01148ac3f0;p=libfirm

diff --git a/ir/stat/firmstat.c b/ir/stat/firmstat.c
index a81af00b8..d78489a83 100644
--- a/ir/stat/firmstat.c
+++ b/ir/stat/firmstat.c
@@ -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-2008 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
@@ -181,6 +195,7 @@ static int opcode_cmp_2(const void *elt, const void *key) {
 static int address_mark_cmp(const void *elt, const void *key, size_t size) {
 	const address_mark_entry_t *e1 = elt;
 	const address_mark_entry_t *e2 = key;
+	(void) size;
 
 	/* compare only the nodes, the rest is used as data container */
 	return e1->node != e2->node;
@@ -228,7 +243,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 +257,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);
@@ -281,7 +288,7 @@ static graph_entry_t *graph_get_entry(ir_graph *irg, hmap_graph_entry_t *hmap)
 {
 	graph_entry_t key;
 	graph_entry_t *elem;
-	int i;
+	size_t i;
 
 	key.irg = irg;
 
@@ -357,11 +364,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 */
 
 /**
@@ -520,6 +526,15 @@ static perm_stat_entry_t *perm_stat_get_entry(struct obstack *obst, ir_node *per
 	return pset_insert(hmap, elem, HASH_PTR(perm));
 }  /* perm_stat_get_entry */
 
+/**
+ * Clear optimizations counter,
+ */
+static void clear_optimization_counter(void)  {
+	int i;
+	for (i = 0; i < FS_OPT_MAX; ++i)
+		cnt_clr(&status->num_opts[i]);
+}
+
 /**
  * Returns the ir_op for an IR-node,
  * handles special cases and return pseudo op codes.
@@ -529,38 +544,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 +624,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 +635,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 +654,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 +688,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 +700,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 +717,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.
@@ -712,11 +771,10 @@ static int cnt_const_args(ir_node *call) {
  */
 static void stat_update_call(ir_node *call, graph_entry_t *graph)
 {
-	ir_node  *block = get_nodes_block(call);
-	ir_node  *ptr = get_Call_ptr(call);
-	entity   *ent = NULL;
-	ir_graph *callee = NULL;
-	int      num_const_args;
+	ir_node   *block = get_nodes_block(call);
+	ir_node   *ptr = get_Call_ptr(call);
+	ir_entity *ent = NULL;
+	ir_graph  *callee = NULL;
 
 	/*
 	 * If the block is bad, the whole subgraph will collapse later
@@ -726,7 +784,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 +801,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 +834,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 */
 
 /**
@@ -788,10 +842,10 @@ static void stat_update_call(ir_node *call, graph_entry_t *graph)
  */
 static void stat_update_call_2(ir_node *call, graph_entry_t *graph)
 {
-	ir_node  *block = get_nodes_block(call);
-	ir_node  *ptr = get_Call_ptr(call);
-	entity   *ent = NULL;
-	ir_graph *callee = NULL;
+	ir_node   *block = get_nodes_block(call);
+	ir_node   *ptr = get_Call_ptr(call);
+	ir_entity *ent = NULL;
+	ir_graph  *callee = NULL;
 
 	/*
 	 * If the block is bad, the whole subgraph will collapse later
@@ -821,6 +875,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 +958,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 +971,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 */
 
 /**
@@ -952,7 +1088,7 @@ static void mark_address_calc(ir_node *node, void *env) {
 	int i, n;
 	unsigned mark_preds = MARK_REF_NON_ADR;
 
-	if (! mode_is_numP(mode))
+	if (! mode_is_data(mode))
 		return;
 
 	if (mode_is_reference(mode)) {
@@ -977,7 +1113,7 @@ static void mark_address_calc(ir_node *node, void *env) {
 		ir_node *pred = get_irn_n(node, i);
 
 		mode = get_irn_op_mode(pred);
-		if (! mode_is_numP(mode))
+		if (! mode_is_data(mode))
 			continue;
 
 		set_adr_mark(graph, pred, get_adr_mark(graph, pred) | mark_preds);
@@ -996,11 +1132,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 +1149,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 +1195,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 +1240,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 */
 
 /**
@@ -1117,6 +1255,7 @@ static void update_graph_stat(graph_entry_t *global, graph_entry_t *graph)
  */
 static void update_graph_stat_2(graph_entry_t *global, graph_entry_t *graph)
 {
+	(void) global;
 	if (graph->is_deleted) {
 		/* deleted, ignore */
 		return;
@@ -1188,6 +1327,30 @@ 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_param_tbl)
+			dumper->dump_param_tbl(dumper, tbl, global);
+	}  /* for */
+}  /* stat_dump_param_tbl */
+
+/**
+ * Dumps the optimization counter
+ */
+static void stat_dump_opt_cnt(const counter_t *tbl, unsigned len) {
+	dumper_t *dumper;
+
+	for (dumper = status->dumper; dumper; dumper = dumper->next) {
+		if (dumper->dump_opt_cnt)
+			dumper->dump_opt_cnt(dumper, tbl, len);
+	}  /* for */
+}  /* stat_dump_opt_cnt */
+
 /**
  * Initialize the dumper.
  */
@@ -1230,7 +1393,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 */
 
@@ -1241,6 +1404,7 @@ ir_op *stat_get_op_from_opcode(opcode code) {
  * @param op   the new IR opcode that was created.
  */
 static void stat_new_ir_op(void *ctx, ir_op *op) {
+	(void) ctx;
 	if (! status->stat_options)
 		return;
 
@@ -1263,6 +1427,8 @@ static void stat_new_ir_op(void *ctx, ir_op *op) {
  * @param op   the IR opcode that is freed
  */
 static void stat_free_ir_op(void *ctx, ir_op *op) {
+	(void) ctx;
+	(void) op;
 	if (! status->stat_options)
 		return;
 
@@ -1280,11 +1446,13 @@ static void stat_free_ir_op(void *ctx, ir_op *op) {
  * @param node  the new IR node that was created
  */
 static void stat_new_node(void *ctx, ir_graph *irg, ir_node *node) {
+	(void) ctx;
+	(void) irg;
 	if (! status->stat_options)
 		return;
 
 	/* do NOT count during dead node elimination */
-	if (status->in_dead_node_elim > 0)
+	if (status->in_dead_node_elim)
 		return;
 
 	STAT_ENTER;
@@ -1313,6 +1481,7 @@ static void stat_new_node(void *ctx, ir_graph *irg, ir_node *node) {
  * @param node  the IR node that will be turned into an ID
  */
 static void stat_turn_into_id(void *ctx, ir_node *node) {
+	(void) ctx;
 	if (! status->stat_options)
 		return;
 
@@ -1342,7 +1511,8 @@ static void stat_turn_into_id(void *ctx, ir_node *node) {
  * @param irg  the new IR graph that was created
  * @param ent  the entity of this graph
  */
-static void stat_new_graph(void *ctx, ir_graph *irg, entity *ent) {
+static void stat_new_graph(void *ctx, ir_graph *irg, ir_entity *ent) {
+	(void) ctx;
 	if (! status->stat_options)
 		return;
 
@@ -1373,6 +1543,7 @@ static void stat_new_graph(void *ctx, ir_graph *irg, entity *ent) {
  * information from being changed, it's "frozen" from now.
  */
 static void stat_free_graph(void *ctx, ir_graph *irg) {
+	(void) ctx;
 	if (! status->stat_options)
 		return;
 
@@ -1401,6 +1572,9 @@ static void stat_free_graph(void *ctx, ir_graph *irg) {
  */
 static void stat_irg_walk(void *ctx, ir_graph *irg, generic_func *pre, generic_func *post)
 {
+	(void) ctx;
+	(void) pre;
+	(void) post;
 	if (! status->stat_options)
 		return;
 
@@ -1408,7 +1582,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 */
@@ -1438,6 +1612,10 @@ static void stat_irg_walk_blkwise(void *ctx, ir_graph *irg, generic_func *pre, g
  */
 static void stat_irg_block_walk(void *ctx, ir_graph *irg, ir_node *node, generic_func *pre, generic_func *post)
 {
+	(void) ctx;
+	(void) node;
+	(void) pre;
+	(void) post;
 	if (! status->stat_options)
 		return;
 
@@ -1445,7 +1623,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 */
@@ -1475,6 +1653,7 @@ static void stat_merge_nodes(
     ir_node **old_node_array, int old_num_entries,
     hook_opt_kind opt)
 {
+	(void) ctx;
 	if (! status->stat_options)
 		return;
 
@@ -1483,29 +1662,30 @@ static void stat_merge_nodes(
 		int i, j;
 		graph_entry_t *graph = graph_get_entry(current_ir_graph, status->irg_hash);
 
+		cnt_inc(&status->num_opts[opt]);
 		if (status->reassoc_run)
 			opt = HOOK_OPT_REASSOC;
 
 		for (i = 0; i < old_num_entries; ++i) {
+			/* nodes might be in new and old, so if we found a node
+			   in both sets, this one  is NOT removed */
 			for (j = 0; j < new_num_entries; ++j) {
 				if (old_node_array[i] == new_node_array[j])
 					break;
+			}  /* for */
+			if (j >= new_num_entries) {
+				int xopt = opt;
 
-				/* nodes might be in new and old, these are NOT removed */
-				if (j >= new_num_entries) {
-					int xopt = opt;
-
-					/* sometimes we did not detect, that it is replaced by a Const */
-					if (opt == HOOK_OPT_CONFIRM && new_num_entries == 1) {
-						ir_op *op = get_irn_op(new_node_array[0]);
-
-						if (op == op_Const || op == op_SymConst)
-							xopt = HOOK_OPT_CONFIRM_C;
-					}  /* if */
+				/* sometimes we did not detect, that it is replaced by a Const */
+				if (opt == HOOK_OPT_CONFIRM && new_num_entries == 1) {
+					ir_op *op = get_irn_op(new_node_array[0]);
 
-					removed_due_opt(old_node_array[i], graph->opt_hash[xopt]);
+					if (op == op_Const || op == op_SymConst)
+						xopt = HOOK_OPT_CONFIRM_C;
 				}  /* if */
-			}  /* for */
+
+				removed_due_opt(old_node_array[i], graph->opt_hash[xopt]);
+			}  /* if */
 		}  /* for */
 	}
 	STAT_LEAVE;
@@ -1518,6 +1698,7 @@ static void stat_merge_nodes(
  * @param flag  if non-zero, reassociation is started else stopped
  */
 static void stat_reassociate(void *ctx, int flag) {
+	(void) ctx;
 	if (! status->stat_options)
 		return;
 
@@ -1535,6 +1716,7 @@ static void stat_reassociate(void *ctx, int flag) {
  * @param node the IR node that will be lowered
  */
 static void stat_lower(void *ctx, ir_node *node) {
+	(void) ctx;
 	if (! status->stat_options)
 		return;
 
@@ -1557,6 +1739,7 @@ static void stat_lower(void *ctx, ir_node *node) {
  */
 static void stat_inline(void *ctx, ir_node *call, ir_graph *called_irg)
 {
+	(void) ctx;
 	if (! status->stat_options)
 		return;
 
@@ -1566,8 +1749,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 */
@@ -1578,6 +1761,7 @@ static void stat_inline(void *ctx, ir_node *call, ir_graph *called_irg)
  * @param ctx  the hook context
  */
 static void stat_tail_rec(void *ctx, ir_graph *irg, int n_calls) {
+	(void) ctx;
 	if (! status->stat_options)
 		return;
 
@@ -1596,13 +1780,14 @@ static void stat_tail_rec(void *ctx, ir_graph *irg, int n_calls) {
  * @param ctx  the hook context
  */
 static void stat_strength_red(void *ctx, ir_graph *irg, ir_node *strong) {
+	(void) ctx;
 	if (! status->stat_options)
 		return;
 
 	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]);
 	}
@@ -1615,13 +1800,12 @@ static void stat_strength_red(void *ctx, ir_graph *irg, ir_node *strong) {
  * @param ctx  the hook context
  */
 static void stat_dead_node_elim(void *ctx, ir_graph *irg, int start) {
+	(void) ctx;
+	(void) irg;
 	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 */
 
 /**
@@ -1630,6 +1814,10 @@ static void stat_dead_node_elim(void *ctx, ir_graph *irg, int start) {
 static void stat_if_conversion(void *context, ir_graph *irg, ir_node *phi,
                                int pos, ir_node *mux, if_result_t reason)
 {
+	(void) context;
+	(void) phi;
+	(void) pos;
+	(void) mux;
 	if (! status->stat_options)
 		return;
 
@@ -1637,7 +1825,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 */
@@ -1647,6 +1835,8 @@ static void stat_if_conversion(void *context, ir_graph *irg, ir_node *phi,
  */
 static void stat_func_call(void *context, ir_graph *irg, ir_node *call)
 {
+	(void) context;
+	(void) call;
 	if (! status->stat_options)
 		return;
 
@@ -1654,7 +1844,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 */
@@ -1665,6 +1855,7 @@ static void stat_func_call(void *context, ir_graph *irg, ir_node *call)
  * @param ctx  the hook context
  */
 static void stat_arch_dep_replace_mul_with_shifts(void *ctx, ir_node *mul) {
+	(void) ctx;
 	if (! status->stat_options)
 		return;
 
@@ -1683,6 +1874,7 @@ static void stat_arch_dep_replace_mul_with_shifts(void *ctx, ir_node *mul) {
  * @param node  the division node that will be optimized
  */
 static void stat_arch_dep_replace_division_by_const(void *ctx, ir_node *node) {
+	(void) ctx;
 	if (! status->stat_options)
 		return;
 
@@ -1864,7 +2056,7 @@ void stat_dump_snapshot(const char *name, const char *phase)
 			++p;
 			l = p - name;
 
-			if (l > sizeof(fname) - 1)
+			if (l > (int) (sizeof(fname) - 1))
 				l = sizeof(fname) - 1;
 
 			memcpy(fname, name, l);
@@ -1924,6 +2116,13 @@ 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);
+
+		/* dump the optimization counter and clear them */
+		stat_dump_opt_cnt(status->num_opts, ARR_SIZE(status->num_opts));
+		clear_optimization_counter();
+
 		stat_dump_finish();
 
 		stat_finish_pattern_history(fname);
@@ -2063,6 +2262,11 @@ 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();
+
+	clear_optimization_counter();
+
 #undef HOOK
 #undef X
 }  /* firm_init_stat */