X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbesched.c;h=64a2cb7ed57d1ba1d6551f8e5cdfae07967bd853;hb=b73faf4843bf2197d6e205e067f54f7863022b30;hp=a588458457016fbf41ef2259c8a94836b0baff77;hpb=e75b04273cb928f5a2dfd63326b147c7a26857da;p=libfirm

diff --git a/ir/be/besched.c b/ir/be/besched.c
index a58845845..64a2cb7ed 100644
--- a/ir/be/besched.c
+++ b/ir/be/besched.c
@@ -1,3 +1,5 @@
+/* $Id$ */
+
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
@@ -12,8 +14,11 @@
 #include "irnode_t.h"
 #include "irgraph_t.h"
 #include "iredges_t.h"
+#include "ircons.h"
+#include "irextbb.h"
 #include "debug.h"
 
+#include "bemodule.h"
 #include "bearch.h"
 #include "besched_t.h"
 #include "beutil.h"
@@ -28,6 +33,8 @@ 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_init_block, ir_node *)
+FIRM_IMPL1_VOID(sched_reset, ir_node *)
 FIRM_IMPL2(sched_comes_after, int, const ir_node *, const ir_node *)
 FIRM_IMPL1_VOID(sched_remove, ir_node *)
 
@@ -51,16 +58,18 @@ void be_sched_dump(FILE *f, ir_graph *irg)
 }
 
 /* Init the scheduling stuff. */
-void be_sched_init(void)
+void be_init_sched(void)
 {
 	sched_irn_data_offset = register_additional_node_data(sizeof(sched_info_t));
 }
 
+BE_REGISTER_MODULE_CONSTRUCTOR(be_init_sched);
+
 void sched_renumber(const ir_node *block)
 {
 	ir_node *irn;
 	sched_info_t *inf;
-	sched_timestep_t step = 0;
+	sched_timestep_t step = SCHED_INITIAL_GRANULARITY;
 
 	sched_foreach(block, irn) {
 		inf = get_irn_sched_info(irn);
@@ -180,7 +189,7 @@ int sched_verify_irg(ir_graph *irg)
 
 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;
+	return arch_irn_class_is(ae, irn, branch);
 }
 
 int sched_skip_phi_predicator(const ir_node *irn, void *data) {
@@ -201,60 +210,50 @@ ir_node *sched_skip(ir_node *from, int forward, sched_predicator_t *predicator,
 	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;
+typedef struct remove_dead_nodes_env_t_ {
+	ir_graph *irg;
+	bitset_t *reachable;
+} remove_dead_nodes_env_t;
 
-		list->end = block;
-		++list->n_blks;
-	}
+static void mark_dead_nodes_walker(ir_node *node, void *data)
+{
+	remove_dead_nodes_env_t *env = (remove_dead_nodes_env_t*) data;
+	bitset_set(env->reachable, get_irn_idx(node));
 }
 
-/*
- * 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)
+static void remove_dead_nodes_walker(ir_node *block, void *data)
 {
-	anchor list;
-	ir_node **blk_list, *b, *n;
-	unsigned i;
+	remove_dead_nodes_env_t *env = (remove_dead_nodes_env_t*) data;
+	ir_node *node, *next;
 
-	/* schedule extended basic blocks */
-	compute_extbb(irg);
+	for(node = sched_first(block); !sched_is_end(node); node = next) {
+		int i, arity;
 
-	list.start  = NULL;
-	list.end    = NULL;
-	list.n_blks = 0;
-	irg_extblock_walk_graph(irg, NULL, create_block_list, &list);
+		// get next node now, as after calling sched_remove it will be invalid
+		next = sched_next(node);
 
-	/** create an array, so we can go forward and backward */
-	blk_list = NEW_ARR_D(ir_node *, irg->obst,list.n_blks);
+		if(bitset_is_set(env->reachable, get_irn_idx(node)))
+			continue;
 
-	for (i = 0, b = list.start; b; b = n, ++i) {
-		n = get_irn_link(b);
-		set_irn_link(b, INT_TO_PTR(i));
+		arity = get_irn_arity(node);
+		for(i = 0; i < arity; ++i)
+			set_irn_n(node, i, new_r_Bad(env->irg));
 
-		blk_list[i] = b;
+		sched_remove(node);
 	}
-	return blk_list;
+}
+
+void be_remove_dead_nodes_from_schedule(ir_graph *irg)
+{
+	remove_dead_nodes_env_t env;
+	env.irg = irg;
+	env.reachable = bitset_alloca(get_irg_last_idx(irg));
+
+	// mark all reachable nodes
+	irg_walk_graph(irg, mark_dead_nodes_walker, NULL, &env);
+
+	// walk schedule and remove non-marked nodes
+	irg_block_walk_graph(irg, remove_dead_nodes_walker, NULL, &env);
 }