diff options
| -rw-r--r-- | polly/lib/Support/ISLTools.cpp | 26 | ||||
| -rw-r--r-- | polly/unittests/Isl/IslTest.cpp | 8 |
2 files changed, 23 insertions, 11 deletions
diff --git a/polly/lib/Support/ISLTools.cpp b/polly/lib/Support/ISLTools.cpp index cb2ca9de9d4..1079263f44d 100644 --- a/polly/lib/Support/ISLTools.cpp +++ b/polly/lib/Support/ISLTools.cpp @@ -366,13 +366,6 @@ polly::computeArrayUnused(isl::union_map Schedule, isl::union_map Writes, auto WriteActions = give(isl_union_map_apply_domain(Schedule.copy(), Writes.copy())); - // { [Element[] -> Scatter[] } - auto AfterReads = afterScatter(ReadActions, ReadEltInSameInst); - auto WritesBeforeAnyReads = - give(isl_union_map_subtract(WriteActions.take(), AfterReads.take())); - auto BeforeWritesBeforeAnyReads = - beforeScatter(WritesBeforeAnyReads, !IncludeWrite); - // { [Element[] -> DomainWrite[]] -> Scatter[] } auto EltDomWrites = give(isl_union_map_apply_range( isl_union_map_range_map(isl_union_map_reverse(Writes.copy())), @@ -390,15 +383,26 @@ polly::computeArrayUnused(isl::union_map Schedule, isl::union_map Writes, auto ReadsOverwrittenRotated = give(isl_union_map_reverse( isl_union_map_curry(reverseDomain(ReadsOverwritten).take()))); auto LastOverwrittenRead = - give(isl_union_map_lexmax(ReadsOverwrittenRotated.take())); + give(isl_union_map_lexmax(ReadsOverwrittenRotated.copy())); // { [Element[] -> DomainWrite[]] -> Scatter[] } auto BetweenLastReadOverwrite = betweenScatter( LastOverwrittenRead, EltDomWrites, IncludeLastRead, IncludeWrite); - return give(isl_union_map_union( - BeforeWritesBeforeAnyReads.take(), - isl_union_map_domain_factor_domain(BetweenLastReadOverwrite.take()))); + // { [Element[] -> Scatter[]] -> DomainWrite[] } + isl::union_map ReachingOverwriteZone = computeReachingWrite( + Schedule, Writes, true, IncludeLastRead, IncludeWrite); + + // { [Element[] -> DomainWrite[]] -> Scatter[] } + isl::union_map ReachingOverwriteRotated = + reverseDomain(ReachingOverwriteZone).curry().reverse(); + + // { [Element[] -> DomainWrite[]] -> Scatter[] } + isl::union_map WritesWithoutReads = ReachingOverwriteRotated.subtract_domain( + ReadsOverwrittenRotated.domain()); + + return BetweenLastReadOverwrite.unite(WritesWithoutReads) + .domain_factor_domain(); } isl::union_set polly::convertZoneToTimepoints(isl::union_set Zone, diff --git a/polly/unittests/Isl/IslTest.cpp b/polly/unittests/Isl/IslTest.cpp index 6ac1169e305..f3a1b3aa5ac 100644 --- a/polly/unittests/Isl/IslTest.cpp +++ b/polly/unittests/Isl/IslTest.cpp @@ -783,6 +783,14 @@ TEST(DeLICM, computeArrayUnused) { computeArrayUnused(UMAP("{ Write[] -> [0] }"), UMAP("{ Write[] -> Elt[] }"), UMAP("{}"), ReadEltInSameInst, false, true)); + + // read, write, write + EXPECT_EQ( + UMAP("{ Elt[] -> [i] : 0 < i <= 20 }"), + computeArrayUnused( + UMAP("{ Read[] -> [0]; WriteA[] -> [10]; WriteB[] -> [20] }"), + UMAP("{ WriteA[] -> Elt[]; WriteB[] -> Elt[] }"), + UMAP("{ Read[] -> Elt[] }"), ReadEltInSameInst, false, true)); } // Read and write in same statement |
