Merge commit '012b224061cd0ba85917b36829515ca99f943d78' into release/…

…graal-vm/1.0

.travis.yml

@@ -20,14 +20,38 @@ env:
   global:
     - JVMCI_VERSION="jvmci-0.48"
     - JDK8_UPDATE_VERSION="172"
-  matrix:
-    - JDK="jdk8" GATE="style,fullbuild" PRIMARY="compiler"
-    - JDK="jdk8" GATE="build,test" PRIMARY="compiler"
-    - JDK="jdk8" GATE="build,test" PRIMARY="substratevm"
-    - JDK="jdk8" GATE="build,bootstraplite" PRIMARY="compiler"
-    - JDK="jdk11" GATE="style,fullbuild" PRIMARY="compiler"
-    - JDK="jdk11" GATE="build,test" PRIMARY="compiler"
-    - JDK="jdk11" GATE="build,bootstraplite" PRIMARY="compiler"
+
+matrix:
+  include:
+  - env: JDK="jdk8" GATE="style,fullbuild" PRIMARY="compiler"
+  - env: JDK="jdk8" GATE="build,test" PRIMARY="compiler"
+  - env: JDK="jdk8" GATE="build,test" PRIMARY="substratevm"
+  - env: JDK="jdk8" GATE="build,bootstraplite" PRIMARY="compiler"
+  - env: JDK="jdk8" GATE="style,fullbuild,sulongBasic" PRIMARY="sulong" LLVM_VERSION="3.8"
+    addons:
+      apt:
+        packages:
+          - python-pip
+          - clang-3.8
+          - llvm-3.8
+          - clang-format-3.8
+          - libc++1
+          - libc++-dev
+  - env: JDK="jdk8" GATE="build,sulong" PRIMARY="vm" DYNAMIC_IMPORTS="/sulong,/substratevm" LLVM_VERSION="6.0" DISABLE_POLYGLOT=true DISABLE_LIBPOLYGLOT=true NATIVE_IMAGE_TESTING=true
+    addons:
+      apt:
+        sources:
+          - ubuntu-toolchain-r-test
+          - llvm-toolchain-trusty-6.0
+        packages:
+          - clang-6.0
+          - llvm-6.0
+          - libc++1
+          - libc++-dev
+  - env: JDK="jdk11" GATE="style,fullbuild" PRIMARY="compiler"
+  - env: JDK="jdk11" GATE="build,test" PRIMARY="compiler"
+  - env: JDK="jdk11" GATE="build,bootstraplite" PRIMARY="compiler"
+
 install:
   - |
       export MX_PATH=${TRAVIS_BUILD_DIR}/../mx
@@ -45,6 +69,9 @@ install:
         wget http://archive.eclipse.org/eclipse/downloads/drops4/R-4.5.2-201602121500/eclipse-SDK-4.5.2-linux-gtk-x86_64.tar.gz -O ${ECLIPSE_TAR}
         tar -C ${TRAVIS_BUILD_DIR}/.. -xzf ${ECLIPSE_TAR}
         export ECLIPSE_EXE=${TRAVIS_BUILD_DIR}/../eclipse/eclipse
+
+        # the style gate needs the full commit history for checking copyright years
+        git fetch --unshallow
       fi
   - |
       if [[ ${GATE} == *fullbuild* ]]
@@ -64,10 +91,19 @@ install:
         tar -C ${TRAVIS_BUILD_DIR}/.. -xzf ${JDK_TAR}
         export JAVA_HOME=${TRAVIS_BUILD_DIR}/../openjdk1.8.0_${JDK8_UPDATE_VERSION}-${JVMCI_VERSION}
       fi
+  - |
+      if [ "${LLVM_VERSION}" != "" ]
+      then
+        export CLANG=clang-$LLVM_VERSION
+        export CLANGXX=clang++-$LLVM_VERSION
+        export OPT=opt-$LLVM_VERSION
+        export LLVM_AS=llvm-as-$LLVM_VERSION
+        export LLVM_LINK=llvm-link-$LLVM_VERSION
+      fi
 
 script:
   - echo ${JAVA_HOME}
   - ${JAVA_HOME}/bin/java -version
-  - mx -v --primary-suite-path ${TRAVIS_BUILD_DIR}/${PRIMARY} --java-home=${JAVA_HOME} gate --strict-mode --tags ${GATE}
+  - mx --primary-suite-path ${TRAVIS_BUILD_DIR}/${PRIMARY} --java-home=${JAVA_HOME} gate --strict-mode --tags ${GATE}
 after_failure:
   - cat hs_err*

