X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeifg.c;h=89b9686ed057aeaf09141da5d10c3da8618f26dd;hb=3bb66ebf95dbb5ddbdedb9065df378121c341717;hp=25f7caf2c54afe9706825775b8599969293430b1;hpb=2621ba4dee69537e8ab2017574f13f87f4d248bd;p=libfirm

diff --git a/ir/be/beifg.c b/ir/be/beifg.c
index 25f7caf2c..89b9686ed 100644
--- a/ir/be/beifg.c
+++ b/ir/be/beifg.c
@@ -17,6 +17,10 @@
 #include <malloc.h>
 #endif
 
+#ifdef __linux__
+#include <malloc.h>
+#endif /* __linux__ */
+
 #ifdef HAVE_ALLOCA_H
 #include <alloca.h>
 #endif
@@ -33,6 +37,7 @@
 #include "irnode_t.h"
 #include "irprintf.h"
 #include "irtools.h"
+#include "irbitset.h"
 #include "beifg_t.h"
 #include "beifg_impl.h"
 #include "irphase.h"
@@ -44,7 +49,7 @@
 
 /** Defines values for the ifg performance test */
 #define BE_CH_PERFORMANCETEST_MIN_NODES (50)
-#define BE_CH_PERFORMANCETEST_COUNT (10)
+#define BE_CH_PERFORMANCETEST_COUNT (500)
 
 typedef struct _coloring_t coloring_t;
 
@@ -271,20 +276,83 @@ static int be_ifg_check_cmp_nodes(const void *a, const void *b)
 	return QSORT_CMP(nr_a, nr_b);
 }
 
-void be_ifg_check_sorted(const be_ifg_t *ifg, FILE *f)
+void be_ifg_check_sorted(const be_ifg_t *ifg)
+{
+	void *iter1 = be_ifg_nodes_iter_alloca(ifg);
+	void *iter2 = be_ifg_neighbours_iter_alloca(ifg);
+
+	ir_node *n, *m;
+	const int node_count = be_ifg_check_get_node_count(ifg);
+	int i = 0;
+
+	ir_node **all_nodes = xmalloc(node_count * sizeof(all_nodes[0]));
+
+	be_ifg_foreach_node(ifg, iter1, n)
+	{
+		if(!node_is_in_irgs_storage(ifg->env->irg, n))
+		{
+			ir_printf("+%F is in ifg but not in the current irg!", n);
+			assert (node_is_in_irgs_storage(ifg->env->irg, n));
+		}
+
+		all_nodes[i] = n;
+		i++;
+	}
+
+	qsort(all_nodes, node_count, sizeof(all_nodes[0]), be_ifg_check_cmp_nodes);
+
+	for (i = 0; i < node_count; i++)
+	{
+		ir_node **neighbours = xmalloc(node_count * sizeof(neighbours[0]));
+		int j = 0;
+		int k = 0;
+		int degree = 0;
+
+		degree = be_ifg_degree(ifg, all_nodes[i]);
+
+		be_ifg_foreach_neighbour(ifg, iter2, all_nodes[i], m)
+		{
+			neighbours[j] = m;
+			j++;
+		}
+
+		qsort(neighbours, j, sizeof(neighbours[0]), be_ifg_check_cmp_nodes);
+
+		ir_printf("%d. %+F's neighbours(%d): ", i+1, all_nodes[i], degree);
+
+		for(k = 0; k < j; k++)
+		{
+			ir_printf("%+F, ", neighbours[k]);
+		}
+
+		ir_printf("\n");
+
+		free(neighbours);
+	}
+
+	free(all_nodes);
+
+}
+
+void be_ifg_check_sorted_to_file(const be_ifg_t *ifg, FILE *f)
 {
 	void *iter1 = be_ifg_nodes_iter_alloca(ifg);
 	void *iter2 = be_ifg_neighbours_iter_alloca(ifg);
 
 	ir_node *n, *m;
 	const int node_count = be_ifg_check_get_node_count(ifg);
-	int neighbours_count = 0;
 	int i = 0;
 
 	ir_node **all_nodes = xmalloc(node_count * sizeof(all_nodes[0]));
 
 	be_ifg_foreach_node(ifg, iter1, n)
 	{
+		if(!node_is_in_irgs_storage(ifg->env->irg, n))
+		{
+			ir_fprintf (f,"+%F is in ifg but not in the current irg!",n);
+			assert (node_is_in_irgs_storage(ifg->env->irg, n));
+		}
+
 		all_nodes[i] = n;
 		i++;
 	}
@@ -308,14 +376,14 @@ void be_ifg_check_sorted(const be_ifg_t *ifg, FILE *f)
 
 		qsort(neighbours, j, sizeof(neighbours[0]), be_ifg_check_cmp_nodes);
 
-		ir_fprintf(f, "%d. %+F's neighbours(%d): ", i+1, all_nodes[i], degree);
+		ir_fprintf (f,"%d. %+F's neighbours(%d): ", i+1, all_nodes[i], degree);
 
 		for(k = 0; k < j; k++)
 		{
-			ir_fprintf(f, "%+F, ", neighbours[k]);
+			ir_fprintf (f,"%+F, ", neighbours[k]);
 		}
 
-		ir_fprintf(f, "\n");
+		ir_fprintf (f,"\n");
 
 		free(neighbours);
 	}
