From ba63642638dd69b19a8d26c05b66df01f6b9d780 Mon Sep 17 00:00:00 2001
From: Rudy Matela <rudy@matela.com.br>
Date: Sat, 10 Feb 2024 13:13:01 +0100
Subject: [PATCH] Makefile: add and use BENCH variable

... and make so that slow benchmarks are run first
---
 Makefile                                       | 7 ++++---
 bench/runtime/zero/bench/arith-c.runtime       | 2 +-
 bench/runtime/zero/bench/arith-t.runtime       | 2 +-
 bench/runtime/zero/bench/bool-c.runtime        | 2 +-
 bench/runtime/zero/bench/list-t.runtime        | 2 +-
 bench/runtime/zero/bench/minus-c.runtime       | 2 +-
 bench/runtime/zero/bench/stats.runtime         | 2 +-
 bench/runtime/zero/eg/arith-negate-abs.runtime | 2 +-
 bench/runtime/zero/eg/binarytree.runtime       | 2 +-
 bench/runtime/zero/eg/binarytree0.runtime      | 2 +-
 bench/runtime/zero/eg/bool.runtime             | 2 +-
 bench/runtime/zero/eg/colour.runtime           | 2 +-
 bench/runtime/zero/eg/digraphs.runtime         | 2 +-
 bench/runtime/zero/eg/fun.runtime              | 2 +-
 bench/runtime/zero/eg/insertsort.runtime       | 2 +-
 bench/runtime/zero/eg/insertsort0.runtime      | 2 +-
 bench/runtime/zero/eg/list.runtime             | 2 +-
 bench/runtime/zero/eg/minus.runtime            | 2 +-
 bench/runtime/zero/eg/monad.runtime            | 2 +-
 bench/runtime/zero/eg/oddeven.runtime          | 2 +-
 bench/runtime/zero/eg/plus-abs.runtime         | 2 +-
 bench/runtime/zero/eg/ratio.runtime            | 2 +-
 bench/runtime/zero/eg/sets.runtime             | 2 +-
 bench/runtime/zero/eg/speculate-reason.runtime | 2 +-
 bench/runtime/zero/eg/string.runtime           | 2 +-
 bench/runtime/zero/eg/tauts.runtime            | 2 +-
 bench/runtime/zero/eg/tuples.runtime           | 2 +-
 bench/runtime/zero/eg/zip.runtime              | 2 +-
 28 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/Makefile b/Makefile
index 5ec3a27..a03178d 100644
--- a/Makefile
+++ b/Makefile
@@ -69,6 +69,7 @@ QUICKEG = \
   eg/arith \
   eg/bool \
   eg/list
