Add build files for benchmarkings; add mandelbrot benchmark

1 files changed, 39 insertions, 30 deletions

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