Switch Intel Broadwell (Iris 6100) to ANGLE.

BUG=skia:5933

Change-Id: I440414d3d3db72a55be493aeb910bda29cc87841
Reviewed-on: https://skia-review.googlesource.com/5473
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>

2 files changed, 33 insertions, 33 deletions

diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index ca538b04ff..d4ad3b208a 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -152,8 +152,8 @@ var (
 		"Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI",
 		"Perf-Win-MSVC-GCE-CPU-AVX2-x86_64-Release",
 		"Perf-Win-MSVC-Golo-GPU-GT610-x86_64-Release",
-		"Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug",
-		"Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release",
+		"Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
+		"Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
 		"Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug",
 		"Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE",
 		"Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
@@ -239,8 +239,8 @@ var (
 		"Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release",
 		"Test-Win-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI",
 		"Test-Win-MSVC-Golo-GPU-GT610-x86_64-Release",
-		"Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug",
-		"Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release",
+		"Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
+		"Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
 		"Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug",
 		"Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE",
 		"Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Release",
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 16be874d01..ab588a835f 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -770,16 +770,16 @@
         "Upload-Perf-Win-MSVC-Golo-GPU-GT610-x86_64-Release"
       ]
     },
-    "Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug": {
+    "Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
       "priority": 0.8,
       "tasks": [
-        "Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug"
+        "Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE"
       ]
     },
-    "Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release": {
+    "Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release"
+        "Upload-Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE"
       ]
     },
     "Perf-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug": {
@@ -1293,16 +1293,16 @@
         "Upload-Test-Win-MSVC-Golo-GPU-GT610-x86_64-Release"
       ]
     },
-    "Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug": {
+    "Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug"
+        "Upload-Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE"
       ]
     },
-    "Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release": {
+    "Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
       "priority": 0.8,
       "tasks": [
-        "Upload-Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release"
+        "Upload-Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE"
       ]
     },
     "Test-Win-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug": {
@@ -6374,7 +6374,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug": {
+    "Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -6393,7 +6393,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug"
+        "Build-Win-MSVC-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
         "gpu:8086:162b",
@@ -6407,7 +6407,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug",
+        "buildername=Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -6422,7 +6422,7 @@
       "isolate": "perf_skia.isolate",
       "priority": 0.8
     },
-    "Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release": {
+    "Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -6441,7 +6441,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release"
+        "Build-Win-MSVC-x86_64-Release-ANGLE"
       ],
       "dimensions": [
         "gpu:8086:162b",
@@ -6455,7 +6455,7 @@
         "../../..",
         "swarm_perf",
         "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release",
+        "buildername=Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -10561,7 +10561,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug": {
+    "Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10580,7 +10580,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Debug"
+        "Build-Win-MSVC-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
         "gpu:8086:162b",
@@ -10594,7 +10594,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug",
+        "buildername=Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -10609,7 +10609,7 @@
       "isolate": "test_skia.isolate",
       "priority": 0.8
     },
-    "Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release": {
+    "Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
       "cipd_packages": [
         {
           "name": "skia/bots/skimage",
@@ -10628,7 +10628,7 @@
         }
       ],
       "dependencies": [
-        "Build-Win-MSVC-x86_64-Release"
+        "Build-Win-MSVC-x86_64-Release-ANGLE"
       ],
       "dimensions": [
         "gpu:8086:162b",
@@ -10642,7 +10642,7 @@
         "../../..",
         "swarm_test",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release",
+        "buildername=Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -12218,9 +12218,9 @@
       "isolate": "upload_nano_results.isolate",
       "priority": 0.8
     },
-    "Upload-Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release": {
+    "Upload-Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
       "dependencies": [
-        "Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release"
+        "Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -12233,7 +12233,7 @@
         "../../..",
         "upload_nano_results",
         "repository=<(REPO)",
-        "buildername=Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release",
+        "buildername=Perf-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14219,9 +14219,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug": {
+    "Upload-Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE": {
       "dependencies": [
-        "Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug"
+        "Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14234,7 +14234,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug",
+        "buildername=Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Debug-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",
@@ -14248,9 +14248,9 @@
       "isolate": "upload_dm_results.isolate",
       "priority": 0.8
     },
-    "Upload-Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release": {
+    "Upload-Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE": {
       "dependencies": [
-        "Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release"
+        "Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE"
       ],
       "dimensions": [
         "cpu:x86-64-avx2",
@@ -14263,7 +14263,7 @@
         "../../..",
         "upload_dm_results",
         "repository=<(REPO)",
-        "buildername=Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release",
+        "buildername=Test-Win-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE",
         "mastername=fake-master",
         "buildnumber=2",
         "slavename=fake-buildslave",