Enable download of the Cranelift backend component in install_next

Author: Kobzol

collector/src/bin/collector.rs

@@ -539,7 +539,11 @@ enum Commands {
     },
 
     /// Installs the next commit for perf.rust-lang.org
-    InstallNext,
+    InstallNext {
+        /// Install additional components to enable benchmarking of the given backends.
+        #[arg(long = "backends", value_parser = EnumArgParser::<CodegenBackend>::default(), default_value = "Llvm")]
+        codegen_backends: MultiEnumValue<CodegenBackend>,
+    },
 
     /// Download a crate into collector/benchmarks.
     Download(DownloadCommand),
@@ -854,8 +858,12 @@ fn main_result() -> anyhow::Result<i32> {
                     runs,
                 } => {
                     let sha = commit.sha.to_string();
-                    let sysroot = Sysroot::install(sha.clone(), &target_triple)
-                        .with_context(|| format!("failed to install sysroot for {:?}", commit))?;
+                    let sysroot = Sysroot::install(
+                        sha.clone(),
+                        &target_triple,
+                        vec![CodegenBackend::Llvm],
+                    )
+                    .with_context(|| format!("failed to install sysroot for {:?}", commit))?;
 
                     let mut benchmarks = get_compile_benchmarks(
                         &compile_benchmark_dir,
@@ -1030,7 +1038,7 @@ fn main_result() -> anyhow::Result<i32> {
             Ok(0)
         }
 
-        Commands::InstallNext => {
+        Commands::InstallNext { codegen_backends } => {
             let last_sha = Command::new("git")
                 .arg("ls-remote")
                 .arg("https://github.com/rust-lang/rust.git")
@@ -1040,7 +1048,7 @@ fn main_result() -> anyhow::Result<i32> {
             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, &target_triple)?;
+            let mut sysroot = Sysroot::install(commit.sha, &target_triple, codegen_backends.0)?;
             sysroot.preserve(); // don't delete it
 
             // Print the directory containing the toolchain.

collector/src/toolchain.rs

@@ -20,7 +20,11 @@ pub struct Sysroot {
 }
 
 impl Sysroot {
-    pub fn install(sha: String, triple: &str) -> anyhow::Result<Self> {
+    pub fn install(
+        sha: String,
+        triple: &str,
+        backends: Vec<CodegenBackend>,
+    ) -> anyhow::Result<Self> {
         let unpack_into = "cache";
 
         fs::create_dir_all(unpack_into)?;
@@ -35,6 +39,9 @@ impl Sysroot {
         download.get_and_extract(Component::Std)?;
         download.get_and_extract(Component::Cargo)?;
         download.get_and_extract(Component::RustSrc)?;
+        if backends.contains(&CodegenBackend::Cranelift) {
+            download.get_and_extract(Component::Cranelift)?;
+        }
 
         let sysroot = download.into_sysroot()?;
 
@@ -76,6 +83,7 @@ enum Component {
     Rustc,
     Std,
     RustSrc,
+    Cranelift,
 }
 
 impl fmt::Display for Component {
@@ -85,6 +93,7 @@ impl fmt::Display for Component {
             Component::Rustc => write!(f, "rustc"),
             Component::Std => write!(f, "rust-std"),
             Component::RustSrc => write!(f, "rust-src"),
+            Component::Cranelift => write!(f, "rustc-codegen-cranelift"),
         }
     }
 }
@@ -187,10 +196,10 @@ impl SysrootDownload {
 
     fn extract<T: Read>(&self, component: Component, reader: T) -> anyhow::Result<()> {
         let mut archive = Archive::new(reader);
-        let prefix = if component == Component::Std {
-            format!("rust-std-{}", self.triple)
-        } else {
-            component.to_string()
+        let prefix = match component {
+            Component::Std => format!("rust-std-{}", self.triple),
+            Component::Cranelift => format!("{component}-preview"),
+            _ => component.to_string(),
         };
 
         let unpack_into = self.directory.join(&self.rust_sha);