[GR-48318] Move compiler packages and module to jdk.compiler.graal namespace.

ci/ci_common/run-spec-examples.libsonnet

@@ -234,6 +234,36 @@ local r      = import "run-spec.libsonnet";
       };
       std.assertEqual(_impl.get_platform_spec(_impl.desugar_task_dict(_input).job).variants, _result)
     ,
+    generate_variants_exclude::
+      local _feature_map = {
+        benchmarks: {
+          [name]: {
+            "<all-os>"+: _impl.exclude,
+          },
+          for name in ["deltablue", "nbody", "binarytrees", "fasta", "jolden", "specjbb2005"]
+        },
+      };
+      local _input = {
+        "job": _impl.generate_variants({
+          // ! is a wildcard for selecting all feature values
+          "benchmarks:!specjbb2005:!jolden": {
+            // run all benchmarks but specjbb2005 and jolden
+            "linux": {
+              "amd64": _impl.include
+            }
+          },
+        }, feature_map=_feature_map)
+      };
+      //
+      local _result =
+      {
+        "benchmarks:deltablue":   { "<all-os>": { "<exclude>": true }, "linux": { "amd64": { "<exclude>": false } } },
+        "benchmarks:nbody":       { "<all-os>": { "<exclude>": true }, "linux": { "amd64": { "<exclude>": false } } },
+        "benchmarks:binarytrees": { "<all-os>": { "<exclude>": true }, "linux": { "amd64": { "<exclude>": false } } },
+        "benchmarks:fasta":       { "<all-os>": { "<exclude>": true }, "linux": { "amd64": { "<exclude>": false } } },
+      };
+      std.assertEqual(_impl.get_platform_spec(_impl.desugar_task_dict(_input).job).variants, _result)
+    ,
     expand_variants::
       local _input = {
         "task": _impl.add_platform_spec({

ci/ci_common/run-spec-impl.libsonnet

@@ -73,17 +73,29 @@ local std_get = (import "../../ci/ci_common/common-utils.libsonnet").std_get;
       std.objectFieldsAll(feature_map);
     assert std.assertEqual(std.set(feature_order), std.set(std.objectFieldsAll(feature_map)));
     assert std.assertEqual(std.length(std.set(feature_order)), std.length(feature_order));
+    assert std.length([x for x in feature_order if std.startsWith(x, "!")]) == 0 : "feature names must not start with '!': " + feature_order;
     local mergeArray(arr) = std.foldl( function(a, b) a + b, arr, {});
     local get_feature_value_pair(key) =
        local split = std.split(key, ":");
        {
          feature: split[0],
          values:
-           assert std.length(split) > 1 : "feature map keys must have the form 'feature_name:feature_value', got '%s'" % [key];
-           if std.length(split) == 2 && split[1] == "*" then
-             std.objectFieldsAll(feature_map[self.feature])
+           // gather specified feature values
+           local _values =
+             assert std.length(split) > 1 : "feature map keys must have the form 'feature_name:feature_value', got '%s'" % [key];
+             if std.length(split) == 2 && split[1] == "*" then
+               std.objectFieldsAll(feature_map[self.feature])
+             else
+               split[1:std.length(split)]
+             ;
+           local excluded = [x[1:] for x in _values if std.startsWith(x, "!")];
+           if std.length(excluded) == 0 then
+             // inclusion only
+             _values
            else
-             split[1:std.length(split)]
+             // exclusion
+             assert std.length(excluded) == std.length(_values) : "Cannot mix inclusion with exclusion (either all entries start with '!' or none): " + _values;
+             std.setDiff(std.objectFieldsAll(feature_map[self.feature]), excluded)
          }
        ;
     local is_feature_desc(key) = std.member(feature_order, get_feature_value_pair(key).feature);

ci/ci_common/run-spec.libsonnet

@@ -181,6 +181,7 @@ local examples   = (import "run-spec-examples.libsonnet").examples;
   // Generates a variants entry using a feature map.
   // See the example for a detailed explanation.
   assert examples.generate_variants,
+  assert examples.generate_variants_exclude,
   generate_variants(variant_spec, feature_map, order=null):: {
     local SEE_ALSO = [$.run_job],
   } + _impl.generate_variants(variant_spec, feature_map, order=order),

ci/common.jsonnet

@@ -259,9 +259,9 @@ local common_json = import "../common.json";
 
   local common = mx + {
     catch_files+: [
-      # Keep in sync with org.graalvm.compiler.debug.StandardPathUtilitiesProvider#DIAGNOSTIC_OUTPUT_DIRECTORY_MESSAGE_REGEXP
+      # Keep in sync with jdk.compiler.graal.debug.StandardPathUtilitiesProvider#DIAGNOSTIC_OUTPUT_DIRECTORY_MESSAGE_REGEXP
       "Graal diagnostic output saved in '(?P<filename>[^']+)'",
-      # Keep in sync with org.graalvm.compiler.debug.DebugContext#DUMP_FILE_MESSAGE_REGEXP
+      # Keep in sync with jdk.compiler.graal.debug.DebugContext#DUMP_FILE_MESSAGE_REGEXP
       "Dumping debug output to '(?P<filename>[^']+)'",
       # Keep in sync with com.oracle.svm.hosted.NativeImageOptions#DEFAULT_ERROR_FILE_NAME
       " (?P<filename>.+/svm_err_b_\\d+T\\d+\\.\\d+_pid\\d+\\.md)",

ci_includes/publish-javadoc.jsonnet

@@ -20,8 +20,8 @@
       ["zip", "-r", "javadoc.zip", "javadoc"],
       ["cd", "../compiler"],
       ["mx", "build"],
-      ["mx", "javadoc", "--projects", "jdk.internal.vm.compiler", "--packages", "org.graalvm.graphio"],
-      ["cd", "src/jdk.internal.vm.compiler/"],
+      ["mx", "javadoc", "--projects", "jdk.compiler.graal", "--packages", "jdk.compiler.graal.graphio"],
+      ["cd", "src/jdk.compiler.graal/"],
       ["zip", "-r", "../../graphio-javadoc.zip", "javadoc"],
       ["cd", "../../.."],
       ["set-export", "GRAAL_REPO", ["pwd"]],

common.json

@@ -35,20 +35,20 @@
     "labsjdk-ee-20-llvm": {"name": "labsjdk",   "version": "ee-20.0.2+2-jvmci-23.1-b02-sulong", "platformspecific": true },
 
     "oraclejdk21":        {"name": "jpg-jdk",   "version": "21",      "build_id": "33", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-21":      {"name": "labsjdk",   "version": "ce-21+35-jvmci-23.1-b15", "platformspecific": true },
-    "labsjdk-ce-21Debug": {"name": "labsjdk",   "version": "ce-21+35-jvmci-23.1-b15-debug", "platformspecific": true },
-    "labsjdk-ce-21-llvm": {"name": "labsjdk",   "version": "ce-21+35-jvmci-23.1-b15-sulong", "platformspecific": true },
-    "labsjdk-ee-21":      {"name": "labsjdk",   "version": "ee-21+35-jvmci-23.1-b15", "platformspecific": true },
-    "labsjdk-ee-21Debug": {"name": "labsjdk",   "version": "ee-21+35-jvmci-23.1-b15-debug", "platformspecific": true },
-    "labsjdk-ee-21-llvm": {"name": "labsjdk",   "version": "ee-21+35-jvmci-23.1-b15-sulong", "platformspecific": true },
+    "labsjdk-ce-21":      {"name": "labsjdk",   "version": "ce-21+35-jvmci-23.1-b21", "platformspecific": true },
+    "labsjdk-ce-21Debug": {"name": "labsjdk",   "version": "ce-21+35-jvmci-23.1-b21-debug", "platformspecific": true },
+    "labsjdk-ce-21-llvm": {"name": "labsjdk",   "version": "ce-21+35-jvmci-23.1-b21-sulong", "platformspecific": true },
+    "labsjdk-ee-21":      {"name": "labsjdk",   "version": "ee-21.0.1+11-jvmci-23.1-b21", "platformspecific": true },
+    "labsjdk-ee-21Debug": {"name": "labsjdk",   "version": "ee-21.0.1+11-jvmci-23.1-b21-debug", "platformspecific": true },
+    "labsjdk-ee-21-llvm": {"name": "labsjdk",   "version": "ee-21.0.1+11-jvmci-23.1-b21-sulong", "platformspecific": true },
 
     "oraclejdk-latest":       {"name": "jpg-jdk",   "version": "22",      "build_id": "18", "release": true, "platformspecific": true, "extrabundles": ["static-libs"]},
-    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-22+18-jvmci-b01", "platformspecific": true },
-    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-22+18-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-22+18-jvmci-b01-sulong", "platformspecific": true },
-    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-22+18-jvmci-b01", "platformspecific": true },
-    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-22+18-jvmci-b01-debug", "platformspecific": true },
-    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-22+18-jvmci-b01-sulong", "platformspecific": true }
+    "labsjdk-ce-latest":      {"name": "labsjdk",   "version": "ce-22+18-jvmci-b02", "platformspecific": true },
+    "labsjdk-ce-latestDebug": {"name": "labsjdk",   "version": "ce-22+18-jvmci-b02-debug", "platformspecific": true },
+    "labsjdk-ce-latest-llvm": {"name": "labsjdk",   "version": "ce-22+18-jvmci-b02-sulong", "platformspecific": true },
+    "labsjdk-ee-latest":      {"name": "labsjdk",   "version": "ee-22+18-jvmci-b02", "platformspecific": true },
+    "labsjdk-ee-latestDebug": {"name": "labsjdk",   "version": "ee-22+18-jvmci-b02-debug", "platformspecific": true },
+    "labsjdk-ee-latest-llvm": {"name": "labsjdk",   "version": "ee-22+18-jvmci-b02-sulong", "platformspecific": true }
   },
 
   "eclipse": {

compiler/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 This changelog summarizes newly introduced optimizations and other compiler related changes.
 
+## GraalVM for JDK 22 (Internal Version 24.0.0)
+* (GR-48318): The Graal module has been renamed from `jdk.internal.vm.compiler` to `jdk.compiler.graal`.
+  Likewise, the compiler packages moved into the `jdk.compiler.graal` namespace.
+  These renamings were done in preparation for [Project Galahad](https://openjdk.org/projects/galahad/).
+
 ## GraalVM for JDK 21 (Internal Version 23.1.0)
 * (GR-43228): Enforce backward-edge control-flow integrity (CFI) on aarch64 based on the `UseBranchProtection` JVM flag.
 

compiler/ci/ci_common/benchmark-suites.libsonnet

@@ -232,22 +232,6 @@
       self.benchmark_cmd + ["shopcart-wrk:mixed-huge"]                   + hwlocBind_16C_32T + ["--"] + self.extra_vm_args + ["-Xms1024m", "-Xmx8192m", "-XX:ActiveProcessorCount=32", "-XX:MaxDirectMemorySize=8192m"],
       bench_upload,
 
-      # tika-wrk odt
-      self.benchmark_cmd + ["tika-wrk:odt-tiny"]                         + hwlocBind_1C_1T   + ["--"] + self.extra_vm_args + ["-Xms32m",   "-Xmx150m",  "-XX:ActiveProcessorCount=1"],
-      bench_upload,
-      self.benchmark_cmd + ["tika-wrk:odt-small"]                        + hwlocBind_2C_2T   + ["--"] + self.extra_vm_args + ["-Xms64m",   "-Xmx250m",  "-XX:ActiveProcessorCount=2"],
-      bench_upload,
-      self.benchmark_cmd + ["tika-wrk:odt-medium"]                       + hwlocBind_4C_4T   + ["--"] + self.extra_vm_args + ["-Xms128m",  "-Xmx600m",  "-XX:ActiveProcessorCount=4"],
-      bench_upload,
-
-      # tika-wrk pdf
-      self.benchmark_cmd + ["tika-wrk:pdf-tiny"]                         + hwlocBind_1C_1T   + ["--"] + self.extra_vm_args + ["-Xms20m",   "-Xmx80m",   "-XX:ActiveProcessorCount=1"],
-      bench_upload,
-      self.benchmark_cmd + ["tika-wrk:pdf-small"]                        + hwlocBind_2C_2T   + ["--"] + self.extra_vm_args + ["-Xms40m",   "-Xmx200m",  "-XX:ActiveProcessorCount=2"],
-      bench_upload,
-      self.benchmark_cmd + ["tika-wrk:pdf-medium"]                       + hwlocBind_4C_4T   + ["--"] + self.extra_vm_args + ["-Xms80m",   "-Xmx500m",  "-XX:ActiveProcessorCount=4"],
-      bench_upload,
-
       # petclinic-wrk
       self.benchmark_cmd + ["petclinic-wrk:mixed-tiny"]                  + hwlocBind_1C_1T   + ["--"] + self.extra_vm_args + ["-Xms32m",   "-Xmx100m",  "-XX:ActiveProcessorCount=1"],
       bench_upload,
@@ -263,8 +247,6 @@
       # helloworld-wrk
       self.benchmark_cmd + ["micronaut-helloworld-wrk:helloworld"]       + hwlocBind_1C_1T   + ["--"] + self.extra_vm_args + ["-Xms8m",    "-Xmx64m",   "-XX:ActiveProcessorCount=1", "-XX:MaxDirectMemorySize=256m"],
       bench_upload,
-      self.benchmark_cmd + ["quarkus-helloworld-wrk:helloworld"]         + hwlocBind_1C_1T   + ["--"] + self.extra_vm_args + ["-Xms8m",    "-Xmx64m",   "-XX:ActiveProcessorCount=1", "-XX:MaxDirectMemorySize=256m"],
-      bench_upload,
       self.benchmark_cmd + ["spring-helloworld-wrk:helloworld"]          + hwlocBind_1C_1T   + ["--"] + self.extra_vm_args + ["-Xms8m",    "-Xmx64m",   "-XX:ActiveProcessorCount=1", "-XX:MaxDirectMemorySize=256m"],
       bench_upload
     ],

compiler/ci/ci_common/gate.jsonnet

@@ -190,6 +190,11 @@
     capabilities+: ["ram16gb"],
   },
 
+  # Avoid using xgene3 nodes
+  avoid_xgene3:: {
+    capabilities+: ["!xgene3"],
+  },
+
   jdk_latest:: "Latest",
 
   # This map defines the builders that run as gates. Each key in this map
@@ -198,12 +203,12 @@
   # fields of the denoted build.
   local gates = {
     "gate-compiler-test-labsjdk-latest-linux-amd64": t("1:00:00") + c.mach5_target,
-    "gate-compiler-test-labsjdk-latest-linux-aarch64": t("1:50:00"),
+    "gate-compiler-test-labsjdk-latest-linux-aarch64": t("1:50:00") + s.avoid_xgene3,
     "gate-compiler-test-labsjdk-latest-darwin-amd64": t("1:00:00") + c.mach5_target + s.ram16gb,
     "gate-compiler-test-labsjdk-latest-darwin-aarch64": t("1:00:00"),
     "gate-compiler-test-labsjdk-latest-windows-amd64": t("1:30:00"),
     "gate-compiler-test_zgc-labsjdk-latest-linux-amd64": t("1:00:00") + c.mach5_target,
-    "gate-compiler-test_zgc-labsjdk-latest-linux-aarch64": t("1:50:00"),
+    "gate-compiler-test_zgc-labsjdk-latest-linux-aarch64": t("1:50:00") + s.avoid_xgene3,
     "gate-compiler-test_zgc-labsjdk-latest-darwin-amd64": t("1:00:00") + c.mach5_target + s.ram16gb,
     "gate-compiler-test_zgc-labsjdk-latest-darwin-aarch64": t("1:00:00"),
 

compiler/docs/CompilationPlanFuzzing.md

@@ -1,7 +1,7 @@
 # Compilation plan fuzzing
 This page covers the creation and usage of fuzzed compilation plans instead of the usual phase orderings specified by the different `CompilerConfiguration`s.
 ## Abstraction design
-The following design can be found in the package `org.graalvm.compiler.core.phases.fuzzing`.
+The following design can be found in the package `jdk.compiler.graal.core.phases.fuzzing`.
 ### Diagram
 ```
                                                                              Suites  >  FuzzedSuites

compiler/docs/Debugging.md

@@ -38,7 +38,7 @@ In addition to IDE debugging, there is support for *printf* style debugging.
 The simplest is to place temporary usages of `System.out` where ever you need them.
 
 For more permanent logging statements, use the `log(...)` methods in
-[`DebugContext`](../src/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugContext.java).
+[`DebugContext`](../src/jdk.compiler.graal.debug/src/jdk/compiler/graal/debug/DebugContext.java).
 A (nestable) debug scope is entered via one of the `scope(...)` methods in that class. For example:
 
 ```java
@@ -54,9 +54,9 @@ try (Scope s = debug.scope("CodeInstall", method)) {
 
 The `debug.log` statement will send output to the console if `CodeInstall` is matched by the
 `-Dgraal.Log` option. The matching logic for this option is implemented in
-[DebugFilter](../src/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/DebugFilter.java#L31-L82)
+[DebugFilter](../src/jdk.compiler.graal/src/jdk/compiler/graal/debug/DebugFilter.java)
 and documented in the
-[Dump help message](../src/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/doc-files/DumpHelp.txt). As
+[Dump help message](../src/jdk.compiler.graal/src/jdk/compiler/graal/debug/doc-files/DumpHelp.txt). As
 mentioned in the javadoc, the same matching logic also applies to the `-Dgraal.Dump`,
 `-Dgraal.Time`, `-Dgraal.Count` and `-Dgraal.TrackMemUse` options.
 
@@ -194,9 +194,9 @@ Specifying one of the debug scope options (i.e., `-Dgraal.Log`, `-Dgraal.Dump`,
 interesting in compiler output related to a single or few methods. In this case, use the
 `-Dgraal.MethodFilter` option to specify a method filter. The matching logic for this option is
 described in
-[MethodFilter](../src/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/MethodFilter.java#L33-L92)
+[MethodFilter](../src/jdk.compiler.graal/src/jdk/compiler/graal/debug/MethodFilter.java#L33-L92)
 and documented in the
-[MethodFilter help message](../src/org.graalvm.compiler.debug/src/org/graalvm/compiler/debug/doc-files/MethodFilterHelp.txt).
+[MethodFilter help message](../src/jdk.compiler.graal/src/jdk/compiler/graal/debug/doc-files/MethodFilterHelp.txt).
 
 ## Metric filtering
 
@@ -214,7 +214,7 @@ In addition to logging, there is support for generating (or dumping) more detail
 visualizations of certain compiler data structures. Currently, there is support for dumping:
 
 * HIR graphs (i.e., instances of
-  [Graph](../src/org.graalvm.compiler.graph/src/org/graalvm/compiler/graph/Graph.java)) to the
+  [Graph](../src/jdk.compiler.graal/src/jdk/compiler/graal/graph/Graph.java)) to the
   [Ideal Graph Visualizer (IGV)](../../docs/tools/ideal-graph-visualizer.md), and
 * LIR register allocation and generated code to the [C1Visualizer](https://github.com/zakkak/c1visualizer)
 
@@ -258,8 +258,8 @@ java version "1.8.0_212"
 Java(TM) SE Runtime Environment (build 1.8.0_212-b31)
 Java HotSpot(TM) 64-Bit Server VM (build 25.212-b31-jvmci-20-b01, mixed mode)
 > find dumps/1497910458736 -type f
-dumps/1497910458736/HotSpotCompilation-539[org.graalvm.compiler.graph.Node.updateUsages(Node, Node)].bgv
-dumps/1497910458736/HotSpotCompilation-539[org.graalvm.compiler.graph.Node.updateUsages(Node, Node)].cfg
+dumps/1497910458736/HotSpotCompilation-539[jdk.compiler.graal.graph.Node.updateUsages(Node, Node)].bgv
+dumps/1497910458736/HotSpotCompilation-539[jdk.compiler.graal.graph.Node.updateUsages(Node, Node)].cfg
 ```
 
 As you become familiar with the scope names used in the compiler, you can refine the `-Dgraal.Dump` option

compiler/docs/JMH.md

@@ -133,7 +133,7 @@ mx benchmark jmh-whitebox:* --results-file=results.json -- --jvm-config=graal-co
 
 The command above runs all *whitebox* benchmarks.
 That are all benchmark distributions that have either a dependency on a `GRAAL*` distribution,
-or include projects starting with `org.graalvm.compiler` in their distribution jar.
+or include projects starting with `jdk.compiler.graal` in their distribution jar.
 
 
 Refer to the [mx documentation][mx in-repo] for further information.