[infra] Switch back to 16-core GCE VMs for Perf and Test.

This partially reverts
https://skia-review.googlesource.com/c/skia/+/124340

Bug: skia:7415, skia:7416
Change-Id: I2a838ff3c543ded54e962e905294811fbc97ef88
Reviewed-on: https://skia-review.googlesource.com/127965
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>

2 files changed, 70 insertions, 72 deletions

diff --git a/infra/bots/gen_tasks.go b/infra/bots/gen_tasks.go
index 64c7209894..ee916f8c92 100644
--- a/infra/bots/gen_tasks.go
+++ b/infra/bots/gen_tasks.go
@@ -49,7 +49,13 @@ const (
 
 	DEFAULT_PROJECT = "skia"
 
+	// Small is a 2-core machine.
+	// TODO(dogben): Would n1-standard-1 or n1-standard-2 be sufficient?
 	MACHINE_TYPE_SMALL = "n1-highmem-2"
+	// Medium is a 16-core machine
+	MACHINE_TYPE_MEDIUM = "n1-standard-16"
+	// Large is a 64-core machine. (We use "highcpu" because we don't need more than 57GB memory for
+	// any of our tasks.)
 	MACHINE_TYPE_LARGE = "n1-highcpu-64"
 
 	// Swarming output dirs.
@@ -479,21 +485,12 @@ func defaultSwarmDimensions(parts map[string]string) []string {
 				d["os"] = DEFAULT_OS_LINUX_GCE
 			}
 			if parts["model"] == "GCE" && d["cpu"] == "x86-64-Haswell_GCE" {
-				// nanobench runs single-threaded, so use a small machine.
-				// dm is multi-threaded for CPU, so use a large machine.
-				machineType, ok := map[string]string{
-					"Calmbench": MACHINE_TYPE_SMALL,
-					"Perf":      MACHINE_TYPE_SMALL,
-					"Test":      MACHINE_TYPE_LARGE,
-				}[parts["role"]]
-				if !ok {
-					glog.Fatalf("Entry %q not found in GCE machine type mapping.", parts["role"])
-				}
 				// Coverage gets slower with more cores.
 				if strings.Contains(parts["extra_config"], "Coverage") {
-					machineType = MACHINE_TYPE_SMALL
+					d["machine_type"] = MACHINE_TYPE_SMALL
+				} else {
+					d["machine_type"] = MACHINE_TYPE_MEDIUM
 				}
-				d["machine_type"] = machineType
 			}
 		} else {
 			if strings.Contains(parts["os"], "Win") {
@@ -1118,7 +1115,8 @@ func presubmit(b *specs.TasksCfgBuilder, name string) string {
 		"reason":           "CQ",
 		"repo_name":        "skia",
 	}
-	// Use MACHINE_TYPE_LARGE because it seems to save ~1m and we want presubmit to be fast.
+	// Use MACHINE_TYPE_LARGE because it seems to save time versus MEDIUM and we want presubmit to be
+	// fast.
 	task := kitchenTask(name, "run_presubmit", "empty.isolate", SERVICE_ACCOUNT_COMPILE, linuxGceDimensions(MACHINE_TYPE_LARGE), extraProps, OUTPUT_NONE)
 
 	replaceArg := func(key, value string) {
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index a27d4b81fd..b1580afae3 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -16403,7 +16403,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highmem-2",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -25014,7 +25014,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highmem-2",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -25127,7 +25127,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highmem-2",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -25245,7 +25245,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highmem-2",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -25363,7 +25363,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highmem-2",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -25476,7 +25476,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highmem-2",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -25589,7 +25589,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highmem-2",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -25702,7 +25702,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highmem-2",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -25820,7 +25820,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highmem-2",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -25933,7 +25933,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highmem-2",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -26046,7 +26046,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highmem-2",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -27807,7 +27807,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highmem-2",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -27920,7 +27920,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highmem-2",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -28033,7 +28033,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highmem-2",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -37172,7 +37172,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20180410",
-        "machine_type:n1-highmem-2",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -37286,7 +37286,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20180410",
-        "machine_type:n1-highmem-2",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -37400,7 +37400,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20180410",
-        "machine_type:n1-highmem-2",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -37514,7 +37514,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20180410",
-        "machine_type:n1-highmem-2",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -37628,7 +37628,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20180410",
-        "machine_type:n1-highmem-2",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -37742,7 +37742,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20180410",
-        "machine_type:n1-highmem-2",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -37856,7 +37856,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20180410",
-        "machine_type:n1-highmem-2",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -37970,7 +37970,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20180410",
-        "machine_type:n1-highmem-2",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -47837,7 +47837,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -47950,7 +47950,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -48068,7 +48068,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -48186,7 +48186,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -48299,7 +48299,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -48412,7 +48412,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -48525,7 +48525,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -48638,7 +48638,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -48751,7 +48751,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -50220,7 +50220,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -50338,7 +50338,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -50451,7 +50451,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -50564,7 +50564,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -50677,7 +50677,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -50790,7 +50790,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -50903,7 +50903,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -51016,7 +51016,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -51134,7 +51134,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -52895,7 +52895,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -53008,7 +53008,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -53121,7 +53121,7 @@
       ],
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Debian-9.4",
         "pool:Skia"
       ],
@@ -65154,7 +65154,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20180410",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -65268,7 +65268,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20180410",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -65382,7 +65382,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20180410",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -65496,7 +65496,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20180410",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -65610,7 +65610,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20180410",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -65724,7 +65724,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20180410",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -65838,7 +65838,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20180410",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -65952,7 +65952,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20180410",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -66066,7 +66066,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20180410",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -66180,7 +66180,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20180410",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -66294,7 +66294,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20180410",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -66408,7 +66408,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20180410",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -66522,7 +66522,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20180410",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -66636,7 +66636,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20180410",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -66750,7 +66750,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20180410",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],
@@ -66864,7 +66864,7 @@
       "dimensions": [
         "cpu:x86-64-Haswell_GCE",
         "image:windows-server-2016-dc-v20180410",
-        "machine_type:n1-highcpu-64",
+        "machine_type:n1-standard-16",
         "os:Windows-2016Server-14393",
         "pool:Skia"
       ],