From 9b58df70a673dfe5e3ee0342b6f921e1378b76ac Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Fri, 3 May 2013 12:00:05 -0700 Subject: [PATCH 1/3] tools: include Makefile.local if present --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 3a710e54b..47f6256e4 100644 --- a/Makefile +++ b/Makefile @@ -940,3 +940,4 @@ cleanbin: Clean: clean cleanbin cleandocs rm -f TAGS tags +-include Makefile.local From e30679de6d64103bf4eca41f1fd5a196918ed21d Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Fri, 3 May 2013 12:00:21 -0700 Subject: [PATCH 2/3] tools: more git ignores --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9c9b1df17..e6d787e6e 100644 --- a/.gitignore +++ b/.gitignore @@ -3,7 +3,7 @@ *.hi *.o _* -cabal-dev +cabal-dev* hledger-web/static/tmp/ hledger-web/yesod-devel/ TAGS @@ -16,3 +16,5 @@ site/[0-9]* /messages /static /templates +profs/profs +t.* From 473f7521067a25258d9ca4bc0ef9a43610924f1f Mon Sep 17 00:00:00 2001 From: Simon Michael Date: Fri, 3 May 2013 13:18:05 -0700 Subject: [PATCH 3/3] tools: update (quick)bench tests a little Today I'm seeing relative performance numbers like this (linode 1G VPS, 32-bit GNU/Linux): +-------------------------------------------++--------------+--------------+--------------+---------------------+ | || hledger-0.18 | hledger-0.19 | hledger-0.20 | ledger-3.0-20130215 | +===========================================++==============+==============+==============+=====================+ | -f data/100x100x10.journal balance || 0.16 | 0.04 | 0.05 | 0.02 | | -f data/1000x1000x10.journal balance || 8.26 | 0.34 | 0.47 | 0.07 | | -f data/10000x1000x10.journal balance || 11.85 | 2.59 | 3.94 | 0.31 | | -f data/10000x1000x10.journal balance aa || 3.73 | 3.49 | 4.72 | 0.23 | | -f data/100x100x10.journal register || 0.07 | 0.07 | 0.07 | 0.07 | | -f data/1000x1000x10.journal register || 0.56 | 0.51 | 0.70 | 0.54 | | -f data/100x100x10.journal print || 0.06 | 0.04 | 0.06 | 0.01 | | -f data/1000x1000x10.journal print || 0.37 | 0.34 | 0.49 | 0.07 | | -f data/10000x1000x10.journal print || 3.84 | 3.54 | 4.62 | 0.55 | +-------------------------------------------++--------------+--------------+--------------+---------------------+ --- Makefile | 5 ++--- bench.tests | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index d4557a5f6..9a9a53245 100644 --- a/Makefile +++ b/Makefile @@ -17,8 +17,7 @@ COVCMD=-f test-wf.csv print # executables to run during "make simplebench". They should be on the path # or in the current directory. hledger executables for benchmarking should # generally be the standard optimised cabal build, constrained to parsec 2. -BENCHEXES=hledger-0.12.1 hledger-0.13 hledger-0.14 hledger-0.15 hledger-0.16 hledger-0.17 hledger-0.18 hledgeropt ledger -BENCHEXES=hledger-0.18 hledgeropt ledger +BENCHEXES=hledger-0.18 hledger-0.19 hledger-0.20 ledger-3.0-20130215 # misc. tools BROWSE=google-chrome @@ -436,7 +435,7 @@ fullcabaltest: # run simple performance benchmarks without saving results # Requires some commands defined in bench.tests and some BENCHEXES defined above. quickbench: samplejournals bench.tests tools/simplebench - tools/simplebench -fbench.tests $(BENCHEXES) + tools/simplebench -v -fbench.tests $(BENCHEXES) @rm -f benchresults.* # run simple performance benchmarks and archive results diff --git a/bench.tests b/bench.tests index 7f3f773d1..90116f661 100644 --- a/bench.tests +++ b/bench.tests @@ -12,7 +12,7 @@ -f data/100x100x10.journal register -f data/1000x1000x10.journal register #-f data/1000x10000x10.journal register --f data/10000x1000x10.journal register +#-f data/10000x1000x10.journal register #-f data/10000x10000x10.journal register #-f data/10000x1000x10.journal register aa #-f data/100000x1000x10.journal register