0a3cac8a90
Reason for revert: Still breaking. e.g. http://build.chromium.org/p/client.skia/builders/Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug/builds/1466/steps/nanobench/logs/stdio http://build.chromium.org/p/client.skia.android/builders/Perf-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release/builds/2280/steps/nanobench/logs/stdio Original issue's description: > Revert of Pass --images '' to nanobench to disable image benchmarking. (patchset #1 id:1 of https://codereview.chromium.org/1381703003/ ) > > Reason for revert: > I have attempted to fix the problems that caused running nanobench with images to fail, so testing to see if they are in fact fixed. > > Original issue's description: > > Pass --images '' to nanobench to disable image benchmarking. > > > > Enabling image benchmarking has caused most nanobench runs to fail, > > both Debug and Release. > > > > BUG=skia:3418 > > NOTREECHECKS=true > > TBR=scroggo@google.com > > > > Committed: https://skia.googlesource.com/skia/+/1f7039c6c5f0f118b629994b0bac255345e5abd6 > > BUG=skia:3418 > > Committed: https://skia.googlesource.com/skia/+/c2e59caa0a466040f4b4f08cb5604c86b2615efa TBR=mtklein@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia:3418 Review URL: https://codereview.chromium.org/1396843003
132 lines
3.5 KiB
Python
Executable File
132 lines
3.5 KiB
Python
Executable File
#
|
|
# Copyright 2015 Google Inc.
|
|
#
|
|
# Use of this source code is governed by a BSD-style license that can be
|
|
# found in the LICENSE file.
|
|
#
|
|
|
|
#!/usr/bin/env python
|
|
|
|
usage = '''
|
|
Write extra flags to outfile for nanobench based on the bot name:
|
|
$ python nanobench_flags.py outfile Perf-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Release
|
|
Or run self-tests:
|
|
$ python nanobench_flags.py test
|
|
'''
|
|
|
|
import inspect
|
|
import json
|
|
import os
|
|
import sys
|
|
|
|
|
|
def lineno():
|
|
caller = inspect.stack()[1] # Up one level to our caller.
|
|
return inspect.getframeinfo(caller[0]).lineno
|
|
|
|
|
|
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 'Appurify' not in bot:
|
|
args.extend(['--scales', '1.0', '1.1'])
|
|
|
|
if 'iOS' in bot:
|
|
args.extend(['--skps', 'ignore_skps'])
|
|
|
|
if 'Appurify' not in bot:
|
|
config = ['565', '8888', 'gpu', 'nonrendering', 'angle', 'hwui']
|
|
# The S4 crashes and the NP produces a long error stream when we run with
|
|
# MSAA.
|
|
if ('GalaxyS4' not in bot and
|
|
'NexusPlayer' not in bot):
|
|
if 'Android' in bot:
|
|
config.extend(['msaa4', 'nvprmsaa4'])
|
|
else:
|
|
config.extend(['msaa16', 'nvprmsaa16'])
|
|
args.append('--config')
|
|
args.extend(config)
|
|
|
|
if 'Valgrind' in bot:
|
|
# Don't care about Valgrind performance.
|
|
args.extend(['--loops', '1'])
|
|
args.extend(['--samples', '1'])
|
|
|
|
if 'HD2000' in bot:
|
|
args.extend(['--GPUbenchTileW', '256'])
|
|
args.extend(['--GPUbenchTileH', '256'])
|
|
|
|
match = []
|
|
if 'Android' in bot:
|
|
# Segfaults when run as GPU bench. Very large texture?
|
|
match.append('~blurroundrect')
|
|
match.append('~patch_grid') # skia:2847
|
|
match.append('~desk_carsvg')
|
|
if 'HD2000' in bot:
|
|
match.extend(['~gradient', '~etc1bitmap']) # skia:2895
|
|
if 'NexusPlayer' in bot:
|
|
match.append('~desk_unicodetable')
|
|
if 'GalaxyS4' in bot:
|
|
match.append('~GLInstancedArraysBench') # skia:4371
|
|
|
|
if 'iOS' in bot:
|
|
match.append('~blurroundrect')
|
|
match.append('~patch_grid') # skia:2847
|
|
match.append('~desk_carsvg')
|
|
match.append('~keymobi')
|
|
match.append('~path_hairline')
|
|
|
|
if match:
|
|
args.append('--match')
|
|
args.extend(match)
|
|
|
|
return args
|
|
cov_end = lineno() # Don't care about code coverage past here.
|
|
|
|
|
|
def self_test():
|
|
import coverage # This way the bots don't need coverage.py to be installed.
|
|
args = {}
|
|
cases = [
|
|
'Perf-Android-Nexus7-Tegra3-Arm7-Release',
|
|
'Perf-Android-GCC-NexusPlayer-GPU-PowerVR-x86-Release',
|
|
'Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind',
|
|
'Test-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Debug-ANGLE',
|
|
'Test-iOS-Clang-iPad4-GPU-SGX554-Arm7-Debug',
|
|
'Test-Android-GCC-GalaxyS4-GPU-SGX544-Arm7-Release',
|
|
]
|
|
|
|
cov = coverage.coverage()
|
|
cov.start()
|
|
for case in cases:
|
|
args[case] = get_args(case)
|
|
cov.stop()
|
|
|
|
this_file = os.path.basename(__file__)
|
|
_, _, not_run, _ = cov.analysis(this_file)
|
|
filtered = [line for line in not_run if line > cov_start and line < cov_end]
|
|
if filtered:
|
|
print 'Lines not covered by test cases: ', filtered
|
|
sys.exit(1)
|
|
|
|
golden = this_file.replace('.py', '.json')
|
|
with open(os.path.join(os.path.dirname(__file__), golden), 'w') as f:
|
|
json.dump(args, f, indent=2, sort_keys=True)
|
|
|
|
|
|
if __name__ == '__main__':
|
|
if len(sys.argv) == 2 and sys.argv[1] == 'test':
|
|
self_test()
|
|
sys.exit(0)
|
|
|
|
if len(sys.argv) != 3:
|
|
print usage
|
|
sys.exit(1)
|
|
|
|
with open(sys.argv[1], 'w') as out:
|
|
json.dump(get_args(sys.argv[2]), out)
|