Download the Cranelift component from rustup if it is requested as a backend

Author: Kobzol

collector/src/bin/collector.rs

@@ -667,6 +667,7 @@ fn main_result() -> anyhow::Result<i32> {
             let get_suite = |rustc: &str, id: &str| {
                 let toolchain = get_local_toolchain(
                     &[Profile::Opt],
+                    &[CodegenBackend::Llvm],
                     rustc,
                     ToolchainConfig::default(),
                     id,
@@ -723,6 +724,7 @@ fn main_result() -> anyhow::Result<i32> {
             let get_toolchain = |rustc: &str, id: &str| {
                 let toolchain = get_local_toolchain(
                     &[Profile::Opt],
+                    &[CodegenBackend::Llvm],
                     rustc,
                     ToolchainConfig::default(),
                     id,
@@ -761,6 +763,7 @@ fn main_result() -> anyhow::Result<i32> {
 
             let toolchain = get_local_toolchain(
                 &profiles,
+                &backends,
                 &local.rustc,
                 *ToolchainConfig::default()
                     .rustdoc(opts.rustdoc.as_deref())
@@ -960,6 +963,7 @@ fn main_result() -> anyhow::Result<i32> {
                 |rustc: &str, suffix: &str| -> anyhow::Result<String> {
                     let toolchain = get_local_toolchain(
                         profiles,
+                        &[CodegenBackend::Llvm],
                         rustc,
                         *ToolchainConfig::default()
                             .rustdoc(opts.rustdoc.as_deref())
@@ -1085,6 +1089,7 @@ fn get_local_toolchain_for_runtime_benchmarks(
 ) -> anyhow::Result<Toolchain> {
     get_local_toolchain(
         &[Profile::Opt],
+        &[CodegenBackend::Llvm],
         &local.rustc,
         *ToolchainConfig::default()
             .cargo(local.cargo.as_deref())

collector/src/toolchain.rs

@@ -1,3 +1,4 @@
+use crate::compile::benchmark::codegen_backend::CodegenBackend;
 use crate::compile::benchmark::profile::Profile;
 use anyhow::{anyhow, Context};
 use log::debug;
@@ -330,6 +331,7 @@ impl<'a> ToolchainConfig<'a> {
 ///   for the nightly Cargo via `rustup`.
 pub fn get_local_toolchain(
     profiles: &[Profile],
+    codegen_backends: &[CodegenBackend],
     rustc: &str,
     toolchain_config: ToolchainConfig<'_>,
     id_suffix: &str,
@@ -357,8 +359,18 @@ pub fn get_local_toolchain(
                 anyhow::bail!("rustup-toolchain-install-master is not installed but must be");
             }
 
-            if !Command::new("rustup-toolchain-install-master")
-                .arg(toolchain)
+            let mut additional_components = vec![];
+            if codegen_backends.contains(&CodegenBackend::Cranelift) {
+                additional_components.push("rustc-codegen-cranelift");
+            }
+
+            let mut cmd = Command::new("rustup-toolchain-install-master");
+            cmd.arg(toolchain);
+            for component in additional_components {
+                cmd.arg("-c").arg(component);
+            }
+
+            if !cmd
                 .status()
                 .context("failed to run `rustup-toolchain-install-master`")?
                 .success()