maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[Simplify] Move to isl C++ 

llvm-svn: 303507
This commit is contained in:
Tobias Grosser 2017-05-21 16:12:21 +00:00
parent 6151654c00
commit b5f61bdeeb
1 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
polly/lib/Transform/Simplify.cpp
View File

@ -131,7 +131,7 @@ private:
/// one element in @p Targets. /// one element in @p Targets.
MemoryAccess *hasWriteBetween(ScopStmt *Stmt, MemoryAccess *From, MemoryAccess *hasWriteBetween(ScopStmt *Stmt, MemoryAccess *From,
MemoryAccess *To, isl::map Targets) { MemoryAccess *To, isl::map Targets) {
auto TargetsSpace = give(isl_map_get_space(Targets.keep())); auto TargetsSpace = Targets.get_space();
bool Started = Stmt->isRegionStmt(); bool Started = Stmt->isRegionStmt();
for (auto *Acc : *Stmt) { for (auto *Acc : *Stmt) {
@ -154,18 +154,16 @@ private:
continue; continue;
auto AccRel = give(Acc->getAccessRelation()); auto AccRel = give(Acc->getAccessRelation());
auto AccRelSpace = give(isl_map_get_space(AccRel.keep())); auto AccRelSpace = AccRel.get_space();
// Spaces being different means that they access different arrays. // Spaces being different means that they access different arrays.
if (isl_space_has_equal_tuples(TargetsSpace.keep(), AccRelSpace.keep()) == if (!TargetsSpace.has_equal_tuples(AccRelSpace))
isl_bool_false)
continue; continue;
AccRel = give(isl_map_intersect_domain(AccRel.take(), AccRel = AccRel.intersect_domain(give(Acc->getStatement()->getDomain()));
Acc->getStatement()->getDomain())); AccRel = AccRel.intersect_params(give(S->getContext()));
AccRel = give(isl_map_intersect_params(AccRel.take(), S->getContext())); auto CommonElt = Targets.intersect(AccRel);
auto CommonElt = give(isl_map_intersect(Targets.copy(), AccRel.copy())); if (!CommonElt.is_empty())
if (isl_map_is_empty(CommonElt.keep()) != isl_bool_true)
return Acc; return Acc;
} }
assert(Stmt->isRegionStmt() && assert(Stmt->isRegionStmt() &&
@ -208,9 +206,7 @@ private:
// If all of a write's elements are overwritten, remove it. // If all of a write's elements are overwritten, remove it.
isl::union_map AccRelUnion = AccRel; isl::union_map AccRelUnion = AccRel;
if (isl_union_map_is_subset(AccRelUnion.keep(), if (AccRelUnion.is_subset(WillBeOverwritten)) {
WillBeOverwritten.keep()) ==
isl_bool_true) {
DEBUG(dbgs() << "Removing " << MA DEBUG(dbgs() << "Removing " << MA
<< " which will be overwritten anyway\n"); << " which will be overwritten anyway\n");
@ -252,15 +248,13 @@ private:
continue; continue;
auto WARel = give(WA->getLatestAccessRelation()); auto WARel = give(WA->getLatestAccessRelation());
WARel = give(isl_map_intersect_domain(WARel.take(), WARel = WARel.intersect_domain(give(WA->getStatement()->getDomain()));
WA->getStatement()->getDomain())); WARel = WARel.intersect_params(give(S->getContext()));
WARel = give(isl_map_intersect_params(WARel.take(), S->getContext()));
auto RARel = give(RA->getLatestAccessRelation()); auto RARel = give(RA->getLatestAccessRelation());
RARel = give(isl_map_intersect_domain(RARel.take(), RARel = RARel.intersect_domain(give(RA->getStatement()->getDomain()));
RA->getStatement()->getDomain())); RARel = RARel.intersect_params(give(S->getContext()));
RARel = give(isl_map_intersect_params(RARel.take(), S->getContext()));
if (isl_map_is_equal(RARel.keep(), WARel.keep()) != isl_bool_true) { if (!RARel.is_equal(WARel)) {
PairUnequalAccRels++; PairUnequalAccRels++;
DEBUG(dbgs() << "Not cleaning up " << WA DEBUG(dbgs() << "Not cleaning up " << WA
<< " because of unequal access relations:\n"); << " because of unequal access relations:\n");