.gitlab-ci.yml

@@ -117,10 +117,12 @@ build-8.10:
 
   after_script:
     - ls -lh
+      # Create rts-stats/ so tar doesn't complain if we didn't collect rts stats
+    - mkdir -p rts-stats
     - |
       nix run -f ./ci -c \
       tar -cJf results.tar.xz -C ci/run \
-      results.json logs
+      results.json logs rts-stats
 
   artifacts:
     when: always

ci/TestPatches.hs

@@ -254,9 +254,10 @@ buildPackage cfg pname version = do
     (makeTestCabalFile cfg pname version)
 
   -- run the build
+  absDirName <- makeAbsolute "./store"
   code <- runProcess $ setWorkingDir dirName
                      $ proc "cabal"
-                     $ ["new-build"] ++ cabalOptions cfg
+                     $ ["--store-dir="++absDirName, "v2-build"] ++ cabalOptions cfg
 
   -- figure out what happened
   let planPath = dirName </> "dist-newstyle" </> "cache" </> "plan.json"
@@ -383,7 +384,7 @@ setup cfg = do
     , MakeConstraints.allowNewer MakeConstraints.bootPkgs
     ] ++ map PP.text extraFragments
 
-  runProcess_ $ proc "cabal" ["new-update"]
+  runProcess_ $ proc "cabal" ["v2-update"]
 
   -- Force cabal to rebuild the index cache.
   buildPackage cfg "acme-box" (mkVersion [0,0,0,0])

ci/ghc-wrapper

+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""
+A small GHC wrapper script for preserving RTS -t output.
+
+Arguments: GHC arguments
+Environment:
+  GHC_RTS_STATS_DIR: Directory in which to place -t output. File will be named after
+    output path given by -o.
+  GHC_RTS_STATS_COMPILER: GHC to wrap.
+"""
+
+import subprocess
+import sys
+import os
+from pathlib import Path
+from typing import List, Optional
+
+def find_output(args: List[str]) -> Optional[Path]:
+    """
+    Find the value of the GHC -o flag.
+    """
+    for arg0, arg1 in zip(args[:-1], args[1:]):
+        if arg0 == '-o':
+            return Path(arg1)
+
+    return None
+
+
+def main() -> None:
+    output = find_output(sys.argv)
+    ghc_path = os.environ['GHC_RTS_STATS_COMPILER']
+    args = [ghc_path] + sys.argv[1:]
+    if output is not None:
+        print(args)
+        out_dir = Path(os.environ['GHC_RTS_STATS_DIR'])
+        out_dir.mkdir(parents=True, exist_ok=True)
+        stats_output = out_dir / (output.name + '.stats')
+        args += ['+RTS', '--machine-readable', '-t%s' % stats_output, '-RTS']
+
+        perf_dir = os.environ.get('GHC_PERF_STATS_DIR')
+        if perf_dir:
+            events = os.environ.get('GHC_PERF_STATS_EVENTS', 'cycles,instructions,cache-misses')
+            Path(perf_dir).mkdir(parents=True, exist_ok=True)
+            perf_output = Path(perf_dir) / (output.name + '.perf')
+            args = ['perf', 'stat', '-o', str(perf_output), '-e', events ] + args
+
+    ret = subprocess.call(args)
+    sys.exit(ret)
+
+if __name__ == '__main__':
+    main()

run-ci

 #!/usr/bin/env bash
 
+# head.hackage CI driver script
+# =============================
+#
+# Environment variables:
+#   GHC:           path to `ghc` executable (defaults to `ghc`)
+#   CI_CONFIG:     path to a configuration script (defaults to `config.sh`)
+#   EXTRA_OPTS:    extra options to pass to `head-hackage-ci`
+#   EXTRA_HC_OPTS: extra options to pass to `ghc`
+#   CPUS:          parallelism amount
+#   USE_NIX:       use `nix` to provide build dependencies.
+#   COLLECT_RTS_STATS
+#                  collect runtime system statistics from compiler (forced on)
+#   COLLECT_PERF_STATS
+#                  collect perf_events counters from compiler
+#   GHC_PERF_STATS_EVENTS
+#                  which counters to collect
+#
+# Configuration script
+# --------------------
+#
+# The configuration script (`config.sh` by default) provides various
+# ad-hoc configuration including:
+#
+#  - which packages are broken
+#  - extra packages to build (that don't have a patch)
+
 set -e
 
 cd ci
@@ -26,18 +52,19 @@ if [ -n "$EXTRA_HC_OPTS" ]; then
   EXTRA_OPTS="$EXTRA_OPTS --ghc-option=\"$EXTRA_HC_OPTS\""
 fi
 
-mkdir -p run
+OUT_DIR="$(realpath .)/run"
+mkdir -p $OUT_DIR
 
-echo "" > run/deps.cabal.project
+echo "" > $OUT_DIR/deps.cabal.project
 if [ -n "$USE_NIX" ]; then
   # Generate native library dependency mapping
-  nix eval --raw -f ./. cabalDepsSrc >> run/deps.cabal.project
+  nix eval --raw -f ./. cabalDepsSrc >> $OUT_DIR/deps.cabal.project
   run="nix run -f ../. -c head-hackage-ci"
 else
   run="head-hackage-ci"
 
   # Sigh, this is an abysmal hack
-  bindir=$(realpath .)/run/bin
+  bindir="$OUT_DIR/bin"
   mkdir -p $bindir
   PATH=$bindir:$PATH
   cp build-repo.sh $bindir/build-repo.sh
@@ -52,7 +79,34 @@ else
   cabal new-install head-hackage-ci --installdir=$bindir
 fi
 
-cd run
+# Collect runtime system stats from compilation.
+COLLECT_RTS_STATS=1
+if [ -n "$COLLECT_RTS_STATS" ]; then
+  use_wrapper=1
+  export GHC_RTS_STATS_DIR="$OUT_DIR/rts-stats"
+fi
+
+# Collect perf stats from compilation.
+if [ -n "$COLLECT_PERF_STATS" ]; then
+  use_wrapper=1
+  export GHC_PERF_STATS_DIR="$OUT_DIR/perf-stats"
+  # GHC_PERF_STATS_EVENTS can be set to determine which events are collected.
+fi
+
+# Compiler wrapper.
+#
+# To make this work we use ci/ghc-wrapper, which adds
+# `+RTS --machine-readable -t...` to the compiler command-line.
+if [ -n "$use_wrapper" ]; then
+  # We need to wrap both ghc and ghc-pkg since cabal-install needs to find the
+  # latter.
+  ln -sf $(pwd)/ghc-wrapper $OUT_DIR/ghc
+  ln -sf $(dirname $GHC)/ghc-pkg $OUT_DIR/ghc-pkg
+  export GHC_RTS_STATS_COMPILER="$GHC"
+  export GHC="$OUT_DIR/ghc"
+fi
+
+cd $OUT_DIR
 rm -f cabal.project
 set -x
 $run \