Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: jruby/jruby
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7744bbcf777f
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3fb4a5d2e78f
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Jun 20, 2016

  1. Copy the full SHA
    28df675 View commit details
  2. Copy the full SHA
    db97be4 View commit details
  3. Copy the full SHA
    3fb4a5d View commit details
Showing with 13 additions and 2 deletions.
  1. +11 −0 ci.hocon
  2. +1 −1 mx.jruby/mx_jruby.py
  3. +1 −1 tool/jt.rb
11 changes: 11 additions & 0 deletions ci.hocon
Original file line number Diff line number Diff line change
@@ -176,6 +176,12 @@ psd-benchmarks: {
] ${post-process-and-upload-results}
}

synthetic-benchmarks: {
run: ${setup-benchmarks} [
[mx, benchmark, synthetic]
] ${post-process-and-upload-results}
}

micro-benchmarks: {
run: ${setup-benchmarks} [
[mx, benchmark, micro]
@@ -221,6 +227,11 @@ builds: [
{name: ruby-benchmarks-psd-graal-core} ${common} ${graal-core} ${bench-caps} ${jruby-truffle} ${psd-benchmarks},
{name: ruby-benchmarks-psd-graalvm} ${common} ${graalvm} ${bench-caps} ${jruby-truffle} ${psd-benchmarks},

{name: ruby-benchmarks-synthetic-noindy} ${common} ${no-graal} ${daily-bench-caps} ${jruby-noindy-benchmark} ${synthetic-benchmarks},
{name: ruby-benchmarks-synthetic-indy} ${common} ${no-graal} ${daily-bench-caps} ${jruby-indy-benchmark} ${synthetic-benchmarks},
{name: ruby-benchmarks-synthetic-graal-core} ${common} ${graal-core} ${bench-caps} ${jruby-truffle} ${synthetic-benchmarks},
{name: ruby-benchmarks-synthetic-graalvm} ${common} ${graalvm} ${bench-caps} ${jruby-truffle} ${synthetic-benchmarks},

{name: ruby-benchmarks-micro-noindy} ${common} ${no-graal} ${daily-bench-caps} ${jruby-noindy-benchmark} ${micro-benchmarks},
{name: ruby-benchmarks-micro-indy} ${common} ${no-graal} ${daily-bench-caps} ${jruby-indy-benchmark} ${micro-benchmarks},
{name: ruby-benchmarks-micro-graal-core} ${common} ${graal-core} ${bench-caps} ${jruby-truffle} ${micro-benchmarks},
2 changes: 1 addition & 1 deletion mx.jruby/mx_jruby.py
Original file line number Diff line number Diff line change
@@ -413,7 +413,7 @@ def benchmarks(self):
for root, dirs, files in os.walk(os.path.join(all_ruby_benchmarks, 'micro')):
for name in files:
if name.endswith('.rb'):
benchmark_file = os.path.join(root, name)
benchmark_file = os.path.join(root, name)[len(all_ruby_benchmarks)+1:]
out = mx.OutputCapture()
jt(['benchmark', 'list', benchmark_file], out=out)
benchmarks.extend([benchmark_file + ':' + b.strip() for b in out.data.split('\n') if len(b.strip()) > 0])
2 changes: 1 addition & 1 deletion tool/jt.rb
Original file line number Diff line number Diff line change
@@ -957,7 +957,7 @@ def benchmark(*args)
end

run_args = []
run_args.push '--graal' unless args.delete('--no-graal')
run_args.push '--graal' unless args.delete('--no-graal') || args.include?('list')
run_args.push '-I', "#{Utilities.find_gem('deep-bench')}/lib" rescue nil
run_args.push '-I', "#{Utilities.find_gem('benchmark-ips')}/lib" rescue nil
run_args.push "#{Utilities.find_gem('benchmark-interface')}/bin/benchmark"