X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fldst2.c;h=1bb87dfee925c625ae4cdb6b3e242e0cb2186a72;hb=bb5c6d5ce2e35c4074900017f8c8e1a4935054d0;hp=abe200500f32019e34201d5bbc15548341828010;hpb=7232a53995f06aca715629ee14a0dcb2a07a0ba3;p=libfirm

diff --git a/ir/opt/ldst2.c b/ir/opt/ldst2.c
index abe200500..1bb87dfee 100644
--- a/ir/opt/ldst2.c
+++ b/ir/opt/ldst2.c
@@ -29,7 +29,7 @@
 
 #include "iroptimize.h"
 
-#include "array.h"
+#include "array_t.h"
 #include "debug.h"
 #include "ircons.h"
 #include "irgraph.h"
@@ -165,6 +165,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 +191,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);
 	}
 }
@@ -361,7 +370,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 +410,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 +525,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;
 	}
@@ -628,6 +637,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)) {
@@ -673,6 +686,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)) {
@@ -821,12 +838,12 @@ 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);
 }