warning fix

[libfirm] / ir / be / beifg.c

diff --git a/ir/be/beifg.c b/ir/be/beifg.c
index 75e3405..89b9686 100644 (file)
--- a/ir/be/beifg.c
+++ b/ir/be/beifg.c
@@ -37,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"
@@ -282,7 +283,6 @@ void be_ifg_check_sorted(const be_ifg_t *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]));
@@ -291,7 +291,7 @@ void be_ifg_check_sorted(const be_ifg_t *ifg)
        {
                if(!node_is_in_irgs_storage(ifg->env->irg, n))
                {
-                       printf ("+%F is in ifg but not in the current 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));
                }
 
@@ -334,8 +334,67 @@ 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 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)
 {
+#ifdef WITH_LIBCORE
        int tests = BE_CH_PERFORMANCETEST_COUNT;
        coloring_t coloring;
 
@@ -349,7 +408,7 @@ 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);
@@ -399,7 +458,6 @@ void be_ifg_check_performance(be_chordal_env_t *chordal_env)
 
                ir_printf("\nstd:; %+F; %u; %u ",current_ir_graph, used_memory, elapsed_usec);
 
-               i=0;
                used_memory=0;
                elapsed_usec=0;
 
@@ -445,7 +503,6 @@ void be_ifg_check_performance(be_chordal_env_t *chordal_env)
 
                ir_printf("\nclique:; %+F; %u; %u ",current_ir_graph, used_memory, elapsed_usec);
 
-               i=0;
                used_memory=0;
                elapsed_usec=0;
 
@@ -491,7 +548,6 @@ void be_ifg_check_performance(be_chordal_env_t *chordal_env)
 
                ir_printf("\nlist:; %+F; %u; %u ",current_ir_graph, used_memory, elapsed_usec);
 
-               i=0;
                used_memory=0;
                elapsed_usec=0;
 
@@ -543,6 +599,7 @@ void be_ifg_check_performance(be_chordal_env_t *chordal_env)
        }
 
        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)
@@ -593,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);
+}