kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* benchmark/run.rb : change option format

Browse source 
* common.mk : ditto


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11486 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
ko1 2007-01-05 18:54:33 +00:00
parent d22d3b5a7a
commit 384cfd3871
4 changed files with 34 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sat Jan 6 03:49:22 2007 Koichi Sasada <ko1@atdot.net>
* benchmark/run.rb : change option format
* common.mk : ditto
Fri Jan 5 22:21:08 2007 Koichi Sasada <ko1@atdot.net> Fri Jan 5 22:21:08 2007 Koichi Sasada <ko1@atdot.net>
* benchmark/bm_app_pentomino.rb : use Array#dup instead of * benchmark/bm_app_pentomino.rb : use Array#dup instead of

40
benchmark/run.rb
View file

@ -1,11 +1,11 @@
# #
# YARV benchmark driver # Ruby benchmark driver
# #
require 'benchmark' require 'benchmark'
require 'rbconfig' require 'rbconfig'
$yarvonly = false $matzrubyonly = false
$rubyonly = false $rubyonly = false
$results = [] $results = []
@ -31,26 +31,20 @@ def bm file
/[a-z]+_(.+)\.rb/ =~ file /[a-z]+_(.+)\.rb/ =~ file
bm_name = $1 bm_name = $1
puts '-----------------------------------------------------------' unless $yarvonly || $rubyonly puts '-----------------------------------------------------------' unless $rubyonly || $matzrubyonly
puts "#{bm_name}: " puts "#{bm_name}: "
puts <<EOS unless $yarvonly || $rubyonly puts <<EOS unless $matzrubyonly || $rubyonly
#{prog} #{prog}
-- --
EOS EOS
#iseq = YARVUtil.parse(File.read(file))
#vm = YARVCore::VM.new
begin begin
result = [bm_name] result = [bm_name]
result << ruby_exec(file) unless $yarvonly result << matzruby_exec(file) unless $rubyonly
result << yarv_exec(file) unless $rubyonly result << ruby_exec(file) unless $matzrubyonly
$results << result $results << result
# puts YARVUtil.parse(File.read(file), file, 1).disasm
# x.report("ruby"){ load(file, false) }
# x.report("yarv"){ vm.eval iseq }
rescue Exception => e rescue Exception => e
puts puts
puts "** benchmark failure: #{e}" puts "** benchmark failure: #{e}"
@ -72,35 +66,35 @@ def ruby_exec file
benchmark file, $ruby_program benchmark file, $ruby_program
end end
def yarv_exec file def matzruby_exec file
print 'yarv' print 'matz'
benchmark file, $yarv_program benchmark file, $matzruby_program
end end
if $0 == __FILE__ if $0 == __FILE__
ARGV.each{|arg| ARGV.each{|arg|
case arg case arg
when /\A--yarv-program=(.+)/ when /\A--ruby=(.+)/
$yarv_program = $1
when /\A--ruby-program=(.+)/
$ruby_program = $1 $ruby_program = $1
when /\A--matzruby=(.+)/
$matzruby_program = $1
when /\A--opts=(.+)/ when /\A--opts=(.+)/
$opts = $1 $opts = $1
when /\A(--yarv)|(-y)/ when /\A(-r|--only-ruby)\z/
$yarvonly = true
when /\A(--ruby)|(-r)/
$rubyonly = true $rubyonly = true
when /\A(-m|--only-matzruby)\z/
$matzrubyonly = true
end end
} }
ARGV.delete_if{|arg| ARGV.delete_if{|arg|
/\A-/ =~ arg /\A-/ =~ arg
} }
puts "MatzRuby:"
system("#{$matzruby_program} -v")
puts "Ruby:" puts "Ruby:"
system("#{$ruby_program} -v") system("#{$ruby_program} -v")
puts puts
puts "YARV:"
system("#{$yarv_program} -v")
if ARGV.empty? if ARGV.empty?
Dir.glob(File.dirname(__FILE__) + '/bm_*.rb').sort.each{|file| Dir.glob(File.dirname(__FILE__) + '/bm_*.rb').sort.each{|file|

12
common.mk
View file

@ -525,7 +525,7 @@ blockinlining.$(OBJEXT): {$(VPATH)}yarv.h {$(VPATH)}yarvcore.h vm_opts.h
BASERUBY = ruby BASERUBY = ruby
MATZRUBY = ruby MATZRUBY = $(BASERUBY)
INSNS2VMOPT = $(CPPFLAGS) --srcdir=$(srcdir) INSNS2VMOPT = $(CPPFLAGS) --srcdir=$(srcdir)
@ -580,13 +580,13 @@ parse: miniruby$(EXEEXT)
$(MINIRUBY) $(srcdir)/tool/parse.rb $(srcdir)/test.rb $(MINIRUBY) $(srcdir)/tool/parse.rb $(srcdir)/test.rb
benchmark: $(RUBY) benchmark: $(RUBY)
$(BASERUBY) -I$(srcdir) -I$(srcdir)/lib $(srcdir)/benchmark/run.rb $(OPT) $(ITEMS) --yarv-program=./$(PROGRAM) --ruby-program=$(BASERUBY) --opts=-I$(srcdir)/lib $(BASERUBY) -I$(srcdir)/lib $(srcdir)/benchmark/run.rb $(OPT) $(ITEMS) --ruby=./$(RUBY) --matzruby=$(MATZRUBY) --opts=-I$(srcdir)/lib
benchmark-each: $(RUBY) benchmark-each: $(RUBY)
$(BASERUBY) -I$(srcdir) $(srcdir)/benchmark/run.rb bm_$(ITEM) $(OPT) --yarv-program=./$(RUBY) --ruby-program=$(BASERUBY) --opts=-I$(srcdir)/lib $(BASERUBY) -I$(srcdir)/lib $(srcdir)/benchmark/run.rb bm_$(ITEM) $(OPT) --ruby=./$(RUBY) --matzruby=$(MATZRUBY) --opts=-I$(srcdir)/lib
tbench: $(RUBY) tbench: $(RUBY)
$(BASERUBY) -I$(srcdir) -I$(srcdir)/lib $(srcdir)/benchmark/run.rb bmx $(OPT) --yarv-program=./$(PROGRAM) --ruby-program=$(BASERUBY) --opts=-I$(srcdir)/lib $(BASERUBY) -I$(srcdir)/lib $(srcdir)/benchmark/run.rb bmx $(OPT) --ruby=./$(RUBY) --matzruby=$(MATZRUBY) --opts=-I$(srcdir)/lib
aotc: aotc:
$(RUBY) -I$(srcdir) -I. $(srcdir)/tool/aotcompile.rb $(INSNS2VMOPT) $(RUBY) -I$(srcdir) -I. $(srcdir)/tool/aotcompile.rb $(INSNS2VMOPT)
@ -599,8 +599,8 @@ vmasm:
run.gdb: run.gdb:
echo b debug_breakpoint > run.gdb echo b debug_breakpoint > run.gdb
echo handle SIGINT nostop # echo handle SIGINT nostop >> run.gdb
echo handle SIGPIPE nostop # echo handle SIGPIPE nostop >> run.gdb
echo run >> run.gdb echo run >> run.gdb
gdb: miniruby$(EXEEXT) run.gdb gdb: miniruby$(EXEEXT) run.gdb

6
version.h
View file

@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0" #define RUBY_VERSION "1.9.0"
#define RUBY_RELEASE_DATE "2007-01-05" #define RUBY_RELEASE_DATE "2007-01-06"
#define RUBY_VERSION_CODE 190 #define RUBY_VERSION_CODE 190
#define RUBY_RELEASE_CODE 20070105 #define RUBY_RELEASE_CODE 20070106
#define RUBY_PATCHLEVEL 0 #define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0 #define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 1 #define RUBY_RELEASE_MONTH 1
#define RUBY_RELEASE_DAY 5 #define RUBY_RELEASE_DAY 6
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];
RUBY_EXTERN const char ruby_release_date[]; RUBY_EXTERN const char ruby_release_date[];