@@ -326,13 +394,11 @@ void be_ifg_check_sorted(const be_ifg_t *ifg, FILE *f)
 
 void be_ifg_check_performance(be_chordal_env_t *chordal_env)
 {
+#ifdef WITH_LIBCORE
 	int tests = BE_CH_PERFORMANCETEST_COUNT;
 	coloring_t coloring;
 
-#ifdef linux
-	struct mallinfo minfo;
-	int used_memory = 0;
-#endif /* linux */
+	int used_memory;
 
 	int i = 0;
 	int rt;
@@ -342,9 +408,8 @@ void be_ifg_check_performance(be_chordal_env_t *chordal_env)
 	lc_timer_t *timer = lc_timer_register("getTime","get Time of copy minimization using the ifg");
 	unsigned long elapsed_usec = 0;
 
-	if ((int) get_irg_estimated_node_cnt >= BE_CH_PERFORMANCETEST_MIN_NODES)
+	if (get_irg_estimated_node_cnt(chordal_env->irg) >= BE_CH_PERFORMANCETEST_MIN_NODES)
 	{
-
 		coloring_init(&coloring, chordal_env->irg, chordal_env->birg->main_env->arch_env);
 		coloring_save(&coloring);
 
@@ -352,10 +417,8 @@ void be_ifg_check_performance(be_chordal_env_t *chordal_env)
 
 		for (i = 0; i<tests; i++) /* performance test with std */
 		{
-#ifdef linux
-			minfo = mallinfo();
-			used_memory = minfo.uordblks;
-#endif /* linux */
+
+			used_memory = lc_get_heap_used_bytes();
 
 			rt = lc_timer_enter_high_priority();
 			lc_timer_start(timer);
@@ -365,10 +428,7 @@ void be_ifg_check_performance(be_chordal_env_t *chordal_env)
 			lc_timer_stop(timer);
 			rt = lc_timer_leave_high_priority();
 
-#ifdef linux
-			minfo = mallinfo();
-			used_memory = minfo.uordblks - used_memory;
-#endif /* linux */
+			used_memory = lc_get_heap_used_bytes() - used_memory;
 
 			coloring_restore(&coloring);
 
@@ -396,24 +456,14 @@ void be_ifg_check_performance(be_chordal_env_t *chordal_env)
 		/* calculating average */
 		elapsed_usec = elapsed_usec / tests;
 
-		ir_printf("\nstd:; %+F; ",current_ir_graph);
-#ifdef linux
-		ir_printf("%u; ", used_memory);
-#endif /* linux */
-		ir_printf("%u; ", elapsed_usec);
+		ir_printf("\nstd:; %+F; %u; %u ",current_ir_graph, used_memory, elapsed_usec);
 
-		i=0;
-#ifdef linux
 		used_memory=0;
-#endif /* linux */
 		elapsed_usec=0;
 
 		for (i = 0; i<tests; i++)  /* performance test with clique */
 		{
-#ifdef linux
-			minfo = mallinfo();
-			used_memory = minfo.uordblks;
-#endif /* linux */
+			used_memory = lc_get_heap_used_bytes();
 
 			rt = lc_timer_enter_high_priority();
 			lc_timer_start(timer);
@@ -423,10 +473,7 @@ void be_ifg_check_performance(be_chordal_env_t *chordal_env)
 			lc_timer_stop(timer);
 			rt = lc_timer_leave_high_priority();
 
-#ifdef linux
-			minfo = mallinfo();
-			used_memory = minfo.uordblks - used_memory;
-#endif /* linux */
+			used_memory = lc_get_heap_used_bytes() - used_memory;
 
 			coloring_restore(&coloring);
 
@@ -454,24 +501,14 @@ void be_ifg_check_performance(be_chordal_env_t *chordal_env)
 		/* calculating average */
 		elapsed_usec = elapsed_usec / tests;
 
-		ir_printf("\nclique:; %+F; ",current_ir_graph);
-#ifdef linux
-		ir_printf("%u; ", used_memory);
-#endif /* linux */
-		ir_printf("%u; ", elapsed_usec);
+		ir_printf("\nclique:; %+F; %u; %u ",current_ir_graph, used_memory, elapsed_usec);
 
-		i=0;
-#ifdef linux
 		used_memory=0;
-#endif /* linux */
 		elapsed_usec=0;
 
 		for (i = 0; i<tests; i++)  /* performance test with list */
 		{
-#ifdef linux
-			minfo = mallinfo();
-			used_memory = minfo.uordblks;
-#endif /* linux */
+			used_memory = lc_get_heap_used_bytes();
 
 			rt = lc_timer_enter_high_priority();
 			lc_timer_start(timer);
@@ -481,10 +518,7 @@ void be_ifg_check_performance(be_chordal_env_t *chordal_env)
 			lc_timer_stop(timer);
 			rt = lc_timer_leave_high_priority();
 
-#ifdef linux
-			minfo = mallinfo();
-			used_memory = minfo.uordblks - used_memory;
-#endif /* linux */
+			used_memory = lc_get_heap_used_bytes() - used_memory;
 
 			coloring_restore(&coloring);
 
@@ -512,24 +546,14 @@ void be_ifg_check_performance(be_chordal_env_t *chordal_env)
 		/* calculating average */
 		elapsed_usec = elapsed_usec / tests;
 
-		ir_printf("\nlist:; %+F; ",current_ir_graph);
-#ifdef linux
-		ir_printf("%u; ", used_memory);
-#endif /* linux */
-		ir_printf("%u; ", elapsed_usec);
+		ir_printf("\nlist:; %+F; %u; %u ",current_ir_graph, used_memory, elapsed_usec);
 
-		i=0;
-#ifdef linux
 		used_memory=0;
-#endif /* linux */
 		elapsed_usec=0;
 
 		for (i = 0; i<tests; i++)  /* performance test with pointer */
 		{
-#ifdef linux
-			minfo = mallinfo();
-			used_memory = minfo.uordblks;
-#endif /* linux */
+			used_memory = lc_get_heap_used_bytes();
 
 			rt = lc_timer_enter_high_priority();
 			lc_timer_start(timer);
@@ -539,10 +563,7 @@ void be_ifg_check_performance(be_chordal_env_t *chordal_env)
 			lc_timer_stop(timer);
 			rt = lc_timer_leave_high_priority();
 
-#ifdef linux
-			minfo = mallinfo();
-			used_memory = minfo.uordblks - used_memory;
-#endif /* linux */
+			used_memory = lc_get_heap_used_bytes() - used_memory;
 
 			coloring_restore(&coloring);
 
@@ -570,20 +591,15 @@ void be_ifg_check_performance(be_chordal_env_t *chordal_env)
 		/* calculating average */
 		elapsed_usec = elapsed_usec / tests;
 
-		ir_printf("\npointer:; %+F; ",current_ir_graph);
-#ifdef linux
-		ir_printf("%u; ", used_memory);
-#endif /* linux */
-		ir_printf("%u; ", elapsed_usec);
+		ir_printf("\npointer:; %+F; %u; %u ",current_ir_graph, used_memory, elapsed_usec);
 
 		i=0;
-#ifdef linux
 		used_memory=0;
-#endif /* linux */
 		elapsed_usec=0;
 	}
 
 	chordal_env->ifg = old_if;
+#endif /* WITH_LIBCORE */
 }
 
 void be_ifg_dump_dot(be_ifg_t *ifg, ir_graph *irg, FILE *file, const be_ifg_dump_dot_cb_t *cb, void *self)
@@ -634,3 +650,23 @@ void be_ifg_dump_dot(be_ifg_t *ifg, ir_graph *irg, FILE *file, const be_ifg_dump
 	fprintf(file, "}\n");
 	bitset_free(nodes);
 }
+
+void be_ifg_stat(const be_ifg_t *ifg, ir_graph *irg, be_ifg_stat_t *stat)
+{
+	void *nodes_it  = be_ifg_nodes_iter_alloca(ifg);
+	void *neigh_it  = be_ifg_neighbours_iter_alloca(ifg);
+	bitset_t *nodes = bitset_irg_malloc(irg);
+
+	ir_node *n, *m;
+
+	memset(stat, 0, sizeof(stat[0]));
+	be_ifg_foreach_node(ifg, nodes_it, n) {
+		stat->n_nodes += 1;
+		be_ifg_foreach_neighbour(ifg, neigh_it, n, m) {
+			bitset_add_irn(nodes, n);
+			stat->n_edges += !bitset_contains_irn(nodes, m);
+		}
+	}
+
+	bitset_free(nodes);
+}