[polly] r197558 - Report detected scops using the new diagnostics
Tobias Grosser
tobias at grosser.es
Wed Dec 18 02:49:53 PST 2013
Author: grosser
Date: Wed Dec 18 04:49:53 2013
New Revision: 197558
URL: http://llvm.org/viewvc/llvm-project?rev=197558&view=rev
Log:
Report detected scops using the new diagnostics
We now report the following:
$ polly-clang -O3 -mllvm -polly -mllvm -polly-report test.c -c \
-gline-tables-only
note: Polly detected an optimizable loop region (scop) in function 'foo'
test.c:2: Start of scop
test.c:3: End of scop
note: Polly detected an optimizable loop region (scop) in function 'bar'
test.c:9: Start of scop
test.c:13: End of scop
Added:
polly/trunk/test/ScopDetect/report-scop-location.ll
Modified:
polly/trunk/lib/Analysis/ScopDetection.cpp
Modified: polly/trunk/lib/Analysis/ScopDetection.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/ScopDetection.cpp?rev=197558&r1=197557&r2=197558&view=diff
==============================================================================
--- polly/trunk/lib/Analysis/ScopDetection.cpp (original)
+++ polly/trunk/lib/Analysis/ScopDetection.cpp Wed Dec 18 04:49:53 2013
@@ -59,6 +59,8 @@
#include "llvm/Assembly/Writer.h"
#include "llvm/DebugInfo.h"
#include "llvm/IR/LLVMContext.h"
+#include "llvm/IR/DiagnosticInfo.h"
+#include "llvm/IR/DiagnosticPrinter.h"
#define DEBUG_TYPE "polly-detect"
#include "llvm/Support/Debug.h"
@@ -156,6 +158,43 @@ BADSCOP_STAT(Alias, "Found base address
BADSCOP_STAT(SimpleLoop, "Loop not in -loop-simplify form");
BADSCOP_STAT(Other, "Others");
+class DiagnosticScopFound : public DiagnosticInfo {
+private:
+ static int PluginDiagnosticKind;
+
+ Function &F;
+ std::string FileName;
+ unsigned EntryLine, ExitLine;
+
+public:
+ DiagnosticScopFound(Function &F, std::string FileName, unsigned EntryLine, unsigned ExitLine)
+ : DiagnosticInfo(PluginDiagnosticKind, DS_Note), F(F), FileName(FileName),
+ EntryLine(EntryLine), ExitLine(ExitLine) {}
+
+ virtual void print(DiagnosticPrinter &DP) const;
+
+ static bool classof(const DiagnosticInfo *DI) {
+ return DI->getKind() == PluginDiagnosticKind;
+ }
+};
+
+int DiagnosticScopFound::PluginDiagnosticKind = 10;
+
+
+void DiagnosticScopFound::print(DiagnosticPrinter &DP) const {
+
+ DP << "Polly detected an optimizable loop region (scop) in function '" << F << "'\n";
+
+ if (FileName.empty()) {
+ DP << "Scop location is unknown. Compile with debug info "
+ "(-g) to get more precise information. ";
+ return;
+ }
+
+ DP << FileName << ":" << EntryLine << ": Start of scop\n";
+ DP << FileName << ":" << ExitLine << ": End of scop";
+}
+
//===----------------------------------------------------------------------===//
// ScopDetection.
bool ScopDetection::isMaxRegionInScop(const Region &R) const {
@@ -658,31 +697,17 @@ void ScopDetection::getDebugLocation(con
LineBegin = std::min(LineBegin, NewLine);
LineEnd = std::max(LineEnd, NewLine);
- break;
}
}
void ScopDetection::printLocations(llvm::Function &F) {
- int NumberOfScops = std::distance(begin(), end());
-
- if (NumberOfScops)
- outs() << ":: Static control regions in " << F.getName() << "\n";
-
for (iterator RI = begin(), RE = end(); RI != RE; ++RI) {
unsigned LineEntry, LineExit;
std::string FileName;
getDebugLocation(*RI, LineEntry, LineExit, FileName);
-
- if (FileName.empty()) {
- outs() << "Scop detected at unknown location. Compile with debug info "
- "(-g) to get more precise information. \n";
- return;
- }
-
- outs() << FileName << ":" << LineEntry
- << ": Start of static control region\n";
- outs() << FileName << ":" << LineExit << ": End of static control region\n";
+ DiagnosticScopFound Diagnostic(F, FileName, LineEntry, LineExit);
+ F.getContext().diagnose(Diagnostic);
}
}
Added: polly/trunk/test/ScopDetect/report-scop-location.ll
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/test/ScopDetect/report-scop-location.ll?rev=197558&view=auto
==============================================================================
--- polly/trunk/test/ScopDetect/report-scop-location.ll (added)
+++ polly/trunk/test/ScopDetect/report-scop-location.ll Wed Dec 18 04:49:53 2013
@@ -0,0 +1,82 @@
+; RUN: opt %loadPolly -polly-detect -polly-report -disable-output < %s 2>&1 | FileCheck %s
+target datalayout = "e-i64:64-f80:128-s:64-n8:16:32:64-S128"
+target triple = "x86_64-unknown-linux-gnu"
+
+; Function Attrs: nounwind uwtable
+define void @foo(float* %A) #0 {
+entry:
+ br label %entry.split
+
+entry.split: ; preds = %entry
+ br label %for.body, !dbg !11
+
+for.body: ; preds = %entry.split, %for.body
+ %indvar = phi i64 [ 0, %entry.split ], [ %indvar.next, %for.body ]
+ %i.01 = trunc i64 %indvar to i32, !dbg !13
+ %arrayidx = getelementptr float* %A, i64 %indvar, !dbg !13
+ %conv = sitofp i32 %i.01 to float, !dbg !13
+ store float %conv, float* %arrayidx, align 4, !dbg !13
+ %indvar.next = add i64 %indvar, 1, !dbg !11
+ %exitcond = icmp ne i64 %indvar.next, 100, !dbg !11
+ br i1 %exitcond, label %for.body, label %for.end, !dbg !11
+
+for.end: ; preds = %for.body
+ ret void, !dbg !14
+}
+
+; CHECK: note: Polly detected an optimizable loop region (scop) in function 'foo'
+; CHECK: test.c:2: Start of scop
+; CHECK: test.c:3: End of scop
+
+; Function Attrs: nounwind uwtable
+define void @bar(float* %A) #0 {
+entry:
+ br label %entry.split
+
+entry.split: ; preds = %entry
+ br label %for.body, !dbg !15
+
+for.body: ; preds = %entry.split, %for.body
+ %indvar = phi i64 [ 0, %entry.split ], [ %indvar.next, %for.body ]
+ %i.01 = trunc i64 %indvar to i32, !dbg !17
+ %arrayidx = getelementptr float* %A, i64 %indvar, !dbg !17
+ %conv = sitofp i32 %i.01 to float, !dbg !17
+ store float %conv, float* %arrayidx, align 4, !dbg !17
+ %indvar.next = add i64 %indvar, 1, !dbg !15
+ %exitcond = icmp ne i64 %indvar.next, 100, !dbg !15
+ br i1 %exitcond, label %for.body, label %for.end, !dbg !15
+
+for.end: ; preds = %for.body
+ ret void, !dbg !18
+}
+
+; CHECK: note: Polly detected an optimizable loop region (scop) in function 'bar'
+; CHECK: test.c:9: Start of scop
+; CHECK: test.c:13: End of scop
+
+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" }
+
+!llvm.dbg.cu = !{!0}
+!llvm.module.flags = !{!8, !9}
+!llvm.ident = !{!10}
+
+!0 = metadata !{i32 786449, metadata !1, i32 12, metadata !"clang version 3.5 ", i1 false, metadata !"", i32 0, metadata !2, metadata !2, metadata !3, metadata !2, metadata !2, metadata !""} ; [ DW_TAG_compile_unit ] [/home/grosser/Projects/polly/git/tools/polly/test.c] [DW_LANG_C99]
+!1 = metadata !{metadata !"test.c", metadata !"/home/grosser/Projects/polly/git/tools/polly"}
+!2 = metadata !{i32 0}
+!3 = metadata !{metadata !4, metadata !7}
+!4 = metadata !{i32 786478, metadata !1, metadata !5, metadata !"foo", metadata !"foo", metadata !"", i32 1, metadata !6, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 false, void (float*)* @foo, null, null, metadata !2, i32 1} ; [ DW_TAG_subprogram ] [line 1] [def] [foo]
+!5 = metadata !{i32 786473, metadata !1} ; [ DW_TAG_file_type ] [/home/grosser/Projects/polly/git/tools/polly/test.c]
+!6 = metadata !{i32 786453, i32 0, null, metadata !"", i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !2, i32 0, null, null, null} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
+!7 = metadata !{i32 786478, metadata !1, metadata !5, metadata !"bar", metadata !"bar", metadata !"", i32 6, metadata !6, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 false, void (float*)* @bar, null, null, metadata !2, i32 6} ; [ DW_TAG_subprogram ] [line 6] [def] [bar]
+!8 = metadata !{i32 2, metadata !"Dwarf Version", i32 4}
+!9 = metadata !{i32 1, metadata !"Debug Info Version", i32 1}
+!10 = metadata !{metadata !"clang version 3.5 "}
+!11 = metadata !{i32 2, i32 0, metadata !12, null}
+!12 = metadata !{i32 786443, metadata !1, metadata !4, i32 2, i32 0, i32 0} ; [ DW_TAG_lexical_block ] [/home/grosser/Projects/polly/git/tools/polly/test.c]
+!13 = metadata !{i32 3, i32 0, metadata !12, null}
+!14 = metadata !{i32 4, i32 0, metadata !4, null}
+!15 = metadata !{i32 9, i32 0, metadata !16, null}
+!16 = metadata !{i32 786443, metadata !1, metadata !7, i32 9, i32 0, i32 1} ; [ DW_TAG_lexical_block ] [/home/grosser/Projects/polly/git/tools/polly/test.c]
+!17 = metadata !{i32 13, i32 0, metadata !16, null}
+!18 = metadata !{i32 14, i32 0, metadata !7, null}
+
More information about the llvm-commits
mailing list