Merge branch 'v0.7' into feat/inv_bench

.github/workflows/ci.yml

@@ -34,3 +34,13 @@ jobs:
           toolchain: nightly-2022-12-10
           override: true
       - run: make test
+  bench:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: nightly-2022-12-10
+          override: true
+      - run: make bench

Cargo.toml

@@ -21,10 +21,10 @@ num-bigint = "0.4"
 hex = "0.4"
 thiserror = "1.0"
 log = "0.4"
-criterion = { version = "0.4", optional = true}
+env_logger = "0.9.0"
 mpt-zktrie = { git = "https://github.com/scroll-tech/zkevm-circuits.git", rev = "7d9bc181953cfc6e7baf82ff0ce651281fd70a8a" }
 rand_chacha = "0.3.0"
-env_logger = "0.9.0"
+criterion = { version = "0.4", optional = true}
 
 [patch."https://github.com/privacy-scaling-explorations/halo2.git"]
 halo2_proofs = { git = "https://github.com/scroll-tech/halo2.git", branch = "develop" }
@@ -39,7 +39,6 @@ default = ["halo2_proofs/mock-batch-inv"]
 
 [dev-dependencies]
 # mpt-zktrie = { path = "../scroll-circuits/zktrie" }
-rand_chacha = "0.3.0"
 plotters = "0.3"
 bencher = "0.1"
 subtle = "2"
@@ -51,3 +50,8 @@ path = "integration-tests/src/main.rs"
 [profile.test]
 opt-level = 3
 debug-assertions = true
+
+[[bench]]
+name = "parallel_assignment"
+harness = false
+required-features = [ "bench" ]

Makefile

@@ -5,4 +5,7 @@ fmt:
 	@cargo fmt
 
 clippy:
-	@cargo clippy --all-features -- -D warnings
+	@cargo clippy --all-features
+
+bench:
+	@cargo bench --features bench

benches/parallel_assignment.rs

@@ -0,0 +1,20 @@
+use criterion::{criterion_group, criterion_main, Criterion};
+use halo2_mpt_circuits::TestCircuit;
+use halo2_proofs::{dev::MockProver, halo2curves::bn256::Fr};
+
+fn bench(criterion: &mut Criterion) {
+    let json = include_str!("traces.json");
+    let circuit = TestCircuit::new(10_000, serde_json::from_str(&json).unwrap());
+
+    criterion.bench_function("assign trace", |bencher| {
+        bencher.iter(|| MockProver::<Fr>::run(14, &circuit, vec![]))
+    });
+}
+
+criterion_group! {
+    name = benches;
+    config = Criterion::default().sample_size(10);
+    targets = bench
+}
+
+criterion_main!(benches);