From 625bb1fc10ebddf356bbf71540f500e749d1cbb6 Mon Sep 17 00:00:00 2001 From: Johannes Doerfert Date: Tue, 26 Apr 2016 09:16:36 +0000 Subject: [PATCH] Do not add but record signed-unsigned assumptions llvm-svn: 267528 --- polly/lib/Support/SCEVAffinator.cpp | 2 +- polly/test/ScopInfo/multidim_only_ivs_3d_cast.ll | 2 +- polly/test/ScopInfo/user_provided_non_dominating_assumptions.ll | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/polly/lib/Support/SCEVAffinator.cpp b/polly/lib/Support/SCEVAffinator.cpp index 4a008c3fef81..1e6fb5ce2e6c 100644 --- a/polly/lib/Support/SCEVAffinator.cpp +++ b/polly/lib/Support/SCEVAffinator.cpp @@ -340,7 +340,7 @@ SCEVAffinator::visitZeroExtendExpr(const SCEVZeroExtendExpr *Expr) { NegDom = ExprDomain ? isl_set_intersect(NegDom, ExprDomain) : NegDom; auto DL = BB ? BB->getTerminator()->getDebugLoc() : DebugLoc(); OpPWAC.second = isl_set_union(OpPWAC.second, isl_set_copy(NegDom)); - S->addAssumption(UNSIGNED, isl_set_params(NegDom), DL, AS_RESTRICTION); + S->recordAssumption(UNSIGNED, NegDom, DL, AS_RESTRICTION, BB); return OpPWAC; } diff --git a/polly/test/ScopInfo/multidim_only_ivs_3d_cast.ll b/polly/test/ScopInfo/multidim_only_ivs_3d_cast.ll index fbe722e7361f..8960cabf4f8b 100644 --- a/polly/test/ScopInfo/multidim_only_ivs_3d_cast.ll +++ b/polly/test/ScopInfo/multidim_only_ivs_3d_cast.ll @@ -11,7 +11,7 @@ ; CHECK: Assumed Context: ; CHECK-NEXT: [o, m, n] -> { : } ; CHECK-NEXT: Invalid Context: -; CHECK-NEXT: [o, m, n] -> { : o < 0 or m < 0 or (o >= 0 and m >= 0 and n <= 0) or (m = 0 and o >= 0 and n > 0) or (o = 0 and m > 0 and n > 0) } +; CHECK-NEXT: [o, m, n] -> { : o < 0 or (o >= 0 and m < 0) or (o >= 0 and m >= 0 and n <= 0) or (m = 0 and o >= 0 and n > 0) or (o = 0 and m > 0 and n > 0) } ; ; CHECK: p0: %o diff --git a/polly/test/ScopInfo/user_provided_non_dominating_assumptions.ll b/polly/test/ScopInfo/user_provided_non_dominating_assumptions.ll index 6e10313ce6b2..e566251b7623 100644 --- a/polly/test/ScopInfo/user_provided_non_dominating_assumptions.ll +++ b/polly/test/ScopInfo/user_provided_non_dominating_assumptions.ll @@ -1,7 +1,6 @@ ; RUN: opt %loadPolly -pass-remarks-analysis="polly-scops" -polly-scops -disable-output < %s 2>&1 | FileCheck %s ; ; CHECK: remark: :0:0: SCoP begins here. -; CHECK-NEXT: remark: :0:0: Signed-unsigned restriction: [i, N, M] -> { : N >= i and M < 0 } ; CHECK-NEXT: remark: :0:0: Inbounds assumption: [i, N, M] -> { : N <= i or (N > i and M <= 100) } ; CHECK-NEXT: remark: :0:0: SCoP ends here. ;