AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't suppress nanobench output table in verbose mode

Browse Source 
Changes verbose mode to print both the table and the individual sample
values. No need to hold back information in verbose mode.

BUG=skia:

Review URL: https://codereview.chromium.org/1208763003
This commit is contained in:
cdalton 2015-06-26 13:32:53 -07:00 committed by Commit bot
parent 58001553ec
commit 2c56ba5cde
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
bench/nanobench.cpp
View File

@ -1005,8 +1005,6 @@ int nanobench_main() {
if (kAutoTuneLoops != FLAGS_loops) {
SkDebugf("Fixed number of loops; times would only be misleading so we won't print them.\n");
} else if (FLAGS_verbose) {
// No header.
} else if (FLAGS_quiet) {
SkDebugf("median\tbench\tconfig\n");
} else if (kTimedSampling == FLAGS_samples) {
@ -1103,11 +1101,6 @@ int nanobench_main() {
, sk_tools::getMaxResidentSetSizeMB()
, bench->getUniqueName()
, config);
} else if (FLAGS_verbose) {
for (int i = 0; i < samples.count(); i++) {
SkDebugf("%s ", HUMANIZE(samples[i]));
}
SkDebugf("%s\n", bench->getUniqueName());
} else if (FLAGS_quiet) {
if (configs.count() == 1) {
config = ""; // Only print the config if we run the same bench on more than one.
@ -1137,6 +1130,13 @@ int nanobench_main() {
gGrFactory->get(configs[i].ctxType)->printGpuStats();
}
#endif
if (FLAGS_verbose) {
SkDebugf("Samples: ");
for (int i = 0; i < samples.count(); i++) {
SkDebugf("%s ", HUMANIZE(samples[i]));
}
SkDebugf("%s\n", bench->getUniqueName());
}
cleanup_run(target);
}
}

8
bin/compare
View File

@ -9,9 +9,11 @@ a,b = {},{}
for (path, d) in [(sys.argv[1], a), (sys.argv[2], b)]:
for line in open(path):
try:
tokens = line.split()
samples = tokens[:-1]
label = tokens[-1]
tokens = line.split()
if tokens[0] != "Samples:":
continue
samples = tokens[1:-1]
label = tokens[-1]
d[label] = map(float, samples)
except:
pass