Rename Mac bots to match reality.
Doing this separately from https://skia-review.googlesource.com/c/36040
to avoid confusion.
No-Try: true
Change-Id: I2d9e03c6da6096f9e14145d9654b9da7a8670036
Reviewed-on: https://skia-review.googlesource.com/35823
Reviewed-by: Brian Salomon <bsalomon@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index a609541..616acc4 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -189,7 +189,7 @@
d["os"] = "Windows-10-10586"
}
// This machine hasn't been upgraded yet.
- if parts["model"] == "MacMini6.2" && os == "Mac" && parts["cpu_or_gpu"] == "CPU" {
+ if parts["model"] == "MacMini7.1" && os == "Mac" && parts["cpu_or_gpu"] == "CPU" {
d["os"] = "Mac-10.11"
}
} else {
@@ -308,8 +308,7 @@
d["gpu"] = gpu
} else if strings.Contains(parts["os"], "Mac") {
gpu, ok := map[string]string{
- // TODO(benjaminwagner): GPU name doesn't match device ID.
- "IntelHD4000": "8086:0a2e",
+ "IntelIris5100": "8086:0a2e",
}[parts["cpu_or_gpu_value"]]
if !ok {
glog.Fatalf("Entry %q not found in Mac GPU mapping.", parts["cpu_or_gpu_value"])
diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index cabcf8c..bc7616b 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -157,11 +157,11 @@
"Perf-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Release",
"Perf-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Debug",
"Perf-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Release",
- "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug",
- "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release",
- "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug",
- "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release",
- "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release-CommandBuffer",
+ "Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug",
+ "Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release",
+ "Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug",
+ "Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release",
+ "Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-CommandBuffer",
"Perf-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Release-CT_BENCH_1k_SKPs",
"Perf-Ubuntu14-GCC-Golo-GPU-GT610-x86_64-Release-CT_BENCH_1k_SKPs",
"Perf-Ubuntu16-Clang-NUC5PPYH-GPU-IntelHD405-x86_64-Debug",
@@ -327,11 +327,11 @@
"Test-Debian9-GCC-ShuttleA-GPU-GTX660-x86_64-Release",
"Test-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Debug",
"Test-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Release",
- "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug",
- "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release",
- "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug",
- "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer",
- "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release",
+ "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug",
+ "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release",
+ "Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug",
+ "Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-CommandBuffer",
+ "Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release",
"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs",
"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_1m_SKPs",
"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_IMG_DECODE_100k_SKPs",
diff --git a/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json b/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release.json
similarity index 91%
rename from infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json
rename to infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release.json
index 6334fcb..c5eb1b8 100644
--- a/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json
+++ b/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release.json
@@ -91,7 +91,7 @@
"--json-output",
"/path/to/tmp/json",
"rmtree",
- "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release/data"
+ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release/data"
],
"infra_step": true,
"name": "rmtree data"
@@ -106,7 +106,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release/data"
+ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release/data"
],
"infra_step": true,
"name": "makedirs data"
@@ -181,7 +181,7 @@
"~inc0.webp",
"~inc1.webp",
"--outResultsFile",
- "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release/data/nanobench_abc123_1337000001.json",
+ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release/data/nanobench_abc123_1337000001.json",
"--properties",
"gitHash",
"abc123",
@@ -199,7 +199,7 @@
"cpu_or_gpu_value",
"AVX",
"model",
- "MacMini6.2",
+ "MacMini7.1",
"os",
"Mac"
],
@@ -221,7 +221,7 @@
"ensure-directory",
"--mode",
"0777",
- "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release/data"
+ "[CUSTOM_[SWARM_OUT_DIR]]/perfdata/Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release/data"
],
"infra_step": true,
"name": "makedirs perf_dir"
diff --git a/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-CommandBuffer.json
similarity index 100%
rename from infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer.json
rename to infra/bots/recipes/perf.expected/Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-CommandBuffer.json
diff --git a/infra/bots/recipes/perf.py b/infra/bots/recipes/perf.py
index 5694c05..2fb54cf 100644
--- a/infra/bots/recipes/perf.py
+++ b/infra/bots/recipes/perf.py
@@ -105,7 +105,7 @@
# Bench instanced rendering on a limited number of platforms
inst_config = gl_prefix + 'inst'
- if 'PixelC' in bot or 'NVIDIA_Shield' in bot or 'MacMini6.2' in bot:
+ if 'PixelC' in bot or 'NVIDIA_Shield' in bot or 'MacMini7.1' in bot:
configs.extend([inst_config, inst_config + sample_count])
if 'CommandBuffer' in bot:
@@ -374,8 +374,8 @@
'Perf-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Release',
'Perf-Chromecast-GCC-Chorizo-CPU-Cortex_A7-arm-Debug',
'Perf-Chromecast-GCC-Chorizo-GPU-Cortex_A7-arm-Release',
- 'Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release',
- 'Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer',
+ 'Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release',
+ 'Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-CommandBuffer',
'Perf-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release',
'Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind',
('Perf-Ubuntu-GCC-ShuttleA-GPU-GTX550Ti-x86_64-Release-Valgrind' +
diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug.json
similarity index 99%
rename from infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json
rename to infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug.json
index d8bc489..ac7f2a0 100644
--- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json
+++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug.json
@@ -219,7 +219,7 @@
"gitHash",
"abc123",
"builder",
- "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug",
+ "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug",
"swarming_bot_id",
"skia-bot-123",
"swarming_task_id",
@@ -238,7 +238,7 @@
"cpu_or_gpu_value",
"AVX",
"model",
- "MacMini6.2",
+ "MacMini7.1",
"os",
"Mac",
"--uninterestingHashesFile",
diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-CommandBuffer.json
similarity index 98%
rename from infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer.json
rename to infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-CommandBuffer.json
index 934767a..4d5f831 100644
--- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer.json
+++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-CommandBuffer.json
@@ -219,7 +219,7 @@
"gitHash",
"abc123",
"builder",
- "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer",
+ "Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-CommandBuffer",
"swarming_bot_id",
"skia-bot-123",
"swarming_task_id",
@@ -236,11 +236,11 @@
"cpu_or_gpu",
"GPU",
"cpu_or_gpu_value",
- "IntelHD4000",
+ "IntelIris5100",
"extra_config",
"CommandBuffer",
"model",
- "MacMini6.2",
+ "MacMini7.1",
"os",
"Mac",
"--uninterestingHashesFile",
diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py
index 5f7d2f1..1360677 100644
--- a/infra/bots/recipes/test.py
+++ b/infra/bots/recipes/test.py
@@ -175,7 +175,7 @@
configs = [x.replace(old, new) for x in configs]
# We also test non-msaa instanced.
configs.append(new)
- elif 'MacMini6.2' in bot:
+ elif 'MacMini7.1' in bot:
configs.extend([gl_prefix + 'inst'])
# CommandBuffer bot *only* runs the command_buffer config.
@@ -830,8 +830,8 @@
'Test-Android-Clang-PixelC-CPU-TegraX1-arm64-Debug-Android',
'Test-ChromeOS-Clang-Chromebook_C100p-GPU-MaliT764-arm-Debug',
'Test-ChromeOS-Clang-Chromebook_CB5_312T-GPU-PowerVRGX6250-arm-Debug',
- 'Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug',
- 'Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer',
+ 'Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug',
+ 'Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-CommandBuffer',
'Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-ASAN',
'Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Debug-MSAN',
'Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Release-TSAN',
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index 39193d7..de75421 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -956,34 +956,34 @@
"Upload-Perf-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Release"
]
},
- "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug": {
+ "Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug": {
"priority": 0.8,
"tasks": [
- "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug"
+ "Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug"
]
},
- "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release": {
+ "Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release": {
"priority": 0.8,
"tasks": [
- "Upload-Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release"
+ "Upload-Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release"
]
},
- "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug": {
+ "Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug": {
"priority": 0.8,
"tasks": [
- "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug"
+ "Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug"
]
},
- "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release": {
+ "Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release": {
"priority": 0.8,
"tasks": [
- "Upload-Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release"
+ "Upload-Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release"
]
},
- "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release-CommandBuffer": {
+ "Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-CommandBuffer": {
"priority": 0.8,
"tasks": [
- "Upload-Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release-CommandBuffer"
+ "Upload-Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-CommandBuffer"
],
"trigger": "master"
},
@@ -1977,35 +1977,35 @@
"Upload-Test-Debian9-GCC-ShuttleA-GPU-GTX960-x86_64-Release"
]
},
- "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug": {
+ "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug": {
"priority": 0.8,
"tasks": [
- "Upload-Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug"
+ "Upload-Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug"
]
},
- "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release": {
+ "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release": {
"priority": 0.8,
"tasks": [
- "Upload-Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release"
+ "Upload-Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release"
]
},
- "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug": {
+ "Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug": {
"priority": 0.8,
"tasks": [
- "Upload-Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug"
+ "Upload-Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug"
]
},
- "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer": {
+ "Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-CommandBuffer": {
"priority": 0.8,
"tasks": [
- "Upload-Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer"
+ "Upload-Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-CommandBuffer"
],
"trigger": "master"
},
- "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release": {
+ "Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release": {
"priority": 0.8,
"tasks": [
- "Upload-Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release"
+ "Upload-Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release"
]
},
"Test-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Debug-CT_DM_100k_SKPs": {
@@ -7706,7 +7706,7 @@
"max_attempts": 1,
"priority": 0.8
},
- "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug": {
+ "Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug": {
"cipd_packages": [
{
"name": "skia/bots/skimage",
@@ -7741,7 +7741,7 @@
"../../..",
"perf",
"repository=<(REPO)",
- "buildername=Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug",
+ "buildername=Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_repo=<(PATCH_REPO)",
@@ -7754,7 +7754,7 @@
"max_attempts": 1,
"priority": 0.8
},
- "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release": {
+ "Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release": {
"cipd_packages": [
{
"name": "skia/bots/skimage",
@@ -7789,7 +7789,7 @@
"../../..",
"perf",
"repository=<(REPO)",
- "buildername=Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release",
+ "buildername=Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_repo=<(PATCH_REPO)",
@@ -7802,7 +7802,7 @@
"max_attempts": 1,
"priority": 0.8
},
- "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug": {
+ "Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug": {
"cipd_packages": [
{
"name": "skia/bots/skimage",
@@ -7836,7 +7836,7 @@
"../../..",
"perf",
"repository=<(REPO)",
- "buildername=Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug",
+ "buildername=Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_repo=<(PATCH_REPO)",
@@ -7849,7 +7849,7 @@
"max_attempts": 1,
"priority": 0.8
},
- "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release": {
+ "Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release": {
"cipd_packages": [
{
"name": "skia/bots/skimage",
@@ -7883,7 +7883,7 @@
"../../..",
"perf",
"repository=<(REPO)",
- "buildername=Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release",
+ "buildername=Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_repo=<(PATCH_REPO)",
@@ -7896,7 +7896,7 @@
"max_attempts": 1,
"priority": 0.8
},
- "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release-CommandBuffer": {
+ "Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-CommandBuffer": {
"cipd_packages": [
{
"name": "skia/bots/skimage",
@@ -7930,7 +7930,7 @@
"../../..",
"perf",
"repository=<(REPO)",
- "buildername=Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release-CommandBuffer",
+ "buildername=Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-CommandBuffer",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_repo=<(PATCH_REPO)",
@@ -15096,7 +15096,7 @@
"max_attempts": 1,
"priority": 0.8
},
- "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug": {
+ "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug": {
"cipd_packages": [
{
"name": "skia/bots/skimage",
@@ -15131,7 +15131,7 @@
"../../..",
"test",
"repository=<(REPO)",
- "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug",
+ "buildername=Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_repo=<(PATCH_REPO)",
@@ -15144,7 +15144,7 @@
"max_attempts": 1,
"priority": 0.8
},
- "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release": {
+ "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release": {
"cipd_packages": [
{
"name": "skia/bots/skimage",
@@ -15179,7 +15179,7 @@
"../../..",
"test",
"repository=<(REPO)",
- "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release",
+ "buildername=Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_repo=<(PATCH_REPO)",
@@ -15192,7 +15192,7 @@
"max_attempts": 1,
"priority": 0.8
},
- "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug": {
+ "Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug": {
"cipd_packages": [
{
"name": "skia/bots/skimage",
@@ -15226,7 +15226,7 @@
"../../..",
"test",
"repository=<(REPO)",
- "buildername=Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug",
+ "buildername=Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_repo=<(PATCH_REPO)",
@@ -15239,7 +15239,7 @@
"max_attempts": 1,
"priority": 0.8
},
- "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer": {
+ "Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-CommandBuffer": {
"cipd_packages": [
{
"name": "skia/bots/skimage",
@@ -15273,7 +15273,7 @@
"../../..",
"test",
"repository=<(REPO)",
- "buildername=Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer",
+ "buildername=Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-CommandBuffer",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_repo=<(PATCH_REPO)",
@@ -15286,7 +15286,7 @@
"max_attempts": 1,
"priority": 0.8
},
- "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release": {
+ "Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release": {
"cipd_packages": [
{
"name": "skia/bots/skimage",
@@ -15320,7 +15320,7 @@
"../../..",
"test",
"repository=<(REPO)",
- "buildername=Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release",
+ "buildername=Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_repo=<(PATCH_REPO)",
@@ -21117,9 +21117,9 @@
"isolate": "upload_nano_results.isolate",
"priority": 0.8
},
- "Upload-Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release": {
+ "Upload-Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release": {
"dependencies": [
- "Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release"
+ "Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release"
],
"dimensions": [
"cpu:x86-64-avx2",
@@ -21132,7 +21132,7 @@
"../../..",
"upload_nano_results",
"repository=<(REPO)",
- "buildername=Perf-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release",
+ "buildername=Perf-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_repo=<(PATCH_REPO)",
@@ -21144,9 +21144,9 @@
"isolate": "upload_nano_results.isolate",
"priority": 0.8
},
- "Upload-Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release": {
+ "Upload-Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release": {
"dependencies": [
- "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release"
+ "Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release"
],
"dimensions": [
"cpu:x86-64-avx2",
@@ -21159,7 +21159,7 @@
"../../..",
"upload_nano_results",
"repository=<(REPO)",
- "buildername=Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release",
+ "buildername=Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_repo=<(PATCH_REPO)",
@@ -21171,9 +21171,9 @@
"isolate": "upload_nano_results.isolate",
"priority": 0.8
},
- "Upload-Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release-CommandBuffer": {
+ "Upload-Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-CommandBuffer": {
"dependencies": [
- "Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release-CommandBuffer"
+ "Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-CommandBuffer"
],
"dimensions": [
"cpu:x86-64-avx2",
@@ -21186,7 +21186,7 @@
"../../..",
"upload_nano_results",
"repository=<(REPO)",
- "buildername=Perf-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release-CommandBuffer",
+ "buildername=Perf-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release-CommandBuffer",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_repo=<(PATCH_REPO)",
@@ -24033,9 +24033,9 @@
"isolate": "upload_dm_results.isolate",
"priority": 0.8
},
- "Upload-Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug": {
+ "Upload-Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug": {
"dependencies": [
- "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug"
+ "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug"
],
"dimensions": [
"cpu:x86-64-avx2",
@@ -24048,7 +24048,7 @@
"../../..",
"upload_dm_results",
"repository=<(REPO)",
- "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug",
+ "buildername=Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Debug",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_repo=<(PATCH_REPO)",
@@ -24060,9 +24060,9 @@
"isolate": "upload_dm_results.isolate",
"priority": 0.8
},
- "Upload-Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release": {
+ "Upload-Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release": {
"dependencies": [
- "Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release"
+ "Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release"
],
"dimensions": [
"cpu:x86-64-avx2",
@@ -24075,7 +24075,7 @@
"../../..",
"upload_dm_results",
"repository=<(REPO)",
- "buildername=Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release",
+ "buildername=Test-Mac-Clang-MacMini7.1-CPU-AVX-x86_64-Release",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_repo=<(PATCH_REPO)",
@@ -24087,9 +24087,9 @@
"isolate": "upload_dm_results.isolate",
"priority": 0.8
},
- "Upload-Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug": {
+ "Upload-Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug": {
"dependencies": [
- "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug"
+ "Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug"
],
"dimensions": [
"cpu:x86-64-avx2",
@@ -24102,7 +24102,7 @@
"../../..",
"upload_dm_results",
"repository=<(REPO)",
- "buildername=Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug",
+ "buildername=Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_repo=<(PATCH_REPO)",
@@ -24114,9 +24114,9 @@
"isolate": "upload_dm_results.isolate",
"priority": 0.8
},
- "Upload-Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer": {
+ "Upload-Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-CommandBuffer": {
"dependencies": [
- "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer"
+ "Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-CommandBuffer"
],
"dimensions": [
"cpu:x86-64-avx2",
@@ -24129,7 +24129,7 @@
"../../..",
"upload_dm_results",
"repository=<(REPO)",
- "buildername=Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Debug-CommandBuffer",
+ "buildername=Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Debug-CommandBuffer",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_repo=<(PATCH_REPO)",
@@ -24141,9 +24141,9 @@
"isolate": "upload_dm_results.isolate",
"priority": 0.8
},
- "Upload-Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release": {
+ "Upload-Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release": {
"dependencies": [
- "Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release"
+ "Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release"
],
"dimensions": [
"cpu:x86-64-avx2",
@@ -24156,7 +24156,7 @@
"../../..",
"upload_dm_results",
"repository=<(REPO)",
- "buildername=Test-Mac-Clang-MacMini6.2-GPU-IntelHD4000-x86_64-Release",
+ "buildername=Test-Mac-Clang-MacMini7.1-GPU-IntelIris5100-x86_64-Release",
"swarm_out_dir=${ISOLATED_OUTDIR}",
"revision=<(REVISION)",
"patch_repo=<(PATCH_REPO)",