Reset to benchmarked artifact in rustc repo

Previously we reset to origin/master which isn't quite right

Author: Mark-Simulacrum

collector/src/execute.rs

@@ -504,6 +504,7 @@ pub struct MeasureProcessor<'a> {
     rt: &'a mut Runtime,
     krate: &'a BenchmarkName,
     conn: &'a mut dyn database::Connection,
+    artifact: &'a database::ArtifactId,
     cid: database::ArtifactIdNumber,
     upload: Option<Upload>,
     is_first_collection: bool,
@@ -516,6 +517,7 @@ impl<'a> MeasureProcessor<'a> {
         rt: &'a mut Runtime,
         conn: &'a mut dyn database::Connection,
         krate: &'a BenchmarkName,
+        artifact: &'a database::ArtifactId,
         cid: database::ArtifactIdNumber,
         self_profile: bool,
     ) -> Self {
@@ -528,6 +530,7 @@ impl<'a> MeasureProcessor<'a> {
             upload: None,
             conn,
             krate,
+            artifact,
             cid,
             is_first_collection: true,
             // Command::new("summarize").status().is_ok()
@@ -773,7 +776,7 @@ impl<'a> Processor for MeasureProcessor<'a> {
     }
 
     fn measure_rustc(&mut self, compiler: Compiler<'_>) -> anyhow::Result<()> {
-        rustc::measure(self.rt, self.conn, compiler, self.cid)
+        rustc::measure(self.rt, self.conn, compiler, self.artifact, self.cid)
     }
 }
 

collector/src/execute/rustc.rs

@@ -9,6 +9,7 @@
 
 use crate::Compiler;
 use anyhow::Context;
+use database::ArtifactId;
 use std::env;
 use std::{collections::HashMap, process::Command};
 use std::{path::Path, time::Duration};
@@ -18,6 +19,7 @@ pub fn measure(
     rt: &mut Runtime,
     conn: &mut dyn database::Connection,
     compiler: Compiler<'_>,
+    artifact: &database::ArtifactId,
     aid: database::ArtifactIdNumber,
 ) -> anyhow::Result<()> {
     checkout().context("checking out rust-lang/rust")?;
@@ -26,8 +28,8 @@ pub fn measure(
     // on. This should (hopefully) reduce variance. It's also a 2x bump in
     // compile times, but we can afford the extra 6 minutes (presuming it
     // actually benefits us).
-    record(rt, conn, compiler, aid)?;
-    record(rt, conn, compiler, aid)?;
+    record(rt, conn, compiler, artifact, aid)?;
+    record(rt, conn, compiler, artifact, aid)?;
 
     Ok(())
 }
@@ -36,16 +38,20 @@ fn record(
     rt: &mut Runtime,
     conn: &mut dyn database::Connection,
     compiler: Compiler<'_>,
+    artifact: &database::ArtifactId,
     aid: database::ArtifactIdNumber,
 ) -> anyhow::Result<()> {
     let checkout = Path::new("rust");
     let status = Command::new("git")
         .current_dir("rust")
         .arg("reset")
         .arg("--hard")
-        .arg("origin/master")
+        .arg(match artifact {
+            ArtifactId::Commit(c) => c.sha.as_str(),
+            ArtifactId::Artifact(id) => id.as_str(),
+        })
         .status()
-        .context("git reset --hard origin/master")?;
+        .context("git reset --hard")?;
     assert!(status.success(), "git reset --hard successful");
     let status = Command::new("git")
         .current_dir("rust")

collector/src/main.rs

@@ -247,6 +247,7 @@ fn bench(
             rt,
             tx.conn(),
             &benchmark.name,
+            &cid,
             interned_cid,
             self_profile,
         );