Implement llvm-backend debug info

.github/workflows/main.yml

@@ -2,6 +2,8 @@ name: GraalVM Gate
 
 on:
   push:
+    branches-ignore:
+      - 'github/**'
     paths-ignore:
       - '.travis.yml'
       - '.github/workflows/quarkus.yml'
@@ -31,6 +33,7 @@ env:
   MX_GIT_CACHE: refcache
   MX_PYTHON_VERSION: 3
   JAVA_HOME: ${{ github.workspace }}/jdk
+  JDT: builtin
   MX_PATH: ${{ github.workspace }}/mx
 
 jobs:
@@ -122,7 +125,7 @@ jobs:
       env: ${{ matrix.env }}
       run: |
         mkdir jdk-dl
-        ${MX_PATH}/mx fetch-jdk --jdk-id ${JDK} --to jdk-dl --alias ${JAVA_HOME}
+        ${MX_PATH}/mx --java-home= fetch-jdk --jdk-id ${JDK} --to jdk-dl --alias ${JAVA_HOME}
     - name: Update dependency cache
       if: ${{ contains(matrix.env.GATE, 'debug') || contains(matrix.env.GATE, 'style') }}
       run: sudo apt update
@@ -150,16 +153,6 @@ jobs:
           git fetch --unshallow
         fi
 
-        if [[ ${GATE} == *fullbuild* ]]
-        then
-          # Only test JDT on JDK8
-          if [ "${JDK}" == "openjdk8" ]
-          then
-            export JDT=${MX_PATH}/ecj.jar
-            wget --no-verbose https://archive.eclipse.org/eclipse/downloads/drops4/R-4.14-201912100610/ecj-4.14.jar -O ${JDT}
-          fi
-        fi
-
         echo ${JAVA_HOME}
         ${JAVA_HOME}/bin/java -version
         if [[ ${WITHOUT_VCS} ]]

.github/workflows/quarkus.yml

@@ -63,12 +63,12 @@ jobs:
     - name: Get JDK
       run: |
         mkdir jdk-dl
-        ${MX_PATH}/mx fetch-jdk --jdk-id labsjdk-ce-11 --to jdk-dl --alias ${JAVA_HOME}
+        ${MX_PATH}/mx --java-home= fetch-jdk --jdk-id labsjdk-ce-11 --to jdk-dl --alias ${JAVA_HOME}
     - name: Build graalvm native-image
       run: |
         cd substratevm
-        ${MX_PATH}/mx --native=native-image --components="Native Image" build
-        mv $(${MX_PATH}/mx --native=native-image --components="Native Image" graalvm-home) ${GRAALVM_HOME}
+        ${MX_PATH}/mx --native=native-image,lib:jvmcicompiler --components="Native Image,LibGraal" build
+        mv $(${MX_PATH}/mx --native=native-image,lib:jvmcicompiler --components="Native Image,LibGraal" graalvm-home) ${GRAALVM_HOME}
         ${GRAALVM_HOME}/bin/native-image --version
     - name: Tar GraalVM
       shell: bash

bench-common.libsonnet

@@ -49,6 +49,13 @@
       default_numa_node:: 0,
       num_threads:: 72
     },
