Add build files for benchmarkings; add mandelbrot benchmark

6 files changed, 150 insertions, 32 deletions

diff --git a/benchmark/bm_so_mandelbrot.rb b/benchmark/bm_so_mandelbrot.rb
new file mode 100644
index 000000000..dd1d75ba1
--- /dev/null
+++ b/benchmark/bm_so_mandelbrot.rb
@@ -0,0 +1,64 @@
+#  The Computer Language Benchmarks Game
+#  http://shootout.alioth.debian.org/
+#
+#  contributed by Karl von Laudermann
+#  modified by Jeremy Echols
+size = 1000 # ARGV[0].to_i
+
+puts "P4\n#{size} #{size}"
+
+ITER = 49                           # Iterations - 1 for easy for..in looping
+LIMIT_SQUARED = 4.0                 # Presquared limit
+
+byte_acc = 0
+bit_num = 0
+
+count_size = size - 1               # Precomputed size for easy for..in looping
+def id(x)
+  x
+end
+
+# For..in loops are faster than .upto, .downto, .times, etc.
+for y in 0..count_size
+  for x in 0..count_size
+    zr = 0.0
+    zi = 0.0
+    cr = (2.0*x/size)-1.5
+    ci = (2.0*y/size)-1.0
+    escape = false
+
+    # To make use of the for..in code, we use a dummy variable,
+    # like one would in C
+    for dummy in 0..ITER
+      tr = zr*zr - zi*zi + cr
+      ti = 2*zr*zi + ci
+      zr, zi = tr, ti
+
+      if (zr*zr+zi*zi) > LIMIT_SQUARED
+        escape = true
+        break
+      end
+    end
+
+#    byte_acc = (byte_acc << 1) | (escape ? 0b0 : 0b1)
+    byte_acc = (byte_acc * 2) | (escape ? 0b0 : 0b1)
+#    byte_acc = (byte_acc * 2) + (escape ? 0b0 : 0b1)
+#    byte_acc = (byte_acc * 2) + 1
+
+    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
+      byte_acc = 0
+      bit_num = 0
+    elsif (x == count_size)
+      byte_acc <<= (8 - bit_num)
+#      byte_acc = byte_acc << (8 - bit_num)
+#      print byte_acc.chr
+      byte_acc = 0
+      bit_num = 0
+    end
+  end
+end
diff --git a/benchmark/build_config_boxing.rb b/benchmark/build_config_boxing.rb
new file mode 100644
index 000000000..b478c9005
--- /dev/null
+++ b/benchmark/build_config_boxing.rb
@@ -0,0 +1,28 @@
+MRuby::Build.new do |conf|
+  toolchain :gcc
+end
+
+MRuby::Build.new('no_boxing') do |conf|
+  toolchain :gcc
+
+  conf.gembox 'default'
+end
+
+MRuby::Build.new('word_boxing') do |conf|
+  toolchain :gcc
+
+  conf.gembox 'default'
+  conf.compilers.each do |c|
+    c.defines += %w(MRB_WORD_BOXING)
+  end
+end
+
+MRuby::Build.new('nan_boxing') do |conf|
+  toolchain :gcc
+
+  conf.gembox 'default'
+  conf.compilers.each do |c|
+    c.defines += %w(MRB_NAN_BOXING)
+  end
+end
+
diff --git a/benchmark/build_config_cc.rb b/benchmark/build_config_cc.rb
new file mode 100644
index 000000000..56d725bc7
--- /dev/null
+++ b/benchmark/build_config_cc.rb
@@ -0,0 +1,13 @@
+MRuby::Build.new do |conf|
+  toolchain :gcc
+end
+
+MRuby::Build.new('gcc') do |conf|
+  toolchain :gcc
+  conf.gembox 'default'
+end
+
+MRuby::Build.new('clang') do |conf|
+  toolchain :clang
+  conf.gembox 'default'
+end
diff --git a/benchmark/fib39.rb b/benchmark/fib.rb
index d5565b779..4b395f9cc 100644
--- a/benchmark/fib39.rb
+++ b/benchmark/fib.rb
@@ -1,8 +1,7 @@
-# Fib 39
 
 def fib n
   return n if n < 2
   fib(n-2) + fib(n-1)
 end
 