+BENCH = $(EG) $(wildcard bench/*-t) $(wildcard bench/*-c)
 LIST_ALL_HSS = find src test eg bench/*.hs mk -name \*.hs | grep -vE 'eg/(regexes|pretty-compact|algebraic-graphs)'
 LIST_LIB_HSS = find src -name \*.hs
 LIB_DEPS = base template-haskell $(INSTALL_DEPS)
@@ -80,16 +81,16 @@ test: all test-sdist $(patsubst %,%.run,$(TESTS)) diff-test
 
 test-with-extra-deps: test diff-test-extra
 
-txt: $(patsubst %,%.txt,$(EG) $(wildcard bench/*-c) $(wildcard bench/*-t))
+txt: $(patsubst %,%.txt,$(BENCH))
 
-diff-test: $(patsubst %,%.diff,$(EG) $(wildcard bench/*-c) $(wildcard bench/*-t))
+diff-test: $(patsubst %,%.diff,$(BENCH))
 
 # Disclaimer: This bench target is not intended to generate paper-grade runtime
 #             datapoints as it runs each benchmark just once.  This target is
 #             meant to track large runtime changes across different git
 #             versions.
 .PHONY: bench
-bench: $(EG) $(patsubst %,%.bench,$(EG) $(wildcard bench/*-c) $(wildcard bench/*-t))
+bench: $(EG) $(patsubst %,%.bench,$(BENCH))
 	@mkdir -p bench/runtime/$$HOSTNAME
 	./bench/versions $(INSTALL_DEPS) | tee bench/runtime/$$HOSTNAME/versions
 
diff --git a/bench/runtime/zero/bench/arith-c.runtime b/bench/runtime/zero/bench/arith-c.runtime
index f429be0..21b86ba 100644
--- a/bench/runtime/zero/bench/arith-c.runtime
+++ b/bench/runtime/zero/bench/arith-c.runtime
@@ -1 +1 @@
-0.65
+0.63
diff --git a/bench/runtime/zero/bench/arith-t.runtime b/bench/runtime/zero/bench/arith-t.runtime
index e65dd88..338ce86 100644
--- a/bench/runtime/zero/bench/arith-t.runtime
+++ b/bench/runtime/zero/bench/arith-t.runtime
@@ -1 +1 @@
-11.53
+11.70
diff --git a/bench/runtime/zero/bench/bool-c.runtime b/bench/runtime/zero/bench/bool-c.runtime
index a4b5a6f..410158a 100644
--- a/bench/runtime/zero/bench/bool-c.runtime
+++ b/bench/runtime/zero/bench/bool-c.runtime
@@ -1 +1 @@
-2.20
+2.28
diff --git a/bench/runtime/zero/bench/list-t.runtime b/bench/runtime/zero/bench/list-t.runtime
index 4911aab..d2bc220 100644
--- a/bench/runtime/zero/bench/list-t.runtime
+++ b/bench/runtime/zero/bench/list-t.runtime
@@ -1 +1 @@
-0.45
+0.44
diff --git a/bench/runtime/zero/bench/minus-c.runtime b/bench/runtime/zero/bench/minus-c.runtime
index fd6d73e..ca6156a 100644
--- a/bench/runtime/zero/bench/minus-c.runtime
+++ b/bench/runtime/zero/bench/minus-c.runtime
@@ -1 +1 @@
-0.95
+0.92
diff --git a/bench/runtime/zero/bench/stats.runtime b/bench/runtime/zero/bench/stats.runtime
index eec15f9..48b9990 100644
--- a/bench/runtime/zero/bench/stats.runtime
+++ b/bench/runtime/zero/bench/stats.runtime
@@ -1 +1 @@
-0.29
+0.31
diff --git a/bench/runtime/zero/eg/arith-negate-abs.runtime b/bench/runtime/zero/eg/arith-negate-abs.runtime
index 9313299..ea3769f 100644
--- a/bench/runtime/zero/eg/arith-negate-abs.runtime
+++ b/bench/runtime/zero/eg/arith-negate-abs.runtime
@@ -1 +1 @@
-1.89
+1.81
diff --git a/bench/runtime/zero/eg/binarytree.runtime b/bench/runtime/zero/eg/binarytree.runtime
index c8829b0..07cde98 100644
--- a/bench/runtime/zero/eg/binarytree.runtime
+++ b/bench/runtime/zero/eg/binarytree.runtime
@@ -1 +1 @@
-1.86
+1.75
diff --git a/bench/runtime/zero/eg/binarytree0.runtime b/bench/runtime/zero/eg/binarytree0.runtime
index 179d305..96ca769 100644
--- a/bench/runtime/zero/eg/binarytree0.runtime
+++ b/bench/runtime/zero/eg/binarytree0.runtime
@@ -1 +1 @@
-0.55
+0.57
diff --git a/bench/runtime/zero/eg/bool.runtime b/bench/runtime/zero/eg/bool.runtime
index d9949ce..e409f4b 100644
--- a/bench/runtime/zero/eg/bool.runtime
+++ b/bench/runtime/zero/eg/bool.runtime
@@ -1 +1 @@
-2.55
+2.52
diff --git a/bench/runtime/zero/eg/colour.runtime b/bench/runtime/zero/eg/colour.runtime
index fc249e9..a4b5a6f 100644
--- a/bench/runtime/zero/eg/colour.runtime
+++ b/bench/runtime/zero/eg/colour.runtime
@@ -1 +1 @@
-2.18
+2.20
diff --git a/bench/runtime/zero/eg/digraphs.runtime b/bench/runtime/zero/eg/digraphs.runtime
index 883d7d6..64d00e7 100644
--- a/bench/runtime/zero/eg/digraphs.runtime
+++ b/bench/runtime/zero/eg/digraphs.runtime
@@ -1 +1 @@
-1.69
+1.60
diff --git a/bench/runtime/zero/eg/fun.runtime b/bench/runtime/zero/eg/fun.runtime
index b48f322..653f1a8 100644
--- a/bench/runtime/zero/eg/fun.runtime
+++ b/bench/runtime/zero/eg/fun.runtime
@@ -1 +1 @@
-1.17
+1.33
diff --git a/bench/runtime/zero/eg/insertsort.runtime b/bench/runtime/zero/eg/insertsort.runtime
index 5540931..23eeb98 100644
--- a/bench/runtime/zero/eg/insertsort.runtime
+++ b/bench/runtime/zero/eg/insertsort.runtime
@@ -1 +1 @@
-8.32
+8.00
diff --git a/bench/runtime/zero/eg/insertsort0.runtime b/bench/runtime/zero/eg/insertsort0.runtime
index 809bdcb..b48f322 100644
--- a/bench/runtime/zero/eg/insertsort0.runtime
+++ b/bench/runtime/zero/eg/insertsort0.runtime
@@ -1 +1 @@
-1.12
+1.17
diff --git a/bench/runtime/zero/eg/list.runtime b/bench/runtime/zero/eg/list.runtime
index 64e9de7..00ddb02 100644
--- a/bench/runtime/zero/eg/list.runtime
+++ b/bench/runtime/zero/eg/list.runtime
@@ -1 +1 @@
-3.28
+2.81
diff --git a/bench/runtime/zero/eg/minus.runtime b/bench/runtime/zero/eg/minus.runtime
index f429be0..b17d954 100644
--- a/bench/runtime/zero/eg/minus.runtime
+++ b/bench/runtime/zero/eg/minus.runtime
@@ -1 +1 @@
-0.65
+0.54
diff --git a/bench/runtime/zero/eg/monad.runtime b/bench/runtime/zero/eg/monad.runtime
index 21b86ba..36808a5 100644
--- a/bench/runtime/zero/eg/monad.runtime
+++ b/bench/runtime/zero/eg/monad.runtime
@@ -1 +1 @@
-0.63
+0.62
diff --git a/bench/runtime/zero/eg/oddeven.runtime b/bench/runtime/zero/eg/oddeven.runtime
index 55acfd9..b27b736 100644
--- a/bench/runtime/zero/eg/oddeven.runtime
+++ b/bench/runtime/zero/eg/oddeven.runtime
@@ -1 +1 @@
-7.45
+7.06
diff --git a/bench/runtime/zero/eg/plus-abs.runtime b/bench/runtime/zero/eg/plus-abs.runtime
index 3db206e..8fd56c8 100644
--- a/bench/runtime/zero/eg/plus-abs.runtime
+++ b/bench/runtime/zero/eg/plus-abs.runtime
@@ -1 +1 @@
-3.88
+3.90
diff --git a/bench/runtime/zero/eg/ratio.runtime b/bench/runtime/zero/eg/ratio.runtime
index 156bbed..2ad5336 100644
--- a/bench/runtime/zero/eg/ratio.runtime
+++ b/bench/runtime/zero/eg/ratio.runtime
@@ -1 +1 @@
-9.03
+8.52
diff --git a/bench/runtime/zero/eg/sets.runtime b/bench/runtime/zero/eg/sets.runtime
index 2f0a20c..ef59ed7 100644
--- a/bench/runtime/zero/eg/sets.runtime
+++ b/bench/runtime/zero/eg/sets.runtime
@@ -1 +1 @@
-8.56
+8.12
diff --git a/bench/runtime/zero/eg/speculate-reason.runtime b/bench/runtime/zero/eg/speculate-reason.runtime
index e4fba21..c8cfe39 100644
--- a/bench/runtime/zero/eg/speculate-reason.runtime
+++ b/bench/runtime/zero/eg/speculate-reason.runtime
@@ -1 +1 @@
-3.12
+3.10
diff --git a/bench/runtime/zero/eg/string.runtime b/bench/runtime/zero/eg/string.runtime
index 1e376f6..341ad3c 100644
--- a/bench/runtime/zero/eg/string.runtime
+++ b/bench/runtime/zero/eg/string.runtime
@@ -1 +1 @@
-1.00
+0.93
diff --git a/bench/runtime/zero/eg/tauts.runtime b/bench/runtime/zero/eg/tauts.runtime
index 8491882..412a394 100644
--- a/bench/runtime/zero/eg/tauts.runtime
+++ b/bench/runtime/zero/eg/tauts.runtime
@@ -1 +1 @@
-5.23
+4.45
diff --git a/bench/runtime/zero/eg/tuples.runtime b/bench/runtime/zero/eg/tuples.runtime
index 6477a57..f7613c2 100644
--- a/bench/runtime/zero/eg/tuples.runtime
+++ b/bench/runtime/zero/eg/tuples.runtime
@@ -1 +1 @@
-1.40
+1.35
diff --git a/bench/runtime/zero/eg/zip.runtime b/bench/runtime/zero/eg/zip.runtime
index 3274853..587cb39 100644
--- a/bench/runtime/zero/eg/zip.runtime
+++ b/bench/runtime/zero/eg/zip.runtime
@@ -1 +1 @@
-2.87
+2.70