From 41699cc9d7a732814339471d737ccd8efa445531 Mon Sep 17 00:00:00 2001
From: Simon Michael <simon@joyful.com>
Date: Fri, 29 May 2009 11:42:34 +0000
Subject: [PATCH] more benchtest cleanups; test balance, register and print

---
 Makefile    | 15 ++-------------
 bench.tests | 17 +++++++++++++----
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/Makefile b/Makefile
index eea184830..b511dc4c9 100644
--- a/Makefile
+++ b/Makefile
@@ -138,14 +138,13 @@ benchtest: sampleledgers bench.tests bench
 	@(cd profs; rm -f latest.bench; ln -s $(TIME).bench latest.bench)
 
 # generate standard sample ledgers
-sampleledgers: sample.ledger 100x100x10.ledger 1000x1000x10.ledger 10000x1000x10.ledger \
-	100000x1000x10.ledger 1000.ledger 10000.ledger 100000.ledger 1000x1000x10.ledger
+sampleledgers: sample.ledger 100x100x10.ledger 1000x1000x10.ledger 10000x1000x10.ledger 100000x1000x10.ledger
 
 sample.ledger:
 	true # XXX should probably regenerate this
 
 100x100x10.ledger: generateledger
-	tools/generateledger 1000 1000 10 >$@
+	tools/generateledger 100 100 10 >$@
 
 1000x1000x10.ledger: generateledger
 	tools/generateledger 1000 1000 10 >$@
@@ -156,16 +155,6 @@ sample.ledger:
 100000x1000x10.ledger: generateledger
 	tools/generateledger 100000 1000 10 >$@
 
-# keep for next benchmark report..
-1000include.ledger:
-	ghc -e 'putStr $$ unlines $$ replicate 1000 "!include sample.ledger"' >1000.ledger
-
-10000include.ledger:
-	ghc -e 'putStr $$ unlines $$ replicate 10000 "!include sample.ledger"' >10000.ledger
-
-100000include.ledger:
-	ghc -e 'putStr $$ unlines $$ replicate 100000 "!include sample.ledger"' >100000.ledger
-
 ######################################################################
 # DOCUMENTATION
 
diff --git a/bench.tests b/bench.tests
index 9b0622b66..aa8dfc13e 100644
--- a/bench.tests
+++ b/bench.tests
@@ -1,7 +1,16 @@
 # tests for "make bench" - one command per line, without the executable
 
--f 1000.ledger balance # old
--f 100x100x10.ledger balance
--f 1000x1000x10.ledger balance
--f 10000x1000x10.ledger balance
+-f 100x100x10.ledger     balance
+-f 1000x1000x10.ledger   balance
+-f 10000x1000x10.ledger  balance
 #-f 100000x1000x10.ledger balance
+
+-f 100x100x10.ledger     register
+-f 1000x1000x10.ledger   register
+-f 10000x1000x10.ledger  register
+#-f 100000x1000x10.ledger register
+
+-f 100x100x10.ledger     print
+-f 1000x1000x10.ledger   print
+-f 10000x1000x10.ledger  print
+#-f 100000x1000x10.ledger print