Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Enable invokedynamic by default #8450

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 25, 2024
Merged

Enable invokedynamic by default #8450

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
94bc193
Enable invokedynamic by default
headius May 21, 2024
bc353eb
Rename these to get CI running again
headius Nov 25, 2024
aba7e88
Combine two functionally equivalent rake-test jobs
headius Nov 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 5 additions & 33 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:

strategy:
matrix:
target: ['test:jruby:int', 'spec:ruby:fast', 'spec:ji', 'spec:ffi']
target: ['test:jruby:int', 'spec:ruby:fast', 'spec:ji', 'spec:ffi', 'test:mri:core:jit', 'test:mri:extra', 'spec:ruby:fast:jit', 'test:mri:stdlib', 'spec:ruby:slow', 'spec:ruby:debug', 'test:jruby:aot', 'test:slow_suites', 'spec:compiler', 'spec:regression', 'spec:jruby', 'spec:jrubyc', 'spec:profiler']
java-version: ['21', '23']
fail-fast: false

Expand All @@ -39,34 +39,6 @@ jobs:
- name: rake ${{ matrix.target }}
run: bin/jruby -S rake ${{ matrix.target }}

rake-test-21:
runs-on: ubuntu-latest

strategy:
matrix:
target: ['test:mri:core:jit', 'test:mri:extra', 'spec:ruby:fast:jit', 'test:mri:stdlib', 'spec:ruby:slow', 'spec:ruby:debug', 'test:jruby:aot', 'test:slow_suites', 'spec:compiler', 'spec:regression', 'spec:jruby', 'spec:jrubyc', 'spec:profiler']
fail-fast: false

name: rake ${{ matrix.target }} (Java 21)

steps:
- name: checkout
uses: actions/checkout@v3
- name: remove default java except 21
run: sudo apt remove temurin-8-jdk temurin-11-jdk temurin-17-jdk
- name: set up java 21
uses: actions/setup-java@v3
with:
distribution: 'zulu'
java-version: '21'
cache: 'maven'
- name: bootstrap
run: mvn -Pbootstrap clean package
- name: bundle install
run: bin/jruby --dev -S bundle install
- name: rake ${{ matrix.target }}
run: bin/jruby -S rake ${{ matrix.target }}

jruby-tests-dev:
runs-on: ubuntu-latest

Expand Down Expand Up @@ -94,7 +66,7 @@ jobs:
- name: rake test:jruby
run: bin/jruby --dev -S rake test:jruby

rake-test-21-indy:
rake-test-indy-off:
runs-on: ubuntu-latest

strategy:
Expand All @@ -103,10 +75,10 @@ jobs:
java-version: ['21', '23']
fail-fast: false

name: rake ${{ matrix.target }} (Java ${{ matrix.java-version }} +indy)
name: rake ${{ matrix.target }} (Java ${{ matrix.java-version }} -indy)

env:
JRUBY_OPTS: '-Xcompile.invokedynamic -X+C -Xjit.threshold=0'
JRUBY_OPTS: '-Xcompile.invokedynamic=false -X+C -Xjit.threshold=0'

steps:
- name: checkout
Expand Down Expand Up @@ -469,7 +441,7 @@ jobs:
permissions:
contents: none
if: ${{ github.ref == 'refs/heads/master' || github.ref == 'refs/heads/jruby-9.5' }}
needs: [mvn-test, mvn-test-extended, mvn-test-windows, dependency-check, rake-test, rake-test-21-indy, rake-test-21, test-versions, sequel, concurrent-ruby, jruby-tests-dev, regression-specs-jit]
needs: [mvn-test, mvn-test-extended, mvn-test-windows, dependency-check, rake-test, rake-test-indy-off, rake-test, test-versions, sequel, concurrent-ruby, jruby-tests-dev, regression-specs-jit]
uses: jruby/jruby/.github/workflows/snapshot-publish.yml@6cd0d4d96d9406635183d81cf91acc82cd78245f
secrets:
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
Expand Down
8 changes: 1 addition & 7 deletions core/src/main/java/org/jruby/util/cli/Options.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
*/
public class Options {
private static final List<Option> _loadedOptions = new ArrayList<>(240);
private static final boolean INVOKEDYNAMIC_DEFAULT = calculateInvokedynamicDefault();
private static final boolean COLOR = System.console() != null;

public static final String IR_PRINT_PATTERN_NO_PATTERN_STRING = "<NO_PATTERN>";
Expand All @@ -73,7 +72,7 @@ public class Options {

public static final Option<CompileMode> COMPILE_MODE = enumeration(COMPILER, "compile.mode", CompileMode.class, CompileMode.JIT, "Set compilation mode. JIT = at runtime; FORCE = before execution.");
public static final Option<Boolean> COMPILE_DUMP = bool(COMPILER, "compile.dump", false, "Dump to console all bytecode generated at runtime.");
public static final Option<Boolean> COMPILE_INVOKEDYNAMIC = bool(COMPILER, "compile.invokedynamic", INVOKEDYNAMIC_DEFAULT, "Use invokedynamic for optimizing Ruby code.");
public static final Option<Boolean> COMPILE_INVOKEDYNAMIC = bool(COMPILER, "compile.invokedynamic", true, "Use invokedynamic for optimizing Ruby code.");
public static final Option<Boolean> COMPILE_CACHE_CLASSES = bool(COMPILER, "compile.cache.classes", false, "Use cache of compiled script classes");
public static final Option<Boolean> COMPILE_CACHE_CLASSES_LOGGING = bool(COMPILER, "compile.cache.classes.logging", false, "Log whether cached script classes are being saved or used");

Expand Down Expand Up @@ -290,11 +289,6 @@ private static <T extends Enum<T>> Option<T> enumeration(Category category, Stri
return option;
}

private static boolean calculateInvokedynamicDefault() {
// We were defaulting on for Java 8 and might again later if JEP 210 helps reduce warmup time.
return false;
}

private static Verbosity calculateVerbosityDefault() {
Boolean verbose = CLI_VERBOSE.load();
if (verbose == null) return Verbosity.NIL;
Expand Down
Loading