X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fldst2.c;h=d73a8f76aa82e8f7620cdde3a4075d3ac6a08c0f;hb=1852308bd33b77378f0fca9e5347d4f9082464c4;hp=39124246d64496e86fe8bfc56c687700ce232b1c;hpb=f3e6f325b23d8b25323e491ce2eb675f5f2ba548;p=libfirm

diff --git a/ir/opt/ldst2.c b/ir/opt/ldst2.c
index 39124246d..d73a8f76a 100644
--- a/ir/opt/ldst2.c
+++ b/ir/opt/ldst2.c
@@ -23,13 +23,11 @@
  * @author  Christoph Mallon
  * @version $Id: $
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "iroptimize.h"
 
-#include "array.h"
+#include "array_t.h"
 #include "debug.h"
 #include "ircons.h"
 #include "irgraph.h"
@@ -43,6 +41,7 @@
 #include "irdump.h"
 #include "irflag_t.h"
 #include "irprintf.h"
+#include "irpass.h"
 
 #if +0
 #define OPTIMISE_LOAD_AFTER_LOAD
@@ -157,7 +156,7 @@ static ir_alias_relation AliasTest(ir_graph* irg, ir_node* addr, ir_mode* mode,
 	} else if (is_Store(other)) {
 		other_addr = get_Store_ptr(other);
 	} else {
-		return may_alias;
+		return ir_may_alias;
 	}
 
 	other_mode = get_irn_mode(other);
@@ -165,6 +164,14 @@ static ir_alias_relation AliasTest(ir_graph* irg, ir_node* addr, ir_mode* mode,
 }
 
 
+static int in_cmp(void const* va, void const* vb)
+{
+	ir_node const* const a = *(ir_node const*const*)va;
+	ir_node const* const b = *(ir_node const*const*)vb;
+	return get_irn_idx(a) - get_irn_idx(b);
+}
+
+
 static ir_node* GenerateSync(ir_graph* irg, ir_node* block, ir_nodeset_t* after_set)
 {
 	size_t set_size = ir_nodeset_size(after_set);
@@ -183,6 +190,7 @@ static ir_node* GenerateSync(ir_graph* irg, ir_node* block, ir_nodeset_t* after_
 		for (i = 0; i < set_size; i++) {
 			in[i] = ir_nodeset_iterator_next(&iter);
 		}
+		qsort(in, set_size, sizeof(*in), in_cmp);
 		return new_r_Sync(irg, block, set_size, in);
 	}
 }
