@@ -1,11 +1,5 @@ # This Rakefile is included so you can run RBS Benchmarks -# -# rake bench # Run all the RBS benchmarks -# rake bench:dir # Run all the RBS benchmarks in DIR -# ex: rake bench:dir DIR=rbs/macro-benchmarks -# rake bench:file # Run only the RBS benchmark specified by FILE -# rake bench:results # Plot the RBS benchmark results (not implemented) -# rake bench:to_csv # Generate a CSV file of RBS results +# See the readme for examples # # NOTE: rakelib/bench.rake requires this directory to be named: benchmark # you may want to modify bench.rake to suit your own defaults. Rakefile @@ -26,7 +26,7 @@ end # Cache the name so it is only generated once during an invocation. # Eliminates having to save the name and pass it around. def report - # os = `uname`.chomp + # os = `uname`.chomp # doesn't work on doze # host = `uname -n`.chomp vm = File.basename VM.split.first # @report ||= "#{RBS_RESULTS_DIR}/RBS-#{vm}-#{os}-#{host}-#{Time.now.strftime "%y%m%d.%H%M%S"}.yaml" @@ -119,6 +119,23 @@ namespace :bench do puts "Done" end + desc "Run all the RBS benchmarks that match PATTERN ex: PATTERN=rbs/micro-benchmarks/bm_gc*" + task :pattern => :setup do + dir = ENV['PATTERN'] || raise("bench:pattern needs PATTERN set") + + puts "Running all benchmarks matching #{dir}" + puts " Writing report to #{report_name}" + + Dir[dir].sort.each do |name| + Dir.chdir File.dirname(name) do + puts " Running #{File.basename name}" + system "#{command name}" + end + end + + puts "Done" + end + desc "Run all the RBS benchmarks in DIR" task :dir => :setup do dir = ENV['DIR'] || raise("bench:dir needs DIR to be a directory") rakelib/bench.rake @@ -8,9 +8,9 @@ # # do something interesting # end # -# Bench.run { quirks 100 } +# Bench.run [100] { |n| quirks n } # -# Bench.run will time the running of the block for the requested +# Bench.run will run the blocktime the running of the block for the requested # number of iterations and then compute some statistics and append # a YAML-formatted report to the specified file. @@ -80,6 +80,16 @@ class Bench inputs.each do |input| f.puts "- #{input}" end + + begin + version_string = "" + version_string = "#{RUBY_VERSION} #{RUBY_RELEASE_DATE} #{RUBY_PATCHLEVEL} #{RUBY_PLATFORM}" + require 'rbconfig' + version_string += ';' + Config::CONFIG['CFLAGS'] + ';' + Config::CONFIG["configure_args"] + rescue Exception + end + + f.puts "ruby_ver: " + version_string end end utils/bench.rb @@ -4,14 +4,16 @@ timeout = File.dirname(__FILE__) + "/timeout" +null = "/dev/null" if RUBY_PLATFORM =~ /mingw|mswin/ timeout = "ruby " + File.dirname(__FILE__) + "/timeout2.rb" + null = "NUL" end limit, vm, runner, name, iterations, report = ARGV start = Time.now -cmd = "#{timeout} -t #{limit} #{vm} #{runner} #{name} #{iterations} #{report} > /dev/null" +cmd = "#{timeout} -t #{limit} #{vm} #{runner} #{name} #{iterations} #{report} > #{null}" system cmd finish = Time.now utils/monitor.rb rbs/micro-benchmarks/bm_gc_cow.rb db3549b91a409ca4096c631d40361251e90ce8bb 2d8d0f243e5a36068672fdac08925f9ee0a4748e Roger Pack rogerpack2005@gmail.com http://github.com/acangiano/ruby-benchmark-suite/commit/37543a8419123eb28ef083d2333491731f499466 37543a8419123eb28ef083d2333491731f499466 2009-06-13T16:45:55-07:00 2009-06-13T16:45:55-07:00 overcome merge difficulty 8406283fd66ddcb3f7a3d77686693e61983a62f3 Roger Pack rogerpack2005@gmail.com