From: Max Moroz Date: Fri, 13 Oct 2017 14:44:51 +0000 (+0000) Subject: [llvm-cov] Generate "report" for given source paths if sources are specified. X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b5d60b88466047579c9e25cddf7bf763ae047ab9;p=llvm [llvm-cov] Generate "report" for given source paths if sources are specified. Summary: Documentation says that user can specify sources for both "show" and "report" commands. "Show" command respects specified sources, but "report" does not. It is useful to have both "show" and "report" generated for specified sources. Also added tests to for both commands with sources specified. Reviewers: vsk, kcc Reviewed By: vsk Differential Revision: https://reviews.llvm.org/D38860 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@315685 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/test/tools/llvm-cov/Inputs/sources_specified/abs.h b/test/tools/llvm-cov/Inputs/sources_specified/abs.h new file mode 100644 index 00000000000..f13c5177c58 --- /dev/null +++ b/test/tools/llvm-cov/Inputs/sources_specified/abs.h @@ -0,0 +1,5 @@ +int abs(int x) { + if (x < 0) + return -x; + return x; +} diff --git a/test/tools/llvm-cov/Inputs/sources_specified/extra/dec.h b/test/tools/llvm-cov/Inputs/sources_specified/extra/dec.h new file mode 100644 index 00000000000..178e1ea8c26 --- /dev/null +++ b/test/tools/llvm-cov/Inputs/sources_specified/extra/dec.h @@ -0,0 +1,3 @@ +int dec(int x) { + return x + 1; +} diff --git a/test/tools/llvm-cov/Inputs/sources_specified/extra/inc.h b/test/tools/llvm-cov/Inputs/sources_specified/extra/inc.h new file mode 100644 index 00000000000..5086aaa1e38 --- /dev/null +++ b/test/tools/llvm-cov/Inputs/sources_specified/extra/inc.h @@ -0,0 +1,3 @@ +int inc(int x) { + return x + 1; +} diff --git a/test/tools/llvm-cov/Inputs/sources_specified/main.cc b/test/tools/llvm-cov/Inputs/sources_specified/main.cc new file mode 100644 index 00000000000..cda21f1f57a --- /dev/null +++ b/test/tools/llvm-cov/Inputs/sources_specified/main.cc @@ -0,0 +1,9 @@ +#include "abs.h" +#include "extra/dec.h" +#include "extra/inc.h" + +int main() { + int x = 0; + inc(x); + return abs(x); +} diff --git a/test/tools/llvm-cov/Inputs/sources_specified/main.covmapping b/test/tools/llvm-cov/Inputs/sources_specified/main.covmapping new file mode 100644 index 00000000000..95f22f53b4d Binary files /dev/null and b/test/tools/llvm-cov/Inputs/sources_specified/main.covmapping differ diff --git a/test/tools/llvm-cov/Inputs/sources_specified/main.profdata b/test/tools/llvm-cov/Inputs/sources_specified/main.profdata new file mode 100644 index 00000000000..aeee1ab7f7d Binary files /dev/null and b/test/tools/llvm-cov/Inputs/sources_specified/main.profdata differ diff --git a/test/tools/llvm-cov/sources-specified.test b/test/tools/llvm-cov/sources-specified.test new file mode 100644 index 00000000000..cd19adf52fe --- /dev/null +++ b/test/tools/llvm-cov/sources-specified.test @@ -0,0 +1,28 @@ +RUN: llvm-cov report -instr-profile %S/Inputs/sources_specified/main.profdata \ +RUN: %S/Inputs/sources_specified/main.covmapping \ +RUN: %S/Inputs/sources_specified/main.cc %S/Inputs/sources_specified/extra \ +RUN: | FileCheck -check-prefix=REPORT %s + +RUN: llvm-cov show -instr-profile %S/Inputs/sources_specified/main.profdata \ +RUN: %S/Inputs/sources_specified/main.covmapping \ +RUN: %S/Inputs/sources_specified/main.cc %S/Inputs/sources_specified/extra \ +RUN: | FileCheck -check-prefix=SHOW %s + + +REPORT: {{^}}main.cc{{.*}} +REPORT: {{^}}extra{{[/\\]}}{{dec|inc}}.h{{.*}} +REPORT: {{^}}extra{{[/\\]}}{{dec|inc}}.h{{.*}} +REPORT-NOT: {{^}}abs.h{{.*}} + +SHOW: {{.*}}main.cc{{.*}} +SHOW: {{.*}}extra{{[/\\]}}{{dec|inc}}.h{{.*}} +SHOW: {{.*}}extra{{[/\\]}}{{dec|inc}}.h{{.*}} +SHOW-NOT: {{.*}}abs.h{{.*}} + +Instructions for regenerating the test: + +clang -mllvm -enable-name-compression=false -fprofile-instr-generate -fcoverage-mapping main.cc -o main + +LLVM_PROFILE_FILE="main.raw" ./main +llvm-profdata merge main.raw -o main.profdata +llvm-cov convert-for-testing ./main -o ./main.covmapping diff --git a/tools/llvm-cov/CodeCoverage.cpp b/tools/llvm-cov/CodeCoverage.cpp index 8d9f4d022ca..2ecd7ea6b90 100644 --- a/tools/llvm-cov/CodeCoverage.cpp +++ b/tools/llvm-cov/CodeCoverage.cpp @@ -947,7 +947,10 @@ int CodeCoverageTool::report(int argc, const char **argv, CoverageReport Report(ViewOpts, *Coverage.get()); if (!ShowFunctionSummaries) { - Report.renderFileReports(llvm::outs()); + if (SourceFiles.empty()) + Report.renderFileReports(llvm::outs()); + else + Report.renderFileReports(llvm::outs(), SourceFiles); } else { if (SourceFiles.empty()) { error("Source files must be specified when -show-functions=true is " diff --git a/tools/llvm-cov/CoverageReport.cpp b/tools/llvm-cov/CoverageReport.cpp index 56745308b79..f930f730d23 100644 --- a/tools/llvm-cov/CoverageReport.cpp +++ b/tools/llvm-cov/CoverageReport.cpp @@ -364,7 +364,12 @@ void CoverageReport::renderFileReports(raw_ostream &OS) const { std::vector UniqueSourceFiles; for (StringRef SF : Coverage.getUniqueSourceFiles()) UniqueSourceFiles.emplace_back(SF.str()); - renderFileReports(OS, UniqueSourceFiles, CoverageFiltersMatchAll()); + renderFileReports(OS, UniqueSourceFiles); +} + +void CoverageReport::renderFileReports( + raw_ostream &OS, ArrayRef Files) const { + renderFileReports(OS, Files, CoverageFiltersMatchAll()); } void CoverageReport::renderFileReports( diff --git a/tools/llvm-cov/CoverageReport.h b/tools/llvm-cov/CoverageReport.h index 4126c319f43..1c9e68e832f 100644 --- a/tools/llvm-cov/CoverageReport.h +++ b/tools/llvm-cov/CoverageReport.h @@ -47,6 +47,9 @@ public: /// Render file reports for every unique file in the coverage mapping. void renderFileReports(raw_ostream &OS) const; + /// Render file reports for the files specified in \p Files. + void renderFileReports(raw_ostream &OS, ArrayRef Files) const; + /// Render file reports for the files specified in \p Files and the functions /// in \p Filters. void renderFileReports(raw_ostream &OS, ArrayRef Files,