Add eGPU jobs.

Change-Id: Ia160d3b17abebf0075f8ce2b608653e496f46d58
Reviewed-on: https://skia-review.googlesource.com/8805
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>

diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index 4570e41..2691fbb 100644 (file)
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -139,6 +139,8 @@
   "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-Vulkan",
   "Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
   "Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
+  "Perf-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug",
+  "Perf-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release",
   "Perf-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Debug",
   "Perf-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Release",
   "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug",
@@ -241,6 +243,8 @@
   "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-Vulkan",
   "Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
   "Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
+  "Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug",
+  "Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release",
   "Test-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Debug",
   "Test-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Release",
   "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug",

diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 9eae08c..42dc525 100644 (file)
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -842,6 +842,18 @@
         "Upload-Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE"
       ]
     },
+    "Perf-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Perf-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug"
+      ]
+    },
+    "Perf-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Perf-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release"
+      ]
+    },
     "Perf-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
@@ -1455,6 +1467,18 @@
         "Upload-Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE"
       ]
     },
+    "Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug"
+      ]
+    },
+    "Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release": {
+      "priority": 0.8,
+      "tasks": [
+        "Upload-Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release"
+      ]
+    },
     "Test-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Debug": {
       "priority": 0.8,
       "tasks": [
@@ -7158,6 +7182,104 @@
       "max_attempts": 1,
       "priority": 0.8
     },
+    "Perf-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:21"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:36"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Debug"
+      ],
+      "dimensions": [
+        "gpu:10de:1401",
+        "machine_type:n1-highcpu-8",
+        "os:Windows-10-14393",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug",
+        "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": "perf_skia.isolate",
+      "priority": 0.8
+    },
+    "Perf-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:21"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:36"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Release"
+      ],
+      "dimensions": [
+        "gpu:10de:1401",
+        "machine_type:n1-highcpu-8",
+        "os:Windows-10-14393",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_perf",
+        "repository=<(REPO)",
+        "buildername=Perf-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release",
+        "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": "perf_skia.isolate",
+      "priority": 0.8
+    },
     "Perf-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Debug": {
       "cipd_packages": [
         {
@@ -12206,6 +12328,104 @@
       "max_attempts": 1,
       "priority": 0.8
     },
+    "Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:21"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:36"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Debug"
+      ],
+      "dimensions": [
+        "gpu:10de:1401",
+        "machine_type:n1-highcpu-8",
+        "os:Windows-10-14393",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug",
+        "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": "test_skia.isolate",
+      "priority": 0.8
+    },
+    "Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release": {
+      "cipd_packages": [
+        {
+          "name": "skia/bots/skimage",
+          "path": "skimage",
+          "version": "version:21"
+        },
+        {
+          "name": "skia/bots/skp",
+          "path": "skp",
+          "version": "version:36"
+        },
+        {
+          "name": "skia/bots/svg",
+          "path": "svg",
+          "version": "version:3"
+        }
+      ],
+      "dependencies": [
+        "Build-Win-MSVC-x86_64-Release"
+      ],
+      "dimensions": [
+        "gpu:10de:1401",
+        "machine_type:n1-highcpu-8",
+        "os:Windows-10-14393",
+        "pool:Skia"
+      ],
+      "execution_timeout_ns": 14400000000000,
+      "expiration_ns": 72000000000000,
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "swarm_test",
+        "repository=<(REPO)",
+        "buildername=Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release",
+        "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": "test_skia.isolate",
+      "priority": 0.8
+    },
     "Test-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Debug": {
       "cipd_packages": [
         {
@@ -14471,6 +14691,36 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
+    "Upload-Perf-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release": {
+      "dependencies": [
+        "Perf-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_nano_results",
+        "repository=<(REPO)",
+        "buildername=Perf-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release",
+        "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)",
+        "gs_bucket=skia-perf"
+      ],
+      "isolate": "upload_nano_results.isolate",
+      "priority": 0.8
+    },
     "Upload-Perf-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Release": {
       "dependencies": [
         "Perf-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Release"
@@ -16721,6 +16971,66 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
+    "Upload-Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug": {
+      "dependencies": [
+        "Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug",
+        "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)",
+        "gs_bucket=skia-infra-gm"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
+    "Upload-Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release": {
+      "dependencies": [
+        "Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release"
+      ],
+      "dimensions": [
+        "cpu:x86-64-avx2",
+        "gpu:none",
+        "os:Ubuntu-14.04",
+        "pool:Skia"
+      ],
+      "extra_args": [
+        "--workdir",
+        "../../..",
+        "upload_dm_results",
+        "repository=<(REPO)",
+        "buildername=Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Release",
+        "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)",
+        "gs_bucket=skia-infra-gm"
+      ],
+      "isolate": "upload_dm_results.isolate",
+      "priority": 0.8
+    },
     "Upload-Test-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Debug": {
       "dependencies": [
         "Test-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Debug"