[polly][PATCH] Diagnostic: Provide end-user message for non-affine access function errors
Andreas Simbuerger
simbuerg at googlemail.com
Thu Aug 14 07:37:42 PDT 2014
---
include/polly/ScopDetectionDiagnostic.h | 11 +++-
lib/Analysis/ScopDetection.cpp | 8 +--
lib/Analysis/ScopDetectionDiagnostic.cpp | 6 ++
.../ReportNonAffineAccess-01.ll | 73 ++++++++++++++++++++++
4 files changed, 91 insertions(+), 7 deletions(-)
create mode 100644 test/ScopDetectionDiagnostics/ReportNonAffineAccess-01.ll
diff --git a/include/polly/ScopDetectionDiagnostic.h b/include/polly/ScopDetectionDiagnostic.h
index dea5e1e..ca21211 100644
--- a/include/polly/ScopDetectionDiagnostic.h
+++ b/include/polly/ScopDetectionDiagnostic.h
@@ -491,10 +491,14 @@ class ReportNonAffineAccess : public ReportAffFunc {
// The non-affine access function.
const SCEV *AccessFunction;
+ // The base pointer of the memory access.
+ const Value *BaseValue;
+
public:
- ReportNonAffineAccess(const SCEV *AccessFunction, const Instruction *Inst)
- : ReportAffFunc(rrkNonAffineAccess, Inst),
- AccessFunction(AccessFunction) {}
+ ReportNonAffineAccess(const SCEV *AccessFunction, const Instruction *Inst,
+ const Value *V)
+ : ReportAffFunc(rrkNonAffineAccess, Inst), AccessFunction(AccessFunction),
+ BaseValue(V) {}
const SCEV *get() { return AccessFunction; }
@@ -506,6 +510,7 @@ public:
/// @name RejectReason interface
//@{
virtual std::string getMessage() const override;
+ virtual std::string getEndUserMessage() const override;
//@}
};
diff --git a/lib/Analysis/ScopDetection.cpp b/lib/Analysis/ScopDetection.cpp
index 75d6731..4e70c87 100644
--- a/lib/Analysis/ScopDetection.cpp
+++ b/lib/Analysis/ScopDetection.cpp
@@ -383,7 +383,7 @@ bool ScopDetection::hasAffineMemoryAccesses(DetectionContext &Context) const {
const Instruction *Insn = PIAF.first;
if (Shape->DelinearizedSizes.empty())
return invalid<ReportNonAffineAccess>(Context, /*Assert=*/true, AF,
- Insn);
+ Insn, BaseValue);
MemAcc *Acc = new MemAcc(Insn, Shape);
InsnToMemAcc.insert({Insn, Acc});
@@ -392,13 +392,13 @@ bool ScopDetection::hasAffineMemoryAccesses(DetectionContext &Context) const {
if (Shape->DelinearizedSizes.empty() ||
Acc->DelinearizedSubscripts.empty())
return invalid<ReportNonAffineAccess>(Context, /*Assert=*/true, AF,
- Insn);
+ Insn, BaseValue);
// Check that the delinearized subscripts are affine.
for (const SCEV *S : Acc->DelinearizedSubscripts)
if (!isAffineExpr(&Context.CurRegion, S, *SE, BaseValue))
return invalid<ReportNonAffineAccess>(Context, /*Assert=*/true, AF,
- Insn);
+ Insn, BaseValue);
}
}
return true;
@@ -441,7 +441,7 @@ bool ScopDetection::isValidMemoryAccess(Instruction &Inst,
if (!PollyDelinearize || !AF)
return invalid<ReportNonAffineAccess>(Context, /*Assert=*/true,
- AccessFunction, &Inst);
+ AccessFunction, &Inst, BaseValue);
const SCEV *ElementSize = SE->getElementSize(&Inst);
Context.ElementSize[BasePointer] = ElementSize;
diff --git a/lib/Analysis/ScopDetectionDiagnostic.cpp b/lib/Analysis/ScopDetectionDiagnostic.cpp
index 2883148..040d6a6 100644
--- a/lib/Analysis/ScopDetectionDiagnostic.cpp
+++ b/lib/Analysis/ScopDetectionDiagnostic.cpp
@@ -301,6 +301,12 @@ bool ReportNonAffineAccess::classof(const RejectReason *RR) {
return RR->getKind() == rrkNonAffineAccess;
}
+std::string ReportNonAffineAccess::getEndUserMessage() const {
+ llvm::StringRef BaseName = BaseValue->getName();
+ std::string Name = (BaseName.size() > 0) ? BaseName : "UNKNOWN";
+ return "The array subscript of \"" + Name + "\" is not affine";
+}
+
//===----------------------------------------------------------------------===//
// ReportIndVar.
diff --git a/test/ScopDetectionDiagnostics/ReportNonAffineAccess-01.ll b/test/ScopDetectionDiagnostics/ReportNonAffineAccess-01.ll
new file mode 100644
index 0000000..38d5d5f
--- /dev/null
+++ b/test/ScopDetectionDiagnostics/ReportNonAffineAccess-01.ll
@@ -0,0 +1,73 @@
+; RUN: opt %loadPolly -pass-remarks-missed="polly-detect" -polly-detect-track-failures -polly-detect -analyze < %s 2>&1| FileCheck %s
+
+; void f(int A[]) {
+; for(int i=0; i<42; ++i)
+; A[i*i] = 0;
+; }
+
+
+; CHECK: remark: ReportNonAffineAccess-01.c:2:7: The following errors keep this region from being a Scop.
+; CHECK: remark: ReportNonAffineAccess-01.c:3:5: The array subscript of "A" is not affine
+; CHECK: remark: ReportNonAffineAccess-01.c:3:5: Invalid Scop candidate ends here.
+
+target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+define void @f(i32* %A) {
+entry:
+ br label %entry.split
+
+entry.split: ; preds = %entry
+ tail call void @llvm.dbg.value(metadata !{i32* %A}, i64 0, metadata !13), !dbg !14
+ tail call void @llvm.dbg.value(metadata !15, i64 0, metadata !16), !dbg !18
+ br label %for.body, !dbg !19
+
+for.body: ; preds = %entry.split, %for.body
+ %0 = phi i32 [ 0, %entry.split ], [ %1, %for.body ], !dbg !20
+ %mul = mul nsw i32 %0, %0, !dbg !20
+ %idxprom1 = zext i32 %mul to i64, !dbg !20
+ %arrayidx = getelementptr inbounds i32* %A, i64 %idxprom1, !dbg !20
+ store i32 0, i32* %arrayidx, align 4, !dbg !20
+ %1 = add nsw i32 %0, 1, !dbg !21
+ tail call void @llvm.dbg.value(metadata !{i32 %1}, i64 0, metadata !16), !dbg !18
+ %exitcond = icmp ne i32 %1, 42, !dbg !19
+ br i1 %exitcond, label %for.body, label %for.end, !dbg !19
+
+for.end: ; preds = %for.body
+ ret void, !dbg !22
+}
+
+declare void @llvm.dbg.declare(metadata, metadata)
+
+declare void @llvm.dbg.value(metadata, i64, metadata)
+
+attributes #0 = { nounwind uwtable "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!10, !11}
+!llvm.ident = !{!12}
+
+!0 = metadata !{i32 786449, metadata !1, i32 12, metadata !"clang version 3.6.0 ", i1 false, metadata !"", i32 0, metadata !2, metadata !2, metadata !3, metadata !2, metadata !2, metadata !"", i32 1} ; [ DW_TAG_compile_unit ] [test/ScopDetectionDiagnostic/ReportNonAffineAccess-01.c] [DW_LANG_C99]
+!1 = metadata !{metadata !"ReportNonAffineAccess-01.c", metadata !"test/ScopDetectionDiagnostic/"}
+!2 = metadata !{}
+!3 = metadata !{metadata !4}
+!4 = metadata !{i32 786478, metadata !1, metadata !5, metadata !"f", metadata !"f", metadata !"", i32 1, metadata !6, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 false, void (i32*)* @f, null, null, metadata !2, i32 1} ; [ DW_TAG_subprogram ] [line 1] [def] [f]
+!5 = metadata !{i32 786473, metadata !1} ; [ DW_TAG_file_type ] [test/ScopDetectionDiagnostic/ReportNonAffineAccess-01.c]
+!6 = metadata !{i32 786453, i32 0, null, metadata !"", i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !7, i32 0, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
+!7 = metadata !{null, metadata !8}
+!8 = metadata !{i32 786447, null, null, metadata !"", i32 0, i64 64, i64 64, i64 0, i32 0, metadata !9} ; [ DW_TAG_pointer_type ] [line 0, size 64, align 64, offset 0] [from int]
+!9 = metadata !{i32 786468, null, null, metadata !"int", i32 0, i64 32, i64 32, i64 0, i32 0, i32 5} ; [ DW_TAG_base_type ] [int] [line 0, size 32, align 32, offset 0, enc DW_ATE_signed]
+!10 = metadata !{i32 2, metadata !"Dwarf Version", i32 4}
+!11 = metadata !{i32 2, metadata !"Debug Info Version", i32 1}
+!12 = metadata !{metadata !"clang version 3.6.0 "}
+!13 = metadata !{i32 786689, metadata !4, metadata !"A", metadata !5, i32 16777217, metadata !8, i32 0, i32 0} ; [ DW_TAG_arg_variable ] [A] [line 1]
+!14 = metadata !{i32 1, i32 12, metadata !4, null}
+!15 = metadata !{i32 0}
+!16 = metadata !{i32 786688, metadata !17, metadata !"i", metadata !5, i32 2, metadata !9, i32 0, i32 0} ; [ DW_TAG_auto_variable ] [i] [line 2]
+!17 = metadata !{i32 786443, metadata !1, metadata !4, i32 2, i32 3, i32 0, i32 0} ; [ DW_TAG_lexical_block ] [test/ScopDetectionDiagnostic/ReportNonAffineAccess-01.c]
+!18 = metadata !{i32 2, i32 11, metadata !17, null}
+!19 = metadata !{i32 2, i32 7, metadata !17, null}
+!20 = metadata !{i32 3, i32 5, metadata !17, null}
+!21 = metadata !{i32 2, i32 22, metadata !17, null}
+!22 = metadata !{i32 4, i32 1, metadata !4, null}
--
2.0.4
More information about the llvm-commits
mailing list