bump

halo2_proofs/src/lib.rs

@@ -25,18 +25,6 @@
 #![allow(unused_imports)]
 #![allow(clippy::derive_partial_eq_without_eq)]
 
-pub mod arithmetic;
-pub mod circuit;
-pub use halo2curves;
-mod multicore;
-pub mod plonk;
-pub mod poly;
-pub mod transcript;
-
-pub mod dev;
-mod helpers;
-pub use helpers::SerdeFormat;
-
 #[cfg(feature = "counter")]
 #[macro_use]
 extern crate lazy_static;
@@ -55,3 +43,15 @@ lazy_static! {
     static ref FFT_COUNTER: Mutex<BTreeMap<usize, usize>> = Mutex::new(BTreeMap::new());
     static ref MSM_COUNTER: Mutex<BTreeMap<usize, usize>> = Mutex::new(BTreeMap::new());
 }
+
+pub mod arithmetic;
+pub mod circuit;
+pub use halo2curves;
+mod multicore;
+pub mod plonk;
+pub mod poly;
+pub mod transcript;
+
+pub mod dev;
+mod helpers;
+pub use helpers::SerdeFormat;

halo2_proofs/src/plonk/prover.rs

@@ -58,6 +58,16 @@ pub fn create_proof<
 where
     Scheme::Scalar: WithSmallOrderMulGroup<3> + FromUniformBytes<64>,
 {
+    #[cfg(feature = "counter")]
+    {
+        use crate::{FFT_COUNTER, MSM_COUNTER};
+        use std::collections::BTreeMap;
+
+        // reset counters at the beginning of the prove
+        *MSM_COUNTER.lock().unwrap() = BTreeMap::new();
+        *FFT_COUNTER.lock().unwrap() = BTreeMap::new();
+    }
+
     for instance in instances.iter() {
         if instance.len() != pk.vk.cs.num_instance_columns {
             return Err(Error::InvalidInstances);
@@ -695,6 +705,18 @@ where
         // We query the h(X) polynomial at x
         .chain(vanishing.open(x));
 
+    #[cfg(feature = "counter")]
+    {
+        use crate::{FFT_COUNTER, MSM_COUNTER};
+        use std::collections::BTreeMap;
+        println!("MSM_COUNTER: {:?}", MSM_COUNTER.lock().unwrap());
+        println!("FFT_COUNTER: {:?}", *FFT_COUNTER.lock().unwrap());
+
+        // reset counters at the end of the proving
+        *MSM_COUNTER.lock().unwrap() = BTreeMap::new();
+        *FFT_COUNTER.lock().unwrap() = BTreeMap::new();
+    }
+
     let prover = P::new(params);
     prover
         .create_proof(rng, transcript, instances)