[polly][PATCH] Diagnostic: Provide end-user message for aliasing errors
Andreas Simbuerger
simbuerg at googlemail.com
Thu Aug 14 06:38:22 PDT 2014
---
include/polly/ScopDetectionDiagnostic.h | 7 ++-
lib/Analysis/ScopDetectionDiagnostic.cpp | 16 ++++--
test/ScopDetectionDiagnostics/ReportAlias-01.ll | 70 +++++++++++++++++++++++++
3 files changed, 88 insertions(+), 5 deletions(-)
create mode 100644 test/ScopDetectionDiagnostics/ReportAlias-01.ll
diff --git a/include/polly/ScopDetectionDiagnostic.h b/include/polly/ScopDetectionDiagnostic.h
index ab4126d..dea5e1e 100644
--- a/include/polly/ScopDetectionDiagnostic.h
+++ b/include/polly/ScopDetectionDiagnostic.h
@@ -673,8 +673,10 @@ public:
private:
/// @brief Format an invalid alias set.
///
- /// @param AS The invalid alias set to format.
- std::string formatInvalidAlias() const;
+ // @param Prefix A prefix string to put before the list of aliasing pointers.
+ // @param Suffix A suffix string to put after the list of aliasing pointers.
+ std::string formatInvalidAlias(std::string Prefix = "",
+ std::string Suffix = "") const;
Instruction *Inst;
@@ -695,6 +697,7 @@ public:
//@{
virtual std::string getMessage() const override;
virtual const DebugLoc &getDebugLoc() const override;
+ virtual std::string getEndUserMessage() const override;
//@}
};
diff --git a/lib/Analysis/ScopDetectionDiagnostic.cpp b/lib/Analysis/ScopDetectionDiagnostic.cpp
index f3f5a73..2883148 100644
--- a/lib/Analysis/ScopDetectionDiagnostic.cpp
+++ b/lib/Analysis/ScopDetectionDiagnostic.cpp
@@ -442,11 +442,12 @@ ReportAlias::ReportAlias(Instruction *Inst, AliasSet &AS)
++BadAliasForScop;
}
-std::string ReportAlias::formatInvalidAlias() const {
+std::string ReportAlias::formatInvalidAlias(std::string Prefix,
+ std::string Suffix) const {
std::string Message;
raw_string_ostream OS(Message);
- OS << "Possible aliasing: ";
+ OS << Prefix;
std::sort(Pointers.begin(), Pointers.end());
@@ -469,10 +470,19 @@ std::string ReportAlias::formatInvalidAlias() const {
break;
}
+ OS << Suffix;
+
return OS.str();
}
-std::string ReportAlias::getMessage() const { return formatInvalidAlias(); }
+std::string ReportAlias::getMessage() const {
+ return formatInvalidAlias("Possible aliasing: ");
+}
+
+std::string ReportAlias::getEndUserMessage() const {
+ return formatInvalidAlias("Accesses to the arrays ",
+ " may access the same memory.");
+}
const DebugLoc &ReportAlias::getDebugLoc() const { return Inst->getDebugLoc(); }
diff --git a/test/ScopDetectionDiagnostics/ReportAlias-01.ll b/test/ScopDetectionDiagnostics/ReportAlias-01.ll
new file mode 100644
index 0000000..2c8df67
--- /dev/null
+++ b/test/ScopDetectionDiagnostics/ReportAlias-01.ll
@@ -0,0 +1,70 @@
+; RUN: opt %loadPolly -pass-remarks-missed="polly-detect" -polly-detect-track-failures -polly-detect -analyze < %s 2>&1| FileCheck %s
+
+;void f(int A[], int B[]) {
+; for (int i=0; i<42; i++)
+; A[i] = B[i];
+;}
+
+; CHECK: remark: ReportAlias-01.c:2:8: The following errors keep this region from being a Scop.
+; CHECK: remark: ReportAlias-01.c:3:5: Accesses to the arrays "A", "B" may access the same memory.
+; CHECK: remark: ReportAlias-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, i32* %B) {
+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 !{i32* %B}, i64 0, metadata !15), !dbg !16
+ tail call void @llvm.dbg.value(metadata !17, i64 0, metadata !18), !dbg !20
+ br label %for.body, !dbg !21
+
+for.body: ; preds = %entry.split, %for.body
+ %indvar = phi i64 [ 0, %entry.split ], [ %indvar.next, %for.body ]
+ %arrayidx = getelementptr i32* %B, i64 %indvar, !dbg !22
+ %arrayidx2 = getelementptr i32* %A, i64 %indvar, !dbg !22
+ %0 = load i32* %arrayidx, align 4, !dbg !22
+ store i32 %0, i32* %arrayidx2, align 4, !dbg !22
+ tail call void @llvm.dbg.value(metadata !{null}, i64 0, metadata !18), !dbg !20
+ %indvar.next = add i64 %indvar, 1, !dbg !21
+ %exitcond = icmp ne i64 %indvar.next, 42, !dbg !21
+ br i1 %exitcond, label %for.body, label %for.end, !dbg !21
+
+for.end: ; preds = %for.body
+ ret void, !dbg !23
+}
+
+declare void @llvm.dbg.declare(metadata, metadata)
+declare void @llvm.dbg.value(metadata, i64, metadata)
+
+!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/ReportAlias-01.c] [DW_LANG_C99]
+!1 = metadata !{metadata !"ReportAlias-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*, 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/ReportAlias-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, 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 786689, metadata !4, metadata !"B", metadata !5, i32 33554433, metadata !8, i32 0, i32 0} ; [ DW_TAG_arg_variable ] [B] [line 1]
+!16 = metadata !{i32 1, i32 21, metadata !4, null}
+!17 = metadata !{i32 0}
+!18 = metadata !{i32 786688, metadata !19, metadata !"i", metadata !5, i32 2, metadata !9, i32 0, i32 0} ; [ DW_TAG_auto_variable ] [i] [line 2]
+!19 = metadata !{i32 786443, metadata !1, metadata !4, i32 2, i32 3, i32 0, i32 0} ; [ DW_TAG_lexical_block ] [test/ScopDetectionDiagnostic/ReportAlias-01.c]
+!20 = metadata !{i32 2, i32 12, metadata !19, null}
+!21 = metadata !{i32 2, i32 8, metadata !19, null}
+!22 = metadata !{i32 3, i32 5, metadata !19, null}
+!23 = metadata !{i32 4, i32 1, metadata !4, null}
--
2.0.4
More information about the llvm-commits
mailing list