X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbeuses.c;h=e3af917c615e12aa0d870ea33ab996c7ed2a1c22;hb=bd31a5350ce9e110c058b4ad2223d460c9eb5c4e;hp=e2acf1ed1b04ede4fb8f7c0f7b23939800bcd14f;hpb=4d5c3365a58cba59993045a9e08e686d8ae079a7;p=libfirm

diff --git a/ir/be/beuses.c b/ir/be/beuses.c
index e2acf1ed1..e3af917c6 100644
--- a/ir/be/beuses.c
+++ b/ir/be/beuses.c
@@ -18,14 +18,11 @@
  */
 
 /**
- * @file   beuse.c
- * @date   27.06.2005
- * @author Sebastian Hack, Matthias Braun
- *
- * Methods to compute when a value will be used again.
- *
- * Copyright (C) 2005 Universitaet Karlsruhe
- * Released under the GPL
+ * @file
+ * @brief       Methods to compute when a value will be used again.
+ * @author      Sebastian Hack, Matthias Braun
+ * @date        27.06.2005
+ * @version     $Id$
  */
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -53,7 +50,7 @@
 #include "besched_t.h"
 #include "beirgmod.h"
 #include "bearch_t.h"
-#include "beuses_t.h"
+#include "beuses.h"
 #include "benodesets.h"
 
 #define SCAN_INTERBLOCK_USES
@@ -78,6 +75,8 @@ static int cmp_use(const void *a, const void *b, size_t n)
 {
 	const be_use_t *p = a;
 	const be_use_t *q = b;
+	(void) n;
+
 	return !(p->block == q->block && p->node == q->node);
 }
 
@@ -121,7 +120,7 @@ static const be_use_t *get_or_set_use_block(be_uses_t *env,
 	return result;
 }
 
-static int be_is_phi_argument(const be_lv_t *lv, const ir_node *block, const ir_node *def)
+static int be_is_phi_argument(const ir_node *block, const ir_node *def)
 {
 	ir_node *node;
 	ir_node *succ_block = NULL;
@@ -162,18 +161,67 @@ static int be_is_phi_argument(const be_lv_t *lv, const ir_node *block, const ir_
 	return 0;
 }
 
+static INLINE
+unsigned get_step(const ir_node *node)
+{
+	return PTR_TO_INT(get_irn_link(node));
+}
+
 static be_next_use_t get_next_use(be_uses_t *env, ir_node *from,
 								  unsigned from_step, const ir_node *def,
 								  int skip_from_uses)
 {
-	unsigned step = from_step;
-	ir_node *block = get_nodes_block(from);
-	ir_node *node;
+	unsigned  step  = from_step;
+	ir_node  *block = get_nodes_block(from);
+	ir_node  *next_use;
+	ir_node  *node;
+	unsigned  timestep;
+	unsigned  next_use_step;
 	const ir_edge_t *edge;
 
+#if 1
+	assert(skip_from_uses == 0 || skip_from_uses == 1);
+	if(skip_from_uses) {
+		from = sched_next(from);
+	}
+
+	next_use      = NULL;
+	next_use_step = INT_MAX;
+	timestep      = get_step(from);
+	foreach_out_edge(def, edge) {
+		ir_node  *node = get_edge_src_irn(edge);
+		unsigned  node_step;
+
+		if(is_Anchor(node))
+			continue;
+		if(get_nodes_block(node) != block)
+			continue;
+		if(is_Phi(node))
+			continue;
+
+		node_step = get_step(node);
+		if(node_step < timestep)
+			continue;
+		if(node_step < next_use_step) {
+			next_use      = node;
+			next_use_step = node_step;
+		}
+	}
+
+	if(next_use != NULL) {
+		be_next_use_t result;
+		result.time           = next_use_step - timestep + skip_from_uses;
+		result.outermost_loop = get_loop_depth(get_irn_loop(block));
+		return result;
+	}
+
+	node = sched_last(block);
+	step = get_step(node) + 1 + timestep + skip_from_uses;
+
+#else
 	if(skip_from_uses) {
-		step++;
 		from = sched_next(from);
+		++step;
 	}
 
 	sched_foreach_from(from, node) {
@@ -209,28 +257,29 @@ static be_next_use_t get_next_use(be_uses_t *env, ir_node *from,
 
 		step++;
 	}
+#endif
 
-	if(be_is_phi_argument(env->lv, block, def)) {
+	if(be_is_phi_argument(block, def)) {
 		// TODO we really should continue searching the uses of the phi,
 		// as a phi isn't a real use that implies a reload (because we could
 		// easily spill the whole phi)
 
 		be_next_use_t result;
-		result.time = step;
+		result.time           = step;
 		result.outermost_loop = get_loop_depth(get_irn_loop(block));
 		return result;
 	}
 
 #ifdef SCAN_INTERBLOCK_USES
 	{
-	unsigned next_use = USES_INFINITY;
+	unsigned next_use   = USES_INFINITY;
 	int outermost_loop;
 	be_next_use_t result;
-	ir_loop *loop = get_irn_loop(block);
-	int loopdepth = get_loop_depth(loop);
-	int found_visited = 0;
-	int found_use = 0;
-	ir_graph *irg = get_irn_irg(block);
+	ir_loop *loop       = get_irn_loop(block);
+	int loopdepth       = get_loop_depth(loop);
+	int found_visited   = 0;
+	int found_use       = 0;
+	ir_graph *irg       = get_irn_irg(block);
 	ir_node *startblock = get_irg_start_block(irg);
 
 	outermost_loop = loopdepth;
@@ -304,12 +353,34 @@ be_next_use_t be_get_next_use(be_uses_t *env, ir_node *from,
 	return get_next_use(env, from, from_step, def, skip_from_uses);
 }
 
+static
+void set_sched_step_walker(ir_node *block, void *data)
+{
+	ir_node  *node;
+	unsigned step = 0;
+	(void) data;
+
+	sched_foreach(block, node) {
+		set_irn_link(node, INT_TO_PTR(step));
+		if(is_Phi(node))
+			continue;
+		if(is_Proj(node))
+			continue;
+		++step;
+	}
+}
+
 be_uses_t *be_begin_uses(ir_graph *irg, const be_lv_t *lv)
 {
 	be_uses_t *env = xmalloc(sizeof(env[0]));
 
 	edges_assure(irg);
 
+	//set_using_irn_link(irg);
+
+	/* precalculate sched steps */
+	irg_block_walk_graph(irg, set_sched_step_walker, NULL, NULL);
+
 	env->uses = new_set(cmp_use, 512);
 	env->irg = irg;
 	env->lv = lv;
@@ -321,6 +392,7 @@ be_uses_t *be_begin_uses(ir_graph *irg, const be_lv_t *lv)
 
 void be_end_uses(be_uses_t *env)
 {
+	//clear_using_irn_link(env->irg);
 	del_set(env->uses);
 	free(env);
 }