[GR-13444] Most --engine options need --experimental-options.

eregon · eregon · commit dcc6c5e0fd82 · 2019-12-31T13:28:38.000Z
PullRequest: truffleruby/1225
diff --git a/.gitignore b/.gitignore
@@ -64,6 +64,7 @@ test/mri/tests/cext-c/**/mkmf.log
 /TRUFFLERUBY*.dist
 /eclipseformat.backup.zip
 /mx.truffleruby/__pycache__
+.checkstyle
 
 # ruby/spec
 /rubyspec_temp
diff --git a/doc/samples/can-we-fold-yet.rb b/doc/samples/can-we-fold-yet.rb
@@ -6,7 +6,7 @@
 # GNU General Public License version 2, or
 # GNU Lesser General Public License version 2.1.
 
-# Use --engine.IterativePartialEscape
+# Use --experimental-options --engine.IterativePartialEscape
 
 require 'readline'
 
diff --git a/mx.truffleruby/mx_truffleruby_benchmark.py b/mx.truffleruby/mx_truffleruby_benchmark.py
@@ -576,7 +576,7 @@ def name(self):
     def runBenchmark(self, benchmark, bmSuiteArgs):
         arguments = ['ruby']
         if not bmSuiteArgs:
-            arguments.extend(['--engine.CompilationExceptionsAreFatal'])
+            arguments.extend(['--experimental-options', '--engine.CompilationExceptionsAreFatal'])
         arguments.extend(['bench/servers/' + benchmark + '.rb'])
 
         server = BackgroundJT(arguments + bmSuiteArgs)
diff --git a/src/main/.checkstyle b/src/main/.checkstyle
diff --git a/test/truffle/compiler/can-we-fold-yet.sh b/test/truffle/compiler/can-we-fold-yet.sh
@@ -2,7 +2,7 @@
 
 source test/truffle/common.sh.inc
 
-jt ruby --engine.IterativePartialEscape doc/samples/can-we-fold-yet.rb < test/truffle/compiler/can-we-fold-yet/input.txt > actual.txt
+jt ruby --experimental-options --engine.IterativePartialEscape doc/samples/can-we-fold-yet.rb < test/truffle/compiler/can-we-fold-yet/input.txt > actual.txt
 
 if ! cmp test/truffle/compiler/can-we-fold-yet/expected.txt actual.txt
 then
diff --git a/test/truffle/compiler/osr.sh b/test/truffle/compiler/osr.sh
@@ -2,4 +2,4 @@
 
 source test/truffle/common.sh.inc
 
-jt ruby --engine.CompilationExceptionsAreFatal test/truffle/compiler/osr/osr.rb
+jt ruby --experimental-options --engine.CompilationExceptionsAreFatal test/truffle/compiler/osr/osr.rb
diff --git a/test/truffle/compiler/pe.sh b/test/truffle/compiler/pe.sh
@@ -2,4 +2,4 @@
 
 source test/truffle/common.sh.inc
 
-jt ruby --engine.CompilationExceptionsAreThrown --engine.IterativePartialEscape test/truffle/compiler/pe/pe.rb "$@"
+jt ruby --experimental-options --engine.CompilationExceptionsAreThrown --engine.IterativePartialEscape test/truffle/compiler/pe/pe.rb "$@"
diff --git a/test/truffle/compiler/pe/pe.rb b/test/truffle/compiler/pe/pe.rb
@@ -24,7 +24,7 @@
 #
 # Run with:
 #
-#   jt ruby --graal --engine.TraceCompilation --engine.CompilationExceptionsAreFatal --engine.IterativePartialEscape test.rb
+#   jt --env jvm-ce ruby --experimental-options --engine.TraceCompilation --engine.CompilationExceptionsAreFatal --engine.IterativePartialEscape test.rb
 
 abort 'not running the GraalVM Compiler' unless TruffleRuby.jit?
 
diff --git a/test/truffle/compiler/stf-optimises.sh b/test/truffle/compiler/stf-optimises.sh
@@ -2,4 +2,4 @@
 
 source test/truffle/common.sh.inc
 
-jt ruby --engine.CompilationExceptionsAreFatal test/truffle/compiler/stf-optimises/stf-optimises.rb
+jt ruby --experimental-options --engine.CompilationExceptionsAreFatal test/truffle/compiler/stf-optimises/stf-optimises.rb
diff --git a/test/truffle/compiler/tp-optimises.sh_excluded b/test/truffle/compiler/tp-optimises.sh_excluded
@@ -2,4 +2,4 @@
 
 source test/truffle/common.sh.inc
 
-jt ruby --engine.CompilationExceptionsAreFatal test/truffle/compiler/tp-optimises/tp-optimises.rb
+jt ruby --experimental-options --engine.CompilationExceptionsAreFatal test/truffle/compiler/tp-optimises/tp-optimises.rb
diff --git a/tool/docker.rb b/tool/docker.rb
@@ -268,7 +268,7 @@ def docker(*args)
         end
 
         configs.each do |c|
-          lines << "RUN ruby #{c} --engine.CompilationExceptionsAreThrown --engine.IterativePartialEscape pe/pe.rb || true"
+          lines << "RUN ruby #{c} --experimental-options --engine.CompilationExceptionsAreThrown --engine.IterativePartialEscape pe/pe.rb || true"
         end
       end
 
diff --git a/tool/jt.rb b/tool/jt.rb
@@ -731,6 +731,7 @@ def rebuild(*options)
         add_experimental_options.call
         vm_args += %w[--backtraces-hide-core-files=false]
       when '--stress'
+        add_experimental_options.call
         vm_args << '--engine.CompileImmediately'
         vm_args << '--engine.BackgroundCompilation=false'
         vm_args << '--engine.CompilationExceptionsAreFatal'
@@ -745,6 +746,7 @@ def rebuild(*options)
         vm_args << '--vm.XX:+UnlockDiagnosticVMOptions' << '--vm.XX:+DebugNonSafepoints'
         vm_args << '--vm.Dgraal.TruffleEnableInfopoints=true'
       when '--fg'
+        add_experimental_options.call
         vm_args << '--engine.BackgroundCompilation=false'
       when '--trace'
         truffleruby_compiler!
@@ -1747,7 +1749,7 @@ def benchmark(*args)
 
     vm_args = []
     if truffleruby?
-      vm_args << '--engine.CompilationExceptionsAreFatal=true'
+      vm_args << '--experimental-options' << '--engine.CompilationExceptionsAreFatal'
     end
     run_ruby(*vm_args, "#{TRUFFLERUBY_DIR}/bench/benchmark", *args, use_exec: true)
   end

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@`
`2`	`2`
`3`	`3`	`source test/truffle/common.sh.inc`
`4`	`4`
`5`		`-jt ruby --engine.CompilationExceptionsAreFatal test/truffle/compiler/osr/osr.rb`
	`5`	`+jt ruby --experimental-options --engine.CompilationExceptionsAreFatal test/truffle/compiler/osr/osr.rb`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`#`
`25`	`25`	`# Run with:`
`26`	`26`	`#`
`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`
`28`	`28`
`29`	`29`	`abort 'not running the GraalVM Compiler' unless TruffleRuby.jit?`
`30`	`30`