b03b5aca54
This entails a few parts: 1. Isolating tools/skpbench/ to be used by the perf task. 2. Adding skpbench to BUILD_PRODUCTS_ISOLATE_WHITELIST 3. Add recipe commands to run skpbench. While it is conceptually similar to nanobench, it doesn't support images nor svgs, only skps, so we don't need to copy those to devices or bring them in via CIPD. 4. Add recipe commands to parse skpbench output and upload to Perf. 5. Update gen_tasks.go to handle skpbench jobs and tasks. BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4551 Change-Id: I09bf0b078067279e138e95eca9316e55539ec735 Reviewed-on: https://skia-review.googlesource.com/4551 Commit-Queue: Kevin Lubick <kjlubick@google.com> Reviewed-by: Eric Boren <borenet@google.com>
290 lines
9.8 KiB
JSON
290 lines
9.8 KiB
JSON
[
|
|
{
|
|
"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",
|
|
"[SLAVE_BUILD]/tmp",
|
|
"511"
|
|
],
|
|
"name": "makedirs tmp_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",
|
|
"shell",
|
|
"mkdir",
|
|
"-p",
|
|
"/sdcard/revenge_of_the_skiabot/resources"
|
|
],
|
|
"cwd": "[SLAVE_BUILD]/skia",
|
|
"name": "mkdir /sdcard/revenge_of_the_skiabot/resources"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"python",
|
|
"-u",
|
|
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
|
"[SLAVE_BUILD]/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",
|
|
"[SLAVE_BUILD]/tmp/SKP_VERSION"
|
|
],
|
|
"name": "write SKP_VERSION"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"adb",
|
|
"shell",
|
|
"cat",
|
|
"/sdcard/revenge_of_the_skiabot/SKP_VERSION"
|
|
],
|
|
"cwd": "[SLAVE_BUILD]/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": "[SLAVE_BUILD]/skia",
|
|
"name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"adb",
|
|
"shell",
|
|
"rm",
|
|
"-rf",
|
|
"/sdcard/revenge_of_the_skiabot/skps"
|
|
],
|
|
"cwd": "[SLAVE_BUILD]/skia",
|
|
"name": "rm /sdcard/revenge_of_the_skiabot/skps"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"adb",
|
|
"shell",
|
|
"mkdir",
|
|
"-p",
|
|
"/sdcard/revenge_of_the_skiabot/skps"
|
|
],
|
|
"cwd": "[SLAVE_BUILD]/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",
|
|
"[SLAVE_BUILD]/skp",
|
|
"/sdcard/revenge_of_the_skiabot/skps"
|
|
],
|
|
"cwd": "[SLAVE_BUILD]/skia",
|
|
"name": "push [SLAVE_BUILD]/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",
|
|
"[SLAVE_BUILD]/tmp/SKP_VERSION",
|
|
"/sdcard/revenge_of_the_skiabot/SKP_VERSION"
|
|
],
|
|
"cwd": "[SLAVE_BUILD]/skia",
|
|
"name": "push [SLAVE_BUILD]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"adb",
|
|
"push",
|
|
"[SLAVE_BUILD]/out/Release/skpbench",
|
|
"/data/local/tmp/"
|
|
],
|
|
"cwd": "[SLAVE_BUILD]/skia",
|
|
"name": "push skpbench"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"python",
|
|
"-u",
|
|
"[SLAVE_BUILD]/skia/tools/skpbench/skpbench.py",
|
|
"/data/local/tmp/skpbench",
|
|
"/sdcard/revenge_of_the_skiabot/skps",
|
|
"--adb",
|
|
"--resultsfile",
|
|
"[CUSTOM_[SWARM_OUT_DIR]]/table",
|
|
"--config",
|
|
"gpu,esinst4"
|
|
],
|
|
"name": "skpbench"
|
|
},
|
|
{
|
|
"cmd": [
|
|
"python",
|
|
"-u",
|
|
"import os\nprint os.environ.get('SWARMING_BOT_ID', '')\n"
|
|
],
|
|
"name": "get swarming bot id",
|
|
"stdout": "/path/to/tmp/",
|
|
"~followup_annotations": [
|
|
"@@@STEP_LOG_LINE@python.inline@import os@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_BOT_ID', '')@@@",
|
|
"@@@STEP_LOG_END@python.inline@@@"
|
|
]
|
|
},
|
|
{
|
|
"cmd": [
|
|
"python",
|
|
"-u",
|
|
"import os\nprint os.environ.get('SWARMING_TASK_ID', '')\n"
|
|
],
|
|
"name": "get swarming task id",
|
|
"stdout": "/path/to/tmp/",
|
|
"~followup_annotations": [
|
|
"@@@STEP_LOG_LINE@python.inline@import os@@@",
|
|
"@@@STEP_LOG_LINE@python.inline@print os.environ.get('SWARMING_TASK_ID', '')@@@",
|
|
"@@@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-PixelC-CPU-TegraX1-arm64-Release-GN_Android_Skpbench/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": [
|
|
"python",
|
|
"-u",
|
|
"[SLAVE_BUILD]/skia/tools/skpbench/skiaperf.py",
|
|
"[CUSTOM_[SWARM_OUT_DIR]]/table",
|
|
"--properties",
|
|
"gitHash",
|
|
"abc123",
|
|
"build_number",
|
|
"5",
|
|
"no_buildbot",
|
|
"True",
|
|
"swarming_bot_id",
|
|
"skia-bot-123",
|
|
"swarming_task_id",
|
|
"123456",
|
|
"--outfile",
|
|
"[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-GN_Android_Skpbench/data/skpbench_abc123_1337000001.json",
|
|
"--key",
|
|
"arch",
|
|
"arm64",
|
|
"compiler",
|
|
"Clang",
|
|
"cpu_or_gpu",
|
|
"CPU",
|
|
"cpu_or_gpu_value",
|
|
"TegraX1",
|
|
"extra_config",
|
|
"GN_Android_Skpbench",
|
|
"model",
|
|
"PixelC",
|
|
"os",
|
|
"Android"
|
|
],
|
|
"name": "Parse skpbench output into Perf json"
|
|
},
|
|
{
|
|
"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",
|
|
"[SLAVE_BUILD]/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": "[SLAVE_BUILD]/skia",
|
|
"name": "kill adb server"
|
|
},
|
|
{
|
|
"name": "$result",
|
|
"recipe_result": null,
|
|
"status_code": 0
|
|
}
|
|
] |