@@ -301,7 +309,7 @@ static void PlaceLoad(ir_graph* irg, ir_node* block, ir_node* load, ir_node* mem
 		ir_alias_relation rel = get_alias_relation(irg, addr, mode, other_addr, other_mode);
 
 		DB((dbg, LEVEL_3, "===> Testing for alias between %+F and %+F. Relation is %d\n", addr, other_addr, rel));
-		if (rel == no_alias) {
+		if (rel == ir_no_alias) {
 			continue;
 		}
 		DB((dbg, LEVEL_3, "===> %+F potentially aliases address %+F\n", load, other_addr));
@@ -332,14 +340,14 @@ static void PlaceStore(ir_graph* irg, ir_node* block, ir_node* store, ir_node* m
 		ir_node* other_node;
 
 		DB((dbg, LEVEL_3, "===> Testing for alias between %+F and %+F. Relation is %d\n", addr, other_addr, rel));
-		if (rel == no_alias) {
+		if (rel == ir_no_alias) {
 			continue;
 		}
 		DB((dbg, LEVEL_3, "===> %+F potentially aliases address %+F\n", store, other_addr));
 
 		ir_nodeset_iterator_init(&interfere_iter, &interfere_sets[i]);
 		while ((other_node = ir_nodeset_iterator_next(&interfere_iter)) != NULL) {
-			if (AliasTest(irg, addr, mode, other_node) != no_alias) {
+			if (AliasTest(irg, addr, mode, other_node) != ir_no_alias) {
 				DB((dbg, LEVEL_3, "===> Removing %+F from execute-after set of %+F due to %+F\n", other_node, addrs[i], store));
 				ir_nodeset_remove_iterator(&interfere_sets[i], &interfere_iter);
 			}
@@ -361,7 +369,7 @@ static int WalkMem(ir_graph* irg, ir_node* node, ir_node* last_block)
 	if (block != last_block) {
 		DB((dbg, LEVEL_3, "===> Changing block from %+F to %+F\n", last_block, block));
 		block_change = 1;
-		if (Block_not_block_visited(block)) {
+		if (!Block_block_visited(block)) {
 			mark_Block_block_visited(block);
 		} else {
 			DB((dbg, LEVEL_2, "===> Hit already visited block at %+F\n", node));
@@ -401,7 +409,7 @@ static int WalkMem(ir_graph* irg, ir_node* node, ir_node* last_block)
 				ir_node* unknown;
 
 				DB((dbg, LEVEL_3, "===> The predecessor was not finished yet\n"));
-				assert(!Block_not_block_visited(pred_block));
+				assert(Block_block_visited(pred_block));
 
 				unknown = new_r_Unknown(irg, mode_M);
 				for (i = 0; i < count_addrs; i++) {
@@ -516,7 +524,7 @@ static void Detotalise(ir_graph* irg)
 	size_t npreds = get_Block_n_cfgpreds(end_block);
 	size_t i;
 
-	unfinished_phis = xmalloc(sizeof(*unfinished_phis) * count_addrs);
+	unfinished_phis = XMALLOCN(ir_node, count_addrs);
 	for (i = 0; i < count_addrs; i++) {
 		unfinished_phis[i] = NULL;
 	}
@@ -534,6 +542,7 @@ static void Detotalise(ir_graph* irg)
 #endif
 
 
+#if 0
 static void AddSyncPreds(ir_nodeset_t* preds, ir_node* sync)
 {
 	size_t n = get_Sync_n_preds(sync);
@@ -549,7 +558,6 @@ static void AddSyncPreds(ir_nodeset_t* preds, ir_node* sync)
 	}
 }
 
-#if 0
 static void NormaliseSync(ir_node* node, void* env)
 {
 	ir_nodeset_t preds;
@@ -628,6 +636,10 @@ typedef struct parallelise_info
 
 static void parallelise_load(parallelise_info *pi, ir_node *irn)
 {
+	/* There is no point in investigating the same subgraph twice */
+	if (ir_nodeset_contains(&pi->user_mem, irn))
+		return;
+
 	//ir_fprintf(stderr, "considering %+F\n", irn);
 	if (get_nodes_block(irn) == pi->origin_block) {
 		if (is_Proj(irn)) {
@@ -646,9 +658,9 @@ static void parallelise_load(parallelise_info *pi, ir_node *irn)
 				ir_node *org_ptr    = pi->origin_ptr;
 				ir_mode *store_mode = get_irn_mode(get_Store_value(pred));
 				ir_node *store_ptr  = get_Store_ptr(pred);
-				if (get_alias_relation(current_ir_graph, org_ptr, org_mode, store_ptr, store_mode) == no_alias) {
+				if (get_alias_relation(current_ir_graph, org_ptr, org_mode, store_ptr, store_mode) == ir_no_alias) {
 					ir_node *mem = get_Store_mem(pred);
-					ir_fprintf(stderr, "Ld after St: %+F (%+F) does not alias %+F (%+F)\n", org_ptr, org_mode, store_ptr, store_mode);
+					//ir_fprintf(stderr, "Ld after St: %+F (%+F) does not alias %+F (%+F)\n", org_ptr, org_mode, store_ptr, store_mode);
 					ir_nodeset_insert(&pi->user_mem, irn);
 					//ir_fprintf(stderr, "adding %+F to user set\n", irn);
 					parallelise_load(pi, mem);
@@ -673,6 +685,10 @@ static void parallelise_load(parallelise_info *pi, ir_node *irn)
 
 static void parallelise_store(parallelise_info *pi, ir_node *irn)
 {
+	/* There is no point in investigating the same subgraph twice */
+	if (ir_nodeset_contains(&pi->user_mem, irn))
+		return;
+
 	//ir_fprintf(stderr, "considering %+F\n", irn);
 	if (get_nodes_block(irn) == pi->origin_block) {
 		if (is_Proj(irn)) {
@@ -683,9 +699,9 @@ static void parallelise_store(parallelise_info *pi, ir_node *irn)
 				ir_node *org_ptr   = pi->origin_ptr;
 				ir_mode *load_mode = get_Load_mode(pred);
 				ir_node *load_ptr  = get_Load_ptr(pred);
-				if (get_alias_relation(current_ir_graph, org_ptr, org_mode, load_ptr, load_mode) == no_alias) {
+				if (get_alias_relation(current_ir_graph, org_ptr, org_mode, load_ptr, load_mode) == ir_no_alias) {
 					ir_node *mem = get_Load_mem(pred);
-					ir_fprintf(stderr, "St after Ld: %+F (%+F) does not alias %+F (%+F)\n", org_ptr, org_mode, load_ptr, load_mode);
+					//ir_fprintf(stderr, "St after Ld: %+F (%+F) does not alias %+F (%+F)\n", org_ptr, org_mode, load_ptr, load_mode);
 					ir_nodeset_insert(&pi->user_mem, irn);
 					//ir_fprintf(stderr, "adding %+F to user set\n", irn);
 					parallelise_store(pi, mem);
@@ -697,10 +713,10 @@ static void parallelise_store(parallelise_info *pi, ir_node *irn)
 				ir_node *org_ptr    = pi->origin_ptr;
 				ir_mode *store_mode = get_irn_mode(get_Store_value(pred));
 				ir_node *store_ptr  = get_Store_ptr(pred);
-				if (get_alias_relation(current_ir_graph, org_ptr, org_mode, store_ptr, store_mode) == no_alias) {
+				if (get_alias_relation(current_ir_graph, org_ptr, org_mode, store_ptr, store_mode) == ir_no_alias) {
 					ir_node *mem;
 
-					ir_fprintf(stderr, "St after St: %+F (%+F) does not alias %+F (%+F)\n", org_ptr, org_mode, store_ptr, store_mode);
+					//ir_fprintf(stderr, "St after St: %+F (%+F) does not alias %+F (%+F)\n", org_ptr, org_mode, store_ptr, store_mode);
 					ir_nodeset_insert(&pi->user_mem, irn);
 					//ir_fprintf(stderr, "adding %+F to user set\n", irn);
 					mem = get_Store_mem(pred);
@@ -771,7 +787,7 @@ static void walker(ir_node *proj, void *env)
 	}
 
 	n = ir_nodeset_size(&pi.user_mem);
-	if (n != 0) { /* nothing happend otherwise */
+	if (n != 0) { /* nothing happened otherwise */
 		ir_graph               *irg  = current_ir_graph;
 		ir_node                *sync;
 		ir_node               **in;
@@ -790,11 +806,11 @@ static void walker(ir_node *proj, void *env)
 			in[i++] = p;
 		}
 		assert(i == n);
-		sync = new_r_Sync(irg, block, n, in);
+		sync = new_r_Sync(block, n, in);
 		exchange(proj, sync);
 
 		assert(pn_Load_M == pn_Store_M);
-		proj = new_r_Proj(irg, block, mem_op, mode_M, pn_Load_M);
+		proj = new_r_Proj(block, mem_op, mode_M, pn_Load_M);
 		set_Sync_pred(sync, 0, proj);
 
 		n = ir_nodeset_size(&pi.this_mem);
@@ -811,7 +827,7 @@ static void walker(ir_node *proj, void *env)
 				in[i++] = p;
 			}
 			assert(i == n);
-			sync = new_r_Sync(irg, block, n, in);
+			sync = new_r_Sync(block, n, in);
 		}
 		set_memop_mem(mem_op, sync);
 	}
@@ -821,12 +837,17 @@ static void walker(ir_node *proj, void *env)
 }
 
 
-void opt_ldst2(ir_graph *irg)
+void opt_sync(ir_graph *irg)
 {
-	assure_irg_address_taken_computed(irg);
-	assure_irp_globals_address_taken_computed();
+	//assure_irg_entity_usage_computed(irg);
+	//assure_irp_globals_entity_usage_computed();
 
 	irg_walk_graph(irg, NULL, walker, NULL);
-  //optimize_graph_df(irg);
+	//optimize_graph_df(irg);
 	//irg_walk_graph(irg, NormaliseSync, NULL, NULL);
 }
+
+ir_graph_pass_t *opt_sync_pass(const char *name)
+{
+	return def_graph_pass(name ? name : "opt_sync", opt_sync);
+}