X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fana%2Fexecfreq.c;h=84abaf18667126120d813f742822d9d26ec6a1cb;hb=35a87ce18bd20e50e2d6b1b20a3f5476a092fe4f;hp=2e7a136a6333e3e0fe06890502e29a4d997fb32b;hpb=10f7b7f8c08284b58e71642e86b9fbad2bccd5cd;p=libfirm

diff --git a/ir/ana/execfreq.c b/ir/ana/execfreq.c
index 2e7a136a6..84abaf186 100644
--- a/ir/ana/execfreq.c
+++ b/ir/ana/execfreq.c
@@ -61,22 +61,22 @@
 #endif
 
 
-#define EPSILON		     1e-5
+#define EPSILON          1e-5
 #define UNDEF(x)         (fabs(x) < EPSILON)
 #define SEIDEL_TOLERANCE 1e-7
 
 #define MAX_INT_FREQ 1000000
 
-#define set_foreach(s,i) for((i)=set_first((s)); (i); (i)=set_next((s)))
+#define set_foreach(s,type,i) for ((i)=(type)set_first((s)); (i); (i)=(type)set_next((s)))
 
-typedef struct _freq_t {
+typedef struct freq_t {
 	const ir_node    *irn;
 	int               idx;
 	double            freq;
 } freq_t;
 
 struct ir_exec_freq {
-	set *set;
+	set *freqs;
 	hook_entry_t hook;
 	double max;
 	double min_non_zero;
@@ -84,41 +84,36 @@ struct ir_exec_freq {
 	unsigned infeasible : 1;
 };
 
-static int
-cmp_freq(const void *a, const void *b, size_t size)
+static int cmp_freq(const void *a, const void *b, size_t size)
 {
-	const freq_t *p = a;
-	const freq_t *q = b;
+	const freq_t *p = (const freq_t*) a;
+	const freq_t *q = (const freq_t*) b;
 	(void) size;
 
 	return !(p->irn == q->irn);
 }
 
-static freq_t *
-set_find_freq(set * set, const ir_node * irn)
+static freq_t *set_find_freq(set *freqs, const ir_node *irn)
 {
-	freq_t     query;
-
+	freq_t query;
 	query.irn = irn;
-	return set_find(set, &query, sizeof(query), HASH_PTR(irn));
+	return (freq_t*) set_find(freqs, &query, sizeof(query), HASH_PTR(irn));
 }
 
-static freq_t *
-set_insert_freq(set * set, const ir_node * irn)
+static freq_t *set_insert_freq(set *freqs, const ir_node *irn)
 {
 	freq_t query;
 
 	query.irn = irn;
 	query.freq = 0.0;
 	query.idx  = -1;
-	return set_insert(set, &query, sizeof(query), HASH_PTR(irn));
+	return (freq_t*) set_insert(freqs, &query, sizeof(query), HASH_PTR(irn));
 }
 
-double
-get_block_execfreq(const ir_exec_freq *ef, const ir_node * irn)
+double get_block_execfreq(const ir_exec_freq *ef, const ir_node *irn)
 {
-	if(!ef->infeasible) {
-		set *freqs = ef->set;
+	if (!ef->infeasible) {
+		set *freqs = ef->freqs;
 		freq_t *freq;
 		assert(is_Block(irn));
 		freq = set_find_freq(freqs, irn);
@@ -139,8 +134,7 @@ get_block_execfreq_ulong(const ir_exec_freq *ef, const ir_node *bb)
 	return res;
 }
 
-static double *
-solve_lgs(gs_matrix_t *mat, double *x, int size)
+static double *solve_lgs(gs_matrix_t *mat, double *x, int size)
 {
 	double init = 1.0 / size;
 	double dev;
@@ -155,7 +149,7 @@ solve_lgs(gs_matrix_t *mat, double *x, int size)
 	do {
 		++iter;
 		dev = gs_matrix_gauss_seidel(mat, x, size);
-	} while(fabs(dev) > SEIDEL_TOLERANCE);
+	} while (fabs(dev) > SEIDEL_TOLERANCE);
 	stat_ev_tim_pop("execfreq_seidel_time");
 	stat_ev_dbl("execfreq_seidel_iter", iter);
 
@@ -181,8 +175,7 @@ solve_lgs(gs_matrix_t *mat, double *x, int size)
 /*
  * Determine probability that predecessor pos takes this cf edge.
  */
-static double
-get_cf_probability(ir_node *bb, int pos, double loop_weight)
+static double get_cf_probability(ir_node *bb, int pos, double loop_weight)
 {
 	double           sum = 0.0;
 	double           cur = 1.0;
@@ -224,16 +217,17 @@ get_cf_probability(ir_node *bb, int pos, double loop_weight)
 
 static void exec_freq_node_info(void *ctx, FILE *f, const ir_node *irn)
 {
-	if(is_Block(irn)) {
-		ir_exec_freq *ef = ctx;
-		fprintf(f, "execution frequency: %g/%lu\n", get_block_execfreq(ef, irn), get_block_execfreq_ulong(ef, irn));
-	}
+	ir_exec_freq *ef = (ir_exec_freq*) ctx;
+	if (!is_Block(irn))
+		return;
+
+	fprintf(f, "execution frequency: %g/%lu\n", get_block_execfreq(ef, irn), get_block_execfreq_ulong(ef, irn));
 }
 
 ir_exec_freq *create_execfreq(ir_graph *irg)
 {
 	ir_exec_freq *execfreq = XMALLOCZ(ir_exec_freq);
-	execfreq->set = new_set(cmp_freq, 32);
+	execfreq->freqs = new_set(cmp_freq, 32);
 
 	memset(&execfreq->hook, 0, sizeof(execfreq->hook));
 
@@ -250,18 +244,17 @@ ir_exec_freq *create_execfreq(ir_graph *irg)
 
 void set_execfreq(ir_exec_freq *execfreq, const ir_node *block, double freq)
 {
-	freq_t *f = set_insert_freq(execfreq->set, block);
+	freq_t *f = set_insert_freq(execfreq->freqs, block);
 	f->freq = freq;
 }
 
 static void collect_blocks(ir_node *bl, void *data)
 {
-	set *freqs = data;
+	set *freqs = (set*) data;
 	set_insert_freq(freqs, bl);
 }
 
-ir_exec_freq *
-compute_execfreq(ir_graph * irg, double loop_weight)
+ir_exec_freq *compute_execfreq(ir_graph *irg, double loop_weight)
 {
 	gs_matrix_t  *mat;
 	int           size;
@@ -284,7 +277,7 @@ compute_execfreq(ir_graph * irg, double loop_weight)
 	dfs = dfs_new(&absgraph_irg_cfg_succ, irg);
 	ef = XMALLOCZ(ir_exec_freq);
 	ef->min_non_zero = HUGE_VAL; /* initialize with a reasonable large number. */
-	freqs = ef->set = new_set(cmp_freq, dfs_get_n_nodes(dfs));
+	freqs = ef->freqs = new_set(cmp_freq, dfs_get_n_nodes(dfs));
 
 	/*
 	 * Populate the exec freq set.
@@ -302,14 +295,13 @@ compute_execfreq(ir_graph * irg, double loop_weight)
 
 	for (idx = dfs_get_n_nodes(dfs) - 1; idx >= 0; --idx) {
 		ir_node *bb = (ir_node *) dfs_get_post_num_node(dfs, size - idx - 1);
-		freq_t *freq;
 		int i;
 
 		freq = set_insert_freq(freqs, bb);
 		freq->idx = idx;
 
 		/* Sum of (execution frequency of predecessor * probability of cf edge) ... */
-		for(i = get_Block_n_cfgpreds(bb) - 1; i >= 0; --i) {
+		for (i = get_Block_n_cfgpreds(bb) - 1; i >= 0; --i) {
 			ir_node *pred = get_Block_cfgpred_block(bb, i);
 			int pred_idx  = size - dfs_get_post_num(dfs, pred) - 1;
 
@@ -360,8 +352,8 @@ compute_execfreq(ir_graph * irg, double loop_weight)
 	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;
+	set_foreach(freqs, freq_t*, freq) {
+		idx = freq->idx;
 
 		/* take abs because it sometimes can be -0 in case of endless loops */
 		freq->freq = fabs(x[idx]) * norm;
@@ -370,7 +362,7 @@ compute_execfreq(ir_graph * irg, double loop_weight)
 		ef->max = MAX(ef->max, freq->freq);
 
 		/* Get the minimum non-zero execution frequency. */
-		if(freq->freq > 0.0)
+		if (freq->freq > 0.0)
 			ef->min_non_zero = MIN(ef->min_non_zero, freq->freq);
 	}
 
@@ -383,24 +375,24 @@ compute_execfreq(ir_graph * irg, double loop_weight)
 		double l1 = 1.0;
 		double h1 = MAX_INT_FREQ;
 
-		double *fs = malloc(set_count(freqs) * sizeof(fs[0]));
+		double *fs = (double*) malloc(set_count(freqs) * sizeof(fs[0]));
 		int i, j, n = 0;
 
-		set_foreach(freqs, freq)
+		set_foreach(freqs, freq_t*, freq)
 			fs[n++] = freq->freq;
 
 		/*
 		 * find the smallest difference of the execution frequencies
 		 * we try to ressolve it with 1 integer.
 		 */
-		for(i = 0; i < n; ++i) {
-			if(fs[i] <= 0.0)
+		for (i = 0; i < n; ++i) {
+			if (fs[i] <= 0.0)
 				continue;
 
-			for(j = i + 1; j < n; ++j) {
+			for (j = i + 1; j < n; ++j) {
 				double diff = fabs(fs[i] - fs[j]);
 
-				if(!UNDEF(diff))
+				if (!UNDEF(diff))
 					smallest_diff = MIN(diff, smallest_diff);
 			}
 		}
@@ -415,7 +407,7 @@ compute_execfreq(ir_graph * irg, double loop_weight)
 		 * if the slope is so high that the largest integer would be larger than MAX_INT_FREQ
 		 * set the largest int freq to that upper limit and recompute the translation function
 		 */
-		if(ef->m * h2 + ef->b > MAX_INT_FREQ) {
+		if (ef->m * h2 + ef->b > MAX_INT_FREQ) {
 			ef->m = (h1 - l1) / (h2 - l2);
 			ef->b = l1 - ef->m * l2;
 		}
@@ -433,10 +425,9 @@ compute_execfreq(ir_graph * irg, double loop_weight)
 	return ef;
 }
 
-void
-free_execfreq(ir_exec_freq *ef)
+void free_execfreq(ir_exec_freq *ef)
 {
-	del_set(ef->set);
+	del_set(ef->freqs);
 	unregister_hook(hook_node_info, &ef->hook);
 	free(ef);
 }