[Truffle] Support using a JVMCI JVM.

jruby · Nov 9, 2016 · 8f0ac39 · 8f0ac39
1 parent f1169c9
commit 8f0ac39
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 7 deletions.
diff --git a/bin/jruby.bash b/bin/jruby.bash
@@ -302,6 +302,8 @@ do
         # Start up as Nailgun server
         java_class=$JAVA_CLASS_NGSERVER
         VERIFY_JRUBY=true ;;
+     --jvmci-truffle)
+        JVMCI_TRUFFLE=true ;;
      --ng)
         # Use native Nailgun client to toss commands to server
         process_special_opts "--ng" ;;
@@ -368,7 +370,7 @@ if [ "$nailgun_client" != "" ]; then
     exit 1
   fi
 else
-if [[ "$VERIFY_JRUBY" != "" && -z "$USING_TRUFFLE" ]]; then
+if [[ "$JVMCI_TRUFFLE" != "" || ("$VERIFY_JRUBY" != "" && -z "$USING_TRUFFLE") ]]; then
   if [ "$PROFILE_ARGS" != "" ]; then
       echo "Running with instrumented profiler"
   fi

diff --git a/tool/jt.rb b/tool/jt.rb
@@ -74,11 +74,12 @@ def self.truffle_release?
 
   def self.find_graal_javacmd_and_options
     graalvm = ENV['GRAALVM_BIN']
+    jvmci = ENV['JVMCI_BIN']
     graal_home = ENV['GRAAL_HOME']
 
-    raise "Both GRAALVM_BIN and GRAAL_HOME defined!" if graalvm && graal_home
+    raise "More than one of GRAALVM_BIN, JVMCI_BIN or GRAAL_HOME defined!" if [graalvm, jvmci, graal_home].count(&:itself) > 1
 
-    if !graalvm && !graal_home
+    if !graalvm && !jvmci && !graal_home
       if truffle_release?
         graalvm = ENV['GRAALVM_RELEASE_BIN']
       else
@@ -88,7 +89,21 @@ def self.find_graal_javacmd_and_options
 
     if graalvm
       javacmd = File.expand_path(graalvm)
+      vm_args = []
       options = []
+    elsif jvmci
+      javacmd = File.expand_path(jvmci)
+      jvmci_graal_home = ENV['JVMCI_GRAAL_HOME']
+      raise "Also set JVMCI_GRAAL_HOME if you set JVMCI_BIN" unless jvmci_graal_home
+      jvmci_graal_home = File.expand_path(jvmci_graal_home)
+      vm_args = [
+        '-d64',
+        '-XX:+UnlockExperimentalVMOptions',
+        '-XX:+EnableJVMCI',
+        '--add-exports=java.base/jdk.internal.module=com.oracle.graal.graal_core',
+        "--module-path=#{jvmci_graal_home}/../truffle/mxbuild/modules/com.oracle.truffle.truffle_api.jar:#{jvmci_graal_home}/mxbuild/modules/com.oracle.graal.graal_core.jar"
+      ]
+      options = ['--jvmci-truffle']
     elsif graal_home
       graal_home = File.expand_path(graal_home)
       command_line = `mx -v -p #{graal_home} vm -version`.lines.to_a.last
@@ -103,11 +118,11 @@ def self.find_graal_javacmd_and_options
         vm_args << [nfi_classes, sulong_dependencies, sulong_jar].join(':')
         vm_args << '-XX:-UseJVMCIClassLoader'
       end
-      options = vm_args.map { |arg| "-J#{arg}" }
+      options = []
     else
       raise 'set one of GRAALVM_BIN or GRAAL_HOME in order to use Graal'
     end
-    [javacmd, options]
+    [javacmd, vm_args.map { |arg| "-J#{arg}" } + options]
   end
 
   def self.find_graal_js
@@ -458,7 +473,7 @@ def help
       jt test                                        run all mri tests, specs and integration tests (set SULONG_HOME, and maybe USE_SYSTEM_CLANG)
       jt test tck [--jdebug]                         run the Truffle Compatibility Kit tests
       jt test mri                                    run mri tests
-          --graal         use Graal (set either GRAALVM_BIN or GRAAL_HOME)
+          --graal         use Graal (set either GRAALVM_BIN, JVMCI_BIN or GRAAL_HOME)
       jt test specs                                  run all specs
       jt test specs fast                             run all specs except sub-processes, GC, sleep, ...
       jt test spec/ruby/language                     run specs in this directory
@@ -496,8 +511,10 @@ def help
       recognised environment variables:
 
         RUBY_BIN                                     The JRuby+Truffle executable to use (normally just bin/jruby)
-        GRAALVM_BIN                                  GraalVM executable (java command) to use
+        GRAALVM_BIN                                  GraalVM executable (java command)
         GRAAL_HOME                                   Directory where there is a built checkout of the Graal compiler (make sure mx is on your path)
+        JVMCI_BIN                                    JVMCI-enabled (so JDK 9 EA build) java command (aslo set JVMCI_GRAAL_HOME)
+        JVMCI_GRAAL_HOME                             Like GRAAL_HOME, but only used for the JARs to run with JVMCI_BIN
         GRAALVM_RELEASE_BIN                          Default GraalVM executable when using a released version of Truffle (such as on master)
         GRAAL_HOME_TRUFFLE_HEAD                      Default Graal directory when using a snapshot version of Truffle (such as on truffle-head)
         SULONG_HOME                                  The Sulong source repository, if you want to run cextc