aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--infra/bots/gen_tasks.go2
-rw-r--r--infra/bots/recipes/swarm_skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench.json3
-rw-r--r--infra/bots/recipes/swarm_skpbench.expected/Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench.json (renamed from infra/bots/recipes/swarm_skpbench.expected/Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-GN_Android_Skpbench.json)10
-rw-r--r--infra/bots/recipes/swarm_skpbench.py12
-rw-r--r--infra/bots/tasks.json30
5 files changed, 29 insertions, 28 deletions
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index e600e61ffa..4a9e3cccf5 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -55,8 +55,8 @@ var (
"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 4e537a61cc..4f62b1e4d8 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
index d002edf043..c62e420feb 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 4e7c02eada..f5d1ef487f 100644
--- a/infra/bots/recipes/swarm_skpbench.py
+++ b/infra/bots/recipes/swarm_skpbench.py
@@ -25,7 +25,8 @@ TEST_BUILDERS = {
'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 @@ 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 = '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 e7a97156e8..6ab14522b9 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -158,16 +158,16 @@
"Upload-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": {
"priority": 0.8,
"tasks": [
- "Upload-Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-GN_Android_Skpbench"
+ "Upload-Perf-Android-Clang-PixelC-GPU-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": {
"priority": 0.8,
"tasks": [
- "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench"
+ "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench"
]
},
"Perf-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-GN": {
@@ -1274,7 +1274,7 @@
"isolate": "perf_skia.isolate",
"priority": 0.8
},
- "Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-GN_Android_Skpbench": {
+ "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench": {
"cipd_packages": [
{
"name": "skia/bots/skp",
@@ -1298,7 +1298,7 @@
"../../..",
"swarm_skpbench",
"repository=<(REPO)",
- "buildername=Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-GN_Android_Skpbench",
+ "buildername=Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench",
"mastername=fake-master",
"buildnumber=2",
"slavename=fake-buildslave",
@@ -1313,7 +1313,7 @@
"isolate": "skpbench_skia.isolate",
"priority": 0.8
},
- "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench": {
+ "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench": {
"cipd_packages": [
{
"name": "skia/bots/skp",
@@ -1322,7 +1322,7 @@
}
],
"dependencies": [
- "Build-Ubuntu-Clang-arm64-Release-GN_Android"
+ "Build-Ubuntu-Clang-arm64-Release-GN_Android_Vulkan"
],
"dimensions": [
"device_os:NMF26C",
@@ -1337,7 +1337,7 @@
"../../..",
"swarm_skpbench",
"repository=<(REPO)",
- "buildername=Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench",
+ "buildername=Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench",
"mastername=fake-master",
"buildnumber=2",
"slavename=fake-buildslave",
@@ -2404,9 +2404,9 @@
"isolate": "upload_nano_results.isolate",
"priority": 0.8
},
- "Upload-Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-GN_Android_Skpbench": {
+ "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench": {
"dependencies": [
- "Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-GN_Android_Skpbench"
+ "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench"
],
"dimensions": [
"cpu:x86-64-avx2",
@@ -2419,7 +2419,7 @@
"../../..",
"upload_nano_results",
"repository=<(REPO)",
- "buildername=Perf-Android-Clang-PixelC-CPU-TegraX1-arm64-Release-GN_Android_Skpbench",
+ "buildername=Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench",
"mastername=fake-master",
"buildnumber=2",
"slavename=fake-buildslave",
@@ -2433,9 +2433,9 @@
"isolate": "upload_nano_results.isolate",
"priority": 0.8
},
- "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench": {
+ "Upload-Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench": {
"dependencies": [
- "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench"
+ "Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench"
],
"dimensions": [
"cpu:x86-64-avx2",
@@ -2448,7 +2448,7 @@
"../../..",
"upload_nano_results",
"repository=<(REPO)",
- "buildername=Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Skpbench",
+ "buildername=Perf-Android-Clang-PixelC-GPU-TegraX1-arm64-Release-GN_Android_Vulkan_Skpbench",
"mastername=fake-master",
"buildnumber=2",
"slavename=fake-buildslave",
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-11 13:33:30 +0000