aboutsummaryrefslogtreecommitdiff
path: root/zkvms
diff options
context:
space:
mode:
authorKamen Mladenov <kamen@syndamia.com>2025-05-02 10:24:47 +0300
committerKamen Mladenov <kamen@syndamia.com>2025-05-02 15:32:54 +0300
commit1a2ad5528f7a61390c40c0b6f56fa507923d09f5 (patch)
tree713b8e86674a34b3a6b6d65062709f192f5b894c /zkvms
parenteefb57f2c035be1a398f630dd8cfed8b4ccbe348 (diff)
downloadzkVMs-benchmarks-1a2ad5528f7a61390c40c0b6f56fa507923d09f5.tar
zkVMs-benchmarks-1a2ad5528f7a61390c40c0b6f56fa507923d09f5.tar.gz
zkVMs-benchmarks-1a2ad5528f7a61390c40c0b6f56fa507923d09f5.zip
chore: cargo fmt
Diffstat (limited to 'zkvms')
-rw-r--r--zkvms/jolt/host/src/main.rs3
-rw-r--r--zkvms/nexus/host/src/main.rs3
-rw-r--r--zkvms/nexus/wrapper_macro/src/lib.rs22
-rw-r--r--zkvms/risc0/host/src/main.rs3
-rw-r--r--zkvms/risc0/wrapper_macro/src/lib.rs4
-rw-r--r--zkvms/sp1/host/src/main.rs3
-rw-r--r--zkvms/sp1/wrapper_macro/src/lib.rs4
-rw-r--r--zkvms/zkm/guest/src/main.rs2
-rw-r--r--zkvms/zkm/host/src/main.rs3
-rw-r--r--zkvms/zkm/wrapper_macro/src/lib.rs28
-rw-r--r--zkvms/zkwasm/host/src/main.rs9
-rw-r--r--zkvms/zkwasm/wrapper_macro/src/lib.rs17
12 files changed, 75 insertions, 26 deletions
diff --git a/zkvms/jolt/host/src/main.rs b/zkvms/jolt/host/src/main.rs
index 8bb3c86..4e74e89 100644
--- a/zkvms/jolt/host/src/main.rs
+++ b/zkvms/jolt/host/src/main.rs
@@ -1,7 +1,6 @@
use zkvms_host_io::{
- benchmarkable, read_args,
+ benchmarkable, output_proof_size, read_args,
RunType::{Execute, Prove, Verify},
- output_proof_size,
};
pub fn main() {
diff --git a/zkvms/nexus/host/src/main.rs b/zkvms/nexus/host/src/main.rs
index 68593fc..95eafe2 100644
--- a/zkvms/nexus/host/src/main.rs
+++ b/zkvms/nexus/host/src/main.rs
@@ -1,8 +1,7 @@
use nexus_sdk::{stwo::seq::Stwo, Local, Prover, Verifiable, Viewable};
use zkvms_host_io::{
- benchmarkable, read_args, Input, Return,
+ benchmarkable, output_proof_size, read_args, Input, Return,
RunType::{Execute, Prove, Verify},
- output_proof_size,
};
fn main() {
diff --git a/zkvms/nexus/wrapper_macro/src/lib.rs b/zkvms/nexus/wrapper_macro/src/lib.rs
index 69d1de2..aa072fd 100644
--- a/zkvms/nexus/wrapper_macro/src/lib.rs
+++ b/zkvms/nexus/wrapper_macro/src/lib.rs
@@ -35,13 +35,29 @@ pub fn make_wrapper(item: TokenStream) -> TokenStream {
let fd = FunctionDefinition::new(&item);
let mut out = TokenStream::new();
- out.extend(format!("let ({}) = read_public_input::<({})>().unwrap();", fd.grouped_public_patterns(), fd.grouped_public_types()).parse::<TokenStream>());
- out.extend(format!("let ({}) = read_private_input::<({})>().unwrap();", fd.grouped_private_patterns(), fd.grouped_private_types()).parse::<TokenStream>());
+ out.extend(
+ format!(
+ "let ({}) = read_public_input::<({})>().unwrap();",
+ fd.grouped_public_patterns(),
+ fd.grouped_public_types()
+ )
+ .parse::<TokenStream>(),
+ );
+ out.extend(
+ format!(
+ "let ({}) = read_private_input::<({})>().unwrap();",
+ fd.grouped_private_patterns(),
+ fd.grouped_private_types()
+ )
+ .parse::<TokenStream>(),
+ );
out.extend(
format!(
"write_public_output::<{}>(&zkp::{}({}));",
- fd.return_type, fd.name, fd.grouped_patterns()
+ fd.return_type,
+ fd.name,
+ fd.grouped_patterns()
)
.parse::<TokenStream>(),
);
diff --git a/zkvms/risc0/host/src/main.rs b/zkvms/risc0/host/src/main.rs
index 78fd164..f010115 100644
--- a/zkvms/risc0/host/src/main.rs
+++ b/zkvms/risc0/host/src/main.rs
@@ -2,9 +2,8 @@ use hex::FromHex;
use risc0_zkp::core::digest::Digest;
use risc0_zkvm::{default_executor, default_prover, ExecutorEnv, Receipt};
use zkvms_host_io::{
- benchmarkable, foreach_input_field, read_args, Input, Output,
+ benchmarkable, foreach_input_field, output_proof_size, read_args, Input, Output,
RunType::{Execute, Prove, Verify},
- output_proof_size,
};
// https://github.com/risc0/risc0/blob/881e512732eca72849b2d0e263a1242aba3158af/risc0/build/src/lib.rs#L280-L284
diff --git a/zkvms/risc0/wrapper_macro/src/lib.rs b/zkvms/risc0/wrapper_macro/src/lib.rs
index c43f5c1..42b8ca0 100644
--- a/zkvms/risc0/wrapper_macro/src/lib.rs
+++ b/zkvms/risc0/wrapper_macro/src/lib.rs
@@ -51,7 +51,9 @@ pub fn make_wrapper(item: TokenStream) -> TokenStream {
.collect::<String>();
out.extend(commits.parse::<TokenStream>());
- out.extend(format!("commit(&zkp::{}({}));", fd.name, fd.grouped_patterns()).parse::<TokenStream>());
+ out.extend(
+ format!("commit(&zkp::{}({}));", fd.name, fd.grouped_patterns()).parse::<TokenStream>(),
+ );
let mut block = TokenStream::new();
block.extend(format!("{{ {} }}", out).parse::<TokenStream>());
diff --git a/zkvms/sp1/host/src/main.rs b/zkvms/sp1/host/src/main.rs
index a395247..5403a53 100644
--- a/zkvms/sp1/host/src/main.rs
+++ b/zkvms/sp1/host/src/main.rs
@@ -1,8 +1,7 @@
use sp1_sdk::{EnvProver, ProverClient, SP1ProofWithPublicValues, SP1Stdin, SP1VerifyingKey};
use zkvms_host_io::{
- benchmarkable, foreach_input_field, read_args, Input,
+ benchmarkable, foreach_input_field, output_proof_size, read_args, Input,
RunType::{Execute, Prove, Verify},
- output_proof_size,
};
/// The ELF (executable and linkable format) file for the Succinct RISC-V zkVM.
diff --git a/zkvms/sp1/wrapper_macro/src/lib.rs b/zkvms/sp1/wrapper_macro/src/lib.rs
index 53965c2..070a09b 100644
--- a/zkvms/sp1/wrapper_macro/src/lib.rs
+++ b/zkvms/sp1/wrapper_macro/src/lib.rs
@@ -51,7 +51,9 @@ pub fn make_wrapper(item: TokenStream) -> TokenStream {
.collect::<String>();
out.extend(commits.parse::<TokenStream>());
- out.extend(format!("commit(&zkp::{}({}));", fd.name, fd.grouped_patterns()).parse::<TokenStream>());
+ out.extend(
+ format!("commit(&zkp::{}({}));", fd.name, fd.grouped_patterns()).parse::<TokenStream>(),
+ );
let mut block = TokenStream::new();
block.extend(format!("{{ {} }}", out).parse::<TokenStream>());
diff --git a/zkvms/zkm/guest/src/main.rs b/zkvms/zkm/guest/src/main.rs
index 2831bdf..4559e25 100644
--- a/zkvms/zkm/guest/src/main.rs
+++ b/zkvms/zkm/guest/src/main.rs
@@ -4,7 +4,7 @@
use wrapper_macro::make_wrapper;
extern crate alloc;
-use alloc::{collections::*, vec::*, string::*};
+use alloc::{collections::*, string::*, vec::*};
use zkm_runtime::io::{commit, read};
zkm_runtime::entrypoint!(main);
diff --git a/zkvms/zkm/host/src/main.rs b/zkvms/zkm/host/src/main.rs
index 1640b30..100e5b1 100644
--- a/zkvms/zkm/host/src/main.rs
+++ b/zkvms/zkm/host/src/main.rs
@@ -7,9 +7,8 @@ use zkm_sdk::{
};
use zkvms_host_io::{
- benchmarkable, read_args,
+ benchmarkable, output_proof_size, read_args,
RunType::{Execute, Prove, Verify},
- output_proof_size,
};
async fn get_proof(
diff --git a/zkvms/zkm/wrapper_macro/src/lib.rs b/zkvms/zkm/wrapper_macro/src/lib.rs
index 6a88602..fde5fa3 100644
--- a/zkvms/zkm/wrapper_macro/src/lib.rs
+++ b/zkvms/zkm/wrapper_macro/src/lib.rs
@@ -33,10 +33,32 @@ pub fn make_wrapper(item: TokenStream) -> TokenStream {
let mut out = TokenStream::new();
// NOTE: The first read returns public data, the second returns private
- out.extend(format!("let ({}) : ({}) = read();", fd.grouped_public_patterns(), fd.grouped_public_types()).parse::<TokenStream>());
- out.extend(format!("let ({}) : ({}) = read();", fd.grouped_private_patterns(), fd.grouped_private_types()).parse::<TokenStream>());
+ out.extend(
+ format!(
+ "let ({}) : ({}) = read();",
+ fd.grouped_public_patterns(),
+ fd.grouped_public_types()
+ )
+ .parse::<TokenStream>(),
+ );
+ out.extend(
+ format!(
+ "let ({}) : ({}) = read();",
+ fd.grouped_private_patterns(),
+ fd.grouped_private_types()
+ )
+ .parse::<TokenStream>(),
+ );
- out.extend(format!("commit::<{}>(&zkp::{}({}));", fd.return_type, fd.name, fd.grouped_patterns()).parse::<TokenStream>());
+ out.extend(
+ format!(
+ "commit::<{}>(&zkp::{}({}));",
+ fd.return_type,
+ fd.name,
+ fd.grouped_patterns()
+ )
+ .parse::<TokenStream>(),
+ );
let mut block = TokenStream::new();
block.extend(format!("{{ {} }}", out).parse::<TokenStream>());
diff --git a/zkvms/zkwasm/host/src/main.rs b/zkvms/zkwasm/host/src/main.rs
index 6a23504..ea8dcf5 100644
--- a/zkvms/zkwasm/host/src/main.rs
+++ b/zkvms/zkwasm/host/src/main.rs
@@ -1,11 +1,10 @@
use std::io::{self, Write};
use std::process::{Command, Stdio};
use zkvms_host_io::{
- benchmarkable, foreach_private_input_field, foreach_public_input_field, read_args,
- PrivateInput, PublicInput,
+ benchmarkable, foreach_private_input_field, foreach_public_input_field, output_proof_size_raw,
+ read_args, PrivateInput, PublicInput,
RunType::{Execute, Prove, Verify},
RunWith,
- output_proof_size_raw,
};
static PUBLIC_INPUT_PATH: &str = "public_input.bin";
@@ -108,7 +107,9 @@ fn main() {
.arg("--output")
.arg(output.clone()));
- let proofSize = std::fs::metadata(output.clone() + "/prog.0.transcript.data").unwrap().len();
+ let proofSize = std::fs::metadata(output.clone() + "/prog.0.transcript.data")
+ .unwrap()
+ .len();
output_proof_size_raw(proofSize as usize);
benchmarkable! {
diff --git a/zkvms/zkwasm/wrapper_macro/src/lib.rs b/zkvms/zkwasm/wrapper_macro/src/lib.rs
index 68a78ae..690cf5e 100644
--- a/zkvms/zkwasm/wrapper_macro/src/lib.rs
+++ b/zkvms/zkwasm/wrapper_macro/src/lib.rs
@@ -61,8 +61,18 @@ pub fn make_wrapper(item: TokenStream) -> TokenStream {
let mut out = TokenStream::new();
- insert_reads(&mut out, fd.public_patterns(), fd.public_types(), "read_public");
- insert_reads(&mut out, fd.private_patterns(), fd.private_types(), "read_private");
+ insert_reads(
+ &mut out,
+ fd.public_patterns(),
+ fd.public_types(),
+ "read_public",
+ );
+ insert_reads(
+ &mut out,
+ fd.private_patterns(),
+ fd.private_types(),
+ "read_private",
+ );
out.extend(
format!(
@@ -73,7 +83,8 @@ pub fn make_wrapper(item: TokenStream) -> TokenStream {
write(val);
}}
",
- fd.name, fd.grouped_patterns()
+ fd.name,
+ fd.grouped_patterns()
)
.parse::<TokenStream>(),
);