From d3aa6488da5fd282806fa7ea847168df89e792b2 Mon Sep 17 00:00:00 2001
From: Sebastian Ullrich <sebasti@nullri.ch>
Date: Tue, 24 Sep 2019 22:41:59 +0200
Subject: [PATCH] chore(tests/bench): update cross suite

---
 nix/derivation.nix      |  4 ++--
 tests/bench/Makefile    |  2 +-
 tests/bench/cross.yaml  |  3 ---
 tests/bench/default.nix | 10 +++++-----
 tests/bench/report.py   |  3 +++
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/nix/derivation.nix b/nix/derivation.nix
index 309989fdb3..d6f31c5a8c 100644
--- a/nix/derivation.nix
+++ b/nix/derivation.nix
@@ -1,4 +1,4 @@
-{ llvmPackages, cmake, python, gmp }:
+{ llvmPackages, bash, cmake, python, gmp }:
 
 llvmPackages.stdenv.mkDerivation rec {
   name = "lean-${version}";
@@ -7,7 +7,7 @@ llvmPackages.stdenv.mkDerivation rec {
   # I have way too many untracked files in my checkout
   src = builtins.fetchGit { url = ../.; };
 
-  nativeBuildInputs = [ cmake python ];
+  nativeBuildInputs = [ bash cmake python ];
   buildInputs = [ gmp llvmPackages.llvm ];
   enableParallelBuilding = true;
 
diff --git a/tests/bench/Makefile b/tests/bench/Makefile
index 8fb84e623c..77bb99afe1 100644
--- a/tests/bench/Makefile
+++ b/tests/bench/Makefile
@@ -121,7 +121,7 @@ bench/unionfind.%.bench: BENCH_PARAMS = 3000000
 
 bench/%gc.lean.bench: %lean.out | bench
 	ulimit -s unlimited && $(TEMCI) short exec $(TEMCI_FLAGS)\
-    -d $< "perf record -o $@.tmp ./$< $(BENCH_PARAMS) >/dev/null && perf report -i $@.tmp -t ';' --stdio -S 'lean::del,lean::dealloc' | ./lean-gc.py"\
+    -d $< "perf record -o $@.tmp ./$< $(BENCH_PARAMS) >/dev/null && perf report -i $@.tmp -t ';' --stdio -S 'lean_del,lean_dealloc' | ./lean-gc.py"\
 	  --runner output --out $@
 
 bench/%gc.hs.bench: %hs.out | bench
diff --git a/tests/bench/cross.yaml b/tests/bench/cross.yaml
index be0bcad7cd..488bb7ab3a 100644
--- a/tests/bench/cross.yaml
+++ b/tests/bench/cross.yaml
@@ -2,9 +2,6 @@
 # Logging level
 log_level: info
 
-# Additional settings file
-settings_file: ''
-
 # Acquire sudo privileges and run benchmark programs with non-sudo user. Only supported on the command line.
 sudo: false
 
diff --git a/tests/bench/default.nix b/tests/bench/default.nix
index 26c43df296..39ba416938 100644
--- a/tests/bench/default.nix
+++ b/tests/bench/default.nix
@@ -1,11 +1,11 @@
 { pkgs ? import ./nixpkgs.nix }:
 
 let
-  lean = { stdenv ? pkgs.llvmPackages_7.stdenv }:
-    (pkgs.callPackage ../../default.nix { inherit stdenv; }).overrideAttrs (attrs: {
+  lean = {}:
+    (pkgs.callPackage ../../default.nix {}).overrideAttrs (attrs: {
      # pin Lean commit to avoid rebuilds
-     # 2019-05-27
-     src = builtins.fetchGit { url = ../../.; rev = "0e8abd81bba1b9c06ea7eab23001bbf08ff267dc"; };
+     # 2019-09-23
+     src = builtins.fetchGit { url = ../../.; rev = "345cc22f7935e4b83ed59b1a8fdf98a9241253ae"; };
     });
   # for binarytrees.hs
   ghcPackages = p: [ p.parallel ];
@@ -35,7 +35,7 @@ let
     '';
   };
   swift = pkgs.swift;
-  temci = import (builtins.fetchGit { url = http://github.com/parttimenerd/temci.git; rev = "e397ef9df168d581dcb46de4603088b7a5c6749c"; }) {};
+  temci = import (builtins.fetchGit { url = http://github.com/parttimenerd/temci.git; rev = "74086d20659731a16d0c04e9022c20fc63958322"; }) {};
 in pkgs.stdenv.mkDerivation rec {
   name = "bench";
   src = pkgs.lib.sourceFilesBySuffices ./. ["Makefile" "leanpkg.path" "temci.yaml" ".py" ".lean" ".hs" ".ml" ".sml"];
diff --git a/tests/bench/report.py b/tests/bench/report.py
index 828cc7e999..116fa45906 100755
--- a/tests/bench/report.py
+++ b/tests/bench/report.py
@@ -12,6 +12,9 @@ from temci.report import stats, rundata
 from temci.utils import number, settings
 import scipy.stats as st
 
+settings.Settings().load_file("cross.yaml")
+number.FNumber.init_settings(settings.Settings()["report/number"])
+
 def single(bench, cat, prop):
     f = f"bench/{bench}{cat}.bench"
     with open(f, "r") as f: