Disable f16 and srgb configs for Android CPU perf.
This is a followup to https://skia-review.googlesource.com/c/9021/ BUG=skia: Change-Id: Ie8bae20162759c2545690fcc4c8867a478914c35 Reviewed-on: https://skia-review.googlesource.com/9065 Reviewed-by: Mike Klein <mtklein@chromium.org> Commit-Queue: Ben Wagner <benjaminwagner@google.com>
This commit is contained in:
Ben Wagner
Skia Commit-Bot
parent
c787e495e2
commit
3809f89eee
@ -27,7 +27,8 @@ def nanobench_flags(bot):
|
||||
args.extend(['--skps', 'ignore_skps'])
|
||||
|
||||
config = ['8888', 'gpu', 'nonrendering', 'hwui' ]
|
||||
if 'AndroidOne' not in bot:
|
||||
if '-arm-' not in bot:
|
||||
# For Android CPU tests, these take too long and cause the task to time out.
|
||||
config += [ 'f16', 'srgb' ]
|
||||
if '-GCE-' in bot:
|
||||
config += [ '565' ]
|
||||
|
||||
@ -0,0 +1,509 @@
|
||||
[
|
||||
{
|
||||
"cmd": [
|
||||
"adb",
|
||||
"shell",
|
||||
"mkdir",
|
||||
"-p",
|
||||
"/sdcard/revenge_of_the_skiabot/resources"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"name": "mkdir /sdcard/revenge_of_the_skiabot/resources"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"python",
|
||||
"-u",
|
||||
"\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n",
|
||||
"[START_DIR]/skia/resources",
|
||||
"/sdcard/revenge_of_the_skiabot/resources"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"name": "push [START_DIR]/skia/resources/* /sdcard/revenge_of_the_skiabot/resources",
|
||||
"~followup_annotations": [
|
||||
"@@@STEP_LOG_LINE@python.inline@@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@import os@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@import sys@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ continue@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb', 'push',@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@",
|
||||
"@@@STEP_LOG_END@python.inline@@@"
|
||||
]
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"python",
|
||||
"-u",
|
||||
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
||||
"[START_DIR]/skia/infra/bots/assets/skp/VERSION",
|
||||
"/path/to/tmp/"
|
||||
],
|
||||
"name": "Get downloaded SKP VERSION"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"python",
|
||||
"-u",
|
||||
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
||||
"42",
|
||||
"[START_DIR]/tmp/SKP_VERSION"
|
||||
],
|
||||
"name": "write SKP_VERSION"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"adb",
|
||||
"shell",
|
||||
"cat",
|
||||
"/sdcard/revenge_of_the_skiabot/SKP_VERSION"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION",
|
||||
"stdout": "/path/to/tmp/"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"adb",
|
||||
"shell",
|
||||
"rm",
|
||||
"-f",
|
||||
"/sdcard/revenge_of_the_skiabot/SKP_VERSION"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"adb",
|
||||
"shell",
|
||||
"rm",
|
||||
"-rf",
|
||||
"/sdcard/revenge_of_the_skiabot/skps"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"name": "rm /sdcard/revenge_of_the_skiabot/skps"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"adb",
|
||||
"shell",
|
||||
"mkdir",
|
||||
"-p",
|
||||
"/sdcard/revenge_of_the_skiabot/skps"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"name": "mkdir /sdcard/revenge_of_the_skiabot/skps"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"python",
|
||||
"-u",
|
||||
"\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n",
|
||||
"[START_DIR]/skp",
|
||||
"/sdcard/revenge_of_the_skiabot/skps"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"name": "push [START_DIR]/skp/* /sdcard/revenge_of_the_skiabot/skps",
|
||||
"~followup_annotations": [
|
||||
"@@@STEP_LOG_LINE@python.inline@@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@import os@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@import sys@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ continue@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb', 'push',@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@",
|
||||
"@@@STEP_LOG_END@python.inline@@@"
|
||||
]
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"adb",
|
||||
"push",
|
||||
"[START_DIR]/tmp/SKP_VERSION",
|
||||
"/sdcard/revenge_of_the_skiabot/SKP_VERSION"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"python",
|
||||
"-u",
|
||||
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
||||
"[START_DIR]/skia/infra/bots/assets/skimage/VERSION",
|
||||
"/path/to/tmp/"
|
||||
],
|
||||
"name": "Get downloaded skimage VERSION"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"python",
|
||||
"-u",
|
||||
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
||||
"42",
|
||||
"[START_DIR]/tmp/SK_IMAGE_VERSION"
|
||||
],
|
||||
"name": "write SK_IMAGE_VERSION"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"adb",
|
||||
"shell",
|
||||
"cat",
|
||||
"/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"name": "read /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION",
|
||||
"stdout": "/path/to/tmp/"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"adb",
|
||||
"shell",
|
||||
"rm",
|
||||
"-f",
|
||||
"/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"name": "rm /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"adb",
|
||||
"shell",
|
||||
"rm",
|
||||
"-rf",
|
||||
"/sdcard/revenge_of_the_skiabot/images"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"name": "rm /sdcard/revenge_of_the_skiabot/images"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"adb",
|
||||
"shell",
|
||||
"mkdir",
|
||||
"-p",
|
||||
"/sdcard/revenge_of_the_skiabot/images"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"name": "mkdir /sdcard/revenge_of_the_skiabot/images"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"python",
|
||||
"-u",
|
||||
"\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n",
|
||||
"[START_DIR]/skimage",
|
||||
"/sdcard/revenge_of_the_skiabot/images"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"name": "push [START_DIR]/skimage/* /sdcard/revenge_of_the_skiabot/images",
|
||||
"~followup_annotations": [
|
||||
"@@@STEP_LOG_LINE@python.inline@@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@import os@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@import sys@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ continue@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb', 'push',@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@",
|
||||
"@@@STEP_LOG_END@python.inline@@@"
|
||||
]
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"adb",
|
||||
"push",
|
||||
"[START_DIR]/tmp/SK_IMAGE_VERSION",
|
||||
"/sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"name": "push [START_DIR]/tmp/SK_IMAGE_VERSION /sdcard/revenge_of_the_skiabot/SK_IMAGE_VERSION"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"python",
|
||||
"-u",
|
||||
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
||||
"[START_DIR]/skia/infra/bots/assets/svg/VERSION",
|
||||
"/path/to/tmp/"
|
||||
],
|
||||
"name": "Get downloaded SVG VERSION"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"python",
|
||||
"-u",
|
||||
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
||||
"42",
|
||||
"[START_DIR]/tmp/SVG_VERSION"
|
||||
],
|
||||
"name": "write SVG_VERSION"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"adb",
|
||||
"shell",
|
||||
"cat",
|
||||
"/sdcard/revenge_of_the_skiabot/SVG_VERSION"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"name": "read /sdcard/revenge_of_the_skiabot/SVG_VERSION",
|
||||
"stdout": "/path/to/tmp/"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"adb",
|
||||
"shell",
|
||||
"rm",
|
||||
"-f",
|
||||
"/sdcard/revenge_of_the_skiabot/SVG_VERSION"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"name": "rm /sdcard/revenge_of_the_skiabot/SVG_VERSION"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"adb",
|
||||
"shell",
|
||||
"rm",
|
||||
"-rf",
|
||||
"/sdcard/revenge_of_the_skiabot/svgs"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"name": "rm /sdcard/revenge_of_the_skiabot/svgs"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"adb",
|
||||
"shell",
|
||||
"mkdir",
|
||||
"-p",
|
||||
"/sdcard/revenge_of_the_skiabot/svgs"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"name": "mkdir /sdcard/revenge_of_the_skiabot/svgs"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"python",
|
||||
"-u",
|
||||
"\nimport os\nimport subprocess\nimport sys\nhost = sys.argv[1]\ndevice = sys.argv[2]\nfor d, _, fs in os.walk(host):\n p = os.path.relpath(d, host)\n if p != '.' and p.startswith('.'):\n continue\n for f in fs:\n print os.path.join(p,f)\n subprocess.check_call(['adb', 'push',\n os.path.realpath(os.path.join(host, p, f)),\n os.path.join(device, p, f)])\n",
|
||||
"[START_DIR]/svg",
|
||||
"/sdcard/revenge_of_the_skiabot/svgs"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"name": "push [START_DIR]/svg/* /sdcard/revenge_of_the_skiabot/svgs",
|
||||
"~followup_annotations": [
|
||||
"@@@STEP_LOG_LINE@python.inline@@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@import os@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@import sys@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@host = sys.argv[1]@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@device = sys.argv[2]@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@for d, _, fs in os.walk(host):@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ p = os.path.relpath(d, host)@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ if p != '.' and p.startswith('.'):@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ continue@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ for f in fs:@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ print os.path.join(p,f)@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ subprocess.check_call(['adb', 'push',@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ os.path.realpath(os.path.join(host, p, f)),@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ os.path.join(device, p, f)])@@@",
|
||||
"@@@STEP_LOG_END@python.inline@@@"
|
||||
]
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"adb",
|
||||
"push",
|
||||
"[START_DIR]/tmp/SVG_VERSION",
|
||||
"/sdcard/revenge_of_the_skiabot/SVG_VERSION"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"name": "push [START_DIR]/tmp/SVG_VERSION /sdcard/revenge_of_the_skiabot/SVG_VERSION"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"adb",
|
||||
"shell",
|
||||
"rm",
|
||||
"-rf",
|
||||
"/sdcard/revenge_of_the_skiabot/perf"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"name": "rm /sdcard/revenge_of_the_skiabot/perf"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"adb",
|
||||
"shell",
|
||||
"mkdir",
|
||||
"-p",
|
||||
"/sdcard/revenge_of_the_skiabot/perf"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"name": "mkdir /sdcard/revenge_of_the_skiabot/perf"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"adb",
|
||||
"push",
|
||||
"[START_DIR]/out/Release/nanobench",
|
||||
"/data/local/tmp/"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"name": "push nanobench"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"python",
|
||||
"-u",
|
||||
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
||||
"set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nogpu --pre_log --scales 1.0 1.1 --config 8888 gpu nonrendering hwui msaa4 nvpr4 nvprdit4 --match ~blurroundrect ~patch_grid ~desk_carsvg ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123_1337000001.json --properties gitHash abc123 build_number 5 --key arch arm compiler Clang cpu_or_gpu CPU cpu_or_gpu_value Exynos5250 extra_config Android model Nexus10 os Android; echo $? >/data/local/tmp/rc",
|
||||
"[START_DIR]/tmp/nanobench.sh"
|
||||
],
|
||||
"name": "write nanobench.sh"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"adb",
|
||||
"push",
|
||||
"[START_DIR]/tmp/nanobench.sh",
|
||||
"/data/local/tmp/"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"name": "push nanobench.sh"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"adb",
|
||||
"logcat",
|
||||
"-c"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"name": "clear log"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"python",
|
||||
"-u",
|
||||
"\nimport subprocess\nimport sys\nbin_dir = sys.argv[1]\nsh = sys.argv[2]\nsubprocess.check_call(['adb', 'shell', 'sh', bin_dir + sh])\ntry:\n sys.exit(int(subprocess.check_output(['adb', 'shell', 'cat',\n bin_dir + 'rc'])))\nexcept ValueError:\n print \"Couldn't read the return code. Probably killed for OOM.\"\n sys.exit(1)\n",
|
||||
"/data/local/tmp/",
|
||||
"nanobench.sh"
|
||||
],
|
||||
"name": "nanobench",
|
||||
"~followup_annotations": [
|
||||
"@@@STEP_LOG_LINE@python.inline@@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@import sys@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@bin_dir = sys.argv[1]@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@sh = sys.argv[2]@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@subprocess.check_call(['adb', 'shell', 'sh', bin_dir + sh])@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@try:@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ sys.exit(int(subprocess.check_output(['adb', 'shell', 'cat',@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ bin_dir + 'rc'])))@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@except ValueError:@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ print \"Couldn't read the return code. Probably killed for OOM.\"@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
|
||||
"@@@STEP_LOG_END@python.inline@@@"
|
||||
]
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"python",
|
||||
"-u",
|
||||
"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
|
||||
"[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android/data",
|
||||
"511"
|
||||
],
|
||||
"name": "makedirs perf_dir",
|
||||
"~followup_annotations": [
|
||||
"@@@STEP_LOG_LINE@python.inline@@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@import sys, os@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@path = sys.argv[1]@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@mode = int(sys.argv[2])@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@if not os.path.isdir(path):@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ if os.path.exists(path):@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ print \"%s exists but is not a dir\" % path@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ sys.exit(1)@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ os.makedirs(path, mode)@@@",
|
||||
"@@@STEP_LOG_END@python.inline@@@"
|
||||
]
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"adb",
|
||||
"pull",
|
||||
"/sdcard/revenge_of_the_skiabot/perf",
|
||||
"[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android/data"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"name": "pull /sdcard/revenge_of_the_skiabot/perf [CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android/data"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"python",
|
||||
"-u",
|
||||
"\nimport os\nimport subprocess\nimport sys\nout = sys.argv[1]\nlog = subprocess.check_output(['adb', 'logcat', '-d'])\nfor line in log.split('\\n'):\n tokens = line.split()\n if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':\n addr, path = tokens[-2:]\n local = os.path.join(out, os.path.basename(path))\n if os.path.exists(local):\n sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])\n line = line.replace(addr, addr + ' ' + sym.strip())\n print line\n",
|
||||
"[START_DIR]/out/Release"
|
||||
],
|
||||
"name": "dump log",
|
||||
"~followup_annotations": [
|
||||
"@@@STEP_LOG_LINE@python.inline@@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@import os@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@import subprocess@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@import sys@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@out = sys.argv[1]@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@log = subprocess.check_output(['adb', 'logcat', '-d'])@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@for line in log.split('\\n'):@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ tokens = line.split()@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ if len(tokens) == 11 and tokens[-7] == 'F' and tokens[-3] == 'pc':@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ addr, path = tokens[-2:]@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ local = os.path.join(out, os.path.basename(path))@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ if os.path.exists(local):@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ sym = subprocess.check_output(['addr2line', '-Cfpe', local, addr])@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ line = line.replace(addr, addr + ' ' + sym.strip())@@@",
|
||||
"@@@STEP_LOG_LINE@python.inline@ print line@@@",
|
||||
"@@@STEP_LOG_END@python.inline@@@"
|
||||
]
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"adb",
|
||||
"kill-server"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"name": "kill adb server"
|
||||
},
|
||||
{
|
||||
"name": "$result",
|
||||
"recipe_result": null,
|
||||
"status_code": 0
|
||||
}
|
||||
]
|
||||
@ -363,7 +363,7 @@
|
||||
"python",
|
||||
"-u",
|
||||
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
||||
"set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config 8888 gpu nonrendering hwui f16 srgb msaa4 nvpr4 nvprdit4 --match ~blurroundrect ~patch_grid ~desk_carsvg ~keymobi_shop_mobileweb_ebay_com.skp ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp; echo $? >/data/local/tmp/rc",
|
||||
"set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config 8888 gpu nonrendering hwui msaa4 nvpr4 nvprdit4 --match ~blurroundrect ~patch_grid ~desk_carsvg ~keymobi_shop_mobileweb_ebay_com.skp ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp; echo $? >/data/local/tmp/rc",
|
||||
"[START_DIR]/tmp/nanobench.sh"
|
||||
],
|
||||
"name": "write nanobench.sh"
|
||||
|
||||
@ -385,7 +385,7 @@
|
||||
"python",
|
||||
"-u",
|
||||
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
||||
"set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config 8888 gpu nonrendering hwui f16 srgb msaa4 nvpr4 nvprdit4 esinst --match ~blurroundrect ~patch_grid ~desk_carsvg ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123_1337000001.json --properties gitHash abc123 build_number 5 --key arch arm compiler Clang cpu_or_gpu GPU cpu_or_gpu_value Adreno420 extra_config GN_Android model Nexus6 os Android; echo $? >/data/local/tmp/rc",
|
||||
"set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config 8888 gpu nonrendering hwui msaa4 nvpr4 nvprdit4 esinst --match ~blurroundrect ~patch_grid ~desk_carsvg ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123_1337000001.json --properties gitHash abc123 build_number 5 --key arch arm compiler Clang cpu_or_gpu GPU cpu_or_gpu_value Adreno420 extra_config GN_Android model Nexus6 os Android; echo $? >/data/local/tmp/rc",
|
||||
"[START_DIR]/tmp/nanobench.sh"
|
||||
],
|
||||
"name": "write nanobench.sh"
|
||||
|
||||
@ -385,7 +385,7 @@
|
||||
"python",
|
||||
"-u",
|
||||
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
||||
"set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config 8888 gpu nonrendering hwui f16 srgb msaa4 nvpr4 nvprdit4 --match ~blurroundrect ~patch_grid ~desk_carsvg ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123_1337000001.json --properties gitHash abc123 build_number 5 --key arch arm compiler Clang cpu_or_gpu GPU cpu_or_gpu_value Tegra3 extra_config GN_Android model Nexus7 os Android; echo $? >/data/local/tmp/rc",
|
||||
"set -x; /data/local/tmp/nanobench --undefok -i /sdcard/revenge_of_the_skiabot/resources --skps /sdcard/revenge_of_the_skiabot/skps --images /sdcard/revenge_of_the_skiabot/images/nanobench --svgs /sdcard/revenge_of_the_skiabot/svgs --nocpu --pre_log --images --gpuStatsDump true --useThermalManager 1,1,10,1000 --scales 1.0 1.1 --config 8888 gpu nonrendering hwui msaa4 nvpr4 nvprdit4 --match ~blurroundrect ~patch_grid ~desk_carsvg ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile /sdcard/revenge_of_the_skiabot/perf/nanobench_abc123_1337000001.json --properties gitHash abc123 build_number 5 --key arch arm compiler Clang cpu_or_gpu GPU cpu_or_gpu_value Tegra3 extra_config GN_Android model Nexus7 os Android; echo $? >/data/local/tmp/rc",
|
||||
"[START_DIR]/tmp/nanobench.sh"
|
||||
],
|
||||
"name": "write nanobench.sh"
|
||||
|
||||
@ -365,7 +365,7 @@
|
||||
"[START_DIR]/out/Release/nanobench.app",
|
||||
"-I",
|
||||
"--args",
|
||||
"--undefok -i resources --skps skps --images images/nanobench --svgs svgs --nocpu --pre_log --images --gpuStatsDump true --scales 1.0 1.1 --skps ignore_skps --config 8888 gpu nonrendering hwui f16 srgb msaa16 nvpr16 nvprdit16 --match ~blurroundrect ~patch_grid ~desk_carsvg ~keymobi ~path_hairline ~GLInstancedArraysBench ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile perf/nanobench_abc123_1337000001.json --properties gitHash abc123 build_number 5 --key arch arm compiler Clang cpu_or_gpu GPU cpu_or_gpu_value GX6450 model iPadMini4 os iOS"
|
||||
"--undefok -i resources --skps skps --images images/nanobench --svgs svgs --nocpu --pre_log --images --gpuStatsDump true --scales 1.0 1.1 --skps ignore_skps --config 8888 gpu nonrendering hwui msaa16 nvpr16 nvprdit16 --match ~blurroundrect ~patch_grid ~desk_carsvg ~keymobi ~path_hairline ~GLInstancedArraysBench ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile perf/nanobench_abc123_1337000001.json --properties gitHash abc123 build_number 5 --key arch arm compiler Clang cpu_or_gpu GPU cpu_or_gpu_value GX6450 model iPadMini4 os iOS"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"env": {
|
||||
|
||||
@ -20,6 +20,7 @@ TEST_BUILDERS = {
|
||||
'skiabot-linux-swarm-000': [
|
||||
('Perf-Android-Clang-NVIDIA_Shield-GPU-TegraX1-arm64-Debug' +
|
||||
'-GN_Android_Vulkan'),
|
||||
'Perf-Android-Clang-Nexus10-CPU-Exynos5250-arm-Release-Android',
|
||||
'Perf-Android-Clang-Nexus5-GPU-Adreno330-arm-Debug-GN_Android',
|
||||
'Perf-Android-Clang-Nexus6-GPU-Adreno420-arm-Release-GN_Android',
|
||||
'Perf-Android-Clang-Nexus7-GPU-Tegra3-arm-Release-GN_Android',
|
||||
|
||||
Loading…
Reference in New Issue
Block a user