--- a/benchmarks/Rakefile Tue May 07 13:31:03 2013 +0100
+++ b/benchmarks/Rakefile Sat May 18 22:29:48 2013 +0200
@@ -1,5 +1,3 @@
-#require 'pry'
-
require 'yaml'
@@ -126,7 +124,7 @@
puts "export CLASSPATH=#{classpath()}"
ENV['CLASSPATH'] = classpath()
- [:jvm, :jvmint, :stx, :libjava, :libjavaint, :stx2libjava].each do | platform |
+ [:jvm, :jvmint, :stx, :libjava, :libjavaint, :stx2libjava, :ruby].each do | platform |
times[platform] = measure(test, passes, platform, runs)
end
@@ -177,7 +175,9 @@
end
elsif (platform == :'stx2libjava')
command = "./benchmark-runner.sh --smalltalk2java -b #{test} -n #{passes} 2>&1"
- else
+ elsif (platform == :ruby)
+ command = "./#{test.downcase}.rb #{passes} 2>&1"
+ else
raise Exception.new("Unssuported platform: #{platform}")
end
@@ -211,12 +211,12 @@
file.write("\n")
file.write(Time.now.to_s)
file.write("\n")
- values = [[ "Test", "JVM", "JVM (int)", "STX-S", "STX-J", "STX-J (int)" , "STX-J2S" ]]
+ values = [[ "Test", "JVM", "JVM (int)", "STX-S", "STX-J", "STX-J (int)" , "STX-J2S", "Ruby" ]]
TESTS.each do | pair |
if (pair.size == 2)
key = pair[0]
if (results.has_key? key)
- values << [ key, results[key][:jvm], results[key][:jvmint], results[key][:stx], results[key][:libjava], results[key][:libjavaint], results[key][:stx2libjava] ]
+ values << [ key, results[key][:jvm], results[key][:jvmint], results[key][:stx], results[key][:libjava], results[key][:libjavaint], results[key][:stx2libjava], results[:key][:ruby] ]
end
end
end
@@ -244,12 +244,12 @@
def write_results_csv(file, results)
- values = [[ "Test", "JVM", "JVM (int)", "STX-S", "STX-J", "STX-J (int)" , "STX-J2S" ]]
+ values = [[ "Test", "JVM", "JVM (int)", "STX-S", "STX-J", "STX-J (int)" , "STX-J2S", "Ruby" ]]
TESTS.each do | pair |
if (pair.size == 2)
key = pair[0]
if (results.has_key? key)
- values << [ key, results[key][:jvm], results[key][:jvmint], results[key][:stx], results[key][:libjava], results[key][:libjavaint], results[key][:stx2libjava] ]
+ values << [ key, results[key][:jvm], results[key][:jvmint], results[key][:stx], results[key][:libjava], results[key][:libjavaint], results[key][:stx2libjava], results[key][:ruby] ]
end
end
end