Author: ko1
Date: 2005-06-28 21:35:56 +0900 (Tue, 28 Jun 2005)
New Revision: 180

Modified:
   trunk/ChangeLog
   trunk/benchmark/run.rb
   trunk/depend
Log:
	* depend : add option TOPT to test rules

	* benchmark/run.rb : fix output format



Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2005-06-28 12:17:01 UTC (rev 179)
+++ trunk/ChangeLog	2005-06-28 12:35:56 UTC (rev 180)
@@ -4,6 +4,13 @@
 #  from Mon, 03 May 2004 01:24:19 +0900
 #
 
+2005-06-28(Tue) 21:34:54 +0900  Koichi Sasada  <ko1 atdot.net>
+
+	* depend : add option TOPT to test rules
+
+	* benchmark/run.rb : fix output format
+
+
 2005-06-28(Tue) 21:15:54 +0900  Koichi Sasada  <ko1 atdot.net>
 
 	* compile.c : fix opt_case_dispatch instruction

Modified: trunk/benchmark/run.rb
===================================================================
--- trunk/benchmark/run.rb	2005-06-28 12:17:01 UTC (rev 179)
+++ trunk/benchmark/run.rb	2005-06-28 12:35:56 UTC (rev 180)
@@ -19,8 +19,9 @@
   return if prog.empty?
 
   /bm_(.+)\.rb/ =~ file
+  bm_name = $1
   puts '-----------------------------------------------------------' unless $yarvonly
-  puts "#{$1}: "
+  puts "#{bm_name}: "
   
   
 puts <<EOS unless $yarvonly
@@ -34,8 +35,11 @@
     # x.report("yarv"){ YARVUtil.load_bm(file) }
     } unless $yarvonly
 
-    ruby_exec(file) unless $yarvonly
-    yarv_exec(file)
+    result = [bm_name]
+    result << ruby_exec(file) unless $yarvonly
+    result << yarv_exec(file)
+    $results << result
+    
     # puts YARVUtil.parse(File.read(file), file, 1).disasm
     
     # x.report("ruby"){ load(file, false)    }
@@ -77,7 +81,7 @@
   result = `#{cmd}`
   puts result
   tmpfile.close(true)
-  $results << result
+  result
 end
 
 def ruby_exec file
@@ -111,10 +115,12 @@
     }
   end
 
-  $results.each{|result|
-    if /([\d\.]+)/ =~ result
-      puts $1
-    end
+  $results.each{|res|
+    print res.shift + "\t"
+    res.each{|result|
+      /([\d\.]+)/ =~ result
+    }
+    print $1 + "\t"
   }
 end
 

Modified: trunk/depend
===================================================================
--- trunk/depend	2005-06-28 12:17:01 UTC (rev 179)
+++ trunk/depend	2005-06-28 12:35:56 UTC (rev 180)
@@ -46,16 +46,16 @@
 	$(RUBY) -I$(srcdir) $(srcdir)/rb/makedocs.rb $(INSNS2VMOPT)
 
 test-all: all
-	$(RUBY) -I$(srcdir) $(srcdir)/test/runner.rb $(TESTOPT)
+	$(RUBY) -I$(srcdir) $(srcdir)/test/runner.rb $(TESTOPT) $(TOPT)
 
 test-each: all
-	$(RUBY) -I$(srcdir) $(srcdir)/test/test_$(ITEM).rb $(TESTOPT)
+	$(RUBY) -I$(srcdir) $(srcdir)/test/test_$(ITEM).rb $(TESTOPT) $(TOPT)
 
 run: all
 	$(RUBY) -I$(srcdir) $(srcdir)/test.rb $(RUNOPT)
 
 benchmark: all
-	$(RUBY) -I$(srcdir) $(srcdir)/benchmark/run.rb
+	$(RUBY) -I$(srcdir) $(srcdir)/benchmark/run.rb $(BOPT)
 
 ITEM=bmx_temp
 tbench: all


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