RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-03-06 19:37:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[llvm-cov] Hide instantiation views for unexecuted functions

Browse Source 
Copying in the full text of the function doesn't help at all when we
already know that it's never executed. Just say that it's unexecuted --
the relevant source text has already been printed.

llvm-svn: 281589
This commit is contained in:
Vedant Kumar 2016-09-15 06:44:51 +00:00
parent 0a5dff338d
commit 7176440043
5 changed files with 56 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
test/tools/llvm-cov/Inputs/hideUnexecutedSubviews.proftext Normal file
View File

@ -0,0 +1,16 @@
_Z4funcIbEiT_
10
2
0
0
_Z4funcIiEiT_
10
2
0
0
main
0
1
0

10
test/tools/llvm-cov/hideUnexecutedSubviews.test Normal file
View File

@ -0,0 +1,10 @@
RUN: llvm-profdata merge %S/Inputs/hideUnexecutedSubviews.proftext -o %t.profdata
RUN: llvm-cov show %S/Inputs/templateInstantiations.covmapping -instr-profile %t.profdata -filename-equivalence %S/showTemplateInstantiations.cpp | FileCheck %s
RUN: llvm-cov show %S/Inputs/templateInstantiations.covmapping -instr-profile %t.profdata -format html -o %t.html.dir -filename-equivalence %S/showTemplateInstantiations.cpp
RUN: FileCheck %s -input-file %t.html.dir/coverage/tmp/showTemplateInstantiations.cpp.html
CHECK: Unexecuted instantiation: _Z4funcIbEiT_
CHECK: Unexecuted instantiation: _Z4funcIiEiT_
CHECK-NOT: Unexecuted instantiation

28
tools/llvm-cov/CodeCoverage.cpp
View File

@ -234,21 +234,23 @@ CodeCoverageTool::createSourceFileView(StringRef SourceFile,
attachExpansionSubViews(*View, Expansions, Coverage); attachExpansionSubViews(*View, Expansions, Coverage);
for (const auto *Function : Coverage.getInstantiations(SourceFile)) { for (const auto *Function : Coverage.getInstantiations(SourceFile)) {
auto SubViewCoverage = Coverage.getCoverageForFunction(*Function); std::unique_ptr<SourceCoverageView> SubView{nullptr};
auto SubViewExpansions = SubViewCoverage.getExpansions();
auto SubView = SourceCoverageView::create(
getSymbolForHumans(Function->Name), SourceBuffer.get(), ViewOpts,
std::move(SubViewCoverage));
attachExpansionSubViews(*SubView, SubViewExpansions, Coverage);
if (SubView) { if (Function->ExecutionCount > 0) {
unsigned FileID = Function->CountedRegions.front().FileID; auto SubViewCoverage = Coverage.getCoverageForFunction(*Function);
unsigned Line = 0; auto SubViewExpansions = SubViewCoverage.getExpansions();
for (const auto &CR : Function->CountedRegions) SubView = SourceCoverageView::create(
if (CR.FileID == FileID) getSymbolForHumans(Function->Name), SourceBuffer.get(), ViewOpts,
Line = std::max(CR.LineEnd, Line); std::move(SubViewCoverage));
View->addInstantiation(Function->Name, Line, std::move(SubView)); attachExpansionSubViews(*SubView, SubViewExpansions, Coverage);
} }
unsigned FileID = Function->CountedRegions.front().FileID;
unsigned Line = 0;
for (const auto &CR : Function->CountedRegions)
if (CR.FileID == FileID)
Line = std::max(CR.LineEnd, Line);
View->addInstantiation(Function->Name, Line, std::move(SubView));
} }
return View; return View;
} }

10
tools/llvm-cov/SourceCoverageViewHTML.cpp
View File

@ -584,7 +584,15 @@ void SourceCoverageViewHTML::renderInstantiationView(raw_ostream &OS,
InstantiationView &ISV, InstantiationView &ISV,
unsigned ViewDepth) { unsigned ViewDepth) {
OS << BeginExpansionDiv; OS << BeginExpansionDiv;
ISV.View->print(OS, /*WholeFile=*/false, /*ShowSourceName=*/true, ViewDepth); if (!ISV.View)
OS << BeginSourceNameDiv
<< tag("pre",
escape("Unexecuted instantiation: " + ISV.FunctionName.str(),
getOptions()))
<< EndSourceNameDiv;
else
ISV.View->print(OS, /*WholeFile=*/false, /*ShowSourceName=*/true,
ViewDepth);
OS << EndExpansionDiv; OS << EndExpansionDiv;
} }

7
tools/llvm-cov/SourceCoverageViewText.cpp
View File

@ -215,7 +215,12 @@ void SourceCoverageViewText::renderInstantiationView(raw_ostream &OS,
unsigned ViewDepth) { unsigned ViewDepth) {
renderLinePrefix(OS, ViewDepth); renderLinePrefix(OS, ViewDepth);
OS << ' '; OS << ' ';
ISV.View->print(OS, /*WholeFile=*/false, /*ShowSourceName=*/true, ViewDepth); if (!ISV.View)
getOptions().colored_ostream(OS, raw_ostream::RED)
<< "Unexecuted instantiation: " << ISV.FunctionName << "\n";
else
ISV.View->print(OS, /*WholeFile=*/false, /*ShowSourceName=*/true,
ViewDepth);
} }
void SourceCoverageViewText::renderTitle(raw_ostream &OS, StringRef Title) { void SourceCoverageViewText::renderTitle(raw_ostream &OS, StringRef Title) {