Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 6151aa05f25c
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 191b69342ef2
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Feb 8, 2016

  1. [Truffle] Enable Graal warning by default.

    @chrisseaton
    chrisseaton committed Feb 8, 2016
    2
    Copy the full SHA
    c6d53a5 View commit details

  2. [Truffle] Change the Graal warning wording.

    @chrisseaton
    chrisseaton committed Feb 8, 2016
    Copy the full SHA
    29b8402 View commit details

  3. [Truffle] Disable Graal warning by default in JT.

    @chrisseaton
    chrisseaton committed Feb 8, 2016
    Copy the full SHA
    191b693 View commit details
Showing with 7 additions and 4 deletions.
  1. +1 −1 core/src/main/java/org/jruby/util/cli/Options.java
  2. +5 −1 tool/jt.rb
  3. +1 −2 truffle/src/main/java/org/jruby/truffle/RubyContext.java
2 changes: 1 addition & 1 deletion core/src/main/java/org/jruby/util/cli/Options.java
View file
Original file line number Diff line number Diff line change
@@ -273,7 +273,7 @@ public class Options {
public static final Option<Boolean> TRUFFLE_CALL_GRAPH = bool(TRUFFLE, "truffle.callgraph", false, "Maintain a call graph.");
public static final Option<String> TRUFFLE_CALL_GRAPH_WRITE = string(TRUFFLE, "truffle.callgraph.write", "File to write the call garph to on exit.");

public static final Option<Boolean> TRUFFLE_GRAAL_WARNING_UNLESS = bool(TRUFFLE, "truffle.graal.warn_unless", false, "Warn unless the JVM has the Graal compiler.");
public static final Option<Boolean> TRUFFLE_GRAAL_WARNING_UNLESS = bool(TRUFFLE, "truffle.graal.warn_unless", true, "Warn unless the JVM has the Graal compiler.");

public static String dump() {
return "# JRuby configuration options with current values\n" +
6 changes: 5 additions & 1 deletion tool/jt.rb
View file
Original file line number Diff line number Diff line change
@@ -293,7 +293,11 @@ def rebuild

def run(*args)
env_vars = args.first.is_a?(Hash) ? args.shift : {}
jruby_args = ['-X+T', "-Xtruffle.core.load_path=#{JRUBY_DIR}/truffle/src/main/ruby"]
jruby_args = [
'-X+T',
"-Xtruffle.core.load_path=#{JRUBY_DIR}/truffle/src/main/ruby",
'-Xtruffle.graal.warn_unless=false'
]

{ '--asm' => '--graal', '--igv' => '--graal' }.each_pair do |arg, dep|
args.unshift dep if args.include?(arg)
3 changes: 1 addition & 2 deletions truffle/src/main/java/org/jruby/truffle/RubyContext.java
View file
Original file line number Diff line number Diff line change
@@ -144,8 +144,7 @@ public RubyContext(Ruby runtime, TruffleLanguage.Env env) {
compilerOptions = Truffle.getRuntime().createCompilerOptions();

if (!onGraal() && options.GRAAL_WARNING_UNLESS) {
System.err.println("WARNING: JRuby+Truffle is designed to be used with a JVM that has the Graal compiler. " +
"Without the Graal compiler, performance will be drastically reduced. " +
System.err.println("WARNING: This JVM does not have the Graal compiler. JRuby+Truffle's performance without it will be limited. " +
"See https://github.com/jruby/jruby/wiki/Truffle-FAQ#how-do-i-get-jrubytruffle");
}