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: 25fc98368f1c
Choose a base ref
...
head repository: jruby/jruby
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b2e5d6f6d13a
Choose a head ref
  • 5 commits
  • 2 files changed
  • 1 contributor

Commits on Jun 6, 2016

  1. 1
    Copy the full SHA
    27478c6 View commit details
  2. Copy the full SHA
    de36884 View commit details
  3. Copy the full SHA
    a9461c9 View commit details
  4. Copy the full SHA
    57b8738 View commit details
  5. Copy the full SHA
    b2e5d6f View commit details
Showing with 145 additions and 11 deletions.
  1. +110 −0 bench/truffle/metrics/mandelbrot.rb
  2. +35 −11 tool/jt.rb
110 changes: 110 additions & 0 deletions bench/truffle/metrics/mandelbrot.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,110 @@
# Copyright © 2004-2013 Brent Fulgham
#
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions are met:
#
# * Redistributions of source code must retain the above copyright notice,
# this list of conditions and the following disclaimer.
#
# * Redistributions in binary form must reproduce the above copyright notice,
# this list of conditions and the following disclaimer in the documentation
# and/or other materials provided with the distribution.
#
# * Neither the name of "The Computer Language Benchmarks Game" nor the name
# of "The Computer Language Shootout Benchmarks" nor the names of its
# contributors may be used to endorse or promote products derived from this
# software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

# The Computer Language Benchmarks Game
# http://benchmarksgame.alioth.debian.org
#
# contributed by Karl von Laudermann
# modified by Jeremy Echols
# modified by Detlef Reichl
# modified by Joseph LaFata
# modified by Peter Zotov

# http://benchmarksgame.alioth.debian.org/u64q/program.php?test=mandelbrot&lang=yarv&id=3

def mandelbrot(size)
Truffle::Graal.assert_not_compiled

sum = 0

byte_acc = 0
bit_num = 0

y = 0
while y < size
ci = (2.0*y/size)-1.0

x = 0
while x < size
zrzr = zr = 0.0
zizi = zi = 0.0
cr = (2.0*x/size)-1.5
escape = 0b1

z = 0
while z < 50
tr = zrzr - zizi + cr
ti = 2.0*zr*zi + ci
zr = tr
zi = ti
# preserve recalculation
zrzr = zr*zr
zizi = zi*zi
if zrzr+zizi > 4.0
escape = 0b0
break
end
z += 1
end

byte_acc = (byte_acc << 1) | escape
bit_num += 1

# Code is very similar for these cases, but using separate blocks
# ensures we skip the shifting when it's unnecessary, which is most cases.
if (bit_num == 8)
#print byte_acc.chr
sum ^= byte_acc
byte_acc = 0
bit_num = 0
elsif (x == size - 1)
byte_acc <<= (8 - bit_num)
#print byte_acc.chr
sum ^= byte_acc
byte_acc = 0
bit_num = 0
end
x += 1
end
y += 1
end

sum
end

start = Time.now

begin
loop do
mandelbrot 750
end
rescue RubyTruffleError
puts Time.now - start
end
46 changes: 35 additions & 11 deletions tool/jt.rb
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@

require 'fileutils'
require 'json'
require 'timeout'

GRAALVM_VERSION = "0.11"

@@ -242,18 +243,41 @@ def self.log(tty_message, full_message)
module ShellUtils
private

def raw_sh(*args)
if args.last == :no_print_cmd
args.pop
else
puts "$ #{printable_cmd(args)}"
def system_timeout(timeout, *args)
begin
pid = Process.spawn(*args)
rescue SystemCallError
return nil
end

begin
Timeout.timeout timeout do
Process.waitpid pid
$?.exitstatus == 0
end
rescue Timeout::Error
Process.kill('TERM', pid)
nil
end
end

def raw_sh(*args)
continue_on_failure = false
if args.last == :continue_on_failure
args.pop
if args.last.is_a?(Hash) && args.last.delete(:continue_on_failure)
continue_on_failure = true
end
result = system(*args)
if !args.last.is_a?(Hash) || !args.last.delete(:no_print_cmd)
puts "$ #{printable_cmd(args)}"
end
timeout = nil
if args.last.is_a?(Hash)
timeout = args.last.delete(:timeout)
end
if timeout
result = system_timeout(timeout, *args)
else
result = system(*args)
end
if result
true
else
@@ -764,7 +788,7 @@ def metrics_alloc(*args)
METRICS_REPS.times do
Utilities.log '.', "sampling\n"
r, w = IO.pipe
run '-Xtruffle.metrics.memory_used_on_exit=true', '-J-verbose:gc', *args, {err: w, out: w}, :no_print_cmd
run '-Xtruffle.metrics.memory_used_on_exit=true', '-J-verbose:gc', *args, {err: w, out: w, no_print_cmd: true}
w.close
samples.push memory_allocated(r.read)
r.close
@@ -839,7 +863,7 @@ def metrics_minheap(*args)
end

def can_run_in_heap(heap, *command)
run("-J-Xmx#{heap}M", *command, {err: '/dev/null', out: '/dev/null'}, :continue_on_failure, :no_print_cmd)
run("-J-Xmx#{heap}M", *command, {err: '/dev/null', out: '/dev/null', no_print_cmd: true, continue_on_failure: true, timeout: 60})
end

def metrics_time(*args)
@@ -849,7 +873,7 @@ def metrics_time(*args)
Utilities.log '.', "sampling\n"
r, w = IO.pipe
start = Time.now
run '-Xtruffle.metrics.time=true', *args, {err: w, out: w}, :no_print_cmd
run '-Xtruffle.metrics.time=true', *args, {err: w, out: w, no_print_cmd: true}
finish = Time.now
w.close
samples.push get_times(r.read, finish - start)