+    x82:: common.linux + common.amd64 + self._bench_machine + {
+      machine_name:: "x82",
+      capabilities+: ["no_frequency_scaling", "tmpfs25g"],
+      numa_nodes:: [0, 1],
+      default_numa_node:: 0,
+      num_threads:: 96
+    },
     xgene3:: common.linux + common.aarch64 + self._bench_machine + {
       machine_name:: "xgene3",
       capabilities+: [],

ci.hocon

@@ -5,9 +5,6 @@ builds = []
 
 binaries-repository = "lafo"
 
-#SDK
-include "sdk/ci.hocon"
-
 #Truffle
 include "truffle/ci.hocon"
 
@@ -18,12 +15,6 @@ logPatterns = [
     ${compiler-suite-root}"/graal_dumps/*/*"
 ]
 
-#Tools
-include "tools/ci.hocon"
-
-#Regex
-include "regex/ci.hocon"
-
 #Examples
 #Examples gate also disabled.
 #include "examples/ci.hocon"
@@ -54,9 +45,6 @@ include "compiler/ci_includes/bench-aarch64-c2.hocon"
 # ------------------ SVM ----------------------
 include "substratevm/ci_includes/gate.hocon"
 
-# Publish Javadoc
-include "ci_includes/publish-javadoc.hocon"
-
 # ------------------- VM ----------------------
 include "vm/ci_common/common.hocon"
 include "vm/ci_common/common-bench.hocon"

ci.jsonnet

@@ -7,14 +7,26 @@ local wasm = import 'wasm/ci.jsonnet';
 # Espresso
 local espresso = import 'espresso/ci.jsonnet';
 
+# Regex
+local regex = import 'regex/ci.jsonnet';
+
+# SDK
+local sdk = import 'sdk/ci.jsonnet';
+
 # Sulong
 local sulong = import 'sulong/ci.jsonnet';
 
+# Tools
+local tools = import 'tools/ci.jsonnet';
+
+# JavaDoc
+local javadoc = import "ci_includes/publish-javadoc.jsonnet";
+
 # Add a guard to `build` that prevents it from running in the gate
-# for a PR that only touches *.md flles.
-local add_markdown_guard(build) = build + {
+# for a PR that only touches *.md files, the docs, are config files for GitHub.
+local add_excludes_guard(build) = build + {
   guard+: {
-    excludes+: ["**.md", "docs/**"]
+    excludes+: ["**.md", "docs/**", ".github/**"]
   }
 };
 
@@ -23,5 +35,14 @@ local add_markdown_guard(build) = build + {
   _checkCommon: (import 'common.jsonnet'),
   ci_resources:: (import 'ci-resources.libsonnet'),
   specVersion: "2",
-  builds: [add_markdown_guard(b) for b in (compiler.builds + wasm.builds + espresso.builds + sulong.builds)]
+  builds: [add_excludes_guard(b) for b in (
+    compiler.builds +
+    wasm.builds +
+    espresso.builds +
+    regex.builds +
+    sdk.builds +
+    sulong.builds +
+    tools.builds +
+    javadoc.builds
+  )]
 }

ci_includes/publish-javadoc.jsonnet

@@ -0,0 +1,52 @@
+{
+  local common = import '../common.jsonnet',
+  local utils = import '../common-utils.libsonnet',
+  local linux_amd64 = common["linux-amd64"],
+
+  local javadoc_publisher = {
+    name: 'graal-publish-javadoc-' + utils.prefixed_jdk(self.jdk_version),
+    run+: [
+      ["cd", "./sdk"],
+      ["mx", "build"],
+      ["mx", "javadoc"],
+      ["zip", "-r", "javadoc.zip", "javadoc"],
+      ["cd", "../truffle"],
+      ["mx", "build"],
+      ["mx", "javadoc"],
+      ["zip", "-r", "javadoc.zip", "javadoc"],
+      ["cd", "../tools"],
+      ["mx", "build"],
+      ["mx", "javadoc"],
+      ["zip", "-r", "javadoc.zip", "javadoc"],
+      ["cd", "../compiler"],
+      ["mx", "build"],
+      ["mx", "javadoc", "--projects", "org.graalvm.graphio"],
+      ["cd", "src/org.graalvm.graphio/"],
+      ["zip", "-r", "../../graphio-javadoc.zip", "javadoc"],
+      ["cd", "../../.."],
+      ["set-export", "GRAAL_REPO", ["pwd"]],
+      ["cd", ".."],
+      ["git", "clone", ["mx", "urlrewrite", "https://github.com/graalvm/graalvm-website.git"]],
+      ["cd", "graalvm-website"],
+      ["rm", "-rf", "sdk/javadoc", "truffle/javadoc", "tools/javadoc", "graphio/javadoc"],
+      ["git", "status" ],
+      ["unzip", "-o", "-d", "sdk", "$GRAAL_REPO/sdk/javadoc.zip"],
+      ["unzip", "-o", "-d", "truffle", "$GRAAL_REPO/truffle/javadoc.zip"],
+      ["unzip", "-o", "-d", "tools", "$GRAAL_REPO/tools/javadoc.zip"],
+      ["unzip", "-o", "-d", "graphio", "$GRAAL_REPO/compiler/graphio-javadoc.zip"],
+      ["git", "add", "sdk/javadoc", "truffle/javadoc", "tools/javadoc", "graphio/javadoc"],
+      ["git", "config", "user.name", "Javadoc Publisher"],
+      ["git", "config", "user.email", "graal-dev@openjdk.java.net"],
+      ["git", "diff", "--staged", "--quiet", "||", "git", "commit", "-m", ["echo", "Javadoc as of", ["date", "+%Y/%m/%d"]]],
+      ["git", "push", "origin", "HEAD"]
+    ],
+     notify_groups:: ["javadoc"],
+     timelimit : "30:00"
+  },
+
+  local all_builds = [
+    common.post_merge + linux_amd64 + common.oraclejdk8 + javadoc_publisher,
+  ],
+  // adds a "defined_in" field to all builds mentioning the location of this current file
+  builds:: [{ defined_in: std.thisFile } + b for b in all_builds]
+}

common.hocon

@@ -43,9 +43,7 @@ labsjdk-ce-17Debug : { downloads : { JAVA_HOME : ${jdks.labsjdk-ce-17Debug} }}
 labsjdk-ee-17Debug : { downloads : { JAVA_HOME : ${jdks.labsjdk-ee-17Debug} }}
 
 common : ${mx} ${deps.common} {
-  catch_files : [
-    "Graal diagnostic output saved in (?P<filename>.+\.zip)"
-  ]
+  catch_files : ${catch_files}
 }
 
 linux : ${common} ${deps.linux}

common.json

@@ -2,29 +2,35 @@
   "README": "This file contains definitions that are useful for the hocon and jsonnet CI files of multiple repositories.",
 
   "jdks": {
-    "openjdk8":           {"name": "openjdk",   "version": "8u302+06-jvmci-21.3-b02", "platformspecific": true },
-    "oraclejdk8":         {"name": "oraclejdk", "version": "8u311+06-jvmci-21.3-b02", "platformspecific": true },
-    "oraclejdk8Debug":    {"name": "oraclejdk", "version": "8u311+06-jvmci-21.3-b02-fastdebug", "platformspecific": true },
+    "openjdk8":           {"name": "openjdk",   "version": "8u302+06-jvmci-21.3-b03", "platformspecific": true },
+    "oraclejdk8":         {"name": "oraclejdk", "version": "8u311+09-jvmci-21.3-b03", "platformspecific": true },
+    "oraclejdk8Debug":    {"name": "oraclejdk", "version": "8u311+09-jvmci-21.3-b03-fastdebug", "platformspecific": true },
 
     "openjdk11":          {"name": "openjdk",   "version": "11.0.11+9", "platformspecific": true },
     "oraclejdk11":        {"name": "oraclejdk", "version": "11.0.11+9", "platformspecific": true },
-    "labsjdk-ce-11":      {"name": "labsjdk",   "version": "ce-11.0.12+5-jvmci-21.3-b02", "platformspecific": true },
-    "labsjdk-ee-11":      {"name": "labsjdk",   "version": "ee-11.0.13+6-jvmci-21.3-b02", "platformspecific": true },
+    "labsjdk-ce-11":      {"name": "labsjdk",   "version": "ce-11.0.12+5-jvmci-21.3-b03", "platformspecific": true },
+    "labsjdk-ee-11":      {"name": "labsjdk",   "version": "ee-11.0.13+9-jvmci-21.3-b03", "platformspecific": true },
 
-    "oraclejdk17":        {"name": "oraclejdk", "version": "17.0.1+2", "platformspecific": true },
-    "labsjdk-ce-17":      {"name": "labsjdk",   "version": "ce-17+35-jvmci-21.3-b02", "platformspecific": true },
-    "labsjdk-ce-17Debug": {"name": "labsjdk",   "version": "ce-17+35-jvmci-21.3-b02-debug", "platformspecific": true },
-    "labsjdk-ee-17":      {"name": "labsjdk",   "version": "ee-17.0.1+7-jvmci-21.3-b02", "platformspecific": true },
-    "labsjdk-ee-17Debug": {"name": "labsjdk",   "version": "ee-17.0.1+7-jvmci-21.3-b02-debug", "platformspecific": true }
+    "oraclejdk17":        {"name": "oraclejdk", "version": "17.0.1+12", "platformspecific": true },
+    "labsjdk-ce-17":      {"name": "labsjdk",   "version": "ce-17+35-jvmci-21.3-b03", "platformspecific": true },
+    "labsjdk-ce-17Debug": {"name": "labsjdk",   "version": "ce-17+35-jvmci-21.3-b03-debug", "platformspecific": true },
+    "labsjdk-ee-17":      {"name": "labsjdk",   "version": "ee-17.0.1+9-jvmci-21.3-b03", "platformspecific": true },
+    "labsjdk-ee-17Debug": {"name": "labsjdk",   "version": "ee-17.0.1+9-jvmci-21.3-b03-debug", "platformspecific": true }
   },
 
-  "COMMENT" : "The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js)",
+  "COMMENT.devkits" : "The devkits versions reflect those used to build the JVMCI JDKs (e.g., see devkit_platform_revisions in <jdk>/make/conf/jib-profiles.js)",
   "devkits": {
       "windows-oraclejdk8": { "packages" : { "devkit:VS2017-15.9.16+1" : "==0" }},
       "windows-openjdk8":   { "packages" : { "devkit:VS2017-15.9.16+1" : "==0" }},
       "windows-jdk11":      { "packages" : { "devkit:VS2017-15.9.24+1" : "==0" }},
       "windows-jdk17":      { "packages" : { "devkit:VS2019-16.9.3+1"  : "==0" }}
   },
+
+  "catch_files" : [
+    "Graal diagnostic output saved in '(?P<filename>[^']+)'",
+    "Dumping debug output to '(?P<filename>[^']+)'"
+  ],
+
   "deps": {
     "COMMENT.common": [
       "pip:isort is a dependency of pip:pylint. The explicit dependency on the pip package works around",
@@ -78,12 +84,8 @@
       }
     },
     "jdt": {
-      "downloads": {
-        "JDT": {
-          "name": "ecj",
-          "version": "4.14.0",
-          "platformspecific": false
-        }
+      "environment": {
+        "JDT": "builtin"
       }
     }
   },

common.jsonnet

@@ -105,9 +105,7 @@
     # enforce self.arch (useful for generating job names)
     arch:: error "self.arch not set",
     capabilities +: [],
-    catch_files +: [
-      "Graal diagnostic output saved in (?P<filename>.+\\.zip)"
-    ]
+    catch_files +: common_json.catch_files
   },
 
   linux:: deps.linux + self.common + {

compiler/CHANGELOG.md

@@ -2,6 +2,9 @@
 
 This changelog summarizes newly introduced optimizations that may be relevant to other teams.
 
+## Version 22.0.0
+* (GR-22707) (GR-30838): New, inner loops first, reverse post order and loop frequency calculations for the compiler.
+
 ## Version 21.2.0
 * (GR-29770) Loop safepoint elimination: Not only consider 32bit loops for safepoint removal but also 64bit ones
 that iterate in 32bit ranges.