Skip to content

Add command line option to print user counters in tabular format #350

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 17 commits into from
May 3, 2017
Merged

Add command line option to print user counters in tabular format #350

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
0de985a
Add command line option --benchmark_counters_tabular
biojppm Mar 2, 2017
cbb2eb8
Tabular counters: fix dangling reference to color_output_.
biojppm Mar 2, 2017
c846eed
Fix use of C-style cast.
biojppm Mar 2, 2017
d84d911
Tabular counters: fix missing cast on MSVC.
biojppm Mar 2, 2017
707dd89
User counters: document tabular output in README.md
biojppm Apr 1, 2017
6151517
Merge remote-tracking branch 'upstream/master' into compact
biojppm May 2, 2017
17a012d
Fix: --benchmark_counters_tabular was not being passed to tests.
biojppm May 2, 2017
c69b385
Add first unit test for benchmark_tabular_counters.
biojppm May 2, 2017
cf20dc9
Add test for tabular output of rate counters.
biojppm May 2, 2017
3db6254
Console reporter: add /s prefix to counter rates.
biojppm May 2, 2017
ea019f3
Allow different counter sets in CSV reporting.
biojppm May 2, 2017
2506044
Add unit test for counter sets.
biojppm May 2, 2017
020bac9
Extend tabular counter tests to different counter sets.
biojppm May 2, 2017
a310886
Fix (that is, ignore) clang compile error.
biojppm May 2, 2017
160770f
Fix dropped-style elses.
biojppm May 2, 2017
1735413
Fix pragma clang ignore with gcc.
biojppm May 2, 2017
ec6f035
Trying again to fix error caused by -Wunused-function.
biojppm May 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix: --benchmark_counters_tabular was not being passed to tests.
  • Loading branch information
@biojppm
biojppm committed May 2, 2017
commit 17a012d7549fa0e962dfa0622de8aef60c42bd3a
35 changes: 21 additions & 14 deletions src/benchmark.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,26 @@ std::unique_ptr<BenchmarkReporter> CreateReporter(
}

} // end namespace

ConsoleReporter::OutputOptions GetOutputOptions(bool force_no_color) {
int output_opts = ConsoleReporter::OO_Defaults;
if ((FLAGS_benchmark_color == "auto" && IsColorTerminal()) ||
IsTruthyFlagValue(FLAGS_benchmark_color)) {
output_opts |= ConsoleReporter::OO_Color;
} else {
output_opts &= ~ConsoleReporter::OO_Color;
}
if(force_no_color) {
output_opts &= ~ConsoleReporter::OO_Color;
}
if(FLAGS_benchmark_counters_tabular) {
output_opts |= ConsoleReporter::OO_Tabular;
} else {
output_opts &= ~ConsoleReporter::OO_Tabular;
}
return static_cast< ConsoleReporter::OutputOptions >(output_opts);
}

} // end namespace internal

size_t RunSpecifiedBenchmarks() {
Expand All @@ -563,21 +583,8 @@ size_t RunSpecifiedBenchmarks(BenchmarkReporter* console_reporter,
std::unique_ptr<BenchmarkReporter> default_console_reporter;
std::unique_ptr<BenchmarkReporter> default_file_reporter;
if (!console_reporter) {
int output_opts = ConsoleReporter::OO_Defaults;
if ((FLAGS_benchmark_color == "auto" && IsColorTerminal()) ||
IsTruthyFlagValue(FLAGS_benchmark_color)) {
output_opts |= ConsoleReporter::OO_Color;
} else {
output_opts &= ~ConsoleReporter::OO_Color;
}
if(FLAGS_benchmark_counters_tabular) {
output_opts |= ConsoleReporter::OO_Tabular;
} else {
output_opts &= ~ConsoleReporter::OO_Tabular;
}
default_console_reporter = internal::CreateReporter(
FLAGS_benchmark_format,
static_cast< ConsoleReporter::OutputOptions >(output_opts));
FLAGS_benchmark_format, internal::GetOutputOptions());
console_reporter = default_console_reporter.get();
}
auto& Out = console_reporter->GetOutputStream();
Expand Down
2 changes: 2 additions & 0 deletions src/benchmark_api_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ bool FindBenchmarksInternal(const std::string& re,
std::vector<Benchmark::Instance>* benchmarks,
std::ostream* Err);

ConsoleReporter::OutputOptions GetOutputOptions(bool force_no_color = false);

namespace {

bool IsZero(double n) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

unused function, apparently? in travis (clang release)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've fixed by pragma-ignoring it, is it OK?

Expand Down
5 changes: 3 additions & 2 deletions src/console_reporter.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,18 +53,19 @@ bool ConsoleReporter::ReportContext(const Context& context) {
}

void ConsoleReporter::PrintHeader(const Run& run) {
std::string str = FormatString("%-*s %13s %13s %10s\n", static_cast<int>(name_field_width_),
std::string str = FormatString("%-*s %13s %13s %10s", static_cast<int>(name_field_width_),
"Benchmark", "Time", "CPU", "Iterations");
if(!run.counters.empty()) {
if(output_options_ & OO_Tabular) {
for(auto const& c : run.counters) {
str += FormatString(" %10s", c.first);
str += FormatString(" %10s", c.first.c_str());
}
}
else {
str += " UserCounters...";
}
}
str += "\n";
std::string line = std::string(str.length(), '-');
GetOutputStream() << line << "\n" << str << line << "\n";
}
Expand Down
4 changes: 3 additions & 1 deletion test/output_test_helper.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#include "../src/check.h" // NOTE: check.h is for internal use only!
#include "../src/re.h" // NOTE: re.h is for internal use only
#include "output_test.h"
#include "../src/benchmark_api_internal.h"

// ========================================================================= //
// ------------------------------ Internals -------------------------------- //
Expand Down Expand Up @@ -367,7 +368,8 @@ int SetSubstitutions(
void RunOutputTests(int argc, char* argv[]) {
using internal::GetTestCaseList;
benchmark::Initialize(&argc, argv);
benchmark::ConsoleReporter CR(benchmark::ConsoleReporter::OO_None);
auto options = benchmark::internal::GetOutputOptions(/*force_no_color*/true);
benchmark::ConsoleReporter CR(options);
benchmark::JSONReporter JR;
benchmark::CSVReporter CSVR;
struct ReporterTest {
Expand Down