From b2ddd014351d0dcf7759b6dae45c7e4332c5d508 Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Mon, 6 Mar 2017 11:10:54 -0500 Subject: [PATCH] Rename PentiumN3700 to IntelHD405. BUG=skia:6324 NOTRY=true Change-Id: I64d87d40c85f1e3a1b2c5aee8d5d68fca81192d6 Reviewed-on: https://skia-review.googlesource.com/9301 Reviewed-by: Mike Klein Commit-Queue: Ben Wagner --- infra/bots/gpu_map.json | 4 +- infra/bots/jobs.json | 16 ++++---- infra/bots/tasks.json | 100 ++++++++++++++++++++++++------------------------ 3 files changed, 60 insertions(+), 60 deletions(-) diff --git a/infra/bots/gpu_map.json b/infra/bots/gpu_map.json index fe75e10..c9d98e9 100644 --- a/infra/bots/gpu_map.json +++ b/infra/bots/gpu_map.json @@ -8,8 +8,8 @@ "GTX960": "10de:1401", "HD4000": "8086:0a2e", "iHD530": "8086:1912", + "IntelHD405": "8086:22b1", "IntelHD4600": "8086:0412", "IntelIris540": "8086:1926", - "IntelIris6100": "8086:162b", - "PentiumN3700": "8086:22b1" + "IntelIris6100": "8086:162b" } diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json index ca5b844..2f141d3 100644 --- a/infra/bots/jobs.json +++ b/infra/bots/jobs.json @@ -133,8 +133,8 @@ "Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release", "Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan", "Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release-Vulkan", - "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug", - "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Release", + "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug", + "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-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", @@ -144,8 +144,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-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug-ANGLE", - "Perf-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Release-ANGLE", + "Perf-Win10-MSVC-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-ANGLE", + "Perf-Win10-MSVC-NUC5PPYH-GPU-IntelHD405-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", @@ -243,8 +243,8 @@ "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release", "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Debug-Vulkan", "Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release-Vulkan", - "Test-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug", - "Test-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Release", + "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug", + "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-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", @@ -254,8 +254,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-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug-ANGLE", - "Test-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Release-ANGLE", + "Test-Win10-MSVC-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-ANGLE", + "Test-Win10-MSVC-NUC5PPYH-GPU-IntelHD405-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", diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json index 3d2ef4f..c061ccc 100644 --- a/infra/bots/tasks.json +++ b/infra/bots/tasks.json @@ -806,16 +806,16 @@ "Upload-Perf-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release-Vulkan" ] }, - "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug": { + "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug": { "priority": 0.8, "tasks": [ - "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug" + "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug" ] }, - "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Release": { + "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release": { "priority": 0.8, "tasks": [ - "Upload-Perf-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Release" + "Upload-Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release" ] }, "Perf-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": { @@ -872,16 +872,16 @@ "Upload-Perf-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE" ] }, - "Perf-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug-ANGLE": { + "Perf-Win10-MSVC-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-ANGLE": { "priority": 0.8, "tasks": [ - "Perf-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug-ANGLE" + "Perf-Win10-MSVC-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-ANGLE" ] }, - "Perf-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Release-ANGLE": { + "Perf-Win10-MSVC-NUC5PPYH-GPU-IntelHD405-x86_64-Release-ANGLE": { "priority": 0.8, "tasks": [ - "Upload-Perf-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Release-ANGLE" + "Upload-Perf-Win10-MSVC-NUC5PPYH-GPU-IntelHD405-x86_64-Release-ANGLE" ] }, "Perf-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug": { @@ -1467,16 +1467,16 @@ "Upload-Test-Ubuntu16-Clang-NUC-GPU-IntelIris540-x86_64-Release-Vulkan" ] }, - "Test-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug": { + "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug": { "priority": 0.8, "tasks": [ - "Upload-Test-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug" + "Upload-Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug" ] }, - "Test-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Release": { + "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release": { "priority": 0.8, "tasks": [ - "Upload-Test-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Release" + "Upload-Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release" ] }, "Test-Win10-MSVC-Golo-GPU-GT610-x86_64-Release": { @@ -1533,16 +1533,16 @@ "Upload-Test-Win10-MSVC-NUC-GPU-IntelIris6100-x86_64-Release-ANGLE" ] }, - "Test-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug-ANGLE": { + "Test-Win10-MSVC-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-ANGLE": { "priority": 0.8, "tasks": [ - "Upload-Test-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug-ANGLE" + "Upload-Test-Win10-MSVC-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-ANGLE" ] }, - "Test-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Release-ANGLE": { + "Test-Win10-MSVC-NUC5PPYH-GPU-IntelHD405-x86_64-Release-ANGLE": { "priority": 0.8, "tasks": [ - "Upload-Test-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Release-ANGLE" + "Upload-Test-Win10-MSVC-NUC5PPYH-GPU-IntelHD405-x86_64-Release-ANGLE" ] }, "Test-Win10-MSVC-NUC6i7KYK-GPU-GTX960-x86_64-Debug": { @@ -6982,7 +6982,7 @@ "max_attempts": 1, "priority": 0.8 }, - "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug": { + "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug": { "cipd_packages": [ { "name": "skia/bots/skimage", @@ -7020,7 +7020,7 @@ "../../..", "swarm_perf", "repository=<(REPO)", - "buildername=Perf-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug", + "buildername=Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug", "mastername=fake-master", "buildnumber=2", "slavename=fake-buildslave", @@ -7036,7 +7036,7 @@ "max_attempts": 1, "priority": 0.8 }, - "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Release": { + "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release": { "cipd_packages": [ { "name": "skia/bots/skimage", @@ -7074,7 +7074,7 @@ "../../..", "swarm_perf", "repository=<(REPO)", - "buildername=Perf-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Release", + "buildername=Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release", "mastername=fake-master", "buildnumber=2", "slavename=fake-buildslave", @@ -7531,7 +7531,7 @@ "max_attempts": 1, "priority": 0.8 }, - "Perf-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug-ANGLE": { + "Perf-Win10-MSVC-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-ANGLE": { "cipd_packages": [ { "name": "skia/bots/skimage", @@ -7564,7 +7564,7 @@ "../../..", "swarm_perf", "repository=<(REPO)", - "buildername=Perf-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug-ANGLE", + "buildername=Perf-Win10-MSVC-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-ANGLE", "mastername=fake-master", "buildnumber=2", "slavename=fake-buildslave", @@ -7580,7 +7580,7 @@ "max_attempts": 1, "priority": 0.8 }, - "Perf-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Release-ANGLE": { + "Perf-Win10-MSVC-NUC5PPYH-GPU-IntelHD405-x86_64-Release-ANGLE": { "cipd_packages": [ { "name": "skia/bots/skimage", @@ -7613,7 +7613,7 @@ "../../..", "swarm_perf", "repository=<(REPO)", - "buildername=Perf-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Release-ANGLE", + "buildername=Perf-Win10-MSVC-NUC5PPYH-GPU-IntelHD405-x86_64-Release-ANGLE", "mastername=fake-master", "buildnumber=2", "slavename=fake-buildslave", @@ -12436,7 +12436,7 @@ "max_attempts": 1, "priority": 0.8 }, - "Test-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug": { + "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug": { "cipd_packages": [ { "name": "skia/bots/skimage", @@ -12474,7 +12474,7 @@ "../../..", "swarm_test", "repository=<(REPO)", - "buildername=Test-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug", + "buildername=Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug", "mastername=fake-master", "buildnumber=2", "slavename=fake-buildslave", @@ -12490,7 +12490,7 @@ "max_attempts": 1, "priority": 0.8 }, - "Test-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Release": { + "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release": { "cipd_packages": [ { "name": "skia/bots/skimage", @@ -12528,7 +12528,7 @@ "../../..", "swarm_test", "repository=<(REPO)", - "buildername=Test-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Release", + "buildername=Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release", "mastername=fake-master", "buildnumber=2", "slavename=fake-buildslave", @@ -12985,7 +12985,7 @@ "max_attempts": 1, "priority": 0.8 }, - "Test-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug-ANGLE": { + "Test-Win10-MSVC-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-ANGLE": { "cipd_packages": [ { "name": "skia/bots/skimage", @@ -13018,7 +13018,7 @@ "../../..", "swarm_test", "repository=<(REPO)", - "buildername=Test-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug-ANGLE", + "buildername=Test-Win10-MSVC-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-ANGLE", "mastername=fake-master", "buildnumber=2", "slavename=fake-buildslave", @@ -13034,7 +13034,7 @@ "max_attempts": 1, "priority": 0.8 }, - "Test-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Release-ANGLE": { + "Test-Win10-MSVC-NUC5PPYH-GPU-IntelHD405-x86_64-Release-ANGLE": { "cipd_packages": [ { "name": "skia/bots/skimage", @@ -13067,7 +13067,7 @@ "../../..", "swarm_test", "repository=<(REPO)", - "buildername=Test-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Release-ANGLE", + "buildername=Test-Win10-MSVC-NUC5PPYH-GPU-IntelHD405-x86_64-Release-ANGLE", "mastername=fake-master", "buildnumber=2", "slavename=fake-buildslave", @@ -15258,9 +15258,9 @@ "isolate": "upload_nano_results.isolate", "priority": 0.8 }, - "Upload-Perf-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Release": { + "Upload-Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release": { "dependencies": [ - "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Release" + "Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release" ], "dimensions": [ "cpu:x86-64-avx2", @@ -15273,7 +15273,7 @@ "../../..", "upload_nano_results", "repository=<(REPO)", - "buildername=Perf-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Release", + "buildername=Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release", "mastername=fake-master", "buildnumber=2", "slavename=fake-buildslave", @@ -15438,9 +15438,9 @@ "isolate": "upload_nano_results.isolate", "priority": 0.8 }, - "Upload-Perf-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Release-ANGLE": { + "Upload-Perf-Win10-MSVC-NUC5PPYH-GPU-IntelHD405-x86_64-Release-ANGLE": { "dependencies": [ - "Perf-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Release-ANGLE" + "Perf-Win10-MSVC-NUC5PPYH-GPU-IntelHD405-x86_64-Release-ANGLE" ], "dimensions": [ "cpu:x86-64-avx2", @@ -15453,7 +15453,7 @@ "../../..", "upload_nano_results", "repository=<(REPO)", - "buildername=Perf-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Release-ANGLE", + "buildername=Perf-Win10-MSVC-NUC5PPYH-GPU-IntelHD405-x86_64-Release-ANGLE", "mastername=fake-master", "buildnumber=2", "slavename=fake-buildslave", @@ -17568,9 +17568,9 @@ "isolate": "upload_dm_results.isolate", "priority": 0.8 }, - "Upload-Test-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug": { + "Upload-Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug": { "dependencies": [ - "Test-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug" + "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug" ], "dimensions": [ "cpu:x86-64-avx2", @@ -17583,7 +17583,7 @@ "../../..", "upload_dm_results", "repository=<(REPO)", - "buildername=Test-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug", + "buildername=Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug", "mastername=fake-master", "buildnumber=2", "slavename=fake-buildslave", @@ -17598,9 +17598,9 @@ "isolate": "upload_dm_results.isolate", "priority": 0.8 }, - "Upload-Test-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Release": { + "Upload-Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release": { "dependencies": [ - "Test-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Release" + "Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release" ], "dimensions": [ "cpu:x86-64-avx2", @@ -17613,7 +17613,7 @@ "../../..", "upload_dm_results", "repository=<(REPO)", - "buildername=Test-Ubuntu16-Clang-NUC5PPYH-GPU-PentiumN3700-x86_64-Release", + "buildername=Test-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Release", "mastername=fake-master", "buildnumber=2", "slavename=fake-buildslave", @@ -17898,9 +17898,9 @@ "isolate": "upload_dm_results.isolate", "priority": 0.8 }, - "Upload-Test-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug-ANGLE": { + "Upload-Test-Win10-MSVC-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-ANGLE": { "dependencies": [ - "Test-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug-ANGLE" + "Test-Win10-MSVC-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-ANGLE" ], "dimensions": [ "cpu:x86-64-avx2", @@ -17913,7 +17913,7 @@ "../../..", "upload_dm_results", "repository=<(REPO)", - "buildername=Test-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Debug-ANGLE", + "buildername=Test-Win10-MSVC-NUC5PPYH-GPU-IntelHD405-x86_64-Debug-ANGLE", "mastername=fake-master", "buildnumber=2", "slavename=fake-buildslave", @@ -17928,9 +17928,9 @@ "isolate": "upload_dm_results.isolate", "priority": 0.8 }, - "Upload-Test-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Release-ANGLE": { + "Upload-Test-Win10-MSVC-NUC5PPYH-GPU-IntelHD405-x86_64-Release-ANGLE": { "dependencies": [ - "Test-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Release-ANGLE" + "Test-Win10-MSVC-NUC5PPYH-GPU-IntelHD405-x86_64-Release-ANGLE" ], "dimensions": [ "cpu:x86-64-avx2", @@ -17943,7 +17943,7 @@ "../../..", "upload_dm_results", "repository=<(REPO)", - "buildername=Test-Win10-MSVC-NUC5PPYH-GPU-PentiumN3700-x86_64-Release-ANGLE", + "buildername=Test-Win10-MSVC-NUC5PPYH-GPU-IntelHD405-x86_64-Release-ANGLE", "mastername=fake-master", "buildnumber=2", "slavename=fake-buildslave", -- 2.7.4