[WIP] Add substitutions for annotation constructors

.travis.yml

@@ -18,8 +18,8 @@ jdk:
 
 env:
   global:
-    - JVMCI_VERSION="jvmci-0.54"
-    - JDK8_UPDATE_VERSION="192"
+    - JVMCI_VERSION="jvmci-0.55"
+    - JDK8_UPDATE_VERSION="202"
 
 matrix:
   include:

README.md

@@ -34,10 +34,10 @@ images or shared objects.
 
 ## Related Repositories
 GraalVM allows running of following languages which are being developed and tested in related repositories with GraalVM core to run on top of it using Truffle and Graal compiler. These are:
-* [Graal.JS](https://github.com/graalvm/graaljs) - JavaScript (ECMAScript 2017 compatible) and node.js 8.11.1
-* [FastR](https://github.com/oracle/fastr) - R Language 3.4.0
+* [Graal.JS](https://github.com/graalvm/graaljs) - JavaScript (ECMAScript 2018 compatible) and node.js 10.15.0
+* [FastR](https://github.com/oracle/fastr) - R Language 3.5.1
 * [GraalPython](https://github.com/graalvm/graalpython) - Python 3.7
-* [TruffleRuby](https://github.com/oracle/truffleruby/) - Ruby Programming Language 2.3.7
+* [TruffleRuby](https://github.com/oracle/truffleruby/) - Ruby Programming Language 2.4.4
 * [SimpleLanguage](https://github.com/graalvm/simplelanguage) - A simple demonstration language for the GraalVM.
 
 

ci.hocon

@@ -27,6 +27,8 @@ include "sulong/ci.hocon"
 #include "examples/ci.hocon"
 
 jvm-config.default = "graal-core"
+libgraal_env = "libgraal"
+vm_subdir = "vm"
 
 include "compiler/ci_common/common.hocon"
 include "compiler/ci_common/gate.hocon"

common.hocon

@@ -1,14 +1,14 @@
 # overlay version
-overlay = a84dd00c92041dfcd04b34c8d3f4d9e8c047d510
+overlay = d0a64ff32d27517b0683ae6ce9cf9614a7fb51d3
 
 # oraclejdk* are released OracleJDK binaries
 # labsjdk* are JDKs based on OracleJDK binaries
 # openjdk8 JDKs on Linux are built by Oracle Labs
 # openjdk8 JDKs on macOS are based on AdoptOpenJDK binaries
 jdks: {
-  labsjdk8:      {name : labsjdk,   version : "8u192-jvmci-0.54", platformspecific: true}
-  openjdk8:      {name : openjdk,   version : "8u192-jvmci-0.54", platformspecific: true}
-  labsjdk8Debug: {name : labsjdk,   version : "8u192-jvmci-0.54-fastdebug", platformspecific: true}
+  labsjdk8:      {name : labsjdk,   version : "8u202-jvmci-0.55", platformspecific: true}
+  openjdk8:      {name : openjdk,   version : "8u202-jvmci-0.55", platformspecific: true}
+  labsjdk8Debug: {name : labsjdk,   version : "8u202-jvmci-0.55-fastdebug", platformspecific: true}
   oraclejdk11:   {name : oraclejdk, version : "11+28", platformspecific: true}
   openjdk11:     {name : openjdk,   version : "11+28", platformspecific: true}
 
@@ -91,6 +91,9 @@ linux-aarch64 : ${linux} {
   capabilities : [linux, aarch64]
 }
 
+DEFAULT_HEAP_SIZE : "8G"
+LARGE_HEAP_SIZE : "31G"
+
 eclipse : {
   downloads : {
     ECLIPSE : {name: eclipse, version: "4.5.2", platformspecific: true}

compiler/README.md

@@ -113,7 +113,7 @@ The advantage of this mode is that Graal can be debugged with a Java debugger.
 
 However, it has some disadvantages. Firstly, since Graal uses the object heap, it can
 reduce application object locality and increase GC pause times. Additionally, it can
-complicate fine tuning options such as `-Xmx` and `Xms` which now need to take the
+complicate fine tuning options such as `-Xmx` and `-Xms` which now need to take the
 heap usage of Graal needs to be taken into account. Secondly, Graal will initially be executed
 in the interpreter and only get faster over time as its hot methods are JIT
 compiled. This is mitigated to some degree by forcing Graal (and JVMCI)
@@ -125,25 +125,39 @@ Graal uses memory separate from the HotSpot heap and it runs compiled
 from the start. That is, it has execution properties similar to other native HotSpot
 compilers such as C1 and C2.
 
-To build libgraal, you need to use the `native-image` tool in the `substratevm` suite.
+To build a GraalVM image with libgraal:
 
 ```
-cd graal/substratevm
-mx build
-mx buildlibgraal
+cd graal/vm
+mx --env libgraal build
 ```
-
-This will produce a shared library in the current working directory whose name is
-compliant with the shared library naming conventions for the platform;
-`libjvmcicompiler.dylib` (macOS), `libjvmcicompiler.so` (Linux, Solaris, etc), `graal.dll` (Windows).
-
-To use this library, copy it to the same directory as `libjava.dylib`/`libjava.so`/`java.dll`
-in your JVMCI JDK8 installation and use the options `-XX:+UseJVMCICompiler -XX:+UseJVMCINativeLibrary`. Alternatively,
-you can directly specify the path to the library as the value to `-XX:JVMCILibPath=`.
-For example:
+The newly built GraalVM image is available at:
+```
+mx --env libgraal graalvm-home
+```
+or following this symlink:
 ```
-mx vm -XX:JVMCILibPath=/path/to/libjvmcicompiler.dylib -XX:+UseJVMCICompiler -XX:+UseJVMCINativeLibrary ...
+./latest_graalvm_home
 ```
+For more information about building GraalVM images, see the [README file of the vm suite](../vm/README.md).
+
+Without leaving the `graal/vm` directory, you can now run libgraal as follows:
+
+1. Use the GraalVM image that you just built:
+
+    ```
+    ./latest_graalvm_home/bin/java -XX:+UseJVMCICompiler -XX:+UseJVMCINativeLibrary ...
+    ```
+
+2. Use `mx`:
+    - On linux:
+        ```
+        mx -p ../compiler vm -XX:JVMCILibPath=latest_graalvm_home/jre/lib/amd64 -XX:+UseJVMCICompiler -XX:+UseJVMCINativeLibrary ...
+        ```
+    - On macOS:
+        ```
+        mx -p ../compiler vm -XX:JVMCILibPath=latest_graalvm_home/jre/lib -XX:+UseJVMCICompiler -XX:+UseJVMCINativeLibrary ...
+        ```
 
 ## Publications and Presentations
 

compiler/ci_common/bench.hocon

@@ -23,7 +23,7 @@ bench-jvmci : {
 
 bench-common : ${compilerCommon} {
   environment: {
-    BENCH_RESULTS_FILE_PATH: "bench-results.json"
+    BENCH_RESULTS_FILE_PATH : "bench-results.json"
   }
   setup: ${compilerCommon.setup} [
     ["mx", "build"]
@@ -33,21 +33,35 @@ bench-common : ${compilerCommon} {
   ]
 }
 
-bench-dacapo: ${bench-common} ${dacapo-bench-notifications} {
+large-heap: {
+  environment : {
+    XMS: ${LARGE_HEAP_SIZE}
+    XMX: ${LARGE_HEAP_SIZE}
+  }
+}
+
+default-heap: {
+  environment : {
+    XMS: ${DEFAULT_HEAP_SIZE}
+    XMX: ${DEFAULT_HEAP_SIZE}
+  }
+}
+
+bench-dacapo: ${bench-common} ${default-heap} ${dacapo-bench-notifications} {
   targets : [bench, post-merge]
   run: [
     ${bench-jvmci.mx-dacapo} ${bench-arguments}
   ]
 }
 
-bench-dacapo-timing: ${bench-common} ${dacapo-bench-notifications} {
+bench-dacapo-timing: ${bench-common} ${default-heap} ${dacapo-bench-notifications} {
   targets: [bench, daily]
   run: [
     ${bench-jvmci.mx-dacapo-timing} ${bench-arguments}
   ]
 }
 
-bench-dacapo-move-profiling: ${bench-common} ${dacapo-bench-notifications} {
+bench-dacapo-move-profiling: ${bench-common} ${default-heap} ${dacapo-bench-notifications} {
   targets: [bench, daily]
   run: [
     ${bench-jvmci.mx-dacapo-move-profiling} ${bench-arguments}
@@ -56,21 +70,21 @@ bench-dacapo-move-profiling: ${bench-common} ${dacapo-bench-notifications} {
 
 # Scala DaCapo-related targets
 
-bench-scala-dacapo: ${bench-common} ${scala-dacapo-bench-notifications} {
+bench-scala-dacapo: ${bench-common} ${default-heap} ${scala-dacapo-bench-notifications} {
   targets: [bench, post-merge]
   run: [
     ${bench-jvmci.mx-scala-dacapo} ${bench-arguments}
   ]
 }
 
-bench-scala-dacapo-timing: ${bench-common} ${scala-dacapo-bench-notifications} {
+bench-scala-dacapo-timing: ${bench-common} ${default-heap} ${scala-dacapo-bench-notifications} {
   targets: [bench, daily]
   run: [
     ${bench-jvmci.mx-scala-dacapo-timing} ${bench-arguments}
   ]
 }
 
-bench-scala-dacapo-move-profiling: ${bench-common} ${scala-dacapo-bench-notifications} {
+bench-scala-dacapo-move-profiling: ${bench-common} ${default-heap} ${scala-dacapo-bench-notifications} {
   targets: [bench, daily]
   run: [
     ${bench-jvmci.mx-scala-dacapo-move-profiling} ${bench-arguments}
@@ -79,7 +93,7 @@ bench-scala-dacapo-move-profiling: ${bench-common} ${scala-dacapo-bench-notifica
 
 # SPECjbb2005-related targets
 
-bench-specjbb2005: ${bench-common} ${specjbb-bench-notifications} {
+bench-specjbb2005: ${bench-common} ${large-heap} ${specjbb-bench-notifications} {
   targets: [bench, post-merge]
   downloads: {
     SPECJBB2005: { name: specjbb2005, version: "1.07" }
@@ -91,7 +105,7 @@ bench-specjbb2005: ${bench-common} ${specjbb-bench-notifications} {
 }
 
 # SPECJvm2008-related targets
-bench-specjvm2008: ${bench-common} ${specjvm-bench-notifications} {
+bench-specjvm2008: ${bench-common} ${large-heap} ${specjvm-bench-notifications} {
   downloads: {
     SPECJVM2008: { name: specjvm2008, version: "1.01" }
   }
@@ -121,7 +135,7 @@ bench-specjvm2008-OneVM: ${bench-specjvm2008} ${specjvm-bench-notifications} {
 
 # SPECjbb2015-related targets
 
-bench-specjbb2015: ${bench-common} ${specjbb-bench-notifications} {
+bench-specjbb2015: ${bench-common} ${large-heap} ${specjbb-bench-notifications} {
   targets: [bench, post-merge]
   run: [
     ${bench-jvmci.mx-specjbb2015} ${bench-arguments}
@@ -134,15 +148,15 @@ bench-specjbb2015: ${bench-common} ${specjbb-bench-notifications} {
 
 # JMH micros graal
 
-bench-micros-graal-whitebox: ${bench-common} ${micros-bench-notifications} {
+bench-micros-graal-whitebox: ${bench-common} ${default-heap} ${micros-bench-notifications} {
   targets: [bench, weekly]
   run: [
     ${bench-jvmci.mx-micros-graal-whitebox} ${bench-arguments}
   ]
   timelimit: "3:00:00"
 }
 
-bench-micros-graal-dist: ${bench-common} ${micros-bench-notifications} {
+bench-micros-graal-dist: ${bench-common} ${default-heap} ${micros-bench-notifications} {
   targets: [bench, weekly]
   run: [
     ${bench-jvmci.mx-micros-graal-dist} ${bench-arguments}
@@ -152,7 +166,7 @@ bench-micros-graal-dist: ${bench-common} ${micros-bench-notifications} {
 
 # Renaissance-related targets
 
-bench-renaissance: ${bench-common} ${renaissance-bench-notifications} {
+bench-renaissance: ${bench-common} ${default-heap} ${renaissance-bench-notifications} {
   targets: [bench, post-merge]
   run: [
     ${bench-jvmci.mx-renaissance} ${bench-arguments}
@@ -165,7 +179,7 @@ bench-renaissance: ${bench-common} ${renaissance-bench-notifications} {
 
 # spark-sql-perf-related targets
 
-bench-spark-sql-perf: ${bench-common} {
+bench-spark-sql-perf: ${bench-common} ${default-heap} {
   targets: [bench, post-merge]
   run: [
     ${bench-jvmci.mx-spark-sql-perf} ${bench-arguments}

compiler/ci_common/gate.hocon

@@ -18,7 +18,8 @@ gateCoverage : {
     EXTRA_VM_ARGS : ""
   }
   run : [
-    ${gateCmd} ["build,coverage", --jacoco-zip, report.zip]
+    ${gateCmd} ["build,coverage", --jacocout, html]
+    [mx, sonarqube-upload, "-Dsonar.host.url=$SONAR_HOST_URL", "-Dsonar.projectKey=com.oracle.graal.compiler."${jvm-config.default}, "-Dsonar.projectName=GraalVM - Compiler ("${jvm-config.default}")", --exclude-generated]
   ]
 }
 

compiler/ci_common/gate_tasks.hocon

@@ -22,7 +22,7 @@ builds += [
   ${gateTestBenchmark} ${labsjdk8}       ${gateLinuxAMD64}   {name: "gate-compiler-benchmarktest-8-linux-amd64"}
   ${gateTestBenchmark} ${labsjdk8Debug}  ${gateLinuxAMD64}   {name: "weekly-test-compiler-benchmarktest-8-linux-amd64-fastdebug"} ${graalWeekly}
   ${gateStyle}         ${labsjdk8}       ${gateLinuxAMD64}   {name: "gate-compiler-style-linux-amd64"}
-  ${gateCoverage}      ${labsjdk8}       ${gateLinuxAMD64}   {name: "weekly-compiler-coverage-8-linux-amd64", timelimit: "1:50:00"} ${graalWeekly} { logs += [*/report.zip] }
+  ${gateCoverage}      ${labsjdk8}       ${gateLinuxAMD64}   {name: "weekly-compiler-coverage-8-linux-amd64", timelimit: "1:50:00"} ${graalWeekly}
 
   ${gateTestCompileImmediately}     ${labsjdk8}       ${gateLinuxAMD64}   {name: "gate-compiler-test-compile-immediately-8-linux-amd64"}
   ${gateMathStubsListener}                                                {name: "daily-hotspot-mathstubs-listener"}

compiler/ci_common/m7_eighth.hocon

@@ -3,8 +3,6 @@
 m7_eighth.default : ${solaris-sparcv9} {
   capabilities: ${solaris-sparcv9.capabilities} [m7_eighth]
   environment : {
-    XMX         : "16g"
-    XMS         : "16g"
     JVM_CONFIG  : ${jvm-config.default}
     JVM         : "server"
     MACHINE_NAME: "m7_eighth"
@@ -17,7 +15,6 @@ m7_eighth.default-g1gc : ${m7_eighth.default} {
   }
 }
 
-
 builds += [
   ${m7_eighth.default} ${bench-dacapo}              ${labsjdk8} { name: "bench-compiler-dacapo-solaris-m7_eighth", timelimit: "1:00:00" }
   ${m7_eighth.default} ${bench-dacapo-timing}       ${labsjdk8} { name: "bench-compiler-dacapo-timing-solaris-m7_eighth", timelimit: "1:00:00" }

compiler/ci_common/x52-jfr.hocon

@@ -1,4 +1,4 @@
-bench-dacapo-jfr: ${bench-common} ${jfr-bench-notifications} {
+bench-dacapo-jfr: ${bench-common} ${default-heap} ${jfr-bench-notifications} {
   environment : {
     BENCH_SUITE : "dacapo"
   }
@@ -9,7 +9,7 @@ bench-dacapo-jfr: ${bench-common} ${jfr-bench-notifications} {
   teardown: ${JFR.teardown} # NOTE : Exclude branch-common to avoid polluting bench server with slower runs
 }
 
-bench-scala-dacapo-jfr: ${bench-common} ${jfr-bench-notifications} {
+bench-scala-dacapo-jfr: ${bench-common} ${default-heap} ${jfr-bench-notifications} {
   environment : {
     BENCH_SUITE : "scala-dacapo"
   }
@@ -20,7 +20,7 @@ bench-scala-dacapo-jfr: ${bench-common} ${jfr-bench-notifications} {
   teardown: ${JFR.teardown} # NOTE : Exclude branch-common to avoid polluting bench server with slower runs
 }
 
-bench-specjvm2008-Single-jfr: ${bench-specjvm2008} ${jfr-bench-notifications} {
+bench-specjvm2008-Single-jfr: ${bench-specjvm2008} ${large-heap} ${jfr-bench-notifications} {
   environment : {
     BENCH_SUITE : "specjvm2008"
   }
@@ -36,7 +36,7 @@ bench-specjvm2008-Single-jfr: ${bench-specjvm2008} ${jfr-bench-notifications} {
   timelimit: "3:30:00"
 }
 
-bench-specjbb2015-jfr: ${bench-common} ${jfr-bench-notifications} {
+bench-specjbb2015-jfr: ${bench-common} ${large-heap} ${jfr-bench-notifications} {
   environment : {
     BENCH_SUITE : "specjbb2015"
   }
@@ -51,7 +51,7 @@ bench-specjbb2015-jfr: ${bench-common} ${jfr-bench-notifications} {
   timelimit: "3:00:00"
 }
 
-bench-renaissance-jfr: ${bench-common} ${jfr-bench-notifications} {
+bench-renaissance-jfr: ${bench-common} ${default-heap} ${jfr-bench-notifications} {
   environment : {
     BENCH_SUITE : "renaissance"
   }
@@ -66,7 +66,7 @@ bench-renaissance-jfr: ${bench-common} ${jfr-bench-notifications} {
   timelimit: "3:45:00"
 }
 
-bench-spark-sql-perf-jfr: ${bench-common} ${jfr-bench-notifications} {
+bench-spark-sql-perf-jfr: ${bench-common} ${default-heap} ${jfr-bench-notifications} {
   environment : {
     BENCH_SUITE : "spark-sql-perf"
   }
@@ -84,8 +84,6 @@ bench-spark-sql-perf-jfr: ${bench-common} ${jfr-bench-notifications} {
 x52.default-jfr : ${linux-amd64} {
   capabilities: ${linux-amd64.capabilities} [x52, no_frequency_scaling]
   environment : {
-    XMX         : "64g"
-    XMS         : "64g"
     JVM_CONFIG  : ${jvm-config.default}
     JVM         : "server"
     MACHINE_NAME: "x52"