[polly] r273905 - Fix assertion due to loop overlap with nonaffine region.
Michael Kruse via llvm-commits
llvm-commits at lists.llvm.org
Mon Jun 27 12:00:50 PDT 2016
Author: meinersbur
Date: Mon Jun 27 14:00:49 2016
New Revision: 273905
URL: http://llvm.org/viewvc/llvm-project?rev=273905&view=rev
Log:
Fix assertion due to loop overlap with nonaffine region.
Reject and report regions that contains loops overlapping nonaffine region.
This situation typically happens in the presence of inifinite loops.
This addresses bug llvm.org/PR28071.
Differential Revision: http://reviews.llvm.org/D21312
Contributed-by: Huihui Zhang <huihuiz at codeaurora.org>
Added:
polly/trunk/test/ScopDetectionDiagnostics/ReportLoopOverlapWithNonAffineSubRegion.ll
Modified:
polly/trunk/include/polly/ScopDetectionDiagnostic.h
polly/trunk/lib/Analysis/ScopDetection.cpp
polly/trunk/lib/Analysis/ScopDetectionDiagnostic.cpp
Modified: polly/trunk/include/polly/ScopDetectionDiagnostic.h
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/include/polly/ScopDetectionDiagnostic.h?rev=273905&r1=273904&r2=273905&view=diff
==============================================================================
--- polly/trunk/include/polly/ScopDetectionDiagnostic.h (original)
+++ polly/trunk/include/polly/ScopDetectionDiagnostic.h Mon Jun 27 14:00:49 2016
@@ -84,6 +84,7 @@ enum RejectReasonKind {
rrkLastAffFunc,
rrkLoopBound,
+ rrkLoopOverlapWithNonAffineSubRegion,
rrkFuncCall,
rrkNonSimpleMemoryAccess,
@@ -498,6 +499,37 @@ public:
/// @name LLVM-RTTI interface
//@{
+ static bool classof(const RejectReason *RR);
+ //@}
+
+ /// @name RejectReason interface
+ //@{
+ virtual std::string getMessage() const override;
+ virtual const DebugLoc &getDebugLoc() const override;
+ virtual std::string getEndUserMessage() const override;
+ //@}
+};
+
+//===----------------------------------------------------------------------===//
+/// @brief Captures errors when loop overlap with nonaffine subregion.
+class ReportLoopOverlapWithNonAffineSubRegion : public RejectReason {
+ //===--------------------------------------------------------------------===//
+
+ /// @brief If L and R are set then L and R overlap.
+
+ /// The loop contains stmt overlapping nonaffine subregion.
+ Loop *L;
+
+ /// The nonaffine subregion that contains infinite loop.
+ Region *R;
+
+ const DebugLoc Loc;
+
+public:
+ ReportLoopOverlapWithNonAffineSubRegion(Loop *L, Region *R);
+
+ /// @name LLVM-RTTI interface
+ //@{
static bool classof(const RejectReason *RR);
//@}
Modified: polly/trunk/lib/Analysis/ScopDetection.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/ScopDetection.cpp?rev=273905&r1=273904&r2=273905&view=diff
==============================================================================
--- polly/trunk/lib/Analysis/ScopDetection.cpp (original)
+++ polly/trunk/lib/Analysis/ScopDetection.cpp Mon Jun 27 14:00:49 2016
@@ -296,10 +296,28 @@ bool ScopDetection::addOverApproximatedR
// All loops in the region have to be overapproximated too if there
// are accesses that depend on the iteration count.
+
+ BoxedLoopsSetTy ARBoxedLoopsSet;
+
for (BasicBlock *BB : AR->blocks()) {
Loop *L = LI->getLoopFor(BB);
- if (AR->contains(L))
+ if (AR->contains(L)) {
Context.BoxedLoopsSet.insert(L);
+ ARBoxedLoopsSet.insert(L);
+ }
+ }
+
+ // Reject if the surrounding loop does not entirely contain the nonaffine
+ // subregion.
+ BasicBlock *BBEntry = AR->getEntry();
+ Loop *L = LI->getLoopFor(BBEntry);
+ while (L && AR->contains(L))
+ L = L->getParentLoop();
+ if (L) {
+ for (const auto *ARBoxedLoop : ARBoxedLoopsSet)
+ if (!L->contains(ARBoxedLoop))
+ return invalid<ReportLoopOverlapWithNonAffineSubRegion>(
+ Context, /*Assert=*/true, L, AR);
}
return (AllowNonAffineSubLoops || Context.BoxedLoopsSet.empty());
Modified: polly/trunk/lib/Analysis/ScopDetectionDiagnostic.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/ScopDetectionDiagnostic.cpp?rev=273905&r1=273904&r2=273905&view=diff
==============================================================================
--- polly/trunk/lib/Analysis/ScopDetectionDiagnostic.cpp (original)
+++ polly/trunk/lib/Analysis/ScopDetectionDiagnostic.cpp Mon Jun 27 14:00:49 2016
@@ -43,6 +43,8 @@ using namespace llvm;
BADSCOP_STAT(CFG, "CFG too complex");
BADSCOP_STAT(LoopBound, "Loop bounds can not be computed");
+BADSCOP_STAT(LoopOverlapWithNonAffineSubRegion,
+ "Loop overlap with nonaffine subregion");
BADSCOP_STAT(FuncCall, "Function call with side effects appeared");
BADSCOP_STAT(AffFunc, "Expression not affine");
BADSCOP_STAT(Alias, "Found base address alias");
@@ -328,6 +330,33 @@ std::string ReportLoopBound::getEndUserM
}
//===----------------------------------------------------------------------===//
+// ReportLoopOverlapWithNonAffineSubRegion.
+
+ReportLoopOverlapWithNonAffineSubRegion::
+ ReportLoopOverlapWithNonAffineSubRegion(Loop *L, Region *R)
+ : RejectReason(rrkLoopOverlapWithNonAffineSubRegion), L(L), R(R),
+ Loc(L->getStartLoc()) {
+ ++BadLoopOverlapWithNonAffineSubRegionForScop;
+}
+
+std::string ReportLoopOverlapWithNonAffineSubRegion::getMessage() const {
+ return "Non affine subregion: " + R->getNameStr() + " overlaps Loop " +
+ L->getHeader()->getName();
+}
+
+const DebugLoc &ReportLoopOverlapWithNonAffineSubRegion::getDebugLoc() const {
+ return Loc;
+}
+
+bool ReportLoopOverlapWithNonAffineSubRegion::classof(const RejectReason *RR) {
+ return RR->getKind() == rrkLoopOverlapWithNonAffineSubRegion;
+}
+
+std::string ReportLoopOverlapWithNonAffineSubRegion::getEndUserMessage() const {
+ return "Loop overlaps with nonaffine subregion.";
+}
+
+//===----------------------------------------------------------------------===//
// ReportFuncCall.
ReportFuncCall::ReportFuncCall(Instruction *Inst)
Added: polly/trunk/test/ScopDetectionDiagnostics/ReportLoopOverlapWithNonAffineSubRegion.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopDetectionDiagnostics/ReportLoopOverlapWithNonAffineSubRegion.ll?rev=273905&view=auto
==============================================================================
--- polly/trunk/test/ScopDetectionDiagnostics/ReportLoopOverlapWithNonAffineSubRegion.ll (added)
+++ polly/trunk/test/ScopDetectionDiagnostics/ReportLoopOverlapWithNonAffineSubRegion.ll Mon Jun 27 14:00:49 2016
@@ -0,0 +1,112 @@
+; RUN: opt %loadPolly -pass-remarks-missed="polly-detect" -polly-allow-nonaffine-loops -analyze -polly-detect < %s 2>&1 | FileCheck %s --check-prefix=REJECTLOOPOVERLAPREGION
+; RUN: opt %loadPolly -pass-remarks-missed="polly-detect" -polly-allow-nonaffine-loops=false -analyze -polly-detect < %s 2>&1 | FileCheck %s --check-prefix=REJECTNONAFFINELOOPS
+
+; void func (int param0, int N, int *A)
+; {
+; for (int i = 0; i < N; i++)
+; if (param0)
+; while (1)
+; A[i] = 1;
+; else
+; A[i] = 2;
+; }
+
+; If we reject non-affine region and loop will be reported:
+;
+; REJECTLOOPOVERLAPREGION: remark: ReportLoopOverlapWithNonAffineRegion.c:3:3: The following errors keep this region from being a Scop.
+; REJECTLOOPOVERLAPREGION: remark: ReportLoopOverlapWithNonAffineRegion.c:3:3: Loop overlaps with nonaffine subregion.
+; REJECTLOOPOVERLAPREGION: remark: ReportLoopOverlapWithNonAffineRegion.c:7:7: Failed to derive an affine function from the loop bounds.
+; REJECTLOOPOVERLAPREGION: remark: ReportLoopOverlapWithNonAffineRegion.c:7:7: Invalid Scop candidate ends here.
+;
+; If we reject non-affine loops the non-affine loop bound will be reported:
+;
+; REJECTNONAFFINELOOPS: remark: ReportLoopOverlapWithNonAffineRegion.c:7:7: The following errors keep this region from being a Scop.
+; REJECTNONAFFINELOOPS: remark: ReportLoopOverlapWithNonAffineRegion.c:7:7: Failed to derive an affine function from the loop bounds.
+; REJECTNONAFFINELOOPS: remark: ReportLoopOverlapWithNonAffineRegion.c:7:7: Invalid Scop candidate ends here.
+
+
+
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+
+; Function Attrs: nounwind uwtable
+define void @func(i32 %param0, i32 %N, i32* %A) #0 !dbg !6 {
+entry:
+ %param0.addr = alloca i32, align 4
+ %N.addr = alloca i32, align 4
+ %A.addr = alloca i32*, align 8
+ %i = alloca i32, align 4
+ store i32 %param0, i32* %param0.addr, align 4
+ store i32 %N, i32* %N.addr, align 4
+ store i32* %A, i32** %A.addr, align 8
+ store i32 0, i32* %i, align 4
+ br label %for.cond
+
+for.cond: ; preds = %for.inc, %entry
+ %0 = load i32, i32* %i, align 4
+ %1 = load i32, i32* %N.addr, align 4
+ %cmp = icmp slt i32 %0, %1
+ br i1 %cmp, label %for.body, label %for.end, !dbg !27
+
+for.body: ; preds = %for.cond
+ %2 = load i32, i32* %param0.addr, align 4
+ %tobool = icmp ne i32 %2, 0
+ br i1 %tobool, label %if.then, label %if.else
+
+if.then: ; preds = %for.body
+ br label %while.body
+
+while.body: ; preds = %if.then, %while.body
+ %3 = load i32, i32* %i, align 4
+ %idxprom = sext i32 %3 to i64
+ %4 = load i32*, i32** %A.addr, align 8
+ %arrayidx = getelementptr inbounds i32, i32* %4, i64 %idxprom
+ store i32 1, i32* %arrayidx, align 4
+ br label %while.body, !dbg !37
+
+if.else: ; preds = %for.body
+ %5 = load i32, i32* %i, align 4
+ %idxprom1 = sext i32 %5 to i64
+ %6 = load i32*, i32** %A.addr, align 8
+ %arrayidx2 = getelementptr inbounds i32, i32* %6, i64 %idxprom1
+ store i32 2, i32* %arrayidx2, align 4
+ br label %if.end
+
+if.end: ; preds = %if.else
+ br label %for.inc
+
+for.inc: ; preds = %if.end
+ %7 = load i32, i32* %i, align 4
+ %inc = add nsw i32 %7, 1
+ store i32 %inc, i32* %i, align 4
+ br label %for.cond
+
+for.end: ; preds = %for.cond
+ ret void
+}
+
+; Function Attrs: nounwind readnone
+declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
+
+attributes #0 = { nounwind uwtable "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!3, !4}
+!llvm.ident = !{!5}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 3.9.0 ", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !2)
+!1 = !DIFile(filename: "ReportLoopOverlapWithNonAffineRegion.c", directory: "test/ScopDetectionDiagnostics/")
+!2 = !{}
+!3 = !{i32 2, !"Dwarf Version", i32 4}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = !{!"clang version 3.9.0 "}
+!6 = distinct !DISubprogram(name: "func", scope: !1, file: !1, line: 1, isLocal: false, isDefinition: true, scopeLine: 2, flags: DIFlagPrototyped, isOptimized: false, unit: !0, variables: !2)
+!19 = distinct !DILexicalBlock(scope: !6, file: !1, line: 3, column: 3)
+!23 = !DILexicalBlockFile(scope: !24, file: !1, discriminator: 1)
+!24 = distinct !DILexicalBlock(scope: !19, file: !1, line: 3, column: 3)
+!27 = !DILocation(line: 3, column: 3, scope: !23)
+!29 = distinct !DILexicalBlock(scope: !30, file: !1, line: 5, column: 9)
+!30 = distinct !DILexicalBlock(scope: !24, file: !1, line: 4, column: 3)
+!33 = distinct !DILexicalBlock(scope: !29, file: !1, line: 6, column: 5)
+!37 = !DILocation(line: 7, column: 7, scope: !38)
+!38 = !DILexicalBlockFile(scope: !33, file: !1, discriminator: 1)
More information about the llvm-commits
mailing list