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: 88eeb494cf3c
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 43f046344205
Choose a head ref
  • 2 commits
  • 2 files changed
  • 1 contributor

Commits on Mar 4, 2015

  1. In case of jit.threshold=0 we should prime IR*Method to make ic has b… 

    …een made.
    @enebo
    enebo committed Mar 4, 2015

    Verified

    This commit was signed with the committer’s verified signature.
    headius Charles Oliver Nutter
    GPG key ID: 8E26FF248BC7AEAD
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9fd5d46 View commit details

  2. Add new test:mri:int_full which is jit.threshold=0 to force full buil… 

    …d tests for full interpreter.
    @enebo
    enebo committed Mar 4, 2015
    Copy the full SHA
    43f0463 View commit details
Showing with 9 additions and 0 deletions.
  1. +5 −0 core/src/main/java/org/jruby/compiler/JITCompiler.java
  2. +4 −0 rakelib/test.rake
5 changes: 5 additions & 0 deletions core/src/main/java/org/jruby/compiler/JITCompiler.java
View file
Original file line number Diff line number Diff line change
@@ -163,6 +163,8 @@ public void fullBuildThresholdReached(final InterpretedIRMethod method, final Ru
jitTask.run();
}
} else {
// Because are non-asynchonously build if the JIT threshold happens to be 0 we will have no ic yet.
method.ensureInstrsReady();
// just run directly
jitTask.run();
}
@@ -186,6 +188,9 @@ public void jitThresholdReached(final MixedModeIRMethod method, final RubyInstan
jitTask.run();
}
} else {
// Because are non-asynchonously build if the JIT threshold happens to be 0 we will have no ic yet.
method.ensureInstrsReady();

// just run directly
jitTask.run();
}
4 changes: 4 additions & 0 deletions rakelib/test.rake
View file
Original file line number Diff line number Diff line change
@@ -78,6 +78,10 @@ namespace :test do
ruby "-X-C -r ./test/mri_test_env.rb test/mri/runner.rb #{ADDITIONAL_TEST_OPTIONS} -q -- #{mri_test_files}"
end

task :int_full do
ruby "-Xjit.threshold=0 -Xjit.background=false -X-C -r ./test/mri_test_env.rb test/mri/runner.rb #{ADDITIONAL_TEST_OPTIONS} -q -- #{mri_test_files}"
end

task :jit do
ruby "-Xjit.threshold=0 -Xjit.background=false -r ./test/mri_test_env.rb test/mri/runner.rb #{ADDITIONAL_TEST_OPTIONS} -q -- #{mri_test_files}"
end