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

Update [dm|nanobench]_flags for CPU/GPU split

Browse Source 
TBR=mtklein
NOTREECHECKS=true
BUG=skia:2073

Review URL: https://codereview.chromium.org/1036223002
This commit is contained in:
borenet 2015-03-27 05:42:18 -07:00 committed by Commit bot
parent daee7eadd1
commit 1e37d1762c
4 changed files with 113 additions and 245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

256
tools/dm_flags.json
View File

@ -1,5 +1,5 @@
{
"Test-Android-GalaxyS3-Mali400-Arm7-Debug": [
"Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug": [
"--config",
"565",
"8888",
@ -86,10 +86,9 @@
"--match",
"~WritePixels",
"~tabl_mozilla_0",
"~desk_yahoonews_0",
"--nocpu"
"~desk_yahoonews_0"
],
"Test-Android-Nexus7-Tegra3-Arm7-Release": [
"Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release": [
"--config",
"565",
"8888",
@ -175,10 +174,9 @@
"_",
"--match",
"~tabl_mozilla_0",
"~desk_yahoonews_0",
"--nocpu"
"~desk_yahoonews_0"
],
"Test-Android-NexusPlayer-PowerVR-x86-Release": [
"Test-Android-GCC-NexusPlayer-CPU-SSSE3-x86-Release": [
"--config",
"565",
"8888",
@ -261,7 +259,7 @@
"~desk_yahoonews_0",
"~ResourceCache"
],
"Test-Android-Xoom-Tegra2-Arm7-Release": [
"Test-Android-GCC-Xoom-GPU-Tegra2-Arm7-Release": [
"--config",
"565",
"8888",
@ -346,160 +344,7 @@
"~tabl_mozilla_0",
"~desk_yahoonews_0"
],
"Test-ChromeOS-Alex-GMA3150-x86-Debug": [
"--config",
"565",
"8888",
"gpu",
"msaa16",
"nvprmsaa16",
"pdf",
"serialize-8888",
"tiles_rt-8888",
"pipe-8888",
"tiles_rt-gpu",
"--blacklist",
"gpu",
"_",
"PANO_20121023_214540.jpg",
"msaa",
"_",
"PANO_20121023_214540.jpg",
"_",
"image",
"pal8os2v2.bmp",
"_",
"image",
"pal8v4.bmp",
"_",
"image",
"pal8v5.bmp",
"_",
"image",
"rgb16-565.bmp",
"_",
"image",
"rgb16-565pal.bmp",
"_",
"image",
"rgb32-111110.bmp",
"_",
"image",
"rgb32bf.bmp",
"_",
"image",
"rgba32.bmp",
"_",
"image",
"rgba32abf.bmp",
"_",
"image",
"rgb24largepal.bmp",
"_",
"image",
"pal8os2v2-16.bmp",
"_",
"image",
"pal8oversizepal.bmp",
"_",
"subset",
"rgb24largepal.bmp",
"_",
"subset",
"pal8os2v2-16.bmp",
"_",
"subset",
"pal8oversizepal.bmp",
"_",
"image",
"Hopstarter-Mac-Folders-Apple.ico",
"--threads",
"1"
],
"Test-Ubuntu12-ShuttleA-GTX550Ti-x86_64-Release-Valgrind_GPU": [
"--config",
"565",
"8888",
"gpu",
"msaa16",
"nvprmsaa16",
"pdf",
"serialize-8888",
"tiles_rt-8888",
"pipe-8888",
"tiles_rt-gpu",
"--nocpu",
"--blacklist",
"gpu",
"_",
"PANO_20121023_214540.jpg",
"msaa",
"_",
"PANO_20121023_214540.jpg",
"_",
"image",
"pal8os2v2.bmp",
"_",
"image",
"pal8v4.bmp",
"_",
"image",
"pal8v5.bmp",
"_",
"image",
"rgb16-565.bmp",
"_",
"image",
"rgb16-565pal.bmp",
"_",
"image",
"rgb32-111110.bmp",
"_",
"image",
"rgb32bf.bmp",
"_",
"image",
"rgba32.bmp",
"_",
"image",
"rgba32abf.bmp",
"_",
"image",
"rgb24largepal.bmp",
"_",
"image",
"pal8os2v2-16.bmp",
"_",
"image",
"pal8oversizepal.bmp",
"_",
"subset",
"rgb24largepal.bmp",
"_",
"subset",
"pal8os2v2-16.bmp",
"_",
"subset",
"pal8oversizepal.bmp",
"_",
"image",
"Hopstarter-Mac-Folders-Apple.ico",
"pdf",
"_",
".webp",
"pdf",
"gm",
"fontmgr_iter",
"pdf",
"_",
"PANO_20121023_214540.jpg",
"pdf",
"skp",
"tabl_worldjournal.skp",
"--match",
"~Threaded"
],
"Test-Ubuntu13.10-GCE-NoGPU-x86_64-Release-TSAN": [
"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN": [
"--config",
"565",
"8888",
@ -569,7 +414,7 @@
"--match",
"~Math"
],
"Test-Ubuntu14-GCE-NoGPU-x86_64-Release-Valgrind_CPU": [
"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Valgrind": [
"--config",
"565",
"8888",
@ -581,7 +426,6 @@
"tiles_rt-8888",
"pipe-8888",
"tiles_rt-gpu",
"--nogpu",
"--blacklist",
"gpu",
"_",
@ -652,7 +496,89 @@
"--match",
"~Threaded"
],
"Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE": [
"Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind": [
"--config",
"565",
"8888",
"gpu",
"msaa16",
"nvprmsaa16",
"pdf",
"serialize-8888",
"tiles_rt-8888",
"pipe-8888",
"tiles_rt-gpu",
"--blacklist",
"gpu",
"_",
"PANO_20121023_214540.jpg",
"msaa",
"_",
"PANO_20121023_214540.jpg",
"_",
"image",
"pal8os2v2.bmp",
"_",
"image",
"pal8v4.bmp",
"_",
"image",
"pal8v5.bmp",
"_",
"image",
"rgb16-565.bmp",
"_",
"image",
"rgb16-565pal.bmp",
"_",
"image",
"rgb32-111110.bmp",
"_",
"image",
"rgb32bf.bmp",
"_",
"image",
"rgba32.bmp",
"_",
"image",
"rgba32abf.bmp",
"_",
"image",
"rgb24largepal.bmp",
"_",
"image",
"pal8os2v2-16.bmp",
"_",
"image",
"pal8oversizepal.bmp",
"_",
"subset",
"rgb24largepal.bmp",
"_",
"subset",
"pal8os2v2-16.bmp",
"_",
"subset",
"pal8oversizepal.bmp",
"_",
"image",
"Hopstarter-Mac-Folders-Apple.ico",
"pdf",
"_",
".webp",
"pdf",
"gm",
"fontmgr_iter",
"pdf",
"_",
"PANO_20121023_214540.jpg",
"pdf",
"skp",
"tabl_worldjournal.skp",
"--match",
"~Threaded"
],
"Test-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Debug-ANGLE": [
"--config",
"565",
"8888",

34
tools/dm_flags.py
View File

@ -9,7 +9,7 @@
usage = '''
Write extra flags to outfile for DM based on the bot name:
$ python dm_flags.py outfile Test-Mac10.9-MacMini6.2-HD4000-x86_64-Release
$ python dm_flags.py outfile Test-Ubuntu-GCC-GCE-CPU-AVX2-x86-Debug
Or run self-tests:
$ python dm_flags.py test
'''
@ -103,20 +103,12 @@ def get_args(bot):
blacklist.extend('pdf gm fontmgr_iter'.split(' '))
blacklist.extend('pdf _ PANO_20121023_214540.jpg'.split(' '))
blacklist.extend('pdf skp tabl_worldjournal.skp'.split(' '))
if 'Valgrind_GPU' in bot:
args.append('--nocpu')
elif 'Valgrind_CPU' in bot:
args.append('--nogpu')
if blacklist:
args.append('--blacklist')
args.extend(blacklist)
match = []
if 'Alex' in bot: # skia:2793
# This machine looks to be running out of heap.
# Running with fewer threads may help.
args.extend(['--threads', '1'])
if 'Valgrind' in bot: # skia:3021
match.append('~Threaded')
if 'TSAN' in bot: # skia:3562
@ -137,13 +129,6 @@ def get_args(bot):
args.append('--match')
args.extend(match)
# Though their GPUs are interesting, these don't test anything on
# the CPU that other ARMv7+NEON bots don't test faster (N5).
if ('Nexus10' in bot or
'Nexus7' in bot or
'GalaxyS3' in bot or
'GalaxyS4' in bot):
args.append('--nocpu')
return args
cov_end = lineno() # Don't care about code coverage past here.
@ -152,15 +137,14 @@ def self_test():
import coverage # This way the bots don't need coverage.py to be installed.
args = {}
cases = [
'Test-Android-GalaxyS3-Mali400-Arm7-Debug',
'Test-Android-Nexus7-Tegra3-Arm7-Release',
'Test-Android-NexusPlayer-PowerVR-x86-Release',
'Test-Android-Xoom-Tegra2-Arm7-Release',
'Test-ChromeOS-Alex-GMA3150-x86-Debug',
'Test-Ubuntu12-ShuttleA-GTX550Ti-x86_64-Release-Valgrind_GPU',
'Test-Ubuntu13.10-GCE-NoGPU-x86_64-Release-TSAN',
'Test-Ubuntu14-GCE-NoGPU-x86_64-Release-Valgrind_CPU',
'Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE',
'Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug',
'Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release',
'Test-Android-GCC-NexusPlayer-CPU-SSSE3-x86-Release',
'Test-Android-GCC-Xoom-GPU-Tegra2-Arm7-Release',
'Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind',
'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-TSAN',
'Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Valgrind',
'Test-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Debug-ANGLE',
]
cov = coverage.coverage()

45
tools/nanobench_flags.json
View File

@ -1,23 +1,4 @@
{
"Perf-Android-GalaxyS3-Mali400-Arm7-Release": [
"--scales",
"1.0",
"1.1",
"--config",
"565",
"8888",
"gpu",
"nonrendering",
"angle",
"hwui",
"msaa4",
"nvprmsaa4",
"--match",
"~blurroundrect",
"~patch_grid",
"~desk_carsvg",
"--nocpu"
],
"Perf-Android-Nexus7-Tegra3-Arm7-Release": [
"--scales",
"1.0",
@ -34,7 +15,7 @@
"--match",
"skp"
],
"Test-Ubuntu12-ShuttleA-GTX550Ti-x86_64-Release-Valgrind_GPU": [
"Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind": [
"--scales",
"1.0",
"1.1",
@ -50,29 +31,9 @@
"--loops",
"1",
"--samples",
"1",
"--nocpu"
"1"
],
"Test-Ubuntu14-GCE-NoGPU-x86_64-Release-Valgrind_CPU": [
"--scales",
"1.0",
"1.1",
"--config",
"565",
"8888",
"gpu",
"nonrendering",
"angle",
"hwui",
"msaa16",
"nvprmsaa16",
"--loops",
"1",
"--samples",
"1",
"--nogpu"
],
"Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE": [
"Test-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Debug-ANGLE": [
"--scales",
"1.0",
"1.1",

23
tools/nanobench_flags.py
View File

@ -1,8 +1,15 @@
#
# 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-GalaxyS3-Mali400-Arm7-Release
$ python nanobench_flags.py outfile Perf-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Release
Or run self-tests:
$ python nanobench_flags.py test
'''
@ -40,10 +47,6 @@ def get_args(bot):
# Don't care about Valgrind performance.
args.extend(['--loops', '1'])
args.extend(['--samples', '1'])
if 'Valgrind_GPU' in bot:
args.append('--nocpu')
elif 'Valgrind_CPU' in bot:
args.append('--nogpu')
if 'HD2000' in bot:
args.extend(['--benchTileW', '256'])
@ -63,10 +66,6 @@ def get_args(bot):
args.append('--match')
args.extend(match)
if ('GalaxyS3' in bot or
'GalaxyS4' in bot):
args.append('--nocpu')
return args
cov_end = lineno() # Don't care about code coverage past here.
@ -75,11 +74,9 @@ def self_test():
import coverage # This way the bots don't need coverage.py to be installed.
args = {}
cases = [
'Perf-Android-GalaxyS3-Mali400-Arm7-Release',
'Perf-Android-Nexus7-Tegra3-Arm7-Release',
'Test-Ubuntu14-GCE-NoGPU-x86_64-Release-Valgrind_CPU',
'Test-Ubuntu12-ShuttleA-GTX550Ti-x86_64-Release-Valgrind_GPU',
'Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE',
'Test-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind',
'Test-Win7-MSVC-ShuttleA-GPU-HD2000-x86-Debug-ANGLE',
]
cov = coverage.coverage()