[infra] Add jobs for new MacBookPro15,3 machines

These are hosted in the new lab. Bug: b/382574933 Change-Id: I966583d3e6abefeb6d03763e070cb8531d7346bc Reviewed-on: https://skia-review.googlesource.com/c/skia/+/931664 Reviewed-by: Kaylee Lubick <[email protected]> Commit-Queue: Eric Boren <[email protected]>
google · Dec 23, 2024 · 79f1fd9 · 79f1fd9
1 parent 0440559
commit 79f1fd9
Show file tree

Hide file tree

Showing 5 changed files with 3,274 additions and 1,986 deletions.
diff --git a/infra/bots/gen_tasks_logic/dm_flags.go b/infra/bots/gen_tasks_logic/dm_flags.go
@@ -531,7 +531,7 @@ func (b *taskBuilder) dmFlags(internalHardwareLabel string) {
 				// anglebug.com/7245
 				skip("angle_mtl_es3", "gm", ALL, "runtime_intrinsics_common_es3")
 
-				if b.gpu("AppleM1") {
+				if b.matchGpu("AppleM") {
 					// M1 Macs fail this test for sRGB color types
 					// skbug.com/13289
 					skip(ALL, "test", ALL, "TransferPixelsToTextureTest")

diff --git a/infra/bots/gen_tasks_logic/gen_tasks_logic.go b/infra/bots/gen_tasks_logic/gen_tasks_logic.go
@@ -957,6 +957,9 @@ func (b *taskBuilder) defaultSwarmDimensions() {
 				"AppleM1": {
 					"MacMini9.1": "arm64-64-Apple_M1",
 				},
+				"AppleM3": {
+					"MacBookPro15.3": "arm64-64-Apple_M3",
+				},
 				"AppleIntel": {
 					"MacBookPro16.2": "x86-64",
 				},
@@ -1051,6 +1054,7 @@ func (b *taskBuilder) defaultSwarmDimensions() {
 			} else if b.matchOs("Mac") {
 				gpu, ok := map[string]string{
 					"AppleM1":       "AppleM1",
+					"AppleM3":       "apple:m3",
 					"IntelHD6000":   "8086:1626",
 					"IntelHD615":    "8086:591e",
 					"IntelIris5100": "8086:0a2e",

diff --git a/infra/bots/gen_tasks_logic/nano_flags.go b/infra/bots/gen_tasks_logic/nano_flags.go
@@ -55,7 +55,7 @@ func (b *taskBuilder) nanobenchFlags(doUpload bool) {
 			if b.os("iOS") || b.model("Nexus7", "Pixel3a", "Pixel5") {
 				sampleCount = 0
 			}
-		} else if b.matchGpu("AppleM1") {
+		} else if b.matchGpu("AppleM") {
 			sampleCount = 4
 		} else if b.matchGpu("Intel") {
 			// MSAA doesn't work well on Intel GPUs chromium:527565, chromium:983926
@@ -91,7 +91,7 @@ func (b *taskBuilder) nanobenchFlags(doUpload bool) {
 
 		if sampleCount > 0 {
 			configs = append(configs, fmt.Sprintf("%smsaa%d", glPrefix, sampleCount))
-			if b.gpu("QuadroP400", "MaliG77", "AppleM1") {
+			if b.matchGpu("QuadroP400", "MaliG77", "AppleM") {
 				configs = append(configs, fmt.Sprintf("%sdmsaa", glPrefix))
 			}
 		}
@@ -121,7 +121,7 @@ func (b *taskBuilder) nanobenchFlags(doUpload bool) {
 		}
 		if b.extraConfig("Metal") && !b.extraConfig("Graphite") {
 			configs = []string{"mtl"}
-			if b.os("iOS") {
+			if b.os("iOS") || b.gpu("AppleM3") {
 				configs = append(configs, "mtlmsaa4")
 			} else {
 				configs = append(configs, "mtlmsaa8")
@@ -196,9 +196,9 @@ func (b *taskBuilder) nanobenchFlags(doUpload bool) {
 	args = append(args, "--config")
 	args = append(args, configs...)
 
-	// Use 4 internal msaa samples on mobile and AppleM1, otherwise 8.
+	// Use 4 internal msaa samples on mobile and AppleM*, otherwise 8.
 	args = append(args, "--internalSamples")
-	if b.matchOs("Android") || b.os("iOS") || b.matchGpu("AppleM1") {
+	if b.matchOs("Android") || b.os("iOS") || b.matchGpu("AppleM") {
 		args = append(args, "4")
 	} else {
 		args = append(args, "8")

diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
@@ -462,6 +462,11 @@
   {"name": "Perf-Mac11-Clang-MacMini9.1-GPU-AppleM1-arm64-Release-All-Graphite_Native_Metal"},
   {"name": "Perf-Mac12-Clang-MacBookPro16.2-CPU-AppleIntel-x86_64-Release-All"},
   {"name": "Perf-Mac12-Clang-MacMini9.1-CPU-AppleM1-arm64-Release-All"},
+  {"name": "Perf-Mac13-Clang-MacBookPro15.3-GPU-AppleM3-arm64-Debug-All"},
+  {"name": "Perf-Mac13-Clang-MacBookPro15.3-GPU-AppleM3-arm64-Debug-All-Graphite_Native_Metal"},
+  {"name": "Perf-Mac13-Clang-MacBookPro15.3-GPU-AppleM3-arm64-Debug-All-Metal"},
+  {"name": "Perf-Mac13-Clang-MacBookPro15.3-GPU-AppleM3-arm64-Release-All"},
+  {"name": "Perf-Mac13-Clang-MacBookPro15.3-GPU-AppleM3-arm64-Release-All-Metal"},
   {"name": "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All"},
   {"name": "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Valgrind_SK_CPU_LIMIT_SSE41"},
   {"name": "Perf-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Release-All-Vulkan"},
@@ -733,6 +738,12 @@
    "cq_config": {"location_regexes": ["(tests|src/gpu)/graphite/.*", "src/sksl/generated/.*"]}
   },
   {"name": "Test-Mac13-Clang-MacMini9.1-GPU-AppleM1-arm64-Debug-All-Graphite_Dawn_Metal_FakeWGPU"},
+  {"name": "Test-Mac13-Clang-MacBookPro15.3-GPU-AppleM3-arm64-Debug-All"},
+  {"name": "Test-Mac13-Clang-MacBookPro15.3-GPU-AppleM3-arm64-Debug-All-ANGLE"},
+  {"name": "Test-Mac13-Clang-MacBookPro15.3-GPU-AppleM3-arm64-Debug-All-Graphite_Native_Metal"},
+  {"name": "Test-Mac13-Clang-MacBookPro15.3-GPU-AppleM3-arm64-Debug-All-Metal"},
+  {"name": "Test-Mac13-Clang-MacBookPro15.3-GPU-AppleM3-arm64-Release-All"},
+  {"name": "Test-Mac13-Clang-MacBookPro15.3-GPU-AppleM3-arm64-Release-All-Metal"},
   {"name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1"},
   {"name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL1_Vulkan"},
   {"name": "Test-Ubuntu18-Clang-Golo-GPU-QuadroP400-x86_64-Debug-All-DDL3_Vulkan",