AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Switch machine-type for Coverage tasks.

Browse Source 
Coverage doesn't seem to deal well with multiple threads. Using 2-core
VMs is faster than using 64-core VMs.

On the other hand, the Coverage Upload task performs much better on a
64-core VM.

Bug: skia:7415
No-Try: true
Change-Id: Ieb58fc47970dd66fa64cf6a8c9de1f9236e2f3a0
Reviewed-on: https://skia-review.googlesource.com/127053
Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Auto-Submit: Ben Wagner <benjaminwagner@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
This commit is contained in:
Ben Wagner 2018-05-09 15:37:34 -04:00 committed by Skia Commit-Bot
parent cab2549286
commit 27d5a3661b
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
infra/bots/gen_tasks.go
View File

@ -489,6 +489,10 @@ func defaultSwarmDimensions(parts map[string]string) []string {
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"] = machineType
}
} else {
@ -1035,7 +1039,8 @@ func coverage(b *specs.TasksCfgBuilder, name string, parts map[string]string, co
extraProps := map[string]string{
"gs_bucket": CONFIG.GsBucketCoverage,
}
uploadTask := kitchenTask(uploadName, "upload_coverage_results", "swarm_recipe.isolate", SERVICE_ACCOUNT_UPLOAD_COVERAGE, linuxGceDimensions(MACHINE_TYPE_SMALL), extraProps, OUTPUT_NONE)
// Use MACHINE_TYPE_LARGE because this does a bunch of computation before upload.
uploadTask := kitchenTask(uploadName, "upload_coverage_results", "swarm_recipe.isolate", SERVICE_ACCOUNT_UPLOAD_COVERAGE, linuxGceDimensions(MACHINE_TYPE_LARGE), extraProps, OUTPUT_NONE)
usesGit(uploadTask, uploadName)
uploadTask.CipdPackages = append(uploadTask.CipdPackages, CIPD_PKGS_GSUTIL...)
// We need clang_linux to get access to the llvm-profdata and llvm-cov binaries

30
infra/bots/tasks.json
View File

@ -48864,7 +48864,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"machine_type:n1-highcpu-64",
"machine_type:n1-highmem-2",
"os:Debian-9.4",
"pool:Skia"
],
@ -48977,7 +48977,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"machine_type:n1-highcpu-64",
"machine_type:n1-highmem-2",
"os:Debian-9.4",
"pool:Skia"
],
@ -49090,7 +49090,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"machine_type:n1-highcpu-64",
"machine_type:n1-highmem-2",
"os:Debian-9.4",
"pool:Skia"
],
@ -49203,7 +49203,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"machine_type:n1-highcpu-64",
"machine_type:n1-highmem-2",
"os:Debian-9.4",
"pool:Skia"
],
@ -49316,7 +49316,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"machine_type:n1-highcpu-64",
"machine_type:n1-highmem-2",
"os:Debian-9.4",
"pool:Skia"
],
@ -49429,7 +49429,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"machine_type:n1-highcpu-64",
"machine_type:n1-highmem-2",
"os:Debian-9.4",
"pool:Skia"
],
@ -49542,7 +49542,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"machine_type:n1-highcpu-64",
"machine_type:n1-highmem-2",
"os:Debian-9.4",
"pool:Skia"
],
@ -49655,7 +49655,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"machine_type:n1-highcpu-64",
"machine_type:n1-highmem-2",
"os:Debian-9.4",
"pool:Skia"
],
@ -49768,7 +49768,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"machine_type:n1-highcpu-64",
"machine_type:n1-highmem-2",
"os:Debian-9.4",
"pool:Skia"
],
@ -49881,7 +49881,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"machine_type:n1-highcpu-64",
"machine_type:n1-highmem-2",
"os:Debian-9.4",
"pool:Skia"
],
@ -49994,7 +49994,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"machine_type:n1-highcpu-64",
"machine_type:n1-highmem-2",
"os:Debian-9.4",
"pool:Skia"
],
@ -50107,7 +50107,7 @@
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"machine_type:n1-highcpu-64",
"machine_type:n1-highmem-2",
"os:Debian-9.4",
"pool:Skia"
],
@ -87551,7 +87551,7 @@
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"gpu:none",
"machine_type:n1-highmem-2",
"machine_type:n1-highcpu-64",
"os:Debian-9.4",
"pool:Skia"
],
@ -91499,7 +91499,7 @@
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"gpu:none",
"machine_type:n1-highmem-2",
"machine_type:n1-highcpu-64",
"os:Debian-9.4",
"pool:Skia"
],
@ -92152,7 +92152,7 @@
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"gpu:none",
"machine_type:n1-highmem-2",
"machine_type:n1-highcpu-64",
"os:Debian-9.4",
"pool:Skia"
],