From d4b0ab066f3b1c819c2b740a9191e254da84b40c Mon Sep 17 00:00:00 2001 From: Max Moroz Date: Mon, 11 Dec 2017 23:17:46 +0000 Subject: [llvm-cov] Add an option for "export" command to emit only file summary data. Summary: That allows to get the same data as produced by "llvm-cov report", but in JSON format, which is better for further processing by end users. Reviewers: vsk Reviewed By: vsk Differential Revision: https://reviews.llvm.org/D41085 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@320435 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/llvm-cov/CodeCoverage.cpp | 5 +++++ tools/llvm-cov/CoverageExporterJson.cpp | 39 +++++++++++++++++++-------------- tools/llvm-cov/CoverageViewOptions.h | 1 + 3 files changed, 29 insertions(+), 16 deletions(-) (limited to 'tools') diff --git a/tools/llvm-cov/CodeCoverage.cpp b/tools/llvm-cov/CodeCoverage.cpp index 2ecd7ea6b90..00258f2a1b3 100644 --- a/tools/llvm-cov/CodeCoverage.cpp +++ b/tools/llvm-cov/CodeCoverage.cpp @@ -631,6 +631,10 @@ int CodeCoverageTool::run(Command Cmd, int argc, const char **argv) { "show-instantiation-summary", cl::Optional, cl::desc("Show instantiation statistics in summary table")); + cl::opt SummaryOnly( + "summary-only", cl::Optional, + cl::desc("Export only summary information for each source file")); + auto commandLineParser = [&, this](int argc, const char **argv) -> int { cl::ParseCommandLineOptions(argc, argv, "LLVM code coverage tool\n"); ViewOpts.Debug = DebugDump; @@ -743,6 +747,7 @@ int CodeCoverageTool::run(Command Cmd, int argc, const char **argv) { ViewOpts.ShowRegionSummary = RegionSummary; ViewOpts.ShowInstantiationSummary = InstantiationSummary; + ViewOpts.ExportSummaryOnly = SummaryOnly; return 0; }; diff --git a/tools/llvm-cov/CoverageExporterJson.cpp b/tools/llvm-cov/CoverageExporterJson.cpp index 5b6b09f048e..7b700908968 100644 --- a/tools/llvm-cov/CoverageExporterJson.cpp +++ b/tools/llvm-cov/CoverageExporterJson.cpp @@ -177,8 +177,11 @@ class CoverageExporterJson { SourceFiles, Options); renderFiles(SourceFiles, FileReports); - emitDictKey("functions"); - renderFunctions(Coverage.getCoveredFunctions()); + // Skip functions-level information for summary-only export mode. + if (!Options.ExportSummaryOnly) { + emitDictKey("functions"); + renderFunctions(Coverage.getCoveredFunctions()); + } emitDictKey("totals"); renderSummary(Totals); @@ -254,27 +257,31 @@ class CoverageExporterJson { emitDictStart(); emitDictElement("filename", FileCoverage.getFilename()); - emitDictKey("segments"); - // Start List of Segments. - emitArrayStart(); + // Skip segments and expansions for summary-only export mode. + if (!Options.ExportSummaryOnly) { + emitDictKey("segments"); - for (const auto &Segment : FileCoverage) - renderSegment(Segment); + // Start List of Segments. + emitArrayStart(); - // End List of Segments. - emitArrayEnd(); + for (const auto &Segment : FileCoverage) + renderSegment(Segment); + + // End List of Segments. + emitArrayEnd(); - emitDictKey("expansions"); + emitDictKey("expansions"); - // Start List of Expansions. - emitArrayStart(); + // Start List of Expansions. + emitArrayStart(); - for (const auto &Expansion : FileCoverage.getExpansions()) - renderExpansion(Expansion); + for (const auto &Expansion : FileCoverage.getExpansions()) + renderExpansion(Expansion); - // End List of Expansions. - emitArrayEnd(); + // End List of Expansions. + emitArrayEnd(); + } emitDictKey("summary"); renderSummary(FileReport); diff --git a/tools/llvm-cov/CoverageViewOptions.h b/tools/llvm-cov/CoverageViewOptions.h index a071c0aca9e..17614c4e9ba 100644 --- a/tools/llvm-cov/CoverageViewOptions.h +++ b/tools/llvm-cov/CoverageViewOptions.h @@ -32,6 +32,7 @@ struct CoverageViewOptions { bool ShowFullFilenames; bool ShowRegionSummary; bool ShowInstantiationSummary; + bool ExportSummaryOnly; OutputFormat Format; std::string ShowOutputDirectory; std::vector DemanglerOpts; -- cgit v1.2.3