X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeifg.c;h=4ce136dbb23850eeea431269d02a2048b4ef6ccd;hb=4a9b94f493b9f161050b2ad406e4c22ea6c81cd5;hp=5dfd03ba020152e5acb323aa4fe18756002e8f43;hpb=8c06ce682c2d3b9c122bb2acf7f01f9032f697fa;p=libfirm

diff --git a/ir/be/beifg.c b/ir/be/beifg.c
index 5dfd03ba0..4ce136dbb 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
@@ -44,7 +48,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;
 
@@ -330,15 +334,71 @@ void be_ifg_check_sorted(const be_ifg_t *ifg)
 
 }
 
+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++;
+	}
+
+	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_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,"\n");
+
+		free(neighbours);
+	}
+
+	free(all_nodes);
+
+}
+
 void be_ifg_check_performance(be_chordal_env_t *chordal_env)
 {
 	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;
@@ -350,7 +410,6 @@ void be_ifg_check_performance(be_chordal_env_t *chordal_env)
 
 	if ((int) get_irg_estimated_node_cnt >= BE_CH_PERFORMANCETEST_MIN_NODES)
 	{
-
 		coloring_init(&coloring, chordal_env->irg, chordal_env->birg->main_env->arch_env);
 		coloring_save(&coloring);
 
@@ -358,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);
@@ -371,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);
 
@@ -402,24 +456,15 @@ 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);
@@ -429,10 +474,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);
 
@@ -460,24 +502,15 @@ 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);
@@ -487,10 +520,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);
 
@@ -518,24 +548,15 @@ 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);
@@ -545,10 +566,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);
 
@@ -576,16 +594,10 @@ 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;
 	}