summaryrefslogtreecommitdiff
path: root/common.mk
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-09-27 06:46:31 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-09-27 06:46:31 +0000
commit87375866a629e64a646c1b32d0e50926a729ca11 (patch)
tree8db2b577f86f2c6957029bf1802aa341452f1a50 /common.mk
parent29538dbb0ed5dda03ecd6348b33ab29d174fcb58 (diff)
* benchmark/driver.rb: added.
* common.mk: fix to use above driver. * benchmark/prepare_so_count_words.rb: added. * benchmark/bm_so_count_words.rb: fix benchmark process. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13535 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
-rw-r--r--common.mk28
1 files changed, 13 insertions, 15 deletions
diff --git a/common.mk b/common.mk
index f19da4b118..702e8ed371 100644
--- a/common.mk
+++ b/common.mk
@@ -595,8 +595,6 @@ blockinlining.$(OBJEXT): {$(VPATH)}blockinlining.c \
id.$(OBJEXT): {$(VPATH)}id.c {$(VPATH)}ruby.h
prelude.$(OBJEXT): {$(VPATH)}prelude.c {$(VPATH)}ruby.h {$(VPATH)}vm_core.h
-MATZRUBY = $(MATZRUBYDIR)ruby
-
INSNS = opt_sc.inc optinsn.inc optunifs.inc insns.inc \
vmtc.inc vm.inc
@@ -637,16 +635,6 @@ docs:
##
-compare: miniruby$(EXEEXT) PHONY
- @$(MATZRUBY) -v -I$(srcdir) $(srcdir)/test.rb
- @$(MINIRUBY) -v -I$(srcdir) $(srcdir)/test.rb
-
-compare-test: miniruby$(EXEEXT) $(PROGRAM) PHONY
- $(RUNRUBY) -I$(srcdir) $(srcdir)/yarvtest/runner.rb $(OPT) ruby=$(MINIRUBY) matzruby=$(MATZRUBY)
-
-compare-test-each: miniruby$(EXEEXT) $(PROGRAM) PHONY
- $(RUNRUBY) -I$(srcdir) $(srcdir)/yarvtest/test_$(ITEM).rb $(OPT) ruby=$(MINIRUBY) matzruby=$(MATZRUBY)
-
run: miniruby$(EXEEXT) PHONY
$(MINIRUBY) -I$(srcdir)/lib $(srcdir)/test.rb $(RUNOPT)
@@ -656,14 +644,24 @@ runruby: $(PROGRAM) PHONY
parse: miniruby$(EXEEXT) PHONY
$(MINIRUBY) $(srcdir)/tool/parse.rb $(srcdir)/test.rb
+COMPARE_RUBY = $(BASERUBY)
+ITEM =
+OPTS =
+
benchmark: $(PROGRAM) PHONY
- $(RUNRUBY) $(srcdir)/benchmark/run.rb $(OPT) $(ITEMS) --ruby='./$(PROGRAM) -I$(srcdir)/lib' --matzruby=$(MATZRUBY)
+ $(BASERUBY) $(srcdir)/benchmark/driver.rb -v \
+ --executables="$(COMPARE_RUBY); $(RUNRUBY)" \
+ --pattern='bm_' --directory=$(srcdir)/benchmark $(OPTS)
benchmark-each: $(PROGRAM) PHONY
- $(RUNRUBY) $(srcdir)/benchmark/run.rb bm_$(ITEM) $(OPT) --ruby='./$(PROGRAM) -I$(srcdir)/lib' --matzruby=$(MATZRUBY)
+ $(BASERUBY) $(srcdir)/benchmark/driver.rb -v \
+ --executables="$(COMPARE_RUBY); $(RUNRUBY)" \
+ --pattern=$(ITEM) --directory=$(srcdir)/benchmark $(OPTS)
tbench: $(PROGRAM) PHONY
- $(RUNRUBY) $(srcdir)/benchmark/run.rb bmx $(OPT) --ruby=./$(PROGRAM) --matzruby=$(MATZRUBY) --opts=-I$(srcdir)/lib
+ $(BASERUBY) $(srcdir)/benchmark/driver.rb -v \
+ --executables="$(COMPARE_RUBY); $(RUNRUBY)" \
+ --pattern='bmx_' --directory=$(srcdir)/benchmark $(OPTS)
aotc: $(PROGRAM) PHONY
./$(PROGRAM) -I$(srcdir)/lib $(srcdir)/bin/ruby2cext $(srcdir)/test.rb