Remove bench_test, add install_next.

`install_next` + `bench_local` can now be used to do what `bench_test`
previously did. This combination is better because it gives
`bench_local` test coverage.

This required adding a `preserve()` method to `Sysroot`, so that an
installed toolchain could be preserved between `install_next` and
`bench_local`.

Author: nnethercote

.github/workflows/ci.yml

@@ -59,7 +59,7 @@ jobs:
       - name: Check benchmarks
         run: sh -x -c "ci/check-benchmarks.sh"
         env:
-          BENCH_TEST_OPTS: "--exclude script-servo"
+          BENCH_INCLUDE_EXCLUDE_OPTS: "--exclude script-servo"
   test_script_servo:
     name: Test benchmark script-servo
     runs-on: ubuntu-latest
@@ -90,5 +90,5 @@ jobs:
       - name: Check benchmarks
         run: sh -x -c "ci/check-benchmarks.sh"
         env:
-          BENCH_TEST_OPTS: "--include script-servo"
+          BENCH_INCLUDE_EXCLUDE_OPTS: "--include script-servo"
           SHELL: "/bin/bash"

ci/check-benchmarks.sh

@@ -5,9 +5,17 @@ set -x;
 bash -c "while true; do sleep 30; echo \$(date) - running ...; done" &
 PING_LOOP_PID=$!
 trap - ERR
+RUST_BACKTRACE=1 RUST_LOG=collector_raw_cargo=trace,collector=debug,rust_sysroot=debug \
+    bindir=`cargo run -p collector --bin collector install_next` \
+    && \
 RUST_BACKTRACE=1 RUST_LOG=collector_raw_cargo=trace,collector=debug,rust_sysroot=debug \
     cargo run -p collector --bin collector -- \
-    bench_test $BENCH_TEST_OPTS
+    bench_local $bindir/rustc Test \
+        --builds Check,Doc \
+        --cargo $bindir/cargo \
+        --runs All \
+        --rustdoc $bindir/rustdoc \
+        $BENCH_INCLUDE_EXCLUDE_OPTS
 code=$?
 kill $PING_LOOP_PID
 exit $code

collector/src/main.rs

@@ -473,17 +473,6 @@ fn main_result() -> anyhow::Result<i32> {
             (@arg DB: --db +takes_value "Database output file")
         )
 
-        (@subcommand bench_test =>
-            (about: "Benchmarks the most recent commit for testing purposes")
-
-            // Mandatory arguments: (none)
-
-            // Options
-            (@arg DB:      --db      +takes_value "Database output file")
-            (@arg EXCLUDE: --exclude +takes_value "Exclude benchmarks matching these")
-            (@arg INCLUDE: --include +takes_value "Include benchmarks matching these")
-        )
-
         (@subcommand profile_local =>
             (about: "Profiles a local rustc with one of several profilers")
 
@@ -507,6 +496,14 @@ fn main_result() -> anyhow::Result<i32> {
              'IncrFull', 'IncrUnchanged', 'IncrPatched', 'All'")
             (@arg RUSTDOC: --rustdoc +takes_value "The path to the local rustdoc to benchmark")
         )
+
+        (@subcommand install_next =>
+            (about: "Installs the next commit for perf.rust-lang.org")
+
+            // Mandatory arguments: (none)
+
+            // Options: (none)
+        )
     )
     .get_matches();
 
@@ -694,46 +691,6 @@ fn main_result() -> anyhow::Result<i32> {
             Ok(0)
         }
 
-        ("bench_test", Some(sub_m)) => {
-            // Mandatory arguments: (none)
-
-            // Options
-            let db = sub_m.value_of("DB").unwrap_or(default_db);
-            let exclude = sub_m.value_of("EXCLUDE");
-            let include = sub_m.value_of("INCLUDE");
-
-            let pool = database::Pool::open(db);
-            let conn = rt.block_on(pool.connection());
-
-            let last_sha = Command::new("git")
-                .arg("ls-remote")
-                .arg("https://github.com/rust-lang/rust.git")
-                .arg("master")
-                .output()
-                .unwrap();
-            let last_sha = String::from_utf8(last_sha.stdout).expect("utf8");
-            let last_sha = last_sha.split_whitespace().next().expect(&last_sha);
-            let commit = get_commit_or_fake_it(&last_sha).expect("success");
-            let sysroot = Sysroot::install(commit.sha.to_string(), "x86_64-unknown-linux-gnu")?;
-
-            let benchmarks = get_benchmarks(&benchmark_dir, include, exclude)?;
-
-            let res = bench(
-                &mut rt,
-                conn,
-                &ArtifactId::Commit(commit),
-                &[BuildKind::Check, BuildKind::Doc], // no Debug or Opt builds
-                &RunKind::all(),
-                Compiler::from_sysroot(&sysroot),
-                &benchmarks,
-                1,
-                /* call_home */ false,
-                /* self_profile */ false,
-            );
-            res.fail_if_nonzero()?;
-            Ok(0)
-        }
-
         ("profile_local", Some(sub_m)) => {
             // Mandatory arguments
             let profiler = Profiler::from_name(sub_m.value_of("PROFILER").unwrap())?;
@@ -781,6 +738,31 @@ fn main_result() -> anyhow::Result<i32> {
             Ok(0)
         }
 
+        ("install_next", Some(_sub_m)) => {
+            // Mandatory arguments: (none)
+
+            // Options: (none)
+
+            let last_sha = Command::new("git")
+                .arg("ls-remote")
+                .arg("https://github.com/rust-lang/rust.git")
+                .arg("master")
+                .output()
+                .unwrap();
+            let last_sha = String::from_utf8(last_sha.stdout).expect("utf8");
+            let last_sha = last_sha.split_whitespace().next().expect(&last_sha);
+            let commit = get_commit_or_fake_it(&last_sha).expect("success");
+            let mut sysroot = Sysroot::install(commit.sha.to_string(), "x86_64-unknown-linux-gnu")?;
+            sysroot.preserve(); // don't delete it
+
+            // Print the directory containing the toolchain.
+            sysroot.rustc.pop();
+            let s = format!("{:?}", sysroot.rustc);
+            println!("{}", &s[1..s.len() - 1]);
+
+            Ok(0)
+        }
+
         _ => {
             let _ = writeln!(stderr(), "{}", matches.usage());
             Ok(2)

collector/src/sysroot.rs

@@ -19,6 +19,7 @@ pub struct Sysroot {
     pub rustdoc: PathBuf,
     pub cargo: PathBuf,
     pub triple: String,
+    pub preserve: bool,
 }
 
 impl Sysroot {
@@ -42,10 +43,17 @@ impl Sysroot {
 
         Ok(sysroot)
     }
+
+    pub fn preserve(&mut self) {
+        self.preserve = true;
+    }
 }
 
 impl Drop for Sysroot {
     fn drop(&mut self) {
+        if self.preserve {
+            return;
+        }
         fs::remove_dir_all(format!("cache/{}", self.sha)).unwrap_or_else(|err| {
             log::info!(
                 "failed to remove {:?}, please do so manually: {:?}",
@@ -121,6 +129,7 @@ impl SysrootDownload {
             cargo: sysroot_bin("cargo")?,
             sha: self.rust_sha,
             triple: self.triple,
+            preserve: false,
         })
     }