diff options
Diffstat (limited to 'tools')
-rw-r--r-- | tools/nanobench_flags.json | 17 | ||||
-rwxr-xr-x | tools/nanobench_flags.py | 15 |
2 files changed, 26 insertions, 6 deletions
diff --git a/tools/nanobench_flags.json b/tools/nanobench_flags.json index 4f669e1fe5..81649152b8 100644 --- a/tools/nanobench_flags.json +++ b/tools/nanobench_flags.json @@ -15,10 +15,12 @@ "~blurroundrect", "~patch_grid", "~desk_carsvg", - "~desk_unicodetable" + "~desk_unicodetable", + "~interlaced1.png", + "~interlaced2.png", + "~interlaced3.png" ], "Perf-Android-Nexus7-Tegra3-Arm7-Release": [ - "--images", "--scales", "1.0", "1.1", @@ -71,7 +73,11 @@ "--loops", "1", "--samples", - "1" + "1", + "--match", + "~interlaced1.png", + "~interlaced2.png", + "~interlaced3.png" ], "Test-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Debug-ANGLE": [ "--images", @@ -93,7 +99,10 @@ "256", "--match", "~gradient", - "~etc1bitmap" + "~etc1bitmap", + "~interlaced1.png", + "~interlaced2.png", + "~interlaced3.png" ], "Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug": [ "--images", diff --git a/tools/nanobench_flags.py b/tools/nanobench_flags.py index f590242686..471c1d92f8 100755 --- a/tools/nanobench_flags.py +++ b/tools/nanobench_flags.py @@ -29,8 +29,8 @@ cov_start = lineno()+1 # We care about coverage starting just past this def. def get_args(bot): args = [] - # Temporarily disable image benchmarking. - args.append('--images') + if 'GPU' in bot: + args.append('--images') if 'Appurify' not in bot: args.extend(['--scales', '1.0', '1.1']) @@ -80,6 +80,17 @@ def get_args(bot): match.append('~keymobi') match.append('~path_hairline') + # the 32-bit GCE bots run out of memory in DM when running these large images + # so defensively disable them in nanobench, too. + # FIXME (scroggo): This may have just been due to SkImageDecoder's + # buildTileIndex leaking memory (skbug.com/4360). That is disabled by + # default for nanobench, so we may not need this. + # FIXME (scroggo): Share image blacklists between dm and nanobench? + if 'x86' in bot and not 'x86-64' in bot: + match.append('~interlaced1.png') + match.append('~interlaced2.png') + match.append('~interlaced3.png') + if match: args.append('--match') args.extend(match) |