X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbesched.c;h=d8c03c716584907f9c9b632642e4d39ab49e6d91;hb=6e3e499d6c68aee0c6a9ada6a99f16c4f6f8445b;hp=dd649e3a07d25386edaadc59ac52ed165135c919;hpb=fd36bead18e3a2d5d6d5b9129c15c1c959e8c8a7;p=libfirm

diff --git a/ir/be/besched.c b/ir/be/besched.c
index dd649e3a0..d8c03c716 100644
--- a/ir/be/besched.c
+++ b/ir/be/besched.c
@@ -1,13 +1,16 @@
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+# include "config.h"
 #endif
 
-#include <stdlib.h>
+#ifdef HAVE_STDLIB_H
+# include <stdlib.h>
+#endif
 
 #include "impl.h"
 #include "irprintf.h"
 #include "irgwalk.h"
 #include "irnode_t.h"
+#include "irgraph_t.h"
 #include "iredges_t.h"
 #include "debug.h"
 
@@ -25,6 +28,7 @@ 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_IMPL2(sched_comes_after, int, const ir_node *, const ir_node *)
 FIRM_IMPL1_VOID(sched_remove, ir_node *)
 
 size_t sched_irn_data_offset = 0;
@@ -41,32 +45,15 @@ static void block_sched_dumper(ir_node *block, void *env)
 	}
 }
 
-void be_sched_dump(FILE *f, const ir_graph *irg)
+void be_sched_dump(FILE *f, ir_graph *irg)
 {
-	irg_block_walk_graph((ir_graph *) irg, block_sched_dumper, NULL, f);
+	irg_block_walk_graph(irg, block_sched_dumper, NULL, f);
 }
 
+/* Init the scheduling stuff. */
 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);
 }
 
 void sched_renumber(const ir_node *block)
@@ -82,10 +69,9 @@ void sched_renumber(const ir_node *block)
   }
 }
 
-
+/* Verify a schedule. */
 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;
@@ -93,6 +79,7 @@ int sched_verify(const ir_node *block)
   const ir_node **save_nodes;
   const ir_edge_t *edge;
   pset *scheduled_nodes = pset_new_ptr_default();
+  FIRM_DBG_REGISTER(firm_dbg_module_t *dbg_sched, "firm.be.sched");
 
   firm_dbg_set_mask(dbg_sched, -1);
 
@@ -104,14 +91,14 @@ int sched_verify(const ir_node *block)
   if(n <= 0)
     return 1;
 
-  save_time_step = malloc(n * sizeof(save_time_step[0]));
-  save_nodes = malloc(n * sizeof(save_nodes[0]));
+  save_time_step = xmalloc(n * sizeof(save_time_step[0]));
+  save_nodes = xmalloc(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;
+    save_nodes[i] = (ir_node *)irn;
     info->time_step = i;
     pset_insert_ptr(scheduled_nodes, irn);
 
@@ -169,16 +156,20 @@ int sched_verify(const ir_node *block)
 
   del_pset(scheduled_nodes);
   free(save_time_step);
-  free(save_nodes);
+  free((void *) save_nodes);
   return res;
 }
 
-static void sched_verify_walker(ir_node *irn, void *data)
+/**
+ * Block-Walker: verify the current block and update the status
+ */
+static void sched_verify_walker(ir_node *block, void *data)
 {
   int *res = data;
-  *res &= sched_verify(irn);
+  *res &= sched_verify(block);
 }
 
+/* Verify the schedules in all blocks of the irg. */
 int sched_verify_irg(ir_graph *irg)
 {
   int res = 1;
@@ -196,13 +187,74 @@ 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)
+/* Skip nodes in a schedule. */
+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;
+	const ir_node *bl = get_block(from);
+	ir_node *curr;
+
+	if (is_Block(from))
+		from = forward ? sched_next(from) : sched_prev(from);
+
+	for(curr = from; curr != bl && predicator(curr, data); curr = forward ? sched_next(curr) : sched_prev(curr));
+
+	return curr;
+}
 
-  for(curr = from; curr != bl && predicator(curr, data);
-      curr = forward ? sched_next(curr) : sched_prev(curr));
-  return curr;
+/** A simple forward single linked list. */
+typedef struct {
+	ir_node *start;   /**< start of the list */
+	ir_node *end;     /**< last block in the list */
+	unsigned n_blks;  /**< number of blocks in the list */
+} anchor;
+
+/**
+ * Ext-Block walker: create a block schedule
+ */
+static void create_block_list(ir_extblk *blk, void *env) {
+	anchor *list = env;
+	int i, n;
+
+	for (i = 0, n = get_extbb_n_blocks(blk); i < n; ++i) {
+		ir_node *block = get_extbb_block(blk, i);
+
+		set_irn_link(block, NULL);
+		if (list->start)
+			set_irn_link(list->end, block);
+		else
+			list->start = block;
+
+		list->end = block;
+		++list->n_blks;
+	}
+}
+
+/*
+ * Calculates a block schedule. The schedule is stored as a linked
+ * list starting at the start_block of the irg.
+ */
+ir_node **sched_create_block_schedule(ir_graph *irg)
+{
+	anchor list;
+	ir_node **blk_list, *b, *n;
+	unsigned i;
+
+	/* schedule extended basic blocks */
+	compute_extbb(irg);
+
+	list.start  = NULL;
+	list.end    = NULL;
+	list.n_blks = 0;
+	irg_extblock_walk_graph(irg, NULL, create_block_list, &list);
+
+	/** create an array, so we can go forward and backward */
+	blk_list = NEW_ARR_D(ir_node *, irg->obst,list.n_blks);
+
+	for (i = 0, b = list.start; b; b = n, ++i) {
+		n = get_irn_link(b);
+		set_irn_link(b, INT_TO_PTR(i));
+
+		blk_list[i] = b;
+	}
+	return blk_list;
 }