Author: ko1
Date: 2005-06-28 13:34:07 +0900 (Tue, 28 Jun 2005)
New Revision: 177

Modified:
   trunk/ChangeLog
   trunk/benchmark/run.rb
   trunk/depend
Log:
	* benchmark/run.rb : add -y, --yarv-only option

	* depend : add BOPT to tbench rule



Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2005-06-27 14:33:00 UTC (rev 176)
+++ trunk/ChangeLog	2005-06-28 04:34:07 UTC (rev 177)
@@ -4,6 +4,13 @@
 #  from Mon, 03 May 2004 01:24:19 +0900
 #
 
+2005-06-28(Tue) 13:20:59 +0900  Koichi Sasada  <ko1 atdot.net>
+
+	* benchmark/run.rb : add -y, --yarv-only option
+
+	* depend : add BOPT to tbench rule
+
+
 2005-06-27(Mon) 23:31:12 +0900  Koichi Sasada  <ko1 atdot.net>
 
 	* depend : add gdb rule

Modified: trunk/benchmark/run.rb
===================================================================
--- trunk/benchmark/run.rb	2005-06-27 14:33:00 UTC (rev 176)
+++ trunk/benchmark/run.rb	2005-06-28 04:34:07 UTC (rev 177)
@@ -6,8 +6,9 @@
 require 'benchmark'
 require 'rbconfig'
 
-$bench = false #|| true
+$yarvonly = false
 
+
 puts "ruby #{RUBY_VERSION} #{RUBY_PLATFORM}(#{RUBY_RELEASE_DATE})"
 puts YARVCore::VERSION + " rev: #{YARVCore::REV} (#{YARVCore::DATE})"
 puts YARVCore::OPTS
@@ -18,11 +19,11 @@
   return if prog.empty?
 
   /bm_(.+)\.rb/ =~ file
-  puts '-----------------------------------------------------------' unless $bench
+  puts '-----------------------------------------------------------' unless $yarvonly
   puts "#{$1}: "
   
   
-puts <<EOS unless $bench
+puts <<EOS unless $yarvonly
 #{prog}
 --
 EOS
@@ -31,9 +32,9 @@
   begin
     Benchmark.bm{|x|
     # x.report("yarv"){ YARVUtil.load_bm(file) }
-    } unless $bench
+    } unless $yarvonly
 
-    ruby_exec(file) unless $bench
+    ruby_exec(file) unless $yarvonly
     yarv_exec(file)
     # puts YARVUtil.parse(File.read(file), file, 1).disasm
     
@@ -88,6 +89,15 @@
 end
 
 if $0 == __FILE__
+  ARGV.each{|arg|
+    if /\A(--yarv)|(-y)/ =~ arg
+      $yarvonly = true
+    end
+  }
+  ARGV.delete_if{|arg|
+    /\A-/ =~ arg
+  }
+  
   if ARGV.empty?
     Dir.glob(File.dirname(__FILE__) + '/bm_*.rb').sort.each{|file|
       bm file

Modified: trunk/depend
===================================================================
--- trunk/depend	2005-06-27 14:33:00 UTC (rev 176)
+++ trunk/depend	2005-06-28 04:34:07 UTC (rev 177)
@@ -59,7 +59,7 @@
 
 ITEM=bmx_temp
 tbench: all
-	$(RUBY) -I$(srcdir) $(srcdir)/benchmark/run.rb $(ITEM)
+	$(RUBY) -I$(srcdir) $(srcdir)/benchmark/run.rb $(ITEM) $(BOPT)
 
 
 test-compiler: all


--
ML: yarv-diff quickml.atdot.net
Info: http://www.atdot.net/~ko1/quickml