From 33921769937420c5a947fc30afc04e7224d2fb80 Mon Sep 17 00:00:00 2001 From: Thomas Miedema Date: Thu, 27 Feb 2025 11:00:35 +0100 Subject: [PATCH] ;dev: update bench*.sh files Since commit 4c7abc3d2f, `just samplejournals` creates sample journals in the examples/ directory with a different naming scheme (e.g. `1ktxns-1kaccts.journal` instead of `1000x1000x10.journal`). Reflect this change in the bench*.sh files. Also fix `just bench-throughput`. --- Justfile | 4 ++-- bench-10ktxns-100kaccts.sh | 6 +++--- bench-10ktxns-10kaccts.sh | 6 +++--- bench.sh | 43 +++++++++++++++++++------------------- bench100k.sh | 6 +++--- bench10k.sh | 6 +++--- bench1k.sh | 6 +++--- bench5k.sh | 6 +++--- 8 files changed, 41 insertions(+), 42 deletions(-) diff --git a/Justfile b/Justfile index 4c11b5028..34d07a8b5 100644 --- a/Justfile +++ b/Justfile @@ -698,8 +698,8 @@ OS := `ghc -ignore-dot-ghci -package-env - -e 'import System.Info' -e 'putStrLn echo system: `uname -a` echo executable: {{ EXE }} echo version: `{{ EXE }} --version` - for n in 1000 2000 3000 4000 5000 6000 7000 8000 9000 10000 100000 ; do \ - printf "%6d txns: " $n; {{ EXE }} stats -f examples/${n}x1000x10.journal | tail -1; \ + for n in 1 2 3 4 5 6 7 8 9 10 100 ; do \ + printf "%3dk txns: " $n; {{ EXE }} stats -f examples/${n}ktxns-1kaccts.journal | tail -1; \ done date diff --git a/bench-10ktxns-100kaccts.sh b/bench-10ktxns-100kaccts.sh index 63dff9adc..4ac8126ac 100644 --- a/bench-10ktxns-100kaccts.sh +++ b/bench-10ktxns-100kaccts.sh @@ -1,3 +1,3 @@ -hledger -f examples/10000x100000x10.journal print -hledger -f examples/10000x100000x10.journal register -hledger -f examples/10000x100000x10.journal balance +hledger -f examples/10ktxns-100kaccts.journal print +hledger -f examples/10ktxns-100kaccts.journal register +hledger -f examples/10ktxns-100kaccts.journal balance diff --git a/bench-10ktxns-10kaccts.sh b/bench-10ktxns-10kaccts.sh index 26eb7cc6b..6af900b43 100644 --- a/bench-10ktxns-10kaccts.sh +++ b/bench-10ktxns-10kaccts.sh @@ -1,3 +1,3 @@ -hledger -f examples/10000x10000x10.journal print -hledger -f examples/10000x10000x10.journal register -hledger -f examples/10000x10000x10.journal balance +hledger -f examples/10ktxns-10kaccts.journal print +hledger -f examples/10ktxns-10kaccts.journal register +hledger -f examples/10ktxns-10kaccts.journal balance diff --git a/bench.sh b/bench.sh index e70875bb8..b5d80f81a 100755 --- a/bench.sh +++ b/bench.sh @@ -5,7 +5,7 @@ # (criterion) is more robust. # # Generate the test journals: -# make samplejournals +# just samplejournals # # Get quickbench: # git clone https://github.com/simonmichael/quickbench @@ -15,32 +15,31 @@ # Measure performance: # time ./bench.sh # show if these work, what they do, total time (GNU time also shows max memory) # quickbench [OPTS] # time each command, one or more times -# make bench # time each command with several hledger versions (BENCHEXES in Makefile) # stack bench hledger # time a different set of benchmarks (bench/bench.hs) # stack bench hledger --ba --criterion # time more carefully, using criterion # commands to benchmark: -# hledger -f examples/100x100x10.journal print -# hledger -f examples/1000x1000x10.journal print -hledger -f examples/10000x1000x10.journal print -# hledger -f examples/10000x1000x10.journal print ff -#hledger -f examples/100000x1000x10.journal print -#hledger -f examples/100000x1000x10.journal print ff +# hledger -f examples/100txns-100accts.journal print +# hledger -f examples/1ktxns-1kaccts.journal print +hledger -f examples/10ktxns-1kaccts.journal print +# hledger -f examples/10ktxns-1kaccts.journal print ff +#hledger -f examples/100ktxns-1kaccts.journal print +#hledger -f examples/100ktxns-1kaccts.journal print ff -# hledger -f examples/100x100x10.journal register -# hledger -f examples/1000x1000x10.journal register -hledger -f examples/10000x1000x10.journal register -# hledger -f examples/10000x1000x10.journal register ff -#hledger -f examples/100000x1000x10.journal register -#hledger -f examples/100000x1000x10.journal register ff +# hledger -f examples/100txns-100accts.journal register +# hledger -f examples/1ktxns-1kaccts.journal register +hledger -f examples/10ktxns-1kaccts.journal register +# hledger -f examples/10ktxns-1kaccts.journal register ff +#hledger -f examples/100ktxns-1kaccts.journal register +#hledger -f examples/100ktxns-1kaccts.journal register ff -# hledger -f examples/100x100x10.journal balance -# hledger -f examples/1000x1000x10.journal balance -hledger -f examples/10000x1000x10.journal balance -# hledger -f examples/10000x1000x10.journal balance ff -#hledger -f examples/100000x1000x10.journal balance -#hledger -f examples/100000x1000x10.journal balance ff -#hledger -f examples/1000x1000x10.journal balance --weekly -#hledger -f examples/10000x1000x10.journal balance --weekly +# hledger -f examples/100txns-100accts.journal balance +# hledger -f examples/1ktxns-1kaccts.journal balance +hledger -f examples/10ktxns-1kaccts.journal balance +# hledger -f examples/10ktxns-1kaccts.journal balance ff +#hledger -f examples/100ktxns-1kaccts.journal balance +#hledger -f examples/100ktxns-1kaccts.journal balance ff +#hledger -f examples/1ktxns-1kaccts.journal balance --weekly +#hledger -f examples/10ktxns-1kaccts.journal balance --weekly diff --git a/bench100k.sh b/bench100k.sh index 47269413d..dc6926e97 100644 --- a/bench100k.sh +++ b/bench100k.sh @@ -1,3 +1,3 @@ -hledger -f examples/100000x1000x10.journal print -hledger -f examples/100000x1000x10.journal register -hledger -f examples/100000x1000x10.journal balance +hledger -f examples/100ktxns-1kaccts.journal print +hledger -f examples/100ktxns-1kaccts.journal register +hledger -f examples/100ktxns-1kaccts.journal balance diff --git a/bench10k.sh b/bench10k.sh index 71688b3d4..b1f8f37b4 100644 --- a/bench10k.sh +++ b/bench10k.sh @@ -1,3 +1,3 @@ -hledger -f examples/10000x1000x10.journal print -hledger -f examples/10000x1000x10.journal register -hledger -f examples/10000x1000x10.journal balance +hledger -f examples/10ktxns-1kaccts.journal print +hledger -f examples/10ktxns-1kaccts.journal register +hledger -f examples/10ktxns-1kaccts.journal balance diff --git a/bench1k.sh b/bench1k.sh index c933299ef..53352b896 100644 --- a/bench1k.sh +++ b/bench1k.sh @@ -1,3 +1,3 @@ -hledger -f examples/1000x1000x10.journal print -hledger -f examples/1000x1000x10.journal register -hledger -f examples/1000x1000x10.journal balance +hledger -f examples/1ktxns-1kaccts.journal print +hledger -f examples/1ktxns-1kaccts.journal register +hledger -f examples/1ktxns-1kaccts.journal balance diff --git a/bench5k.sh b/bench5k.sh index 6509a5128..a515db421 100644 --- a/bench5k.sh +++ b/bench5k.sh @@ -1,3 +1,3 @@ -hledger -f examples/5000x1000x10.journal print -hledger -f examples/5000x1000x10.journal register -hledger -f examples/5000x1000x10.journal balance +hledger -f examples/5ktxns-1kaccts.journal print +hledger -f examples/5ktxns-1kaccts.journal register +hledger -f examples/5ktxns-1kaccts.journal balance