Moved to new lpp library

[libfirm] / ir / be / besched.c

diff --git a/ir/be/besched.c b/ir/be/besched.c
index 4256936..b3c40e7 100644 (file)
--- a/ir/be/besched.c
+++ b/ir/be/besched.c
@@ -1,10 +1,14 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <stdlib.h>
 
 #include "impl.h"
 #include "irprintf.h"
 #include "irgwalk.h"
-#include "irnode.h"
+#include "irnode_t.h"
+#include "iredges_t.h"
 #include "debug.h"
 
 #include "besched_t.h"
@@ -28,9 +32,10 @@ static void block_sched_dumper(ir_node *block, void *env)
        FILE *f = env;
        const ir_node *curr;
 
-       ir_fprintf(f, "%n:\n", block);
+       ir_fprintf(f, "%+F:\n", block);
        sched_foreach(block, curr) {
-               ir_fprintf(f, "\t%n\n", curr);
+    sched_info_t *info = get_irn_sched_info(curr);
+               ir_fprintf(f, "\t%6d: %+F\n", info->time_step, curr);
        }
 }
 
@@ -83,6 +88,11 @@ int sched_verify(const ir_node *block)
   const ir_node *irn;
   int i, n;
   int *save_time_step;
+  const ir_node **save_nodes;
+  const ir_edge_t *edge;
+  pset *scheduled_nodes = pset_new_ptr_default();
+
+  firm_dbg_set_mask(dbg_sched, -1);
 
   /* Count the number of nodes in the schedule. */
   n = 0;
@@ -90,12 +100,15 @@ int sched_verify(const ir_node *block)
     n++;
 
   save_time_step = malloc(n * sizeof(save_time_step[0]));
+  save_nodes = malloc(n * sizeof(save_nodes[0]));
 
   i = 0;
   sched_foreach(block, irn) {
     sched_info_t *info = get_irn_sched_info(irn);
     save_time_step[i] = info->time_step;
+    save_nodes[i] = irn;
     info->time_step = i;
+    pset_insert_ptr(scheduled_nodes, irn);
 
     i += 1;
   }
@@ -111,12 +124,13 @@ int sched_verify(const ir_node *block)
     for(i = 0, n = get_irn_arity(irn); i < n; i++) {
       ir_node *op = get_irn_n(irn, i);
 
-      if(mode_is_datab(get_irn_mode(op))
+      if(to_appear_in_schedule(op)
+          && !is_Phi(irn)
           && get_nodes_block(op) == block
           && sched_get_time_step(op) > step) {
 
           DBG((dbg_sched, LEVEL_DEFAULT,
-                "%n is operand of %n but scheduled after", op, irn));
+                "%+F: %+F is operand of %+F but scheduled after\n", block, op, irn));
           res = 0;
       }
     }
@@ -126,8 +140,9 @@ int sched_verify(const ir_node *block)
   for(i = 1; i < n; ++i) {
     if(save_time_step[i] - save_time_step[i - 1] <= 0) {
       DBG((dbg_sched, LEVEL_DEFAULT,
-            "position %d: time step shrinks (from %d to %d)\n",
-            i, save_time_step[i - 1], save_time_step[i]));
+            "%+F from %+F(%d) -> %+F(%d) step shrinks from %d -> %d\n",
+            block, save_nodes[i - 1], i - 1, save_nodes[i], i,
+            save_time_step[i - 1], save_time_step[i]));
       res = 0;
     }
   }
@@ -139,7 +154,17 @@ int sched_verify(const ir_node *block)
     info->time_step = save_time_step[i++];
   }
 
+  /* Check for all nodes in the block if they are scheduled. */
+  foreach_out_edge(block, edge) {
+    ir_node *irn = get_edge_src_irn(edge);
+    if(to_appear_in_schedule(irn) && !pset_find_ptr(scheduled_nodes, irn))
+      DBG((dbg_sched, LEVEL_DEFAULT,
+            "%+F: %+F is in block but not scheduled\n", block, irn));
+  }
+
+  del_pset(scheduled_nodes);
   free(save_time_step);
+  free(save_nodes);
   return res;
 }