Add cargo risczero benchmark command

.vscode/settings.json

@@ -45,5 +45,11 @@
     "risc0/zkvm/methods/guest/Cargo.toml",
     "risc0/zkvm/methods/std/Cargo.toml",
     "tools/crates-validator/Cargo.toml",
+  ],
+  "cSpell.words": [
+    "canonicalize",
+    "risczero",
+    "tempdir",
+    "tmpdir"
   ]
 }

Cargo.toml

@@ -48,6 +48,7 @@ risc0-sys = { version = "0.21.0-alpha.1", default-features = false, path = "risc
 risc0-zkp = { version = "0.21.0-alpha.1", default-features = false, path = "risc0/zkp" }
 risc0-zkvm = { version = "0.21.0-alpha.1", default-features = false, path = "risc0/zkvm" }
 risc0-zkvm-platform = { version = "0.21.0-alpha.1", default-features = false, path = "risc0/zkvm/platform" }
+risc0-zkvm-methods = { version = "0.21.0-alpha.1", default-features = false, path = "risc0/zkvm/methods" }
 
 [profile.bench]
 lto = true

risc0/build/src/docker.rs

@@ -35,7 +35,12 @@ const DOCKER_IGNORE: &str = r#"
 const TARGET_DIR: &str = "target/riscv-guest/riscv32im-risc0-zkvm-elf/docker";
 
 /// Build the package in the manifest path using a docker environment.
-pub fn docker_build(manifest_path: &Path, src_dir: &Path, features: &[String]) -> Result<()> {
+pub fn docker_build(
+    manifest_path: &Path,
+    src_dir: &Path,
+    binaries: &[String],
+    features: &[String],
+) -> Result<()> {
     let manifest_path = manifest_path
         .canonicalize()
         .context(format!("manifest_path: {manifest_path:?}"))?;
@@ -69,14 +74,24 @@ pub fn docker_build(manifest_path: &Path, src_dir: &Path, features: &[String]) -
         let temp_dir = tempdir()?;
         let temp_path = temp_dir.path();
         let rel_manifest_path = manifest_path.strip_prefix(&src_dir)?;
-        create_dockerfile(&rel_manifest_path, temp_path, pkg_name.as_str(), features)?;
+        create_dockerfile(
+            &rel_manifest_path,
+            temp_path,
+            pkg_name.as_str(),
+            binaries,
+            features,
+        )?;
         build(&src_dir, temp_path)?;
     }
     println!("ELFs ready at:");
 
     let target_dir = src_dir.join(TARGET_DIR);
     for target in root_pkg.targets.iter() {
         if target.is_bin() {
+            if !binaries.is_empty() && !binaries.contains(&target.name) {
+                println!("Skipping target: {}", target.name);
+                continue;
+            }
             let elf_path = target_dir.join(&pkg_name).join(&target.name);
             let image_id = compute_image_id(&elf_path)?;
             let rel_elf_path = Path::new(TARGET_DIR).join(&pkg_name).join(&target.name);
@@ -94,6 +109,7 @@ fn create_dockerfile(
     manifest_path: &Path,
     temp_dir: &Path,
     pkg_name: &str,
+    binaries: &[String],
     features: &[String],
 ) -> Result<()> {
     let manifest_env = &[("CARGO_MANIFEST_PATH", manifest_path.to_str().unwrap())];
@@ -111,6 +127,11 @@ fn create_dockerfile(
     ];
 
     let mut build_args = common_args.clone();
+    let binaries_str = binaries.join(",");
+    if !binaries.is_empty() {
+        build_args.push("--bin");
+        build_args.push(&binaries_str);
+    }
     let features_str = features.join(",");
     if !features.is_empty() {
         build_args.push("--features");

risc0/build/src/lib.rs

@@ -401,6 +401,11 @@ fn build_guest_package<P>(
         cargo_command("build", &[])
     };
 
+    let binaries_str = guest_opts.bin.join(",");
+    if !guest_opts.bin.is_empty() {
+        cmd.args(&["--bin", &binaries_str]);
+    }
+
     let features_str = guest_opts.features.join(",");
     if !features_str.is_empty() {
         cmd.args(&["--features", &features_str]);
@@ -500,6 +505,9 @@ pub struct GuestOptions {
     /// Features for cargo to build the guest with.
     pub features: Vec<String>,
 
+    /// Binary names to build.
+    pub bin: Vec<String>,
+
     /// Use a docker environment for building.
     pub use_docker: Option<DockerOptions>,
 }
@@ -557,6 +565,7 @@ pub fn embed_methods_with_options(mut guest_pkg_to_options: HashMap<&str, GuestO
             docker_build(
                 guest_pkg.manifest_path.as_std_path(),
                 &src_dir,
+                &guest_opts.bin,
                 &guest_opts.features,
             )
             .unwrap();

risc0/cargo-risczero/Cargo.toml

@@ -33,13 +33,17 @@ reqwest-middleware = "0.2"
 reqwest-retry = "0.3"
 risc0-build = { workspace = true }
 risc0-r0vm = { workspace = true, optional = true }
-risc0-zkvm = { workspace = true, optional = true }
+risc0-zkvm = { workspace = true, default-features = false, features = ["std", "getrandom"] }
+risc0-zkvm-methods = { workspace = true, default-features = false }
 serde = { version = "1", features = ["derive"] }
+serde_json = "1.0.96"
+sha2 = "0.10.8"
 syn = "2.0.38"
 tar = "0.4"
 tempfile = "3"
 text_io = "0.1.12"
 tokio = { version = "1", features = ["rt"] }
+tracing = { version = "0.1", features = ["log"] }
 tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 zip = { version = "0.6", optional = true }
 

risc0/cargo-risczero/src/bin/cargo-risczero.rs

@@ -30,6 +30,7 @@ fn main() -> Result<()> {
         RisczeroCmd::BuildToolchain(cmd) => cmd.run(),
         RisczeroCmd::Install(cmd) => cmd.run(),
         RisczeroCmd::New(cmd) => cmd.run(),
+        RisczeroCmd::Benchmark(cmd) => cmd.run(),
         #[cfg(feature = "experimental")]
         RisczeroCmd::BuildCrate(build) => build.run(BuildSubcommand::Build),
         #[cfg(feature = "experimental")]