fixed some minor bugs

[libfirm] / ir / be / besched.c

diff --git a/ir/be/besched.c b/ir/be/besched.c
index a770749..add6428 100644 (file)
--- a/ir/be/besched.c
+++ b/ir/be/besched.c
@@ -1,25 +1,31 @@
+#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 "bearch.h"
 #include "besched_t.h"
-#include "besched.h"
+#include "beutil.h"
 #include "belistsched.h"
 
 FIRM_IMPL1(sched_get_time_step, int, const ir_node *)
-FIRM_IMPL1(sched_has_succ, int, const ir_node *)
+FIRM_IMPL1(sched_has_next, int, const ir_node *)
 FIRM_IMPL1(sched_has_prev, int, const ir_node *)
-FIRM_IMPL1(sched_succ, ir_node *, const ir_node *)
+FIRM_IMPL1(sched_next, ir_node *, const ir_node *)
 FIRM_IMPL1(sched_prev, ir_node *, const ir_node *)
 FIRM_IMPL1(sched_first, ir_node *, const ir_node *)
 FIRM_IMPL1(sched_last, ir_node *, const ir_node *)
 FIRM_IMPL2(sched_add_after, ir_node *, ir_node *, ir_node *)
 FIRM_IMPL2(sched_add_before, ir_node *, ir_node *, ir_node *)
+FIRM_IMPL1_VOID(sched_remove, ir_node *)
 
 size_t sched_irn_data_offset = 0;
 
@@ -28,9 +34,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);
        }
 }
 
@@ -42,24 +49,7 @@ void be_sched_dump(FILE *f, const ir_graph *irg)
 void be_sched_init(void)
 {
        sched_irn_data_offset = register_additional_node_data(sizeof(sched_info_t));
-  firm_dbg_register("be.sched");
-}
-
-void be_sched_test(void)
-{
-       int i, n;
-       struct obstack obst;
-
-       obstack_init(&obst);
-
-       for(i = 0, n = get_irp_n_irgs(); i < n; ++i) {
-               ir_graph *irg = get_irp_irg(i);
-
-               list_sched(irg, trivial_selector);
-               be_sched_dump(stdout, irg);
-       }
-
-       obstack_free(&obst, NULL);
+       firm_dbg_register("be.sched");
 }
 
 void sched_renumber(const ir_node *block)
@@ -83,19 +73,30 @@ 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;
   sched_foreach(block, irn)
     n++;
 
+  if(n <= 0)
+    return 1;
+
   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] = (ir_node *)irn;
     info->time_step = i;
+    pset_insert_ptr(scheduled_nodes, irn);
 
     i += 1;
   }
@@ -111,12 +112,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 +128,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 +142,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((void *) save_nodes);
   return res;
 }
 
@@ -156,3 +169,28 @@ int sched_verify_irg(ir_graph *irg)
 
   return res;
 }
+
+int (sched_comes_after)(const ir_node *n1, const ir_node *n2)
+{
+       return _sched_comes_after(n1, n2);
+}
+
+int sched_skip_cf_predicator(const ir_node *irn, void *data) {
+  arch_env_t *ae = data;
+  return arch_irn_classify(ae, irn) == arch_irn_class_branch;
+}
+
+int sched_skip_phi_predicator(const ir_node *irn, void *data) {
+       return is_Phi(irn);
+}
+
+extern ir_node *sched_skip(ir_node *from, int forward,
+    sched_predicator_t *predicator, void *data)
+{
+  const ir_node *bl = get_block(from);
+  ir_node *curr;
+
+  for(curr = from; curr != bl && predicator(curr, data);
+      curr = forward ? sched_next(curr) : sched_prev(curr));
+  return curr;
+}