Rename HD4000 GPU to IntelHD4000 on bots
This is so the blanket disabling of MSAA on Intel bots (in test.py & perf.py) actually disables it on the HD4000.
Change-Id: Ief3c0c85ed53e312f5e584ab51ba76f78fb8c036
Reviewed-on: https://skia-review.googlesource.com/17822
Reviewed-by: Kevin Lubick <kjlubick@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index d2b4ee2..aafa162 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -795,22 +795,22 @@
"Upload-Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release"
]
},
- "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug": {
+ "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug": {
"priority": 0.8,
"tasks": [
- "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug"
+ "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug"
]
},
- "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release": {
+ "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release": {
"priority": 0.8,
"tasks": [
- "Upload-Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release"
+ "Upload-Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release"
]
},
- "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-CommandBuffer": {
+ "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release-CommandBuffer": {
"priority": 0.8,
"tasks": [
- "Upload-Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-CommandBuffer"
+ "Upload-Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release-CommandBuffer"
]
},
"Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug": {
@@ -1641,22 +1641,22 @@
"Upload-Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release"
]
},
- "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug": {
+ "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug": {
"priority": 0.8,
"tasks": [
- "Upload-Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug"
+ "Upload-Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug"
]
},
- "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer": {
+ "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer": {
"priority": 0.8,
"tasks": [
- "Upload-Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer"
+ "Upload-Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer"
]
},
- "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release": {
+ "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release": {
"priority": 0.8,
"tasks": [
- "Upload-Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release"
+ "Upload-Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release"
]
},
"Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug": {
@@ -6260,7 +6260,7 @@
"max_attempts": 1,
"priority": 0.8
},
- "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug": {
+ "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug": {
"cipd_packages": [
{
"name": "skia/bots/skimage",
@@ -6294,7 +6294,7 @@
"../../..",
"perf",
"repository=<(REPO)",
- "buildername=Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug",
+ "buildername=Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_repo=<(PATCH_REPO)",
@@ -6307,7 +6307,7 @@
"max_attempts": 1,
"priority": 0.8
},
- "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release": {
+ "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release": {
"cipd_packages": [
{
"name": "skia/bots/skimage",
@@ -6341,7 +6341,7 @@
"../../..",
"perf",
"repository=<(REPO)",
- "buildername=Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release",
+ "buildername=Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_repo=<(PATCH_REPO)",
@@ -6354,7 +6354,7 @@
"max_attempts": 1,
"priority": 0.8
},
- "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-CommandBuffer": {
+ "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release-CommandBuffer": {
"cipd_packages": [
{
"name": "skia/bots/skimage",
@@ -6388,7 +6388,7 @@
"../../..",
"perf",
"repository=<(REPO)",
- "buildername=Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-CommandBuffer",
+ "buildername=Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release-CommandBuffer",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_repo=<(PATCH_REPO)",
@@ -12237,7 +12237,7 @@
"max_attempts": 1,
"priority": 0.8
},
- "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug": {
+ "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug": {
"cipd_packages": [
{
"name": "skia/bots/skimage",
@@ -12271,7 +12271,7 @@
"../../..",
"test",
"repository=<(REPO)",
- "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug",
+ "buildername=Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_repo=<(PATCH_REPO)",
@@ -12284,7 +12284,7 @@
"max_attempts": 1,
"priority": 0.8
},
- "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer": {
+ "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer": {
"cipd_packages": [
{
"name": "skia/bots/skimage",
@@ -12318,7 +12318,7 @@
"../../..",
"test",
"repository=<(REPO)",
- "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer",
+ "buildername=Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_repo=<(PATCH_REPO)",
@@ -12331,7 +12331,7 @@
"max_attempts": 1,
"priority": 0.8
},
- "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release": {
+ "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release": {
"cipd_packages": [
{
"name": "skia/bots/skimage",
@@ -12365,7 +12365,7 @@
"../../..",
"test",
"repository=<(REPO)",
- "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release",
+ "buildername=Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_repo=<(PATCH_REPO)",
@@ -17822,9 +17822,9 @@
"isolate": "upload_nano_results.isolate",
"priority": 0.8
},
- "Upload-Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release": {
+ "Upload-Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release": {
"dependencies": [
- "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release"
+ "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release"
],
"dimensions": [
"cpu:x86-64-avx2",
@@ -17837,7 +17837,7 @@
"../../..",
"upload_nano_results",
"repository=<(REPO)",
- "buildername=Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release",
+ "buildername=Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_repo=<(PATCH_REPO)",
@@ -17849,9 +17849,9 @@
"isolate": "upload_nano_results.isolate",
"priority": 0.8
},
- "Upload-Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-CommandBuffer": {
+ "Upload-Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release-CommandBuffer": {
"dependencies": [
- "Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-CommandBuffer"
+ "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release-CommandBuffer"
],
"dimensions": [
"cpu:x86-64-avx2",
@@ -17864,7 +17864,7 @@
"../../..",
"upload_nano_results",
"repository=<(REPO)",
- "buildername=Perf-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release-CommandBuffer",
+ "buildername=Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release-CommandBuffer",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_repo=<(PATCH_REPO)",
@@ -20225,9 +20225,9 @@
"isolate": "upload_dm_results.isolate",
"priority": 0.8
},
- "Upload-Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug": {
+ "Upload-Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug": {
"dependencies": [
- "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug"
+ "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug"
],
"dimensions": [
"cpu:x86-64-avx2",
@@ -20240,7 +20240,7 @@
"../../..",
"upload_dm_results",
"repository=<(REPO)",
- "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug",
+ "buildername=Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_repo=<(PATCH_REPO)",
@@ -20252,9 +20252,9 @@
"isolate": "upload_dm_results.isolate",
"priority": 0.8
},
- "Upload-Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer": {
+ "Upload-Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer": {
"dependencies": [
- "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer"
+ "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer"
],
"dimensions": [
"cpu:x86-64-avx2",
@@ -20267,7 +20267,7 @@
"../../..",
"upload_dm_results",
"repository=<(REPO)",
- "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Debug-CommandBuffer",
+ "buildername=Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_repo=<(PATCH_REPO)",
@@ -20279,9 +20279,9 @@
"isolate": "upload_dm_results.isolate",
"priority": 0.8
},
- "Upload-Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release": {
+ "Upload-Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release": {
"dependencies": [
- "Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release"
+ "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release"
],
"dimensions": [
"cpu:x86-64-avx2",
@@ -20294,7 +20294,7 @@
"../../..",
"upload_dm_results",
"repository=<(REPO)",
- "buildername=Test-Mac-Clang-MacMini6.2-GPU-HD4000-x86_64-Release",
+ "buildername=Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_repo=<(PATCH_REPO)",