[GR-19220] Switch to --engine options (#1863).

eregon · eregon · commit c82a6c3911d1 · 2019-12-23T14:00:57.000Z
PullRequest: truffleruby/1217
diff --git a/doc/contributor/workflow.md b/doc/contributor/workflow.md
@@ -161,7 +161,7 @@ $ jt --use jvm-ce ruby ...
 ```
 
 We have flags in `jt` to set some options, such as `--trace` for
-`--vm.Dgraal.TraceTruffleCompilation=true`.
+`--engine.TraceCompilation`.
 
 ## Testing with Graal
 
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 --vm.Dgraal.TruffleIterativePartialEscape=true
+# Use --engine.IterativePartialEscape
 
 require 'readline'
 
diff --git a/doc/user/faq.md b/doc/user/faq.md
@@ -113,11 +113,11 @@ loop do
 end
 ```
 
-We'll use the `--vm.Dgraal.TraceTruffleCompilation=true` to ask the Truffle
+We'll use the `--engine.TraceCompilation` to ask the Truffle
 Framework to tell us when it compiles something using the GraalVM Compiler.
 
 ```
-$ ruby --vm.Dgraal.TraceTruffleCompilation=true test.rb
+$ ruby --engine.TraceCompilation test.rb
 [truffle] opt done         block in <main> test.rb:1 <opt> <split-3a9ffa1b>         |ASTSize       8/    8 |Time   103(  99+4   )ms |DirectCallNodes I    0/D    0 |GraalNodes    24/    3 |CodeSize           69 |CodeAddress 0x11245cf50 |Source   ../test.rb:1
 ```
 
diff --git a/doc/user/reporting-performance-problems.md b/doc/user/reporting-performance-problems.md
@@ -39,7 +39,7 @@ native mode so that startup and warmup time is shorter.
 ## How to check for basic performance problems
 
 If you are examining the performance of TruffleRuby, we would recommend that you
-always run with the `--vm.Dgraal.TraceTruffleCompilation=true` flag. If you see
+always run with the `--engine.TraceCompilation` flag. If you see
 compilation failures or repeated compilation of the same methods, this is an
 indicator that something is not working as intended and you may need to examine
 why, or ask us to help you do so. If you don't run with this flag Truffle will
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(['--vm.Dgraal.TruffleCompilationExceptionsAreFatal=true'])
+            arguments.extend(['--engine.CompilationExceptionsAreFatal'])
         arguments.extend(['bench/servers/' + benchmark + '.rb'])
 
         server = BackgroundJT(arguments + bmSuiteArgs)
diff --git a/spec/truffle/launcher_spec.rb b/spec/truffle/launcher_spec.rb
@@ -301,8 +301,8 @@ def should_print_full_java_command(options, env: {})
   guard -> { TruffleRuby.jit? } do
     it "applies Truffle options" do
       options = [
-        "--vm.Dgraal.TraceTruffleCompilation=true",
-        "--vm.Dgraal.TruffleBackgroundCompilation=false",
+        "--engine.TraceCompilation",
+        "--engine.BackgroundCompilation=false",
       ].join(" ")
       out = ruby_exe("2000.times {}", options: options, args: "2>&1")
       out.should include("[truffle] opt done")
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 --vm.Dgraal.TruffleIterativePartialEscape=true doc/samples/can-we-fold-yet.rb < test/truffle/compiler/can-we-fold-yet/input.txt > actual.txt
+jt ruby --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 --vm.Dgraal.TruffleCompilationExceptionsAreFatal=true test/truffle/compiler/osr/osr.rb
+jt ruby --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 --vm.Dgraal.TruffleCompilationExceptionsAreThrown=true --vm.Dgraal.TruffleIterativePartialEscape=true test/truffle/compiler/pe/pe.rb "$@"
+jt ruby --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 --vm.Dgraal.TraceTruffleCompilation=true --vm.Dgraal.TruffleCompilationExceptionsAreFatal=true --vm.Dgraal.TruffleIterativePartialEscape=true test.rb
+#   jt ruby --graal --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 --vm.Dgraal.TruffleCompilationExceptionsAreFatal=true test/truffle/compiler/stf-optimises/stf-optimises.rb
+jt ruby --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 --vm.Dgraal.TruffleCompilationExceptionsAreFatal=true test/truffle/compiler/tp-optimises/tp-optimises.rb
+jt ruby --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} --vm.Dgraal.TruffleCompilationExceptionsAreThrown=true --vm.Dgraal.TruffleIterativePartialEscape=true pe/pe.rb || true"
+          lines << "RUN ruby #{c} --engine.CompilationExceptionsAreThrown --engine.IterativePartialEscape pe/pe.rb || true"
         end
       end
 
diff --git a/tool/jt.rb b/tool/jt.rb
@@ -731,9 +731,9 @@ def rebuild(*options)
         add_experimental_options.call
         vm_args += %w[--backtraces-hide-core-files=false]
       when '--stress'
-        vm_args << '--vm.Dgraal.TruffleCompileImmediately=true'
-        vm_args << '--vm.Dgraal.TruffleBackgroundCompilation=false'
-        vm_args << '--vm.Dgraal.TruffleCompilationExceptionsAreFatal=true'
+        vm_args << '--engine.CompileImmediately'
+        vm_args << '--engine.BackgroundCompilation=false'
+        vm_args << '--engine.CompilationExceptionsAreFatal'
       when '--asm'
         vm_args += %w[--vm.XX:+UnlockDiagnosticVMOptions --vm.XX:CompileCommand=print,*::callRoot]
       when '--jdebug'
@@ -745,10 +745,10 @@ def rebuild(*options)
         vm_args << '--vm.XX:+UnlockDiagnosticVMOptions' << '--vm.XX:+DebugNonSafepoints'
         vm_args << '--vm.Dgraal.TruffleEnableInfopoints=true'
       when '--fg'
-        vm_args << '--vm.Dgraal.TruffleBackgroundCompilation=false'
+        vm_args << '--engine.BackgroundCompilation=false'
       when '--trace'
         truffleruby_compiler!
-        vm_args << '--vm.Dgraal.TraceTruffleCompilation=true'
+        vm_args << '--engine.TraceCompilation'
       when '--igv', '--igv-full'
         truffleruby_compiler!
         vm_args << (arg == '--igv-full' ? '--vm.Dgraal.Dump=Truffle:2' : '--vm.Dgraal.Dump=Truffle:1')
@@ -1747,7 +1747,7 @@ def benchmark(*args)
 
     vm_args = []
     if truffleruby?
-      vm_args << '--vm.Dgraal.TruffleCompilationExceptionsAreFatal=true'
+      vm_args << '--engine.CompilationExceptionsAreFatal=true'
     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 --vm.Dgraal.TruffleCompilationExceptionsAreFatal=true test/truffle/compiler/osr/osr.rb`
	`5`	`+jt ruby --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 --vm.Dgraal.TraceTruffleCompilation=true --vm.Dgraal.TruffleCompilationExceptionsAreFatal=true --vm.Dgraal.TruffleIterativePartialEscape=true test.rb`
	`27`	`+# jt ruby --graal --engine.TraceCompilation --engine.CompilationExceptionsAreFatal --engine.IterativePartialEscape test.rb`
`28`	`28`
`29`	`29`	`abort 'not running the GraalVM Compiler' unless TruffleRuby.jit?`
`30`	`30`