Add skpbench jobs for CCPR
Adds new runs that benchmark just a handful of skps with CCPR. This will also be Pixel's small debut on skpbench. Bug: skia: Change-Id: I7e4c3aeaa083ffe29c275f1c021ee62d177b6172 Reviewed-on: https://skia-review.googlesource.com/62302 Reviewed-by: Eric Boren <borenet@google.com> Commit-Queue: Chris Dalton <csmartdalton@google.com>
This commit is contained in:
parent
955ed3d9b6
commit
1e6b36eb57
@ -817,7 +817,7 @@ Recipe for the Skia RecreateSKPs Bot.
|
||||
|
||||
[DEPS](/infra/bots/recipes/skpbench.py#12): [recipe\_engine/context][recipe_engine/recipe_modules/context], [recipe\_engine/file][recipe_engine/recipe_modules/file], [recipe\_engine/path][recipe_engine/recipe_modules/path], [recipe\_engine/properties][recipe_engine/recipe_modules/properties], [recipe\_engine/python][recipe_engine/recipe_modules/python], [recipe\_engine/raw\_io][recipe_engine/recipe_modules/raw_io], [recipe\_engine/step][recipe_engine/recipe_modules/step], [recipe\_engine/time][recipe_engine/recipe_modules/time], [core](#recipe_modules-core), [flavor](#recipe_modules-flavor), [run](#recipe_modules-run), [vars](#recipe_modules-vars)
|
||||
|
||||
— **def [RunSteps](/infra/bots/recipes/skpbench.py#104)(api):**
|
||||
— **def [RunSteps](/infra/bots/recipes/skpbench.py#115)(api):**
|
||||
|
||||
— **def [skpbench\_steps](/infra/bots/recipes/skpbench.py#41)(api):**
|
||||
|
||||
|
@ -137,6 +137,8 @@
|
||||
"Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-All-Android",
|
||||
"Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench",
|
||||
"Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Vulkan_Skpbench",
|
||||
"Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_CCPR_Skpbench",
|
||||
"Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench",
|
||||
"Perf-ChromeOS-Clang-Chromebook_303C12-GPU-MaliT604-arm-Debug-All",
|
||||
"Perf-ChromeOS-Clang-Chromebook_303C12-GPU-MaliT604-arm-Release-All",
|
||||
"Perf-ChromeOS-Clang-Chromebook_513C24_K01-GPU-MaliT860-arm-Debug-All",
|
||||
|
@ -0,0 +1,371 @@
|
||||
[
|
||||
{
|
||||
"cmd": [
|
||||
"python",
|
||||
"-u",
|
||||
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
|
||||
"--json-output",
|
||||
"/path/to/tmp/json",
|
||||
"ensure-directory",
|
||||
"--mode",
|
||||
"0777",
|
||||
"[START_DIR]/tmp"
|
||||
],
|
||||
"infra_step": true,
|
||||
"name": "makedirs tmp_dir"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"adb.1.0.35",
|
||||
"shell",
|
||||
"mkdir",
|
||||
"-p",
|
||||
"/sdcard/revenge_of_the_skiabot/resources"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"env": {
|
||||
"BUILDTYPE": "Release",
|
||||
"CHROME_HEADLESS": "1",
|
||||
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
|
||||
"SKIA_OUT": "[START_DIR]/out"
|
||||
},
|
||||
"infra_step": true,
|
||||
"name": "mkdir /sdcard/revenge_of_the_skiabot/resources"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"python",
|
||||
"-u",
|
||||
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
|
||||
"--json-output",
|
||||
"/path/to/tmp/json",
|
||||
"copy",
|
||||
"[START_DIR]/skia/infra/bots/assets/skp/VERSION",
|
||||
"/path/to/tmp/"
|
||||
],
|
||||
"infra_step": true,
|
||||
"name": "Get downloaded SKP VERSION"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"python",
|
||||
"-u",
|
||||
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
|
||||
"--json-output",
|
||||
"/path/to/tmp/json",
|
||||
"copy",
|
||||
"42",
|
||||
"[START_DIR]/tmp/SKP_VERSION"
|
||||
],
|
||||
"infra_step": true,
|
||||
"name": "write SKP_VERSION"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"adb.1.0.35",
|
||||
"shell",
|
||||
"cat",
|
||||
"/sdcard/revenge_of_the_skiabot/SKP_VERSION"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"env": {
|
||||
"BUILDTYPE": "Release",
|
||||
"CHROME_HEADLESS": "1",
|
||||
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
|
||||
"SKIA_OUT": "[START_DIR]/out"
|
||||
},
|
||||
"infra_step": true,
|
||||
"name": "read /sdcard/revenge_of_the_skiabot/SKP_VERSION",
|
||||
"stdout": "/path/to/tmp/"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"adb.1.0.35",
|
||||
"shell",
|
||||
"rm",
|
||||
"-f",
|
||||
"/sdcard/revenge_of_the_skiabot/SKP_VERSION"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"env": {
|
||||
"BUILDTYPE": "Release",
|
||||
"CHROME_HEADLESS": "1",
|
||||
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
|
||||
"SKIA_OUT": "[START_DIR]/out"
|
||||
},
|
||||
"infra_step": true,
|
||||
"name": "rm /sdcard/revenge_of_the_skiabot/SKP_VERSION"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"adb.1.0.35",
|
||||
"shell",
|
||||
"rm",
|
||||
"-rf",
|
||||
"/sdcard/revenge_of_the_skiabot/skps"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"env": {
|
||||
"BUILDTYPE": "Release",
|
||||
"CHROME_HEADLESS": "1",
|
||||
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
|
||||
"SKIA_OUT": "[START_DIR]/out"
|
||||
},
|
||||
"infra_step": true,
|
||||
"name": "rm /sdcard/revenge_of_the_skiabot/skps"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"adb.1.0.35",
|
||||
"shell",
|
||||
"mkdir",
|
||||
"-p",
|
||||
"/sdcard/revenge_of_the_skiabot/skps"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"env": {
|
||||
"BUILDTYPE": "Release",
|
||||
"CHROME_HEADLESS": "1",
|
||||
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
|
||||
"SKIA_OUT": "[START_DIR]/out"
|
||||
},
|
||||
"infra_step": true,
|
||||
"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.1.0.35', '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"
|
||||
],
|
||||
"env": {
|
||||
"BUILDTYPE": "Release",
|
||||
"CHROME_HEADLESS": "1",
|
||||
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
|
||||
"SKIA_OUT": "[START_DIR]/out"
|
||||
},
|
||||
"infra_step": true,
|
||||
"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.1.0.35', '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.1.0.35",
|
||||
"push",
|
||||
"[START_DIR]/tmp/SKP_VERSION",
|
||||
"/sdcard/revenge_of_the_skiabot/SKP_VERSION"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"env": {
|
||||
"BUILDTYPE": "Release",
|
||||
"CHROME_HEADLESS": "1",
|
||||
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
|
||||
"SKIA_OUT": "[START_DIR]/out"
|
||||
},
|
||||
"infra_step": true,
|
||||
"name": "push [START_DIR]/tmp/SKP_VERSION /sdcard/revenge_of_the_skiabot/SKP_VERSION"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"adb.1.0.35",
|
||||
"push",
|
||||
"[START_DIR]/out/Release/skpbench",
|
||||
"/data/local/tmp/"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"env": {
|
||||
"BUILDTYPE": "Release",
|
||||
"CHROME_HEADLESS": "1",
|
||||
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
|
||||
"SKIA_OUT": "[START_DIR]/out"
|
||||
},
|
||||
"infra_step": true,
|
||||
"name": "push skpbench"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"python",
|
||||
"-u",
|
||||
"[START_DIR]/skia/tools/skpbench/skpbench.py",
|
||||
"/data/local/tmp/skpbench",
|
||||
"--adb",
|
||||
"--adb_binary",
|
||||
"adb.1.0.35",
|
||||
"--resultsfile",
|
||||
"[CUSTOM_[SWARM_OUT_DIR]]/table",
|
||||
"--config",
|
||||
"gles",
|
||||
"-v5",
|
||||
"--pr",
|
||||
"ccpr",
|
||||
"--nocache",
|
||||
"/sdcard/revenge_of_the_skiabot/skps/desk_*svg.skp",
|
||||
"/sdcard/revenge_of_the_skiabot/skps/desk_chalkboard.skp"
|
||||
],
|
||||
"env": {
|
||||
"BUILDTYPE": "Release",
|
||||
"CHROME_HEADLESS": "1",
|
||||
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
|
||||
"SKIA_OUT": "[START_DIR]/out"
|
||||
},
|
||||
"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",
|
||||
"RECIPE_MODULE[recipe_engine::file]/resources/fileutil.py",
|
||||
"--json-output",
|
||||
"/path/to/tmp/json",
|
||||
"ensure-directory",
|
||||
"--mode",
|
||||
"0777",
|
||||
"[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench/data"
|
||||
],
|
||||
"infra_step": true,
|
||||
"name": "makedirs perf_dir"
|
||||
},
|
||||
{
|
||||
"cmd": [
|
||||
"python",
|
||||
"-u",
|
||||
"[START_DIR]/skia/tools/skpbench/skiaperf.py",
|
||||
"[CUSTOM_[SWARM_OUT_DIR]]/table",
|
||||
"--properties",
|
||||
"gitHash",
|
||||
"abc123",
|
||||
"swarming_bot_id",
|
||||
"skia-bot-123",
|
||||
"swarming_task_id",
|
||||
"123456",
|
||||
"--outfile",
|
||||
"[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench/data/skpbench_abc123_1337000001.json",
|
||||
"--key",
|
||||
"arch",
|
||||
"arm64",
|
||||
"compiler",
|
||||
"Clang",
|
||||
"cpu_or_gpu",
|
||||
"GPU",
|
||||
"cpu_or_gpu_value",
|
||||
"Adreno530",
|
||||
"extra_config",
|
||||
"Android_CCPR_Skpbench",
|
||||
"model",
|
||||
"Pixel",
|
||||
"os",
|
||||
"Android",
|
||||
"test_filter",
|
||||
"All"
|
||||
],
|
||||
"env": {
|
||||
"BUILDTYPE": "Release",
|
||||
"CHROME_HEADLESS": "1",
|
||||
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
|
||||
"SKIA_OUT": "[START_DIR]/out"
|
||||
},
|
||||
"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.1.0.35', '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"
|
||||
],
|
||||
"env": {
|
||||
"BUILDTYPE": "Release",
|
||||
"CHROME_HEADLESS": "1",
|
||||
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
|
||||
"SKIA_OUT": "[START_DIR]/out"
|
||||
},
|
||||
"infra_step": true,
|
||||
"name": "dump log",
|
||||
"timeout": 300,
|
||||
"~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.1.0.35', '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.1.0.35",
|
||||
"kill-server"
|
||||
],
|
||||
"cwd": "[START_DIR]/skia",
|
||||
"env": {
|
||||
"BUILDTYPE": "Release",
|
||||
"CHROME_HEADLESS": "1",
|
||||
"PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
|
||||
"SKIA_OUT": "[START_DIR]/out"
|
||||
},
|
||||
"infra_step": true,
|
||||
"name": "kill adb server"
|
||||
},
|
||||
{
|
||||
"name": "$result",
|
||||
"recipe_result": null,
|
||||
"status_code": 0
|
||||
}
|
||||
]
|
@ -207,7 +207,6 @@
|
||||
"-u",
|
||||
"[START_DIR]/skia/tools/skpbench/skpbench.py",
|
||||
"/data/local/tmp/skpbench",
|
||||
"/sdcard/revenge_of_the_skiabot/skps",
|
||||
"--adb",
|
||||
"--adb_binary",
|
||||
"adb.1.0.35",
|
||||
@ -215,8 +214,8 @@
|
||||
"[CUSTOM_[SWARM_OUT_DIR]]/table",
|
||||
"--config",
|
||||
"gles,glesinst4",
|
||||
"-v",
|
||||
"5"
|
||||
"-v5",
|
||||
"/sdcard/revenge_of_the_skiabot/skps"
|
||||
],
|
||||
"env": {
|
||||
"BUILDTYPE": "Release",
|
||||
|
@ -207,7 +207,6 @@
|
||||
"-u",
|
||||
"[START_DIR]/skia/tools/skpbench/skpbench.py",
|
||||
"/data/local/tmp/skpbench",
|
||||
"/sdcard/revenge_of_the_skiabot/skps",
|
||||
"--adb",
|
||||
"--adb_binary",
|
||||
"adb.1.0.35",
|
||||
@ -215,8 +214,8 @@
|
||||
"[CUSTOM_[SWARM_OUT_DIR]]/table",
|
||||
"--config",
|
||||
"vk",
|
||||
"-v",
|
||||
"5"
|
||||
"-v5",
|
||||
"/sdcard/revenge_of_the_skiabot/skps"
|
||||
],
|
||||
"env": {
|
||||
"BUILDTYPE": "Release",
|
||||
|
@ -207,7 +207,6 @@
|
||||
"-u",
|
||||
"[START_DIR]/skia/tools/skpbench/skpbench.py",
|
||||
"/data/local/tmp/skpbench",
|
||||
"/sdcard/revenge_of_the_skiabot/skps",
|
||||
"--adb",
|
||||
"--adb_binary",
|
||||
"adb.1.0.35",
|
||||
@ -215,8 +214,8 @@
|
||||
"[CUSTOM_[SWARM_OUT_DIR]]/table",
|
||||
"--config",
|
||||
"gles,glesinst4",
|
||||
"-v",
|
||||
"5"
|
||||
"-v5",
|
||||
"/sdcard/revenge_of_the_skiabot/skps"
|
||||
],
|
||||
"env": {
|
||||
"BUILDTYPE": "Release",
|
||||
|
@ -46,19 +46,30 @@ def skpbench_steps(api):
|
||||
skpbench_dir = api.vars.slave_dir.join('skia', 'tools', 'skpbench')
|
||||
table = api.path.join(api.vars.swarming_out_dir, 'table')
|
||||
|
||||
config = 'gles,glesinst4'
|
||||
if 'Vulkan' in api.vars.builder_name:
|
||||
config = 'vk'
|
||||
elif 'CCPR' in api.vars.builder_name:
|
||||
config = 'gles'
|
||||
else:
|
||||
config = 'gles,glesinst4'
|
||||
|
||||
skpbench_args = [
|
||||
api.path.join(api.vars.android_bin_dir, 'skpbench'),
|
||||
api.path.join(api.vars.android_data_dir, 'skps'),
|
||||
'--adb',
|
||||
'--adb_binary', ADB_BINARY,
|
||||
'--resultsfile', table,
|
||||
'--config', config,
|
||||
# TODO(dogben): Track down what's causing bots to die.
|
||||
'-v', '5']
|
||||
'-v5']
|
||||
if 'CCPR' in api.vars.builder_name:
|
||||
skpbench_args += [
|
||||
'--pr', 'ccpr',
|
||||
'--nocache',
|
||||
api.path.join(api.vars.android_data_dir, 'skps/desk_*svg.skp'),
|
||||
api.path.join(api.vars.android_data_dir, 'skps/desk_chalkboard.skp')]
|
||||
else:
|
||||
skpbench_args += [
|
||||
api.path.join(api.vars.android_data_dir, 'skps')]
|
||||
|
||||
api.run(api.python, 'skpbench',
|
||||
script=skpbench_dir.join('skpbench.py'),
|
||||
@ -115,6 +126,8 @@ TEST_BUILDERS = [
|
||||
'Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench',
|
||||
('Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-'
|
||||
'Android_Vulkan_Skpbench'),
|
||||
('Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-'
|
||||
'Android_CCPR_Skpbench'),
|
||||
]
|
||||
|
||||
|
||||
|
@ -812,6 +812,12 @@
|
||||
"Upload-Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android"
|
||||
]
|
||||
},
|
||||
"Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench": {
|
||||
"priority": 0.8,
|
||||
"tasks": [
|
||||
"Upload-Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench"
|
||||
]
|
||||
},
|
||||
"Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan": {
|
||||
"priority": 0.8,
|
||||
"tasks": [
|
||||
@ -830,6 +836,12 @@
|
||||
"Upload-Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-All-Android"
|
||||
]
|
||||
},
|
||||
"Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_CCPR_Skpbench": {
|
||||
"priority": 0.8,
|
||||
"tasks": [
|
||||
"Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_CCPR_Skpbench"
|
||||
]
|
||||
},
|
||||
"Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench": {
|
||||
"priority": 0.8,
|
||||
"tasks": [
|
||||
@ -6914,6 +6926,38 @@
|
||||
"max_attempts": 1,
|
||||
"priority": 0.8
|
||||
},
|
||||
"Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench": {
|
||||
"dependencies": [
|
||||
"Build-Debian9-Clang-arm64-Release-Android",
|
||||
"Housekeeper-PerCommit-BundleRecipes",
|
||||
"Housekeeper-PerCommit-IsolateSKP"
|
||||
],
|
||||
"dimensions": [
|
||||
"device_os:OPR3.170623.008",
|
||||
"device_type:sailfish",
|
||||
"os:Android",
|
||||
"pool:Skia"
|
||||
],
|
||||
"execution_timeout_ns": 14400000000000,
|
||||
"expiration_ns": 72000000000000,
|
||||
"extra_args": [
|
||||
"--workdir",
|
||||
"../../..",
|
||||
"skpbench",
|
||||
"repository=<(REPO)",
|
||||
"buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench",
|
||||
"swarm_out_dir=${ISOLATED_OUTDIR}",
|
||||
"revision=<(REVISION)",
|
||||
"patch_repo=<(PATCH_REPO)",
|
||||
"patch_storage=<(PATCH_STORAGE)",
|
||||
"patch_issue=<(ISSUE)",
|
||||
"patch_set=<(PATCHSET)"
|
||||
],
|
||||
"io_timeout_ns": 2400000000000,
|
||||
"isolate": "skpbench_skia_bundled_unix.isolate",
|
||||
"max_attempts": 1,
|
||||
"priority": 0.8
|
||||
},
|
||||
"Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan": {
|
||||
"dependencies": [
|
||||
"Build-Debian9-Clang-arm64-Release-Android_Vulkan",
|
||||
@ -7016,6 +7060,38 @@
|
||||
"max_attempts": 1,
|
||||
"priority": 0.8
|
||||
},
|
||||
"Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_CCPR_Skpbench": {
|
||||
"dependencies": [
|
||||
"Build-Debian9-Clang-arm64-Release-Android",
|
||||
"Housekeeper-PerCommit-BundleRecipes",
|
||||
"Housekeeper-PerCommit-IsolateSKP"
|
||||
],
|
||||
"dimensions": [
|
||||
"device_os:OPR6.170623.010",
|
||||
"device_type:dragon",
|
||||
"os:Android",
|
||||
"pool:Skia"
|
||||
],
|
||||
"execution_timeout_ns": 14400000000000,
|
||||
"expiration_ns": 72000000000000,
|
||||
"extra_args": [
|
||||
"--workdir",
|
||||
"../../..",
|
||||
"skpbench",
|
||||
"repository=<(REPO)",
|
||||
"buildername=Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_CCPR_Skpbench",
|
||||
"swarm_out_dir=${ISOLATED_OUTDIR}",
|
||||
"revision=<(REVISION)",
|
||||
"patch_repo=<(PATCH_REPO)",
|
||||
"patch_storage=<(PATCH_STORAGE)",
|
||||
"patch_issue=<(ISSUE)",
|
||||
"patch_set=<(PATCHSET)"
|
||||
],
|
||||
"io_timeout_ns": 2400000000000,
|
||||
"isolate": "skpbench_skia_bundled_unix.isolate",
|
||||
"max_attempts": 1,
|
||||
"priority": 0.8
|
||||
},
|
||||
"Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench": {
|
||||
"dependencies": [
|
||||
"Build-Debian9-Clang-arm64-Release-Android",
|
||||
@ -23235,6 +23311,33 @@
|
||||
"isolate": "upload_nano_results.isolate",
|
||||
"priority": 0.8
|
||||
},
|
||||
"Upload-Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench": {
|
||||
"dependencies": [
|
||||
"Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench"
|
||||
],
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"gpu:none",
|
||||
"os:Debian-9.1",
|
||||
"pool:Skia"
|
||||
],
|
||||
"extra_args": [
|
||||
"--workdir",
|
||||
"../../..",
|
||||
"upload_nano_results",
|
||||
"repository=<(REPO)",
|
||||
"buildername=Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_CCPR_Skpbench",
|
||||
"swarm_out_dir=${ISOLATED_OUTDIR}",
|
||||
"revision=<(REVISION)",
|
||||
"patch_repo=<(PATCH_REPO)",
|
||||
"patch_storage=<(PATCH_STORAGE)",
|
||||
"patch_issue=<(ISSUE)",
|
||||
"patch_set=<(PATCHSET)",
|
||||
"gs_bucket=skia-perf"
|
||||
],
|
||||
"isolate": "upload_nano_results.isolate",
|
||||
"priority": 0.8
|
||||
},
|
||||
"Upload-Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan": {
|
||||
"dependencies": [
|
||||
"Perf-Android-Clang-Pixel-GPU-Adreno530-arm64-Release-All-Android_Vulkan"
|
||||
@ -23289,6 +23392,33 @@
|
||||
"isolate": "upload_nano_results.isolate",
|
||||
"priority": 0.8
|
||||
},
|
||||
"Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_CCPR_Skpbench": {
|
||||
"dependencies": [
|
||||
"Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_CCPR_Skpbench"
|
||||
],
|
||||
"dimensions": [
|
||||
"cpu:x86-64-Haswell_GCE",
|
||||
"gpu:none",
|
||||
"os:Debian-9.1",
|
||||
"pool:Skia"
|
||||
],
|
||||
"extra_args": [
|
||||
"--workdir",
|
||||
"../../..",
|
||||
"upload_nano_results",
|
||||
"repository=<(REPO)",
|
||||
"buildername=Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_CCPR_Skpbench",
|
||||
"swarm_out_dir=${ISOLATED_OUTDIR}",
|
||||
"revision=<(REVISION)",
|
||||
"patch_repo=<(PATCH_REPO)",
|
||||
"patch_storage=<(PATCH_STORAGE)",
|
||||
"patch_issue=<(ISSUE)",
|
||||
"patch_set=<(PATCHSET)",
|
||||
"gs_bucket=skia-perf"
|
||||
],
|
||||
"isolate": "upload_nano_results.isolate",
|
||||
"priority": 0.8
|
||||
},
|
||||
"Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench": {
|
||||
"dependencies": [
|
||||
"Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-All-Android_Skpbench"
|
||||
|
Loading…
Reference in New Issue
Block a user