luci: specify core counts for chromium.clang builders.

Bug: 964674
Change-Id: Ib243128c333c2a685706834340198ca3ed3a600d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1617695
Commit-Queue: John Budorick <jbudorick@chromium.org>
Commit-Queue: Nico Weber <thakis@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#661196}
diff --git a/infra/config/cr-buildbucket.cfg b/infra/config/cr-buildbucket.cfg
index 12ad188e..c239b96 100644
--- a/infra/config/cr-buildbucket.cfg
+++ b/infra/config/cr-buildbucket.cfg
@@ -343,6 +343,27 @@
 }
 
 builder_mixins {
+  name: "clang-linux-ci"
+  mixins: "clang-ci"
+  mixins: "linux"
+  dimensions: "cores:32"
+}
+
+builder_mixins {
+  name: "clang-mac-ci"
+  mixins: "clang-ci"
+  mixins: "mac"
+  dimensions: "cores:24"
+}
+
+builder_mixins {
+  name: "clang-win-ci"
+  mixins: "clang-ci"
+  mixins: "win"
+  dimensions: "cores:32"
+}
+
+builder_mixins {
   name: "clang-coverage"
   recipe {
     name: "chromium_clang_coverage_tot"
@@ -1815,174 +1836,143 @@
     # chromium.clang
     builders {
       name: "CFI Linux CF"
-      mixins: "clang-ci"
-      mixins: "linux"
+      mixins: "clang-linux-ci"
     }
     builders {
       name: "CFI Linux ToT"
-      mixins: "clang-ci"
-      mixins: "linux"
+      mixins: "clang-linux-ci"
     }
     builders {
       name: "CrWinAsan"
-      mixins: "clang-ci"
-      mixins: "win"
+      mixins: "clang-win-ci"
     }
     builders {
       name: "CrWinAsan(dll)"
-      mixins: "clang-ci"
-      mixins: "win"
+      mixins: "clang-win-ci"
     }
     builders {
       name: "ToTAndroid"
-      mixins: "clang-ci"
-      mixins: "linux"
+      mixins: "clang-linux-ci"
     }
     builders {
       name: "ToTAndroid (dbg)"
-      mixins: "clang-ci"
-      mixins: "linux"
+      mixins: "clang-linux-ci"
     }
     builders {
       name: "ToTAndroid x64"
-      mixins: "clang-ci"
-      mixins: "linux"
+      mixins: "clang-linux-ci"
     }
     builders {
       name: "ToTAndroid64"
-      mixins: "clang-ci"
-      mixins: "linux"
+      mixins: "clang-linux-ci"
     }
     builders {
       name: "ToTAndroidASan"
-      mixins: "clang-ci"
-      mixins: "linux"
+      mixins: "clang-linux-ci"
 
       # needed to target dedicated HW
       dimensions: "builderless:"
+      dimensions: "cores:"
       dimensions: "os:"
       auto_builder_dimension: YES
     }
     builders {
       name: "ToTAndroidCFI"
-      mixins: "clang-ci"
-      mixins: "linux"
+      mixins: "clang-linux-ci"
     }
     builders {
       name: "ToTAndroidOfficial"
-      mixins: "clang-ci"
-      mixins: "linux"
+      mixins: "clang-linux-ci"
     }
     builders {
       name: "ToTLinux"
-      mixins: "clang-ci"
-      mixins: "linux"
+      mixins: "clang-linux-ci"
     }
     builders {
       name: "ToTLinux (dbg)"
-      mixins: "clang-ci"
-      mixins: "linux"
+      mixins: "clang-linux-ci"
     }
     builders {
       name: "ToTLinuxASan"
-      mixins: "clang-ci"
-      mixins: "linux"
+      mixins: "clang-linux-ci"
     }
     builders {
       name: "ToTLinuxASanLibfuzzer"
-      mixins: "clang-ci"
-      mixins: "linux"
+      mixins: "clang-linux-ci"
     }
     builders {
       name: "ToTLinuxCoverage"
-      mixins: "clang-ci"
+      mixins: "clang-linux-ci"
       mixins: "clang-coverage"
-      mixins: "linux"
     }
     builders {
       name: "ToTLinuxMSan"
-      mixins: "clang-ci"
-      mixins: "linux"
+      mixins: "clang-linux-ci"
     }
     builders {
       name: "ToTLinuxTSan"
-      mixins: "clang-ci"
-      mixins: "linux"
+      mixins: "clang-linux-ci"
     }
     builders {
       name: "ToTLinuxThinLTO"
-      mixins: "clang-ci"
-      mixins: "linux"
+      mixins: "clang-linux-ci"
     }
     builders {
       name: "ToTLinuxUBSanVptr"
-      mixins: "clang-ci"
-      mixins: "linux"
+      mixins: "clang-linux-ci"
     }
     builders {
       name: "ToTMac"
-      mixins: "clang-ci"
-      mixins: "mac"
+      mixins: "clang-mac-ci"
     }
     builders {
       name: "ToTMac (dbg)"
-      mixins: "clang-ci"
-      mixins: "mac"
+      mixins: "clang-mac-ci"
     }
     builders {
       name: "ToTMacASan"
-      mixins: "clang-ci"
-      mixins: "mac"
+      mixins: "clang-mac-ci"
     }
     builders {
       name: "ToTMacCoverage"
-      mixins: "clang-ci"
+      mixins: "clang-mac-ci"
       mixins: "clang-coverage"
-      mixins: "mac"
     }
     builders {
       name: "ToTWin(dbg)"
-      mixins: "clang-ci"
-      mixins: "win"
+      mixins: "clang-win-ci"
     }
     builders {
       name: "ToTWin(dll)"
-      mixins: "clang-ci"
-      mixins: "win"
+      mixins: "clang-win-ci"
     }
     builders {
       name: "ToTWin64(dbg)"
-      mixins: "clang-ci"
-      mixins: "win"
+      mixins: "clang-win-ci"
     }
     builders {
       name: "ToTWin64(dll)"
-      mixins: "clang-ci"
-      mixins: "win"
+      mixins: "clang-win-ci"
     }
     builders {
       name: "ToTWinASanLibfuzzer"
-      mixins: "clang-ci"
-      mixins: "win"
+      mixins: "clang-win-ci"
     }
     builders {
       name: "ToTWinCFI"
-      mixins: "clang-ci"
-      mixins: "win"
+      mixins: "clang-win-ci"
     }
     builders {
       name: "ToTWinCFI64"
-      mixins: "clang-ci"
-      mixins: "win"
+      mixins: "clang-win-ci"
     }
     builders {
       name: "ToTWinLibcxx64"
-      mixins: "clang-ci"
-      mixins: "win"
+      mixins: "clang-win-ci"
     }
     builders {
       name: "ToTiOS"
-      mixins: "clang-ci"
+      mixins: "clang-mac-ci"
       mixins: "ios"
       recipe {
         name: "ios/unified_builder_tester"
@@ -1990,7 +1980,7 @@
     }
     builders {
       name: "ToTiOSDevice"
-      mixins: "clang-ci"
+      mixins: "clang-mac-ci"
       mixins: "ios"
       recipe {
         name: "ios/unified_builder_tester"
@@ -1998,13 +1988,11 @@
     }
     builders {
       name: "UBSanVptr Linux"
-      mixins: "clang-ci"
-      mixins: "linux"
+      mixins: "clang-linux-ci"
     }
     builders {
       name: "linux-win_cross-rel"
-      mixins: "clang-ci"
-      mixins: "linux"
+      mixins: "clang-linux-ci"
     }
 
     # chromium.gpu