Merge pull request #712 from nnethercote/fix-llvm-lines

Fix `collector llvm-lines`

Author: Mark-Simulacrum

.github/workflows/ci.yml

@@ -110,6 +110,10 @@ jobs:
           toolchain: beta
           override: true
 
+      - name: Install profilers
+        run: |
+          cargo install cargo-llvm-lines
+
       - name: Configure environment
         run: |
           sudo apt-get update

ci/check-benchmarks.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
 
-set -e -x;
+set -eE -x;
 
 bash -c "while true; do sleep 30; echo \$(date) - running ...; done" &
 PING_LOOP_PID=$!
-trap 'kill $PING_LOOP_PID' ERR
+trap 'kill $PING_LOOP_PID' ERR 1 2 3 6
 
 # Install a toolchain.
 RUST_BACKTRACE=1 RUST_LOG=collector_raw_cargo=trace,collector=debug,rust_sysroot=debug \

ci/check-profiling.sh

@@ -1,13 +1,13 @@
 #!/bin/bash
 #
-# This script is basically just a smoke test. It only tests `eprintln`
-# profiling because setting up the other profilers is something of a hassle.
+# This script only tests some of the profilers at the moment. More coverage
+# would be nice.
 
-set -e -x;
+set -eE -x;
 
 bash -c "while true; do sleep 30; echo \$(date) - running ...; done" &
 PING_LOOP_PID=$!
-trap 'kill $PING_LOOP_PID' ERR
+trap 'kill $PING_LOOP_PID' ERR 1 2 3 6
 
 # Install a toolchain.
 RUST_BACKTRACE=1 RUST_LOG=collector_raw_cargo=trace,collector=debug,rust_sysroot=debug \
@@ -28,5 +28,18 @@ 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.
+RUST_BACKTRACE=1 RUST_LOG=collector_raw_cargo=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 \
+        --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
+
 kill $PING_LOOP_PID
 exit 0

collector/src/execute.rs

@@ -172,7 +172,7 @@ impl Profiler {
                 }
             }
             Profiler::LlvmLines => match build_kind {
-                BuildKind::Debug | BuildKind::Opt => Some("rustc"),
+                BuildKind::Debug | BuildKind::Opt => Some("llvm-lines"),
                 BuildKind::Check | BuildKind::Doc => None,
             },
         }