README.md

@@ -25,6 +25,8 @@ implemented with the instrumentation framework.
 compilation of Java applications under closed-world assumption into executable
 images or shared objects.
 
+* [Sulong](sulong/README.md) is an engine for running LLVM bitcode on GraalVM.
+
 * [TRegex](regex/README.md) is an implementation of regular expressions which leverages GraalVM for efficient compilation of automata.
 
 * [VM](vm/README.md) includes the components to build a modular GraalVM image.
@@ -36,17 +38,16 @@ GralVM allows running of following languages which are being developed and teste
 * [FastR](https://github.com/oracle/fastr) - R Language 3.4.0
 * [GraalPython](https://github.com/graalvm/graalpython) - Python 3.7
 * [TruffleRuby](https://github.com/oracle/truffleruby/) - Ruby Programming Language 2.3.7
-* [Sulong](https://github.com/graalvm/sulong) - LLVM bitcode interpreter
 * [SimpleLanguage](https://github.com/graalvm/simplelanguage) - A simple demonstration language for the GraalVM.
 
 
 ## License
 
 Each GraalVM component is licensed:
-* [Truffle](/truffle/) and its dependency [Graal SDK](/sdk/) are licensed under
-the [GPL 2 with Classpath exception](truffle/LICENSE.GPL.md).
+* [Truffle](/truffle/) and its dependency [Graal SDK](/sdk/) are licensed under the [Universal Permissive License](truffle/LICENSE.md).
 * [Tools](/tools/) project is licensed under the [GPL 2 with Classpath exception](tools/LICENSE.GPL.md).
 * [TRegex](/regex/) project is licensed under the [GPL 2 with Classpath exception](regex/LICENSE.GPL.md).
 * The [Graal compiler](/compiler/) is licensed under the [GPL 2 with Classpath exception](compiler/LICENSE.md).
 * [Substrate VM](/substratevm/) is licensed under the [GPL 2 with Classpath exception](substratevm/LICENSE.md).
+* [Sulong](/sulong/) is licensed under [3-clause BSD](sulong/LICENSE).
 * [VM](/vm/) is licensed under the [GPL 2 with Classpath exception](vm/GraalCE_license_3rd_party_license.txt).

ci.hocon

@@ -19,6 +19,9 @@ include "tools/ci.hocon"
 #Regex
 include "regex/ci.hocon"
 
+#Sulong
+include "sulong/ci.hocon"
+
 #Examples
 #Examples gate also disabled.
 #include "examples/ci.hocon"

ci_includes/publish-javadoc.hocon

@@ -33,7 +33,7 @@ builds += [
         ["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", "commit", "-m", [ "echo", "Javadoc as of", [ "date", "+%Y/%m/%d" ] ] ],
+        ["git", "diff", "--staged", "--quiet", "||", "git", "commit", "-m", [ "echo", "Javadoc as of", [ "date", "+%Y/%m/%d" ] ] ],
         ["git", "push", "origin", "gh-pages"],
     ],
     targets : [post-merge],

common.hocon

@@ -1,5 +1,5 @@
 # overlay version
-overlay = 2a0e8bf60091865a22f2ba20b84979f68f202225
+overlay = e2d86bcb06922e4d9017e675376ed7515902392c
 
 # oraclejdk* are released OracleJDK binaries
 # labsjdk* are JDKs based on OracleJDK binaries

compiler/README.md

@@ -63,7 +63,7 @@ cd graal/compiler
 Changing to the `graal/compiler` directory informs mx that the focus of development (called the _primary suite_) is Graal.
 All subsequent mx commands should be executed from this directory.
 
-Here's the recipe for building and running Graal (if on Windows, replace mx with mx.cmd):
+Here's the recipe for building and running Graal:
 
 ```
 mx build
@@ -74,6 +74,10 @@ By default, Graal is only used for hosted compilation (i.e., the VM still uses C
 To make the VM use Graal as the top tier JIT compiler, add the `-XX:+UseJVMCICompiler` option to the command line.
 To disable use of Graal altogether, use `-XX:-EnableJVMCI`.
 
+### Windows Specifics
+
+When applying above steps on Windows, replace `export` with `set`.
+
 ## IDE Configuration
 
 You can generate IDE project configurations by running:
@@ -121,6 +125,24 @@ The build step above should work on all [supported JDK 8 build platforms](https:
 It should also work on other platforms (such as Oracle Linux, CentOS and Fedora as described [here](http://mail.openjdk.java.net/pipermail/graal-dev/2015-December/004050.html)).
 If you run into build problems, send a message to the [Graal mailing list](http://mail.openjdk.java.net/mailman/listinfo/graal-dev).
 
+### Windows Specifics
+
+Building JDK requires some bash-like environment. Fortunately, the one that comes as a part of the standard
+*Git for Windows* installation will suffice, in which case you will just have to set `MKS_HOME` to point
+to the directory with Linux tools, e.g.:
+
+```
+set MKS_HOME=<GIT_DIR>\usr\bin
+```
+
+where `<GIT_DIR>` is a path to your Git installation directory. It is important that there are **NO**
+spaces in the path, otherwise the build will fail.
+
+You will also need an *MSVC 2010 SP1* compiler. The following tool chain is recommended:
+
+1. [Microsoft Windows SDK for Windows 7 and .NET Framework 4 (ISO)](https://www.microsoft.com/en-us/download/details.aspx?id=8442)
+2. [Microsoft Visual C++ 2010 Service Pack 1 Compiler Update for the Windows SDK 7.1](https://www.microsoft.com/en-us/download/details.aspx?id=4422)
+
 ## License
 
 The Graal compiler is licensed under the [GPL 2](LICENSE.md).

compiler/ci_common/m7_eighth.hocon

@@ -25,12 +25,12 @@ builds += [
   ${m7_eighth.default} ${bench-scala-dacapo-timing} ${labsjdk8} { name: "bench-compiler-scala-dacapo-timing-solaris-m7_eighth", timelimit: "1:00:00" }
   ${m7_eighth.default} ${bench-specjvm2008-Single}  ${labsjdk8} { name: "bench-compiler-specjvm2008-Single-solaris-m7_eighth" }
   ${m7_eighth.default} ${bench-specjvm2008-OneVM}   ${labsjdk8} { name: "bench-compiler-specjvm2008-OneVM-solaris-m7_eighth" }
-  ${m7_eighth.default} ${bench-specjbb2015}         ${labsjdk8} { name: "bench-compiler-specjbb2015-solaris-m7_eighth" }
+  # GR-11609 ${m7_eighth.default} ${bench-specjbb2015}         ${labsjdk8} { name: "bench-compiler-specjbb2015-solaris-m7_eighth" }
   ${m7_eighth.default} ${bench-micros-graal-whitebox} ${labsjdk8} { name: "bench-compiler-jmh-micros-graal-whitebox-solaris-m7_eighth" }
   ${m7_eighth.default} ${bench-micros-graal-dist}   ${labsjdk8} { name: "bench-compiler-jmh-micros-graal-dist-solaris-m7_eighth" }
 
   ${m7_eighth.default-g1gc} ${bench-dacapo}              ${labsjdk8} { targets : [weekly, bench], name: "bench-compiler-dacapo-g1gc-solaris-m7_eighth", timelimit: "1:00:00" }
   ${m7_eighth.default-g1gc} ${bench-scala-dacapo}        ${labsjdk8} { targets : [weekly, bench], name: "bench-compiler-scala-dacapo-g1gc-solaris-m7_eighth", timelimit: "1:00:00" }
   ${m7_eighth.default-g1gc} ${bench-specjvm2008-Single}  ${labsjdk8} { targets : [weekly, bench], name: "bench-compiler-specjvm2008-g1gc-Single-solaris-m7_eighth" }
-  ${m7_eighth.default-g1gc} ${bench-specjbb2015}         ${labsjdk8} { targets : [weekly, bench], name: "bench-compiler-specjbb2015-g1gc-solaris-m7_eighth" }
+  # GR-11609 ${m7_eighth.default-g1gc} ${bench-specjbb2015}         ${labsjdk8} { targets : [weekly, bench], name: "bench-compiler-specjbb2015-g1gc-solaris-m7_eighth" }
 ]

compiler/ci_common/x52-tracera.hocon

@@ -16,23 +16,23 @@ x52.tracera-bu-tmpfs10g: ${x52.default} {
 }
 
 builds += [
-  ${x52.tracera-tmpfs10g} ${bench-dacapo-hwloc}                         ${labsjdk8} { targets : [bench, daily],  name: "bench-compiler-dacapo-linux-x52-tracera" }
+  ${x52.tracera-tmpfs10g} ${bench-dacapo-hwloc}                         ${labsjdk8} { targets : [bench, weekly], name: "bench-compiler-dacapo-linux-x52-tracera" }
   ${x52.tracera-tmpfs10g} ${bench-dacapo-timing-hwloc}                  ${labsjdk8} { targets : [bench, weekly], name: "bench-compiler-dacapo-timing-linux-x52-tracera" }
   ${x52.tracera-tmpfs10g} ${bench-dacapo-move-profiling-hwloc}          ${labsjdk8} { targets : [bench, weekly], name: "bench-compiler-dacapo-move-profiling-linux-x52-tracera" }
-  ${x52.tracera-tmpfs10g} ${bench-scala-dacapo-hwloc}                   ${labsjdk8} { targets : [bench, daily],  name: "bench-compiler-scala-dacapo-linux-x52-tracera" }
+  ${x52.tracera-tmpfs10g} ${bench-scala-dacapo-hwloc}                   ${labsjdk8} { targets : [bench, weekly], name: "bench-compiler-scala-dacapo-linux-x52-tracera" }
   ${x52.tracera-tmpfs10g} ${bench-scala-dacapo-timing-hwloc}            ${labsjdk8} { targets : [bench, weekly], name: "bench-compiler-scala-dacapo-timing-linux-x52-tracera" }
   ${x52.tracera-tmpfs10g} ${bench-scala-dacapo-move-profiling-hwloc}    ${labsjdk8} { targets : [bench, weekly], name: "bench-compiler-scala-dacapo-move-profiling-linux-x52-tracera" }
-  ${x52.tracera} ${bench-specjvm2008-Single}                            ${labsjdk8} { targets : [bench, daily],  name: "bench-compiler-specjvm2008-Single-linux-x52-tracera" }
+  ${x52.tracera} ${bench-specjvm2008-Single}                            ${labsjdk8} { targets : [bench, weekly], name: "bench-compiler-specjvm2008-Single-linux-x52-tracera" }
   ${x52.tracera} ${bench-specjvm2008-OneVM}                             ${labsjdk8} { targets : [bench, weekly], name: "bench-compiler-specjvm2008-OneVM-linux-x52-tracera" }
-  ${x52.tracera} ${bench-specjbb2015}                                   ${labsjdk8} { targets : [bench, daily],  name: "bench-compiler-specjbb2015-linux-x52-tracera" }
+  ${x52.tracera} ${bench-specjbb2015}                                   ${labsjdk8} { targets : [bench, weekly], name: "bench-compiler-specjbb2015-linux-x52-tracera" }
   ${x52.tracera} ${bench-micros-graal-whitebox}                         ${labsjdk8} { targets : [bench, weekly], name: "bench-compiler-jmh-micros-graal-whitebox-linux-x52-tracera" }
   ${x52.tracera} ${bench-micros-graal-dist}                             ${labsjdk8} { targets : [bench, weekly], name: "bench-compiler-jmh-micros-graal-dist-linux-x52-tracera" }
-  ${x52.tracera} ${bench-renaissance-hwloc}                             ${labsjdk8} { targets : [bench, daily],  name: "bench-compiler-renaissance-linux-x52-tracera" }
+  ${x52.tracera} ${bench-renaissance-hwloc}                             ${labsjdk8} { targets : [bench, weekly], name: "bench-compiler-renaissance-linux-x52-tracera" }
 
-  ${x52.tracera-bu-tmpfs10g} ${bench-dacapo-hwloc}                      ${labsjdk8} { targets : [weekly, bench], name: "bench-compiler-dacapo-linux-x52-tracera-bu" }
-  ${x52.tracera-bu-tmpfs10g} ${bench-dacapo-timing-hwloc}               ${labsjdk8} { targets : [weekly, bench], name: "bench-compiler-dacapo-timing-linux-x52-tracera-bu" }
-  ${x52.tracera-bu-tmpfs10g} ${bench-dacapo-move-profiling-hwloc}       ${labsjdk8} { targets : [weekly, bench], name: "bench-compiler-dacapo-move-profiling-linux-x52-tracera-bu" }
-  ${x52.tracera-bu-tmpfs10g} ${bench-scala-dacapo-hwloc}                ${labsjdk8} { targets : [weekly, bench], name: "bench-compiler-scala-dacapo-linux-x52-tracera-bu" }
-  ${x52.tracera-bu-tmpfs10g} ${bench-scala-dacapo-timing-hwloc}         ${labsjdk8} { targets : [weekly, bench], name: "bench-compiler-scala-dacapo-timing-linux-x52-tracera-bu" }
-  ${x52.tracera-bu-tmpfs10g} ${bench-scala-dacapo-move-profiling-hwloc} ${labsjdk8} { targets : [weekly, bench], name: "bench-compiler-scala-dacapo-move-profiling-linux-x52-tracera-bu" }
+  ${x52.tracera-bu-tmpfs10g} ${bench-dacapo-hwloc}                      ${labsjdk8} { targets : [bench, weekly], name: "bench-compiler-dacapo-linux-x52-tracera-bu" }
+  ${x52.tracera-bu-tmpfs10g} ${bench-dacapo-timing-hwloc}               ${labsjdk8} { targets : [bench, weekly], name: "bench-compiler-dacapo-timing-linux-x52-tracera-bu" }
+  ${x52.tracera-bu-tmpfs10g} ${bench-dacapo-move-profiling-hwloc}       ${labsjdk8} { targets : [bench, weekly], name: "bench-compiler-dacapo-move-profiling-linux-x52-tracera-bu" }
+  ${x52.tracera-bu-tmpfs10g} ${bench-scala-dacapo-hwloc}                ${labsjdk8} { targets : [bench, weekly], name: "bench-compiler-scala-dacapo-linux-x52-tracera-bu" }
+  ${x52.tracera-bu-tmpfs10g} ${bench-scala-dacapo-timing-hwloc}         ${labsjdk8} { targets : [bench, weekly], name: "bench-compiler-scala-dacapo-timing-linux-x52-tracera-bu" }
+  ${x52.tracera-bu-tmpfs10g} ${bench-scala-dacapo-move-profiling-hwloc} ${labsjdk8} { targets : [bench, weekly], name: "bench-compiler-scala-dacapo-move-profiling-linux-x52-tracera-bu" }
 ]

compiler/ci_common/x52.hocon

@@ -47,6 +47,6 @@ builds += [
   ${x52.default-g1gc} ${bench-renaissance-hwloc}  ${labsjdk8} { targets: [weekly, bench], name: "bench-compiler-renaissance-g1gc-linux-x52" }
   ${x52.default} ${bench-spark-sql-perf}          ${labsjdk8} { name: "bench-compiler-spark-sql-perf-linux-x52" }
 
-  ${x52.default} ${bench-specjbb2005} ${labsjdk8} { name: "bench-compiler-specjbb2005-linux-x52"}
-  ${x52.default-g1gc} ${bench-specjbb2005} ${labsjdk8} { targets : [weekly, bench], name: "bench-compiler-specjbb2005-g1gc-linux-x52"}
+  # GR-11418 ${x52.default} ${bench-specjbb2005} ${labsjdk8} { name: "bench-compiler-specjbb2005-linux-x52"}
+  # GR-11418 ${x52.default-g1gc} ${bench-specjbb2005} ${labsjdk8} { targets : [weekly, bench], name: "bench-compiler-specjbb2005-g1gc-linux-x52"}
 ]

compiler/ci_includes/deploy.hocon

@@ -11,17 +11,20 @@ deploy-binaries-all-suites-no-rewrites : [
    ["export", "MX_URLREWRITES=$PREV_MX_URLREWRITES"]
 ]
 
-deploy-sdk-truffle-compiler-tools : ${compilerCommon} {
-  targets : [post-merge, deploy]
+deploy-sdk-truffle-compiler-tools-sulong : ${compilerCommon} {
+  packages: {
+    llvm: "==4.0.1"
+  }
+  environment: {
+    DYNAMIC_IMPORTS: "/tools,/sulong"
+  }
   run : [
-    # compiler depends on all suites we want to deploy, except tools
-    ["export", "DYNAMIC_IMPORTS=/tools"]
     ["mx", "--strict-compliance", "build"]
   ] ${deploy-binaries-all-suites} ${deploy-binaries-all-suites-no-rewrites}
+  targets : [post-merge, deploy]
 }
 
 builds += [
-  ${deploy-sdk-truffle-compiler-tools} ${linux-amd64} ${linux-deploy} ${labsjdk8} {name: "postmerge-deploy-binaries-linux-amd64"}
-  ${deploy-sdk-truffle-compiler-tools} ${darwin-amd64} ${darwin-deploy} ${labsjdk8} {name: "postmerge-deploy-binaries-darwin-amd64"}
-  ${deploy-sdk-truffle-compiler-tools} ${solaris-sparcv9} ${solaris-deploy} ${labsjdk8} {name: "postmerge-deploy-binaries-solaris-sparcv9"}
+  ${deploy-sdk-truffle-compiler-tools-sulong} ${linux-amd64} ${linux-deploy} ${labsjdk8} {name: "postmerge-deploy-binaries-linux-amd64"}
+  ${deploy-sdk-truffle-compiler-tools-sulong} ${darwin-amd64} ${darwin-deploy} ${labsjdk8} {name: "postmerge-deploy-binaries-darwin-amd64"}
 ]