diff options
Diffstat (limited to 'infra/bots/gen_tasks.go')
| -rw-r--r-- | infra/bots/gen_tasks.go | 81 |
1 files changed, 64 insertions, 17 deletions
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go index f34c5097d3..dd062e4f1c 100644 --- a/infra/bots/gen_tasks.go +++ b/infra/bots/gen_tasks.go @@ -161,26 +161,38 @@ var ( "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug", "Perf-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release", "Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release", + "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug", + "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE", + "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan", + "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release", + "Perf-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE", + "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-ShuttleA-GPU-AMDHD7770-x86_64-Debug", + "Perf-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Release", "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug", "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan", "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release", "Perf-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release-Vulkan", + "Perf-Win10-MSVC-ShuttleB-GPU-IntelHD4600-x86_64-Debug", + "Perf-Win10-MSVC-ShuttleB-GPU-IntelHD4600-x86_64-Release", "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug", "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE", "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release", "Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE", "Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug", "Perf-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release", + "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug", + "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-ANGLE", + "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan", + "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release", + "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-ANGLE", + "Perf-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-Vulkan", "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug", "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug", "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI", "Perf-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release", - "Perf-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Debug", - "Perf-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release", - "Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Debug", - "Perf-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release", "Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug", "Perf-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release", "Test-Android-Clang-AndroidOne-CPU-MT6582-arm-Debug-Android", @@ -245,27 +257,39 @@ var ( "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Debug", "Test-Ubuntu-GCC-ShuttleA-GPU-GTX660-x86_64-Release", "Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release", + "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug", + "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-ANGLE", + "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan", + "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release", + "Test-Win10-MSVC-NUC-GPU-IntelIris540-x86_64-Release-ANGLE", + "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-ShuttleA-GPU-AMDHD7770-x86_64-Debug", + "Test-Win10-MSVC-ShuttleA-GPU-AMDHD7770-x86_64-Release", "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug", "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Debug-Vulkan", "Test-Win10-MSVC-ShuttleA-GPU-GTX660-x86_64-Release", + "Test-Win10-MSVC-ShuttleB-GPU-IntelHD4600-x86_64-Debug", + "Test-Win10-MSVC-ShuttleB-GPU-IntelHD4600-x86_64-Release", "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug", "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Debug-ANGLE", "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release", "Test-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE", "Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Debug", "Test-Win10-MSVC-ShuttleC-GPU-iHD530-x86_64-Release", + "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug", + "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-ANGLE", + "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Debug-Vulkan", + "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release", + "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-ANGLE", + "Test-Win10-MSVC-ZBOX-GPU-GTX1070-x86_64-Release-Vulkan", "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Debug", "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86-Release", "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug", "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Debug-GDI", "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release", "Test-Win2k8-MSVC-GCE-CPU-AVX2-x86_64-Release-GDI", - "Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Debug", - "Test-Win8-MSVC-ShuttleA-GPU-HD7770-x86_64-Release", - "Test-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Debug", - "Test-Win8-MSVC-ShuttleB-GPU-HD4600-x86_64-Release", "Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Debug", "Test-iOS-Clang-iPadMini4-GPU-GX6450-Arm7-Release", } @@ -334,11 +358,28 @@ func swarmDimensions(parts map[string]string) []string { "Mac": "Mac-10.11", "Ubuntu": DEFAULT_OS_LINUX, "Win": "Windows-2008ServerR2-SP1", - "Win10": "Windows-10-10586", + "Win10": "Windows-10-14393", "Win2k8": "Windows-2008ServerR2-SP1", "Win8": "Windows-8.1-SP0", "iOS": "iOS-9.3.1", }[os] + if parts["cpu_or_gpu"] == "GPU" && os == "Win10" { + // We're in the process of moving Windows Skolo bots to + // a new Windows image. + d["os"] = map[string]string{ + "AMDHD7770": "Windows-10-14393", + // In Chrome Golo; won't be updated. + "GT610": "Windows-10-10586", + "GTX1070": "Windows-10-14393", + "GTX660": "Windows-10-14393", + "GTX960": "Windows-10-14393", + "IntelHD4600": "Windows-10-14393", + // Crashing with new image. + "iHD530": "Windows-10-10586", + "IntelIris540": "Windows-10-14393", + "IntelIris6100": "Windows-10-14393", + }[parts["cpu_or_gpu_value"]] + } } else { d["os"] = DEFAULT_OS } @@ -384,15 +425,21 @@ func swarmDimensions(parts map[string]string) []string { } } else { d["gpu"] = map[string]string{ - "GeForce320M": "10de:08a4", - "GT610": "10de:104a", - "GTX550Ti": "10de:1244", - "GTX660": "10de:11c0", - "GTX960": "10de:1401", - "HD4000": "8086:0a2e", - "HD4600": "8086:0412", - "HD7770": "1002:683d", + "AMDHD7770": "1002:683d", + "GeForce320M": "10de:08a4", + "GT610": "10de:104a", + "GTX1070": "10de:1ba1", + "GTX550Ti": "10de:1244", + "GTX660": "10de:11c0", + "GTX960": "10de:1401", + // TODO(benjaminwagner): This device ID doesn't + // match HD4000. + "HD4000": "8086:0a2e", + // This bot will eventually go away, so I'm not + // going to bother renaming it. "iHD530": "8086:1912", + "IntelHD4600": "8086:0412", + "IntelIris540": "8086:1926", "IntelIris6100": "8086:162b", }[parts["cpu_or_gpu_value"]] } |