Merge with master.

ci.jsonnet

@@ -1,5 +1,5 @@
 # Common
-local common = import 'common.jsonnet';
+local common = import 'ci/ci_common/common.jsonnet';
 local graal_common = import 'graal-common.json';
 
 # Compiler
@@ -35,12 +35,12 @@ local javadoc = import "ci_includes/publish-javadoc.jsonnet";
 # VM
 local vm = import 'vm/ci/ci_includes/vm.jsonnet';
 
-local verify_ci = (import 'ci-check.libsonnet').verify_ci;
+local verify_ci = (import 'ci/ci_common/ci-check.libsonnet').verify_ci;
 
 {
   # Ensure that entries in common.jsonnet can be resolved.
-  _checkCommon: (import 'common.jsonnet'),
-  ci_resources:: (import 'ci-resources.libsonnet'),
+  _checkCommon: (import 'ci/ci_common/common.jsonnet'),
+  ci_resources:: (import 'ci/ci_common/ci-resources.libsonnet'),
   overlay: graal_common.ci.overlay,
   specVersion: "3",
   builds: [common.add_excludes_guard(b) for b in (

bench-common.libsonnet → ci/ci_common/bench-common.libsonnet

@@ -1,5 +1,5 @@
 {
-  local common = import "common.jsonnet",
+  local common = import "ci/ci_common/common.jsonnet",
   local utils = import "common-utils.libsonnet",
 
   # benchmark job base with automatically generated name

common.jsonnet → ci/ci_common/common.jsonnet

@@ -1,8 +1,8 @@
 local composable = (import "common-utils.libsonnet").composable;
 
-local mx_version = (import "common.json").mx_version;
-local common_json = composable(import "common.json");
-local repo_config = import 'repo-configuration.libsonnet';
+local mx_version = (import "../../common.json").mx_version;
+local common_json = composable(import "../../common.json");
+local repo_config = import '../repo-configuration.libsonnet';
 local jdks = common_json.jdks;
 local deps = common_json.deps;
 local downloads = common_json.downloads;
@@ -51,7 +51,7 @@ local add_jdk_version(name) =
 
   build_base:: {
     // holds location of CI resources that can easily be overwritten in an overlay
-    ci_resources:: (import "ci-resources.libsonnet"),
+    ci_resources:: (import "ci/ci_common/ci-resources.libsonnet"),
   },
 
   // Job frequencies

ci/ci_common/run-spec-impl.libsonnet

@@ -3,7 +3,7 @@ local supported_oss_names = r.supported_oss_names;
 local supported_archs_names = r.supported_archs_names;
 local supported_jdks_names = r.supported_jdks_names;
 
-local std_get = (import "../../common-utils.libsonnet").std_get;
+local std_get = (import "../../ci/ci_common/common-utils.libsonnet").std_get;
 {
   //
   local CONFIG_KEY = "<build-config>",

ci/ci_common/run-spec-tools.libsonnet

@@ -3,7 +3,7 @@ local _impl = import "run-spec-impl.libsonnet";
 local supported_oss_names = r.supported_oss_names;
 local supported_archs_names = r.supported_archs_names;
 local supported_jdks_names = r.supported_jdks_names;
-local std_get = (import "../../common-utils.libsonnet").std_get;
+local std_get = (import "../../ci/ci_common/common-utils.libsonnet").std_get;
 {
   local map_os_arch_jdk(fn) =
     [fn(os, arch, jdk)

ci_includes/publish-javadoc.jsonnet

@@ -1,6 +1,6 @@
 {
-  local common = import '../common.jsonnet',
-  local utils = import '../common-utils.libsonnet',
+  local common = import '../ci/ci_common/common.jsonnet',
+  local utils = import '../ci/ci_common/common-utils.libsonnet',
   local linux_amd64 = common.linux_amd64,
 
   local javadoc_publisher = {

common.json

@@ -1,7 +1,7 @@
 {
   "README": "This file contains definitions that are useful for the hocon and jsonnet CI files of multiple repositories.",
 
-  "mx_version" : "6.11.4",
+  "mx_version" : "6.14.2",
 
   "jdks": {
     "openjdk11":          {"name": "jpg-jdk",   "version": "11.0.11", "build_id": "9", "open": true, "release": true, "platformspecific": true },

compiler/ci/ci.jsonnet

@@ -1,5 +1,5 @@
 {
-  local utils = (import '../../common-utils.libsonnet'),
+  local utils = (import '../../ci/ci_common/common-utils.libsonnet'),
   local graal = (import 'ci_includes/gate.jsonnet'),
   local graal_common = (import 'ci_common/gate.jsonnet'),
   local graal_benchmarks = (import 'ci_common/benchmark-builders.jsonnet'),

compiler/ci/ci_common/benchmark-builders.jsonnet

@@ -1,6 +1,6 @@
 {
-  local c = (import '../../../common.jsonnet'),
-  local bc = (import '../../../bench-common.libsonnet'),
+  local c = (import '../../../ci/ci_common/common.jsonnet'),
+  local bc = (import '../../../ci/ci_common/bench-common.libsonnet'),
   local cc = (import 'compiler-common.libsonnet'),
   local bench = (import 'benchmark-suites.libsonnet'),
   local hw = bc.bench_hw,

compiler/ci/ci_common/benchmark-suites.libsonnet

@@ -1,7 +1,7 @@
 {
   local common_json = (import '../../../common.json'),
-  local c = (import '../../../common.jsonnet'),
-  local bc = (import '../../../bench-common.libsonnet'),
+  local c = (import '../../../ci/ci_common/common.jsonnet'),
+  local bc = (import '../../../ci/ci_common/bench-common.libsonnet'),
   local cc = (import 'compiler-common.libsonnet'),
 
   local _suite_key(a) = a['suite'],

compiler/ci/ci_common/compiler-common.libsonnet

@@ -1,8 +1,8 @@
 {
-  local common = import "../../../common.jsonnet",
-  local bench_common = import "../../../bench-common.libsonnet",
-  local config = import "../../../repo-configuration.libsonnet",
-  local ci_resources = import "../../../ci-resources.libsonnet",
+  local common = import "../../../ci/ci_common/common.jsonnet",
+  local bench_common = import "../../../ci/ci_common/bench-common.libsonnet",
+  local config = import "../../../ci/repo-configuration.libsonnet",
+  local ci_resources = import "../../../ci/ci_common/ci-resources.libsonnet",
 
   enable_profiling:: {
     environment+: {

compiler/ci/ci_common/gate.jsonnet

@@ -1,6 +1,6 @@
 {
-  local c = import '../../../common.jsonnet',
-  local config = import '../../../repo-configuration.libsonnet',
+  local c = import '../../../ci/ci_common/common.jsonnet',
+  local config = import '../../../ci/repo-configuration.libsonnet',
   local jvm_config = config.compiler.default_jvm_config,
   local s = self,
   local t(limit) = {timelimit: limit},

compiler/ci/ci_includes/baseline-benchmarks.jsonnet

@@ -1,6 +1,6 @@
 {
-  local c = (import '../../../common.jsonnet'),
-  local bc = (import '../../../bench-common.libsonnet'),
+  local c = (import '../../../ci/ci_common/common.jsonnet'),
+  local bc = (import '../../../ci/ci_common/bench-common.libsonnet'),
   local cc = (import '../ci_common/compiler-common.libsonnet'),
   local bench = (import '../ci_common/benchmark-suites.libsonnet'),
   local hw = bc.bench_hw,

compiler/ci/ci_includes/bootstrap_extra.libsonnet

@@ -1,6 +1,6 @@
 # Bootstrap tasks specific to Graal CE
 {
-  local c = import '../../../common.jsonnet',
+  local c = import '../../../ci/ci_common/common.jsonnet',
   local g = import '../ci_common/gate.jsonnet',
 
   # See definition of `gates` local variable in ../ci_common/gate.jsonnet

compiler/ci/ci_includes/gate.jsonnet

@@ -1,7 +1,7 @@
 {
-  local common = import '../../../common.jsonnet',
-  local utils = import '../../../common-utils.libsonnet',
-  local config = import '../../../repo-configuration.libsonnet',
+  local common = import '../../../ci/ci_common/common.jsonnet',
+  local utils = import '../../../ci/ci_common/common-utils.libsonnet',
+  local config = import '../../../ci/repo-configuration.libsonnet',
 
   local gate_math_stubs_listener = {
     name: 'daily-hotspot-mathstubs-listener-' + utils.prefixed_jdk(self.jdk_version),

compiler/mx.compiler/suite.py

@@ -1556,21 +1556,13 @@
       "annotationProcessors" : [
         "GRAAL_PROCESSOR",
       ],
-      "javaCompliance" : "11+",
-      "workingSets" : "Graal,Truffle",
-    },
-
-    "org.graalvm.compiler.truffle.compiler.amd64" : {
-      "subDir" : "src",
-      "sourceDirs" : ["src"],
-      "dependencies" : [
-        "org.graalvm.compiler.replacements.amd64",
-        "truffle:TRUFFLE_API",
-      ],
-      "checkstyle" : "org.graalvm.compiler.graph",
-      "annotationProcessors" : [
-        "GRAAL_PROCESSOR",
-      ],
+      "requiresConcealed" : {
+        "jdk.internal.vm.ci" : [
+          "jdk.vm.ci.aarch64",
+          "jdk.vm.ci.amd64",
+          "jdk.vm.ci.code",
+        ],
+      },
       "javaCompliance" : "11+",
       "workingSets" : "Graal,Truffle",
     },
@@ -1646,7 +1638,6 @@
       "dependencies" : [
         "org.graalvm.compiler.hotspot",
         "org.graalvm.compiler.truffle.compiler",
-        "org.graalvm.compiler.truffle.compiler.amd64",
         "org.graalvm.compiler.truffle.runtime",
         "org.graalvm.compiler.core.test",
         "org.graalvm.compiler.replacements.test",
@@ -1657,6 +1648,13 @@
         "jdk.unsupported", # sun.misc.Unsafe
         "java.logging"
       ],
+      "requiresConcealed" : {
+        "jdk.internal.vm.ci" : [
+          "jdk.vm.ci.aarch64",
+          "jdk.vm.ci.amd64",
+          "jdk.vm.ci.code",
+        ],
+      },
       "annotationProcessors" : [
         "GRAAL_PROCESSOR",
         "truffle:TRUFFLE_DSL_PROCESSOR"
@@ -1840,7 +1838,6 @@
       "subDir" : "src",
       "sourceDirs" : ["src"],
       "dependencies" : [
-        "org.graalvm.compiler.truffle.compiler.amd64",
         "org.graalvm.compiler.truffle.compiler.hotspot",
         "org.graalvm.compiler.hotspot.amd64",
       ],
@@ -2110,7 +2107,6 @@
         "org.graalvm.compiler.hotspot.amd64",
         "org.graalvm.compiler.hotspot",
         "org.graalvm.compiler.lir.aarch64",
-        "org.graalvm.compiler.truffle.compiler.amd64",
         "org.graalvm.compiler.truffle.runtime.serviceprovider",
         "org.graalvm.compiler.truffle.runtime.hotspot",
         "org.graalvm.compiler.truffle.runtime.hotspot.java",

compiler/src/org.graalvm.compiler.asm.aarch64.test/src/org/graalvm/compiler/asm/aarch64/test/TestProtectedAssembler.java

@@ -170,11 +170,6 @@ protected void cls(int size, Register dst, Register src) {
         super.cls(size, dst, src);
     }
 
-    @Override
-    protected void csinc(int size, Register dst, Register src1, Register src2, ConditionFlag condition) {
-        super.csinc(size, dst, src1, src2, condition);
-    }
-
     @Override
     protected void fmovFpu2Cpu(int size, Register dst, Register src) {
         super.fmovFpu2Cpu(size, dst, src);