summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/ChangeLog.graphite7
-rw-r--r--gcc/graphite-dependences.c7
-rw-r--r--gcc/graphite-sese-to-poly.c4
4 files changed, 21 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index cb76451bab6..e67d343922c 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,12 @@
2011-01-25 Sebastian Pop <sebastian.pop@amd.com>
+ * graphite-dependences.c (reduction_dr_1): Allow several reductions
+ in a reduction PBB.
+ * graphite-sese-to-poly.c (split_reduction_stmt): Do not split PBBs
+ that have already been marked as PBB_IS_REDUCTION.
+
+2011-01-25 Sebastian Pop <sebastian.pop@amd.com>
+
* graphite-scop-detection.c (same_close_phi_node): New.
(remove_duplicate_close_phi): New.
(make_close_phi_nodes_unique): New.
diff --git a/gcc/ChangeLog.graphite b/gcc/ChangeLog.graphite
index 1782e768ec2..091bbcaa9ba 100644
--- a/gcc/ChangeLog.graphite
+++ b/gcc/ChangeLog.graphite
@@ -1,5 +1,12 @@
2011-01-17 Sebastian Pop <sebastian.pop@amd.com>
+ * graphite-dependences.c (reduction_dr_1): Allow several reductions
+ in a reduction PBB.
+ * graphite-sese-to-poly.c (split_reduction_stmt): Do not split PBBs
+ that have already been marked as PBB_IS_REDUCTION.
+
+2011-01-17 Sebastian Pop <sebastian.pop@amd.com>
+
* graphite-scop-detection.c (same_close_phi_node): New.
(remove_duplicate_close_phi): New.
(make_close_phi_nodes_unique): New.
diff --git a/gcc/graphite-dependences.c b/gcc/graphite-dependences.c
index d45c7ce2aea..b9b1d1b5880 100644
--- a/gcc/graphite-dependences.c
+++ b/gcc/graphite-dependences.c
@@ -571,10 +571,11 @@ reduction_dr_1 (poly_bb_p pbb1, poly_dr_p pdr1, poly_dr_p pdr2)
poly_dr_p pdr;
FOR_EACH_VEC_ELT (poly_dr_p, PBB_DRS (pbb1), i, pdr)
- if (PDR_TYPE (pdr) == PDR_WRITE)
- break;
+ if (PDR_TYPE (pdr) == PDR_WRITE
+ && same_pdr_p (pdr, pdr1) && same_pdr_p (pdr, pdr2))
+ return true;
- return same_pdr_p (pdr, pdr1) && same_pdr_p (pdr, pdr2);
+ return false;
}
/* Return true when the data dependence relation between the data
diff --git a/gcc/graphite-sese-to-poly.c b/gcc/graphite-sese-to-poly.c
index 301fb9688ca..a7178efed94 100644
--- a/gcc/graphite-sese-to-poly.c
+++ b/gcc/graphite-sese-to-poly.c
@@ -2640,7 +2640,9 @@ split_reduction_stmt (scop_p scop, gimple stmt)
/* Do not split basic blocks with no writes to memory: the reduction
will be the only write to memory. */
- if (nb_data_writes_in_bb (bb) == 0)
+ if (nb_data_writes_in_bb (bb) == 0
+ /* Or if we have already marked BB as a reduction. */
+ || PBB_IS_REDUCTION (pbb_from_bb (bb)))
return bb;
e1 = split_pbb (scop, pbb, bb, stmt);