Skip to content

Commit 8415600

Browse files
committed
Most --engine options need --experimental-options
* The only stable --engine option currently is TraceCompilation.
1 parent 886217a commit 8415600

File tree

10 files changed

+12
-10
lines changed

10 files changed

+12
-10
lines changed

doc/samples/can-we-fold-yet.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# GNU General Public License version 2, or
77
# GNU Lesser General Public License version 2.1.
88

9-
# Use --engine.IterativePartialEscape
9+
# Use --experimental-options --engine.IterativePartialEscape
1010

1111
require 'readline'
1212

mx.truffleruby/mx_truffleruby_benchmark.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -576,7 +576,7 @@ def name(self):
576576
def runBenchmark(self, benchmark, bmSuiteArgs):
577577
arguments = ['ruby']
578578
if not bmSuiteArgs:
579-
arguments.extend(['--engine.CompilationExceptionsAreFatal'])
579+
arguments.extend(['--experimental-options', '--engine.CompilationExceptionsAreFatal'])
580580
arguments.extend(['bench/servers/' + benchmark + '.rb'])
581581

582582
server = BackgroundJT(arguments + bmSuiteArgs)

test/truffle/compiler/can-we-fold-yet.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
source test/truffle/common.sh.inc
44

5-
jt ruby --engine.IterativePartialEscape doc/samples/can-we-fold-yet.rb < test/truffle/compiler/can-we-fold-yet/input.txt > actual.txt
5+
jt ruby --experimental-options --engine.IterativePartialEscape doc/samples/can-we-fold-yet.rb < test/truffle/compiler/can-we-fold-yet/input.txt > actual.txt
66

77
if ! cmp test/truffle/compiler/can-we-fold-yet/expected.txt actual.txt
88
then

test/truffle/compiler/osr.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
source test/truffle/common.sh.inc
44

5-
jt ruby --engine.CompilationExceptionsAreFatal test/truffle/compiler/osr/osr.rb
5+
jt ruby --experimental-options --engine.CompilationExceptionsAreFatal test/truffle/compiler/osr/osr.rb

test/truffle/compiler/pe.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
source test/truffle/common.sh.inc
44

5-
jt ruby --engine.CompilationExceptionsAreThrown --engine.IterativePartialEscape test/truffle/compiler/pe/pe.rb "$@"
5+
jt ruby --experimental-options --engine.CompilationExceptionsAreThrown --engine.IterativePartialEscape test/truffle/compiler/pe/pe.rb "$@"

test/truffle/compiler/pe/pe.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
#
2525
# Run with:
2626
#
27-
# jt ruby --graal --engine.TraceCompilation --engine.CompilationExceptionsAreFatal --engine.IterativePartialEscape test.rb
27+
# jt --env jvm-ce ruby --experimental-options --engine.TraceCompilation --engine.CompilationExceptionsAreFatal --engine.IterativePartialEscape test.rb
2828

2929
abort 'not running the GraalVM Compiler' unless TruffleRuby.jit?
3030

test/truffle/compiler/stf-optimises.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
source test/truffle/common.sh.inc
44

5-
jt ruby --engine.CompilationExceptionsAreFatal test/truffle/compiler/stf-optimises/stf-optimises.rb
5+
jt ruby --experimental-options --engine.CompilationExceptionsAreFatal test/truffle/compiler/stf-optimises/stf-optimises.rb

test/truffle/compiler/tp-optimises.sh_excluded

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22

33
source test/truffle/common.sh.inc
44

5-
jt ruby --engine.CompilationExceptionsAreFatal test/truffle/compiler/tp-optimises/tp-optimises.rb
5+
jt ruby --experimental-options --engine.CompilationExceptionsAreFatal test/truffle/compiler/tp-optimises/tp-optimises.rb

tool/docker.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,7 @@ def docker(*args)
268268
end
269269

270270
configs.each do |c|
271-
lines << "RUN ruby #{c} --engine.CompilationExceptionsAreThrown --engine.IterativePartialEscape pe/pe.rb || true"
271+
lines << "RUN ruby #{c} --experimental-options --engine.CompilationExceptionsAreThrown --engine.IterativePartialEscape pe/pe.rb || true"
272272
end
273273
end
274274

tool/jt.rb

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -731,6 +731,7 @@ def rebuild(*options)
731731
add_experimental_options.call
732732
vm_args += %w[--backtraces-hide-core-files=false]
733733
when '--stress'
734+
add_experimental_options.call
734735
vm_args << '--engine.CompileImmediately'
735736
vm_args << '--engine.BackgroundCompilation=false'
736737
vm_args << '--engine.CompilationExceptionsAreFatal'
@@ -745,6 +746,7 @@ def rebuild(*options)
745746
vm_args << '--vm.XX:+UnlockDiagnosticVMOptions' << '--vm.XX:+DebugNonSafepoints'
746747
vm_args << '--vm.Dgraal.TruffleEnableInfopoints=true'
747748
when '--fg'
749+
add_experimental_options.call
748750
vm_args << '--engine.BackgroundCompilation=false'
749751
when '--trace'
750752
truffleruby_compiler!
@@ -1747,7 +1749,7 @@ def benchmark(*args)
17471749

17481750
vm_args = []
17491751
if truffleruby?
1750-
vm_args << '--engine.CompilationExceptionsAreFatal=true'
1752+
vm_args << '--experimental-options' << '--engine.CompilationExceptionsAreFatal'
17511753
end
17521754
run_ruby(*vm_args, "#{TRUFFLERUBY_DIR}/bench/benchmark", *args, use_exec: true)
17531755
end

0 commit comments

Comments
 (0)