Add compiler configuration to calmbench bots

Now the calmbench bot has the same name schema as the build bots
and we're testing using Clang instead of GCC. In the future, we
may also import some configuration schemas from perf bots.

Bug: skia:
Change-Id: Idd9556cff36b749a6c9139d34f70ac50ca48fbba
Reviewed-on: https://skia-review.googlesource.com/62920
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Yuqian Li <liyuqian@google.com>

7 files changed, 12 insertions, 9 deletions

diff --git a/infra/bots/jobs.json b/infra/bots/jobs.json
index b1f541c2d2..a7600ec026 100644
--- a/infra/bots/jobs.json
+++ b/infra/bots/jobs.json
@@ -477,5 +477,5 @@
   "Test-iOS-Clang-iPhone6-GPU-GX6450-arm64-Release-All",
   "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Debug-All",
   "Test-iOS-Clang-iPhone7-GPU-GT7600-arm64-Release-All",
-  "Calmbench-Debian9"
+  "Calmbench-Debian9-Clang-x86_64-Release"
 ]
diff --git a/infra/bots/recipe_modules/builder_name_schema/builder_name_schema.json b/infra/bots/recipe_modules/builder_name_schema/builder_name_schema.json
index 037074684e..7db2eb1db6 100644
--- a/infra/bots/recipe_modules/builder_name_schema/builder_name_schema.json
+++ b/infra/bots/recipe_modules/builder_name_schema/builder_name_schema.json
@@ -50,7 +50,10 @@
       "configuration"
     ],
     "Calmbench": [
-      "os"
+      "os",
+      "compiler",
+      "target_arch",
+      "configuration"
     ]
   },
   "builder_name_sep": "-"
diff --git a/infra/bots/recipe_modules/vars/examples/full.expected/Calmbench-Debian9.json b/infra/bots/recipe_modules/vars/examples/full.expected/Calmbench-Debian9-Clang-x86_64-Release.json
index 4594f9e6b9..4594f9e6b9 100644
--- a/infra/bots/recipe_modules/vars/examples/full.expected/Calmbench-Debian9.json
+++ b/infra/bots/recipe_modules/vars/examples/full.expected/Calmbench-Debian9-Clang-x86_64-Release.json
diff --git a/infra/bots/recipe_modules/vars/examples/full.py b/infra/bots/recipe_modules/vars/examples/full.py
index 712e630cc2..da1149c8a6 100644
--- a/infra/bots/recipe_modules/vars/examples/full.py
+++ b/infra/bots/recipe_modules/vars/examples/full.py
@@ -31,7 +31,7 @@ TEST_BUILDERS = [
   'Perf-Debian9-Clang-GCE-CPU-AVX2-x86_64-Release-All-ASAN',
   'Perf-Ubuntu14-GCC-GCE-CPU-AVX2-x86_64-Release-All-CT_BENCH_1k_SKPs',
   'Upload-Debian9-Clang-GCE-CPU-AVX2-x86_64-Debug-Coverage',
-  'Calmbench-Debian9'
+  'Calmbench-Debian9-Clang-x86_64-Release'
 ]
 
 
diff --git a/infra/bots/recipes/calmbench.expected/Calmbench-Debian9.json b/infra/bots/recipes/calmbench.expected/Calmbench-Debian9-Clang-x86_64-Release.json
index 6170bcbc94..52bcbe5008 100644
--- a/infra/bots/recipes/calmbench.expected/Calmbench-Debian9.json
+++ b/infra/bots/recipes/calmbench.expected/Calmbench-Debian9-Clang-x86_64-Release.json
@@ -174,7 +174,7 @@
       "[CUSTOM_/_B_WORK]/skia/bin/gn",
       "gen",
       "[START_DIR]/out/Release",
-      "--args=is_debug=false"
+      "--args=cc=\"[START_DIR]/clang_linux/bin/clang\" cxx=\"[START_DIR]/clang_linux/bin/clang++\" extra_cflags=[\"-B[START_DIR]/clang_linux/bin\"] extra_ldflags=[\"-B[START_DIR]/clang_linux/bin\", \"-fuse-ld=lld\"] is_debug=false target_cpu=\"x86_64\""
     ],
     "cwd": "[CUSTOM_/_B_WORK]/skia",
     "env": {
diff --git a/infra/bots/recipes/calmbench.py b/infra/bots/recipes/calmbench.py
index 0a75d0d057..82d5e0dfe1 100644
--- a/infra/bots/recipes/calmbench.py
+++ b/infra/bots/recipes/calmbench.py
@@ -38,7 +38,7 @@ def RunSteps(api):
   api.run.check_failure()
 
 def GenTests(api):
-  builder = "Calmbench-Debian9"
+  builder = "Calmbench-Debian9-Clang-x86_64-Release"
   test = (
     api.test(builder) +
     api.properties(buildername=builder,
diff --git a/infra/bots/tasks.json b/infra/bots/tasks.json
index a30143f2e3..98e74d3968 100644
--- a/infra/bots/tasks.json
+++ b/infra/bots/tasks.json
@@ -545,10 +545,10 @@
         "Build-Win-MSVC-x86_64-Release-Vulkan"
       ]
     },
-    "Calmbench-Debian9": {
+    "Calmbench-Debian9-Clang-x86_64-Release": {
       "priority": 0.8,
       "tasks": [
-        "Calmbench-Debian9"
+        "Calmbench-Debian9-Clang-x86_64-Release"
       ]
     },
     "Housekeeper-Nightly-RecreateSKPs_Canary": {
@@ -5531,7 +5531,7 @@
       "isolate": "compile_skia.isolate",
       "priority": 0.8
     },
-    "Calmbench-Debian9": {
+    "Calmbench-Debian9-Clang-x86_64-Release": {
       "cipd_packages": [
         {
           "name": "skia/bots/clang_linux",
@@ -5554,7 +5554,7 @@
         "../../..",
         "calmbench",
         "repository=<(REPO)",
-        "buildername=Calmbench-Debian9",
+        "buildername=Calmbench-Debian9-Clang-x86_64-Release",
         "swarm_out_dir=${ISOLATED_OUTDIR}",
         "revision=<(REVISION)",
         "patch_repo=<(PATCH_REPO)",