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

Stop benching PNG buildTileIndex by default

Browse Source 
It leaks memory and kills the bots. Supply an option to run it for
local comparison.

BUG=skia:4360
BUG=skia:3418

Review URL: https://codereview.chromium.org/1396613007
This commit is contained in:
scroggo 2015-10-13 13:33:33 -07:00 committed by Commit bot
parent 0adfffba1b
commit 2da1a854b0
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
bench/nanobench.cpp
View File

@ -111,6 +111,7 @@ DEFINE_bool(loopSKP, true, "Loop SKPs like we do for micro benches?");
DEFINE_int32(flushEvery, 10, "Flush --outResultsFile every Nth run.");
DEFINE_bool(resetGpuContext, true, "Reset the GrContext before running each test.");
DEFINE_bool(gpuStats, false, "Print GPU stats after each gpu benchmark?");
DEFINE_bool(pngBuildTileIndex, false, "If supported, use png buildTileIndex/decodeSubset.");
static SkString humanize(double ms) {
if (FLAGS_verbose) return SkStringPrintf("%llu", (uint64_t)(ms*1e6));
@ -508,8 +509,8 @@ static Target* is_enabled(Benchmark* bench, const Config& config) {
*/
static bool run_subset_bench(const SkString& path, bool useCodec) {
static const char* const exts[] = {
"jpg", "jpeg", "png",
"JPG", "JPEG", "PNG",
"jpg", "jpeg",
"JPG", "JPEG",
};
for (uint32_t i = 0; i < SK_ARRAY_COUNT(exts); i++) {
@ -518,7 +519,18 @@ static bool run_subset_bench(const SkString& path, bool useCodec) {
}
}
return !useCodec && (path.endsWith("webp") || path.endsWith("WEBP"));
// Test png in SkCodec, and optionally on SkImageDecoder. SkImageDecoder is
// disabled by default because it leaks memory.
// skbug.com/4360
if ((useCodec || FLAGS_pngBuildTileIndex) && (path.endsWith("png") || path.endsWith("PNG"))) {
return true;
}
if (!useCodec && (path.endsWith("webp") || path.endsWith("WEBP"))) {
return true;
}
return false;
}
/*