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>

1 files changed, 15 insertions, 15 deletions

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",