X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbesched.c;h=add6428708c8a3d76782d689fc43bf2dfd5d95e1;hb=071b81998b17c006621e299c51aafd7ffc19f27a;hp=ae2f9f43dcf54111275b9351b485bc5ccb8b3dc6;hpb=10f8d2d5dd9f9fef27212b9bdad08e122803c46f;p=libfirm

diff --git a/ir/be/besched.c b/ir/be/besched.c
index ae2f9f43d..add642870 100644
--- a/ir/be/besched.c
+++ b/ir/be/besched.c
@@ -1,20 +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;
 
@@ -23,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);
 	}
 }
 
@@ -37,21 +49,148 @@ 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)
+void sched_renumber(const ir_node *block)
 {
-	int i, n;
-	struct obstack obst;
+  ir_node *irn;
+  sched_info_t *inf;
+  sched_timestep_t step = 0;
 
-	obstack_init(&obst);
+  sched_foreach(block, irn) {
+    inf = get_irn_sched_info(irn);
+    inf->time_step = step;
+    step += SCHED_INITIAL_GRANULARITY;
+  }
+}
 
-	for(i = 0, n = get_irp_n_irgs(); i < n; ++i) {
-		ir_graph *irg = get_irp_irg(i);
 
-		list_sched(irg, trivial_selector, NULL);
-		be_sched_dump(stdout, irg);
-	}
+int sched_verify(const ir_node *block)
+{
+  firm_dbg_module_t *dbg_sched = firm_dbg_register("be.sched");
+  int res = 1;
+  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;
+  }
+
+  /*
+   * Check if each relevant operand of a node is scheduled before
+   * the node itself.
+   */
+  sched_foreach(block, irn) {
+    int i, n;
+    int step = sched_get_time_step(irn);
+
+    for(i = 0, n = get_irn_arity(irn); i < n; i++) {
+      ir_node *op = get_irn_n(irn, i);
+
+      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,
+                "%+F: %+F is operand of %+F but scheduled after\n", block, op, irn));
+          res = 0;
+      }
+    }
+  }
+
+  /* Check, if the time steps are correct */
+  for(i = 1; i < n; ++i) {
+    if(save_time_step[i] - save_time_step[i - 1] <= 0) {
+      DBG((dbg_sched, LEVEL_DEFAULT,
+            "%+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;
+    }
+  }
+
+  /* Restore the old time steps */
+  i = 0;
+  sched_foreach(block, irn) {
+    sched_info_t *info = get_irn_sched_info(irn);
+    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;
+}
+
+static void sched_verify_walker(ir_node *irn, void *data)
+{
+  int *res = data;
+  *res &= sched_verify(irn);
+}
+
+int sched_verify_irg(ir_graph *irg)
+{
+  int res = 1;
+  irg_block_walk_graph(irg, sched_verify_walker, NULL, &res);
+
+  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;
 
-	obstack_free(&obst, NULL);
+  for(curr = from; curr != bl && predicator(curr, data);
+      curr = forward ? sched_next(curr) : sched_prev(curr));
+  return curr;
 }