Add more profiler testing.

Author: nnethercote

.github/workflows/ci.yml

@@ -97,6 +97,8 @@ jobs:
 
       - name: Install profilers
         run: |
+          # njn: comment about 3.15
+          sudo apt install -y valgrind-3.15
           cargo install cargo-llvm-lines
 
       - name: Configure environment

ci/check-profiling.sh

@@ -13,33 +13,62 @@ trap 'kill $PING_LOOP_PID' ERR 1 2 3 6
 RUST_BACKTRACE=1 RUST_LOG=raw_cargo_messages=trace,collector=debug,rust_sysroot=debug \
     bindir=`cargo run -p collector --bin collector install_next`
 
-# Profile with eprintln.
+#----------------------------------------------------------------------------
+# Test the profilers
+#----------------------------------------------------------------------------
+
+# time-passes: TODO
+
+# perf-record: TODO
+
+# oprofile: TODO
+
+# Cachegrind.
 RUST_BACKTRACE=1 RUST_LOG=raw_cargo_messages=trace,collector=debug,rust_sysroot=debug \
     cargo run -p collector --bin collector -- \
-    profile_local eprintln $bindir/rustc Test \
+    profile_local cachegrind $bindir/rustc Test \
+        --builds Check \
         --cargo $bindir/cargo \
         --include helloworld \
         --runs Full
+valgrind --version  # njn: temp
+head -100 results/cgout-Test-helloworld-Check-Full  # njn: temp
+test -f results/cgout-Test-helloworld-Check-Full
+grep -q "events: Ir" results/cgout-Test-helloworld-Check-Full
+head -100 results/cgann-Test-helloworld-Check-Full   # njn: temp
+test -f results/cgann-Test-helloworld-Check-Full
+grep -q "PROGRAM TOTALS" results/cgann-Test-helloworld-Check-Full
+
+# Callgrind: TODO
+
+# DHAT: TODO
+
+# Massif: TODO
 
-# Check that Check/Debug/Opt files are present, and that Doc files aren't
-# present, becuase they're not done by default.
+# njn: move the check/debug/opt checking later
+# eprintln. Note: Check/Debug/Opt files must be present, and Doc files must not
+# be present, because they're not collected by default.
+RUST_BACKTRACE=1 RUST_LOG=raw_cargo_messages=trace,collector=debug,rust_sysroot=debug \
+    cargo run -p collector --bin collector -- \
+    profile_local eprintln $bindir/rustc Test \
+        --cargo $bindir/cargo \
+        --include helloworld \
+        --runs Full
 test -f results/eprintln-Test-helloworld-Check-Full
 test -f results/eprintln-Test-helloworld-Debug-Full
 test -f results/eprintln-Test-helloworld-Opt-Full
 test ! -e results/eprintln-Test-helloworld-Doc-Full
 
-# Profile with llvm-lines.
+# llvm-lines.
 RUST_BACKTRACE=1 RUST_LOG=raw_cargo_messages=trace,collector=debug,rust_sysroot=debug \
     cargo run -p collector --bin collector -- \
     profile_local llvm-lines $bindir/rustc Test \
         --builds Debug \
         --cargo $bindir/cargo \
-        --include futures \
+        --include helloworld \
         --runs Full
-
-# Check the output is present and looks something like it should.
-test -f results/ll-Test-futures-Debug-Full
-grep -q "Lines.*Copies.*Function name" results/ll-Test-futures-Debug-Full
+test -f results/ll-Test-helloworld-Debug-Full
+grep -q "Lines.*Copies.*Function name" results/ll-Test-helloworld-Debug-Full
 
 kill $PING_LOOP_PID
 exit 0