[polly] r334937 - Move buildConditionSet to C++
Tobias Grosser via llvm-commits
llvm-commits at lists.llvm.org
Mon Jun 18 05:35:36 PDT 2018
Author: grosser
Date: Mon Jun 18 05:35:36 2018
New Revision: 334937
URL: http://llvm.org/viewvc/llvm-project?rev=334937&view=rev
Log:
Move buildConditionSet to C++
Modified:
polly/trunk/lib/Analysis/ScopInfo.cpp
Modified: polly/trunk/lib/Analysis/ScopInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/ScopInfo.cpp?rev=334937&r1=334936&r2=334937&view=diff
==============================================================================
--- polly/trunk/lib/Analysis/ScopInfo.cpp (original)
+++ polly/trunk/lib/Analysis/ScopInfo.cpp Mon Jun 18 05:35:36 2018
@@ -1367,30 +1367,29 @@ static std::pair<isl::set, isl::set> par
}
/// Create the conditions under which @p L @p Pred @p R is true.
-static __isl_give isl_set *buildConditionSet(ICmpInst::Predicate Pred,
- __isl_take isl_pw_aff *L,
- __isl_take isl_pw_aff *R) {
+static isl::set buildConditionSet(ICmpInst::Predicate Pred, isl::pw_aff L,
+ isl::pw_aff R) {
switch (Pred) {
case ICmpInst::ICMP_EQ:
- return isl_pw_aff_eq_set(L, R);
+ return L.eq_set(R);
case ICmpInst::ICMP_NE:
- return isl_pw_aff_ne_set(L, R);
+ return L.ne_set(R);
case ICmpInst::ICMP_SLT:
- return isl_pw_aff_lt_set(L, R);
+ return L.lt_set(R);
case ICmpInst::ICMP_SLE:
- return isl_pw_aff_le_set(L, R);
+ return L.le_set(R);
case ICmpInst::ICMP_SGT:
- return isl_pw_aff_gt_set(L, R);
+ return L.gt_set(R);
case ICmpInst::ICMP_SGE:
- return isl_pw_aff_ge_set(L, R);
+ return L.ge_set(R);
case ICmpInst::ICMP_ULT:
- return isl_pw_aff_lt_set(L, R);
+ return L.lt_set(R);
case ICmpInst::ICMP_UGT:
- return isl_pw_aff_gt_set(L, R);
+ return L.gt_set(R);
case ICmpInst::ICMP_ULE:
- return isl_pw_aff_le_set(L, R);
+ return L.le_set(R);
case ICmpInst::ICMP_UGE:
- return isl_pw_aff_ge_set(L, R);
+ return L.ge_set(R);
default:
llvm_unreachable("Non integer predicate not supported");
}
@@ -1440,7 +1439,9 @@ bool buildConditionSets(Scop &S, BasicBl
RHS = getPwAff(S, BB, InvalidDomainMap, SE.getSCEV(CaseValue));
isl_set *CaseConditionSet =
- buildConditionSet(ICmpInst::ICMP_EQ, isl_pw_aff_copy(LHS), RHS);
+ buildConditionSet(ICmpInst::ICMP_EQ, isl::manage_copy(LHS),
+ isl::manage(RHS))
+ .release();
ConditionSets[Idx] = isl_set_coalesce(
isl_set_intersect(CaseConditionSet, isl_set_copy(Domain)));
}
@@ -1517,7 +1518,9 @@ bool buildConditionSets(Scop &S, BasicBl
bool NonNeg = false;
isl_pw_aff *LHS = getPwAff(S, BB, InvalidDomainMap, LHSSCEV, NonNeg);
isl_pw_aff *RHS = getPwAff(S, BB, InvalidDomainMap, RHSSCEV, NonNeg);
- ConsequenceCondSet = buildConditionSet(ICmpInst::ICMP_SLE, LHS, RHS);
+ ConsequenceCondSet = buildConditionSet(ICmpInst::ICMP_SLE, isl::manage(LHS),
+ isl::manage(RHS))
+ .release();
} else if (auto *PHI = dyn_cast<PHINode>(Condition)) {
auto *Unique = dyn_cast<ConstantInt>(
getUniqueNonErrorValue(PHI, &S.getRegion(), *S.getLI(), *S.getDT()));
@@ -1598,7 +1601,9 @@ bool buildConditionSets(Scop &S, BasicBl
default:
LHS = getPwAff(S, BB, InvalidDomainMap, LeftOperand, NonNeg);
RHS = getPwAff(S, BB, InvalidDomainMap, RightOperand, NonNeg);
- ConsequenceCondSet = buildConditionSet(ICond->getPredicate(), LHS, RHS);
+ ConsequenceCondSet = buildConditionSet(ICond->getPredicate(),
+ isl::manage(LHS), isl::manage(RHS))
+ .release();
break;
}
}
More information about the llvm-commits
mailing list