X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Fexecfreq.c;h=c2f1c7cf5bfe175cf456b519670d7facb3b6a915;hb=7e8388fa7996ff182d3aa4e0cdd41b27bed4982f;hp=ff9ef3eff28ca2d84112cb6fe2539a208ea74232;hpb=3244e5da5a8ba71d7b43958b5dad1f938b262265;p=libfirm

diff --git a/ir/ana/execfreq.c b/ir/ana/execfreq.c
index ff9ef3eff..c2f1c7cf5 100644
--- a/ir/ana/execfreq.c
+++ b/ir/ana/execfreq.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2007 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -112,6 +112,7 @@ set_insert_freq(set * set, const ir_node * irn)
 
 	query.irn = irn;
 	query.freq = 0.0;
+	query.idx  = -1;
 	return set_insert(set, &query, sizeof(query), HASH_PTR(irn));
 }
 
@@ -231,6 +232,12 @@ void set_execfreq(ir_exec_freq *execfreq, const ir_node *block, double freq)
 	f->freq = freq;
 }
 
+static void collect_blocks(ir_node *bl, void *data)
+{
+	set *freqs = data;
+	set_insert_freq(freqs, bl);
+}
+
 ir_exec_freq *
 compute_execfreq(ir_graph * irg, double loop_weight)
 {
@@ -254,7 +261,14 @@ compute_execfreq(ir_graph * irg, double loop_weight)
 	ef = xmalloc(sizeof(ef[0]));
 	memset(ef, 0, sizeof(ef[0]));
 	ef->min_non_zero = HUGE_VAL; /* initialize with a reasonable large number. */
-	freqs = ef->set = new_set(cmp_freq, 32);
+	freqs = ef->set = new_set(cmp_freq, dfs_get_n_nodes(dfs));
+
+	/*
+	 * Populate the exec freq set.
+	 * The DFS cannot be used alone, since the CFG might not be connected
+	 * due to unreachable code.
+	 */
+	irg_block_walk_graph(irg, collect_blocks, NULL, freqs);
 
 	construct_cf_backedges(irg);
 	/* TODO: edges are corrupt for EDGE_KIND_BLOCK after the local optimize
@@ -291,7 +305,8 @@ compute_execfreq(ir_graph * irg, double loop_weight)
 	 */
 	s = set_find_freq(freqs, get_irg_start_block(irg));
 	e = set_find_freq(freqs, get_irg_end_block(irg));
-	gs_matrix_set(mat, s->idx, e->idx, 1.0);
+	if (e->idx >= 0)
+		gs_matrix_set(mat, s->idx, e->idx, 1.0);
 
 	/* solve the system and delete the matrix */
 	solve_lgs(mat, x, size);
@@ -301,16 +316,14 @@ compute_execfreq(ir_graph * irg, double loop_weight)
 	 * compute the normalization factor.
 	 * 1.0 / exec freq of start block.
 	 */
-	assert(x[s->idx] > 0.0);
-	norm = 1.0 / x[s->idx];
+	norm = x[s->idx] != 0.0 ? 1.0 / x[s->idx] : 1.0;
 
 	ef->max = 0.0;
 	set_foreach(freqs, freq) {
 		int idx = freq->idx;
 
-		/* freq->freq = UNDEF(x[idx]) ? EPSILON : x[idx]; */
-		/* TODO: Do we need the check for zero? */
-		freq->freq = x[idx] * norm;
+		/* take abs because it sometimes can be -0 in case of endless loops */
+		freq->freq = fabs(x[idx]) * norm;
 
 		/* get the maximum exec freq */
 		ef->max = MAX(ef->max, freq->freq);