From fcd5d8fd332b30800c85008100446961473f97d6 Mon Sep 17 00:00:00 2001
From: ko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 19 Jun 2013 23:15:56 +0000
Subject: [PATCH] * tool/gcbench.rb: Summary in one line. * common.mk: separete
 gcbench-hash to gcbench-hash1 and gcbench-hash2.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@41462 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog       | 6 ++++++
 common.mk       | 8 +++++---
 tool/gcbench.rb | 6 ++----
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cd6b7e0c1b..a7127611af 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jun 20 08:09:29 2013  Koichi Sasada  <ko1@atdot.net>
+
+	* tool/gcbench.rb: Summary in one line.
+
+	* common.mk: separete gcbench-hash to gcbench-hash1 and gcbench-hash2.
+
 Thu Jun 20 08:07:23 2013  Tanaka Akira  <akr@fsij.org>
 
 	* bignum.c (BIGSIZE): New macro.
diff --git a/common.mk b/common.mk
index 2a9f1a4c0c..429e7a0416 100644
--- a/common.mk
+++ b/common.mk
@@ -430,14 +430,16 @@ gcbench-rdoc: PHONY ruby
 	@echo Benchmark with Generating RDoc documentation
 	$(Q) $(XRUBY) "$(srcdir)/tool/gcbench.rb" "$(srcdir)/tool/rdocbench.rb" --root "$(srcdir)" --page-dir "$(srcdir)/doc" --encoding=UTF-8 --no-force-update --all --ri  --debug $(RDOCFLAGS) --quiet "$(srcdir)"
 
-HASHBENCH_TYPE=1
-gcbench-hash: PHONY ruby
+gcbench-hash1: PHONY ruby
 	@echo "Benchmark with hashbench1 (many temporal objects / obj count intensive)"
 	$(Q) $(XRUBY) "$(srcdir)/tool/gcbench.rb" "$(srcdir)/tool/hashbench1.rb"
-	@echo
+
+gcbench-hash2: PHONY ruby
 	@echo "Benchmark with hashbench2 (increasing hash size / malloc intensive)"
 	$(Q) $(XRUBY) "$(srcdir)/tool/gcbench.rb" "$(srcdir)/tool/hashbench2.rb"
 
+gcbench-hash: PHONY gcbench-hash1 gcbench-hash2
+
 nodoc: PHONY
 
 what-where-doc: no-install-doc
diff --git a/tool/gcbench.rb b/tool/gcbench.rb
index e16cb9ddce..ca9f3cd950 100644
--- a/tool/gcbench.rb
+++ b/tool/gcbench.rb
@@ -18,7 +18,5 @@ puts Benchmark::CAPTION
 puts tms
 puts "GC total time (sec): #{gc_time}"
 puts
-puts "Summary (ruby): #{RUBY_DESCRIPTION} (#{script})"
-puts "Summary (real): #{tms.real} sec"
-puts "Summary (gctm): #{gc_time} sec"
-puts "Summary (gc#) : #{GC.count}"
+puts "Summary #{RUBY_DESCRIPTION}\t#{tms.real}\t#{gc_time}\t#{GC.count}"
+puts "         (real time in sec, GC time in sec, GC count)"