[Truffle] Update bench debug

* From truffle-head
jruby · Dec 18, 2015 · c3389c3 · c3389c3
1 parent 3a0d0b7
commit c3389c3
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/tool/jt.rb b/tool/jt.rb
@@ -412,25 +412,24 @@ def untag(path, *args)
   def bench(command, *args)
     bench_dir = Utilities.find_bench
     env_vars = {
-      "JRUBY_9000_DEV_DIR" => JRUBY_DIR,
+      "JRUBY_DEV_DIR" => JRUBY_DIR,
       "GRAAL_BIN" => Utilities.find_graal,
     }
-    bench_args = ["#{bench_dir}/bin/bench"]
+    bench_args = ["#{bench_dir}/bin/bench9000"]
     case command
     when 'debug'
       if args.delete '--ruby-backtrace'
         compilation_exceptions_behaviour = "-J-G:+TruffleCompilationExceptionsAreThrown"
       else
         compilation_exceptions_behaviour = "-J-G:+TruffleCompilationExceptionsAreFatal"
       end
-      env_vars = env_vars.merge({'JRUBY_OPTS' => "-J-G:+TraceTruffleCompilation -J-G:+DumpOnError -J-G:-GraphPE #{compilation_exceptions_behaviour}"})
-      bench_args += ['score', 'jruby-9000-dev-truffle-graal', '--show-commands', '--show-samples']
+      bench_args += ['score', '--config', "#{bench_dir}/benchmarks/default.config.rb", 'jruby-dev-truffle-graal', '--show-commands', '--show-samples']
       raise 'specify a single benchmark for run - eg classic-fannkuch-redux' if args.size != 1
     when 'reference'
-      bench_args += ['reference', 'jruby-9000-dev-truffle-graal', '--show-commands']
+      bench_args += ['reference', '--config', "#{bench_dir}/benchmarks/default.config.rb", 'jruby-dev-truffle-graal', '--show-commands']
       args << "5" if args.empty?
     when 'compare'
-      bench_args += ['compare-reference', 'jruby-9000-dev-truffle-graal']
+      bench_args += ['compare-reference', '--config', "#{bench_dir}/benchmarks/default.config.rb", 'jruby-dev-truffle-graal']
       args << "5" if args.empty?
     else
       raise ArgumentError, command