Merge pull request #1556 from rust-lang/fix-llvm-lines

Fix `EXPECT_ONLY_WRAPPED_RUSTC` for `cargo llvm-lines`

Author: Kobzol

ci/check-profiling.sh

@@ -137,21 +137,18 @@ test ! -s results/eprintln-Test-helloworld-Check-Full
 # Including both `helloworld` and `regex-1.5.5` benchmarks, as they exercise the
 # zero dependency and the greater than zero dependency cases, respectively, the
 # latter of which has broken before.
-#
-# XXX: `regex-1.5.5` is currently excluded because it's failing on CI, even
-# though it works locally. #1537 is the issue for this.
 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 \
         --id Test \
         --profiles Debug \
         --cargo $bindir/cargo \
-        --include helloworld \
+        --include helloworld,regex-1.5.5 \
         --scenarios Full
 test -f results/ll-Test-helloworld-Debug-Full
 grep -q "Lines.*Copies.*Function name" results/ll-Test-helloworld-Debug-Full
-#test -f results/ll-Test-regex-1.5.5-Debug-Full
-#grep -q "Lines.*Copies.*Function name" results/ll-Test-regex-1.5.5-Debug-Full
+test -f results/ll-Test-regex-1.5.5-Debug-Full
+grep -q "Lines.*Copies.*Function name" results/ll-Test-regex-1.5.5-Debug-Full
 
 # llvm-ir. `Debug` not `Check` because it works better that way.
 RUST_BACKTRACE=1 RUST_LOG=raw_cargo_messages=trace,collector=debug,rust_sysroot=debug \

collector/src/execute/mod.rs

@@ -75,6 +75,14 @@ impl PerfTool {
         }
     }
 
+    /// Should return true if this perf tool calls Cargo "recursively" inside of it.
+    /// This is not compatible with a check that is performed to make sure that only the
+    /// final rustc is invoked during a benchmark/profiling phase.
+    /// See the `EXPECT_ONLY_WRAPPED_RUSTC` environment variable in `rustc-fake`.
+    fn calls_cargo_recursively(&self) -> bool {
+        matches!(self, PerfTool::ProfileTool(profiler::Profiler::LlvmLines))
+    }
+
     fn is_scenario_allowed(&self, scenario: Scenario) -> bool {
         use bencher::Bencher::*;
         use profiler::Profiler::*;
@@ -252,7 +260,9 @@ impl<'a> CargoProcess<'a> {
                 // If we're using a processor, we expect that only the crate
                 // we're interested in benchmarking will be built, not any
                 // dependencies.
-                cmd.env("EXPECT_ONLY_WRAPPED_RUSTC", "1");
+                if !processor.perf_tool().calls_cargo_recursively() {
+                    cmd.env("EXPECT_ONLY_WRAPPED_RUSTC", "1");
+                }
                 cmd.arg("--wrap-rustc-with");
                 cmd.arg(perf_tool_name);
                 cmd.args(&self.rustc_args);