X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fopt%2Fparallelize_mem.c;h=9154906627c2f750d635df01fe02494fc59f6bf5;hb=731e9399d5d23b6a15ed4b705f6e6542cb90e55b;hp=17590515066c1b0f60686e4ec0c84d85bba9083e;hpb=54bc302a93d19fc1df3b20d3b93f84aad7d00a33;p=libfirm

diff --git a/ir/opt/parallelize_mem.c b/ir/opt/parallelize_mem.c
index 175905150..915490662 100644
--- a/ir/opt/parallelize_mem.c
+++ b/ir/opt/parallelize_mem.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 1995-2008 University of Karlsruhe.  All right reserved.
+ * Copyright (C) 1995-2011 University of Karlsruhe.  All right reserved.
  *
  * This file is part of libFirm.
  *
@@ -21,7 +21,6 @@
  * @file
  * @brief   parallelizing Load/Store optimisation
  * @author  Christoph Mallon
- * @version $Id: $
  */
 #include "config.h"
 
@@ -42,6 +41,7 @@
 #include "irflag_t.h"
 #include "irprintf.h"
 #include "irpass.h"
+#include "iredges.h"
 
 typedef struct parallelize_info
 {
@@ -74,7 +74,7 @@ static void parallelize_load(parallelize_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) == ir_no_alias) {
+				if (get_alias_relation(org_ptr, org_mode, store_ptr, store_mode) == ir_no_alias) {
 					ir_node *mem = get_Store_mem(pred);
 					ir_nodeset_insert(&pi->user_mem, irn);
 					parallelize_load(pi, mem);
@@ -111,7 +111,7 @@ static void parallelize_store(parallelize_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) == ir_no_alias) {
+				if (get_alias_relation(org_ptr, org_mode, load_ptr, load_mode) == ir_no_alias) {
 					ir_node *mem = get_Load_mem(pred);
 					ir_nodeset_insert(&pi->user_mem, irn);
 					parallelize_store(pi, mem);
@@ -123,7 +123,7 @@ static void parallelize_store(parallelize_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) == ir_no_alias) {
+				if (get_alias_relation(org_ptr, org_mode, store_ptr, store_mode) == ir_no_alias) {
 					ir_node *mem;
 
 					ir_nodeset_insert(&pi->user_mem, irn);
@@ -151,7 +151,7 @@ static void walker(ir_node *proj, void *env)
 	ir_node          *mem_op;
 	ir_node          *pred;
 	ir_node          *block;
-	int               n;
+	size_t            n;
 	parallelize_info  pi;
 
 	(void)env;
@@ -191,45 +191,32 @@ static void walker(ir_node *proj, void *env)
 	}
 
 	n = ir_nodeset_size(&pi.user_mem);
-	if (n != 0) { /* nothing happened otherwise */
-		ir_graph               *irg  = current_ir_graph;
-		ir_node                *sync;
-		ir_node               **in;
-		ir_nodeset_iterator_t   iter;
-		int                     i;
-
-		++n;
-		NEW_ARR_A(ir_node*, in, n);
+	if (n > 0) { /* nothing happened otherwise */
+		ir_node  *sync;
+		ir_node **in   = XMALLOCN(ir_node*, n+1);
+		size_t    i;
+
 		i = 0;
-		in[i++] = new_r_Unknown(irg, mode_M);
-		ir_nodeset_iterator_init(&iter, &pi.user_mem);
-		for (;;) {
-			ir_node* p = ir_nodeset_iterator_next(&iter);
-			if (p == NULL) break;
-			in[i++] = p;
+		in[i++] = proj;
+		foreach_ir_nodeset(&pi.user_mem, node, iter) {
+			in[i++] = node;
 		}
-		assert(i == n);
-		sync = new_r_Sync(block, n, in);
-		exchange(proj, sync);
-
-		assert(pn_Load_M == pn_Store_M);
-		proj = new_r_Proj(block, mem_op, mode_M, pn_Load_M);
-		set_Sync_pred(sync, 0, proj);
+		assert(i == n+1);
+		sync = new_r_Sync(block, i, in);
+		xfree(in);
+		edges_reroute_except(proj, sync, sync);
 
 		n = ir_nodeset_size(&pi.this_mem);
-		ir_nodeset_iterator_init(&iter, &pi.this_mem);
 		if (n == 1) {
-			sync = ir_nodeset_iterator_next(&iter);
+			sync = ir_nodeset_first(&pi.this_mem);
 		} else {
-			NEW_ARR_A(ir_node*, in, n);
+			in = XMALLOCN(ir_node*, n);
 			i = 0;
-			for (;;) {
-				ir_node* p = ir_nodeset_iterator_next(&iter);
-				if (p == NULL) break;
-				in[i++] = p;
+			foreach_ir_nodeset(&pi.this_mem, node, iter) {
+				in[i++] = node;
 			}
 			assert(i == n);
-			sync = new_r_Sync(block, n, in);
+			sync = new_r_Sync(block, i, in);
 		}
 		set_memop_mem(mem_op, sync);
 	}
@@ -240,12 +227,9 @@ static void walker(ir_node *proj, void *env)
 
 void opt_parallelize_mem(ir_graph *irg)
 {
-	//assure_irg_entity_usage_computed(irg);
-	//assure_irp_globals_entity_usage_computed();
-
+	assure_irg_properties(irg, IR_GRAPH_PROPERTY_CONSISTENT_OUT_EDGES);
 	irg_walk_graph(irg, NULL, walker, NULL);
-	//optimize_graph_df(irg);
-	//irg_walk_graph(irg, NormaliseSync, NULL, NULL);
+	confirm_irg_properties(irg, IR_GRAPH_PROPERTIES_CONTROL_FLOW);
 }
 
 ir_graph_pass_t *opt_parallelize_mem_pass(const char *name)