3rd-party
/
catch2
mirror of https://github.com/catchorg/Catch2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1768 from RT222/master 

Simplified benchmark output with --benchmark-no-analysis
This commit is contained in:
Martin Hořeňovský 2019-10-08 21:07:35 +02:00 committed by GitHub
parent a5a22cdadb 2331249a8d
commit 75200e199e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 40 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
include/reporters/catch_reporter_console.cpp
View File

@ -331,8 +331,8 @@ public:
tp.m_currentColumn++; tp.m_currentColumn++;
auto colInfo = tp.m_columnInfos[tp.m_currentColumn]; auto colInfo = tp.m_columnInfos[tp.m_currentColumn];
auto padding = (strSize + 2 < static_cast<std::size_t>(colInfo.width)) auto padding = (strSize + 1 < static_cast<std::size_t>(colInfo.width))
? std::string(colInfo.width - (strSize + 2), ' ') ? std::string(colInfo.width - (strSize + 1), ' ')
: std::string(); : std::string();
if (colInfo.justification == ColumnInfo::Left) if (colInfo.justification == ColumnInfo::Left)
tp.m_os << colStr << padding << ' '; tp.m_os << colStr << padding << ' ';
@ -353,12 +353,26 @@ public:
ConsoleReporter::ConsoleReporter(ReporterConfig const& config) ConsoleReporter::ConsoleReporter(ReporterConfig const& config)
: StreamingReporterBase(config), : StreamingReporterBase(config),
m_tablePrinter(new TablePrinter(config.stream(), m_tablePrinter(new TablePrinter(config.stream(),
{ [&config]() -> std::vector<ColumnInfo> {
{ "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 32, ColumnInfo::Left }, if (config.fullConfig()->benchmarkNoAnalysis())
{ "samples mean std dev", 14, ColumnInfo::Right }, {
{ "iterations low mean low std dev", 14, ColumnInfo::Right }, return{
{ "estimated high mean high std dev", 14, ColumnInfo::Right } { "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 43, ColumnInfo::Left },
})) {} { " samples", 14, ColumnInfo::Right },
{ " iterations", 14, ColumnInfo::Right },
{ " mean", 14, ColumnInfo::Right }
};
}
else
{
return{
{ "benchmark name", CATCH_CONFIG_CONSOLE_WIDTH - 32, ColumnInfo::Left },
{ "samples mean std dev", 14, ColumnInfo::Right },
{ "iterations low mean low std dev", 14, ColumnInfo::Right },
{ "estimated high mean high std dev", 14, ColumnInfo::Right }
};
}
}())) {}
ConsoleReporter::~ConsoleReporter() = default; ConsoleReporter::~ConsoleReporter() = default;
std::string ConsoleReporter::getDescription() { std::string ConsoleReporter::getDescription() {
@ -431,18 +445,26 @@ void ConsoleReporter::benchmarkPreparing(std::string const& name) {
} }
void ConsoleReporter::benchmarkStarting(BenchmarkInfo const& info) { void ConsoleReporter::benchmarkStarting(BenchmarkInfo const& info) {
(*m_tablePrinter) << info.samples << ColumnBreak() (*m_tablePrinter) << info.samples << ColumnBreak()
<< info.iterations << ColumnBreak() << info.iterations << ColumnBreak();
<< Duration(info.estimatedDuration) << ColumnBreak(); if (!m_config->benchmarkNoAnalysis())
(*m_tablePrinter) << Duration(info.estimatedDuration) << ColumnBreak();
} }
void ConsoleReporter::benchmarkEnded(BenchmarkStats<> const& stats) { void ConsoleReporter::benchmarkEnded(BenchmarkStats<> const& stats) {
(*m_tablePrinter) << ColumnBreak() if (m_config->benchmarkNoAnalysis())
<< Duration(stats.mean.point.count()) << ColumnBreak() {
<< Duration(stats.mean.lower_bound.count()) << ColumnBreak() (*m_tablePrinter) << Duration(stats.mean.point.count()) << ColumnBreak();
<< Duration(stats.mean.upper_bound.count()) << ColumnBreak() << ColumnBreak() }
<< Duration(stats.standardDeviation.point.count()) << ColumnBreak() else
<< Duration(stats.standardDeviation.lower_bound.count()) << ColumnBreak() {
<< Duration(stats.standardDeviation.upper_bound.count()) << ColumnBreak() << ColumnBreak() << ColumnBreak() << ColumnBreak() << ColumnBreak(); (*m_tablePrinter) << ColumnBreak()
<< Duration(stats.mean.point.count()) << ColumnBreak()
<< Duration(stats.mean.lower_bound.count()) << ColumnBreak()
<< Duration(stats.mean.upper_bound.count()) << ColumnBreak() << ColumnBreak()
<< Duration(stats.standardDeviation.point.count()) << ColumnBreak()
<< Duration(stats.standardDeviation.lower_bound.count()) << ColumnBreak()
<< Duration(stats.standardDeviation.upper_bound.count()) << ColumnBreak() << ColumnBreak() << ColumnBreak() << ColumnBreak() << ColumnBreak();
}
} }
void ConsoleReporter::benchmarkFailed(std::string const& error) { void ConsoleReporter::benchmarkFailed(std::string const& error) {