-puts fib(39)
+puts fib(37)
diff --git a/benchmark/plot.gpl b/benchmark/plot.gpl
new file mode 100644
index 000000000..639674d68
--- /dev/null
+++ b/benchmark/plot.gpl
@@ -0,0 +1,5 @@
+set yrange [0:]
+set terminal pdf
+set xtics rotate by -45
+set style histogram errorbars gap 2 lw 1
+set style fill solid border -1
diff --git a/tasks/benchmark.rake b/tasks/benchmark.rake
index c2f93d82d..18802708e 100644
--- a/tasks/benchmark.rake
+++ b/tasks/benchmark.rake
@@ -1,5 +1,5 @@
 module MRuby
-  BENCHMARK_REPEAT = 2
+  BENCHMARK_REPEAT = 4
 end
 
 $dat_files = []
@@ -15,10 +15,19 @@ end
 def plot
   opts_file = "#{MRUBY_ROOT}/benchmark/plot.gpl"
   opts = File.read(opts_file).each_line.to_a.map(&:strip).join(';')
-  opts += ';plot '
 
   dat_files = $dat_files.group_by {|f| File.dirname(f).split(File::SEPARATOR)[-1]}
 
+  build_config_name = if ENV['MRUBY_CONFIG']
+    File.basename(ENV['MRUBY_CONFIG'], '.rb').gsub('build_config_', '')
+  else
+    "bm"
+  end
+
+  opts += ";set output '#{File.join(MRUBY_ROOT, 'benchmark', "#{build_config_name}.pdf")}'"
+
+  opts += ';plot '
+
   opts += dat_files.keys.map do |data_file|
     %Q['-' u 2:3:4:xtic(1) w hist title columnheader(1)]
   end.join(',')
@@ -28,7 +37,7 @@ def plot
 
   IO.popen(cmd, 'w') do |p|
     dat_files.each do |target_name, bm_files|
-      p.puts target_name
+      p.puts target_name.gsub('_', '-')
       bm_files.each do |bm_file|
         p.write File.read(bm_file)
       end
@@ -39,33 +48,33 @@ end
 
 
 MRuby.each_target do |target|
-  mruby_path = "#{target.build_dir}/bin/mruby"
-  if File.file? mruby_path
-    bm_files.each do |bm_file|
-      bm_name = File.basename bm_file, ".rb"
-
-      dat_dir = File.join('benchmark', target.name)
-      dat_file = File.join(dat_dir, "#{bm_name}.dat")
-      $dat_files << dat_file
-
-      directory dat_dir
-
-      file dat_file => [bm_file, dat_dir] do |task|
-        print bm_name
-        puts "..."
-
-        data = (0...MRuby::BENCHMARK_REPEAT).map do |n|
-          str = %x{(time -f "%e %S %U" #{mruby_path} #{bm_file}) 2>&1 >/dev/null}
-          str.split(' ').map(&:to_f)
-        end
-
-        File.open(task.name, "w") do |f|
-          data = data.map {|_,r,s| (r + s) / 2.0}
-          min = data.min
-          max = data.max
-          avg = data.inject(&:+) / data.size
-          f.puts "#{bm_name.gsub('_', '-')} #{avg} #{min} #{max}"
-        end
+  next if target.name == 'host'
+  mruby_bin = "#{target.build_dir}/bin/mruby"
+
+  bm_files.each do |bm_file|
+    bm_name = File.basename bm_file, ".rb"
+
+    dat_dir = File.join('benchmark', target.name)
+    dat_file = File.join(dat_dir, "#{bm_name}.dat")
+    $dat_files << dat_file
+
+    directory dat_dir
+
+    file dat_file => [bm_file, dat_dir, mruby_bin] do |task|
+      print bm_name
+      puts "..."
+
+      data = (0...MRuby::BENCHMARK_REPEAT).map do |n|
+        str = %x{(time -f "%e %S %U" #{mruby_bin} #{bm_file}) 2>&1 >/dev/null}
+        str.split(' ').map(&:to_f)
+      end
+
+      File.open(task.name, "w") do |f|
+        data = data.map {|_,r,s| (r + s) / 2.0}
+        min = data.min
+        max = data.max
+        avg = data.inject(&:+) / data.size
+        f.puts "#{bm_name.gsub('_', '-')} #{avg} #{min} #{max}"
       end
     end
   end