add verify_ci gate helper

- add bench mixin to common

Author: cosminbasca

ci.jsonnet

@@ -3,7 +3,7 @@ local const = import 'ci_common/constants.libsonnet';
 local builder = import 'ci_common/builder.libsonnet';
 
 {
-  overlay: "a02d502769517eff6324561f77f7cc73ded73284",
+  overlay: "7d164a8ab30e6ec2d3176469d7d549dcee66380e",
 
   // ======================================================================================================
   //

ci_common/builder.libsonnet

@@ -8,7 +8,7 @@ local mixins = import 'mixins.libsonnet';
     // the build templates
     //
     // ------------------------------------------------------------------------------------------------------
-    local baseBuilder = {
+    local base = {
         downloads: {},
         environment: {},
         setup: [],
@@ -20,24 +20,24 @@ local mixins = import 'mixins.libsonnet';
         targets: [],
         run: [],
     },
-    baseBuilder:: baseBuilder,
+    base:: base,
 
-    local commonBuilder = baseBuilder + mixins.labsjdk8 + {
+    local common = base + mixins.labsjdk8 + {
         dynamicImports:: "/sulong,/compiler",
 
         setup +: [
             ["mx", "sforceimports"],
             ["mx", "--dynamicimports", self.dynamicImports, "build"],
         ]
     },
-    commonBuilder:: commonBuilder,
+    common:: common,
 
     // ------------------------------------------------------------------------------------------------------
     //
     // the gate templates
     //
     // ------------------------------------------------------------------------------------------------------
-    local baseGate = commonBuilder + {
+    local baseGate = common + {
         tags: "tags must be defined",
 
         // local truffleDebugFlags = utils.graalOption("TraceTruffleCompilation", "true"),
@@ -84,7 +84,7 @@ local mixins = import 'mixins.libsonnet';
     //
     // ------------------------------------------------------------------------------------------------------
     deployGate(platform)::
-        baseBuilder + mixins.graalCore + mixins.sulong + mixins.getPlatform(platform) + {
+        base + mixins.graalCore + mixins.sulong + mixins.getPlatform(platform) + {
             targets: const.TARGET.postMerge,
             setup +: [
                 ["mx", "sversions"],
@@ -97,7 +97,7 @@ local mixins = import 'mixins.libsonnet';
         },
 
     coverageGate::
-        commonBuilder + mixins.getPlatform(platform="linux") + {
+        common + mixins.getPlatform(platform="linux") + {
             targets: const.TARGET.weekly,
             timelimit: const.TIME_LIMIT["4h"],
             run +: [

ci_common/mixins.libsonnet

@@ -108,4 +108,18 @@ local const = import 'constants.libsonnet';
         }
     },
     sulong:: sulong,
+
+    local bench = {
+        packages +: {
+            "make": ">=3.83",
+            "binutils": "==2.23.2",
+        },
+        environment +: {
+            BENCH_RESULTS_FILE_PATH: "bench-results.json",
+        },
+        logs +: [
+            "results.json",
+        ],
+    },
+    bench:: bench,
 }

mx.graalpython/mx_graalpython.py

@@ -902,6 +902,23 @@ def import_python_sources(args):
     SUITE.vc.git_command(SUITE.dir, ["merge", "python-import"])
 
 
+# ----------------------------------------------------------------------------------------------------------------------
+#
+# add ci verification util
+#
+# ----------------------------------------------------------------------------------------------------------------------
+def verify_ci(dest_suite, args=None):
+    """Verify CI configuration"""
+    base_suite = SUITE
+    if not isinstance(dest_suite, mx.SourceSuite) or not isinstance(base_suite, mx.SourceSuite):
+        raise mx.abort("Can not use verify-ci on binary suites: {} and {} need to be source suites".format(
+            SUITE.name, dest_suite.name))
+    assert isinstance(base_suite, mx.SourceSuite)
+    for ext in [".libsonnet", ".jsonnet"]:
+        mx.log("CI setup verifying *{} files ... ".format(ext))
+        mx.verify_ci(args, base_suite, dest_suite, common_dirs=['ci_common'], extension=ext)
+
+
 # ----------------------------------------------------------------------------------------------------------------------
 #
 # register as a GraalVM language