Add vulkan build to skpbench.
This also fixes the name of the tasks because skpbench is always GPU.
There was a config for monitoring the gpu clock instead of the cpu clock,
but this was removed because the gpu clock isn't very useful at the moment.
cpu clock is basically wall-time, i.e. an accurate measurement of the
entire test.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4873
Change-Id: If1c7dd3141e24f79555ee7b3756f09618df54cb4
Reviewed-on: https://skia-review.googlesource.com/4873
Commit-Queue: Kevin Lubick <kjlubick@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index e600e61..4a9e3cc 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -55,8 +55,8 @@
"Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Debug-GN_Android_Vulkan",
"Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android",
"Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan",
- "Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-GN_Android_Skpbench",
"Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench",
+ "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench",
"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN",
"Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug",
"Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release",
diff --git a/infra/bots/recipes/swarm_skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench.json b/infra/bots/recipes/swarm_skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench.json
index 4e537a6..4f62b1e 100644
--- a/infra/bots/recipes/swarm_skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench.json
+++ b/infra/bots/recipes/swarm_skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench.json
@@ -156,8 +156,7 @@
"--resultsfile",
"[CUSTOM_[SWARM_OUT_DIR]]/table",
"--config",
- "gpu,esinst4",
- "--gpu"
+ "gpu,esinst4"
],
"name": "skpbench"
},
diff --git a/infra/bots/recipes/swarm_skpbench.expected/Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-GN_Android_Skpbench.json b/infra/bots/recipes/swarm_skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench.json
similarity index 97%
rename from infra/bots/recipes/swarm_skpbench.expected/Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-GN_Android_Skpbench.json
rename to infra/bots/recipes/swarm_skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench.json
index d002edf..c62e420 100644
--- a/infra/bots/recipes/swarm_skpbench.expected/Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-GN_Android_Skpbench.json
+++ b/infra/bots/recipes/swarm_skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench.json
@@ -156,7 +156,7 @@
"--resultsfile",
"[CUSTOM_[SWARM_OUT_DIR]]/table",
"--config",
- "gpu,esinst4"
+ "vk"
],
"name": "skpbench"
},
@@ -193,7 +193,7 @@
"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",
+ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench/data",
"511"
],
"name": "makedirs perf_dir",
@@ -228,18 +228,18 @@
"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",
+ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench/data/skpbench_abc123_1337000001.json",
"--key",
"arch",
"arm64",
"compiler",
"Clang",
"cpu_or_gpu",
- "CPU",
+ "GPU",
"cpu_or_gpu_value",
"TegraX1",
"extra_config",
- "GN_Android_Skpbench",
+ "GN_Android_Vulkan_Skpbench",
"model",
"PixelC",
"os",
diff --git a/infra/bots/recipes/swarm_skpbench.py b/infra/bots/recipes/swarm_skpbench.py
index 4e7c02e..f5d1ef4 100644
--- a/infra/bots/recipes/swarm_skpbench.py
+++ b/infra/bots/recipes/swarm_skpbench.py
@@ -25,7 +25,8 @@
'client.skia': {
'skiabot-linux-swarm-000': [
'Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench',
- 'Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-GN_Android_Skpbench',
+ ('Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-' +
+ 'GN_Android_Vulkan_Skpbench'),
],
},
}
@@ -53,15 +54,16 @@
skpbench_dir = api.vars.slave_dir.join('skia', 'tools', 'skpbench')
table = api.path.join(api.vars.swarming_out_dir, 'table')
+ config = 'gpu,esinst4'
+ if 'Vulkan' in api.vars.builder_name:
+ config = 'vk'
+
skpbench_args = [
api.path.join(api.vars.android_bin_dir, 'skpbench'),
api.path.join(api.vars.android_data_dir, 'skps'),
'--adb',
'--resultsfile', table,
- '--config', 'gpu,esinst4']
-
- if 'GPU' in api.vars.builder_name:
- skpbench_args.append('--gpu')
+ '--config', config]
api.run(api.python, 'skpbench',
script=skpbench_dir.join('skpbench.py'),
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index e7a9715..6ab1452 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -158,18 +158,18 @@
"Upload-Perf-Android-Clang-Nexus6p-GPU-Adreno430-arm64-Release-GN_Android_Vulkan"
]
},
- "Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-GN_Android_Skpbench": {
- "priority": 0.8,
- "tasks": [
- "Upload-Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-GN_Android_Skpbench"
- ]
- },
"Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench": {
"priority": 0.8,
"tasks": [
"Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench"
]
},
+ "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench": {
+ "priority": 0.8,
+ "tasks": [
+ "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench"
+ ]
+ },
"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": {
"priority": 0.8,
"tasks": [
@@ -1274,45 +1274,6 @@
"isolate": "perf_skia.isolate",
"priority": 0.8
},
- "Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-GN_Android_Skpbench": {
- "cipd_packages": [
- {
- "name": "skia/bots/skp",
- "path": "skp",
- "version": "version:15"
- }
- ],
- "dependencies": [
- "Build-Ubuntu-Clang-arm64-Release-GN_Android"
- ],
- "dimensions": [
- "device_os:NMF26C",
- "device_type:dragon",
- "os:Android",
- "pool:Skia"
- ],
- "execution_timeout_ns": 14400000000000,
- "expiration_ns": 72000000000000,
- "extra_args": [
- "--workdir",
- "../../..",
- "swarm_skpbench",
- "repository=<(REPO)",
- "buildername=Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-GN_Android_Skpbench",
- "mastername=fake-master",
- "buildnumber=2",
- "slavename=fake-buildslave",
- "nobuildbot=True",
- "swarm_out_dir=${ISOLATED_OUTDIR}",
- "revision=<(REVISION)",
- "patch_storage=<(PATCH_STORAGE)",
- "patch_issue=<(ISSUE)",
- "patch_set=<(PATCHSET)"
- ],
- "io_timeout_ns": 2400000000000,
- "isolate": "skpbench_skia.isolate",
- "priority": 0.8
- },
"Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench": {
"cipd_packages": [
{
@@ -1352,6 +1313,45 @@
"isolate": "skpbench_skia.isolate",
"priority": 0.8
},
+ "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench": {
+ "cipd_packages": [
+ {
+ "name": "skia/bots/skp",
+ "path": "skp",
+ "version": "version:15"
+ }
+ ],
+ "dependencies": [
+ "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
+ ],
+ "dimensions": [
+ "device_os:NMF26C",
+ "device_type:dragon",
+ "os:Android",
+ "pool:Skia"
+ ],
+ "execution_timeout_ns": 14400000000000,
+ "expiration_ns": 72000000000000,
+ "extra_args": [
+ "--workdir",
+ "../../..",
+ "swarm_skpbench",
+ "repository=<(REPO)",
+ "buildername=Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench",
+ "mastername=fake-master",
+ "buildnumber=2",
+ "slavename=fake-buildslave",
+ "nobuildbot=True",
+ "swarm_out_dir=${ISOLATED_OUTDIR}",
+ "revision=<(REVISION)",
+ "patch_storage=<(PATCH_STORAGE)",
+ "patch_issue=<(ISSUE)",
+ "patch_set=<(PATCHSET)"
+ ],
+ "io_timeout_ns": 2400000000000,
+ "isolate": "skpbench_skia.isolate",
+ "priority": 0.8
+ },
"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": {
"cipd_packages": [
{
@@ -2404,35 +2404,6 @@
"isolate": "upload_nano_results.isolate",
"priority": 0.8
},
- "Upload-Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-GN_Android_Skpbench": {
- "dependencies": [
- "Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-GN_Android_Skpbench"
- ],
- "dimensions": [
- "cpu:x86-64-avx2",
- "gpu:none",
- "os:Ubuntu",
- "pool:Skia"
- ],
- "extra_args": [
- "--workdir",
- "../../..",
- "upload_nano_results",
- "repository=<(REPO)",
- "buildername=Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-GN_Android_Skpbench",
- "mastername=fake-master",
- "buildnumber=2",
- "slavename=fake-buildslave",
- "nobuildbot=True",
- "swarm_out_dir=${ISOLATED_OUTDIR}",
- "revision=<(REVISION)",
- "patch_storage=<(PATCH_STORAGE)",
- "patch_issue=<(ISSUE)",
- "patch_set=<(PATCHSET)"
- ],
- "isolate": "upload_nano_results.isolate",
- "priority": 0.8
- },
"Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench": {
"dependencies": [
"Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench"
@@ -2462,6 +2433,35 @@
"isolate": "upload_nano_results.isolate",
"priority": 0.8
},
+ "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench": {
+ "dependencies": [
+ "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench"
+ ],
+ "dimensions": [
+ "cpu:x86-64-avx2",
+ "gpu:none",
+ "os:Ubuntu",
+ "pool:Skia"
+ ],
+ "extra_args": [
+ "--workdir",
+ "../../..",
+ "upload_nano_results",
+ "repository=<(REPO)",
+ "buildername=Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench",
+ "mastername=fake-master",
+ "buildnumber=2",
+ "slavename=fake-buildslave",
+ "nobuildbot=True",
+ "swarm_out_dir=${ISOLATED_OUTDIR}",
+ "revision=<(REVISION)",
+ "patch_storage=<(PATCH_STORAGE)",
+ "patch_issue=<(ISSUE)",
+ "patch_set=<(PATCHSET)"
+ ],
+ "isolate": "upload_nano_results.isolate",
+ "priority": 0.8
+ },
"Upload-Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": {
"dependencies": [
"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN"
