code cosmetics

Author: hero78119

ceno_zkvm/src/scheme/utils.rs

@@ -6,7 +6,7 @@ use itertools::Itertools;
 use multilinear_extensions::{
     commutative_op_mle_pair_pool,
     mle::{DenseMultilinearExtension, FieldType, IntoMLE},
-    op_mle_xa_b_pool, op_mle3_range_pool,
+    op_mle_xa_b, op_mle3_range,
     util::{ceil_log2, max_usable_threads},
     virtual_poly_v2::ArcMultilinearExtension,
 };
@@ -244,22 +244,6 @@ fn try_recycle_arcpoly<E: ExtensionField, PF1: Fn() -> Vec<E>, PF2: Fn() -> Vec<
     pool_b: &mut SimpleVecPool<Vec<E::BaseField>, PF2>,
     pool_expected_size_vec: usize,
 ) {
-    // fn downcast_arc<E: ExtensionField>(
-    //     arc: ArcMultilinearExtension<'_, E>,
-    // ) -> DenseMultilinearExtension<E> {
-    //     unsafe {
-    //         // get the raw pointer from the Arc
-    //         assert_eq!(Arc::strong_count(&arc), 1);
-    //         let raw = Arc::into_raw(arc);
-    //         // cast the raw pointer to the desired concrete type
-    //         let typed_ptr = raw as *const DenseMultilinearExtension<E>;
-    //         // manually drop the Arc without dropping the value
-    //         Arc::decrement_strong_count(raw);
-    //         // reconstruct the Arc with the concrete type
-    //         // Move the value out
-    //         ptr::read(typed_ptr)
-    //     }
-    // }
     let len = poly.evaluations().len();
     if len == pool_expected_size_vec {
         match poly {
@@ -470,7 +454,7 @@ pub(crate) fn wit_infer_by_expr_pool<'a, E: ExtensionField, const N: usize>(
             },
             &|cow_x, cow_a, cow_b, pool_e, pool_b| {
                 let (x, a, b) = (cow_x.as_ref(), cow_a.as_ref(), cow_b.as_ref());
-                let poly = op_mle_xa_b_pool!(
+                let poly = op_mle_xa_b!(
                     |x, a, b, res| {
                         let res = SyncUnsafeCell::new(res);
                         assert_eq!(a.len(), 1);

ceno_zkvm/src/utils.rs

@@ -230,6 +230,8 @@ where
     result
 }
 
+/// a simple vector pool
+/// not support multi-thread access
 pub struct SimpleVecPool<T, F: Fn() -> T> {
     pool: VecDeque<T>,
     factory_fn: F,
@@ -238,20 +240,13 @@ pub struct SimpleVecPool<T, F: Fn() -> T> {
 impl<T, F: Fn() -> T> SimpleVecPool<T, F> {
     // Create a new pool with a factory closure
     pub fn new(init: F) -> Self {
-        let pool = SimpleVecPool {
+        SimpleVecPool {
             pool: VecDeque::new(),
             factory_fn: init,
-        };
-
-        pool
-    }
-
-    // Add a new item to the pool
-    pub fn add(&mut self, item: T) {
-        self.pool.push_back(item);
+        }
     }
 
-    // Borrow an item from the pool, or create a new one if empty
+    // borrow an item from the pool, or create a new one if empty
     pub fn borrow(&mut self) -> T {
         self.pool.pop_front().unwrap_or_else(|| (self.factory_fn)())
     }

multilinear_extensions/src/mle.rs

@@ -1062,10 +1062,7 @@ macro_rules! op_mle3_range {
         let $bb_out = $op;
         $op_bb_out
     }};
-}
 
-#[macro_export]
-macro_rules! op_mle3_range_pool {
     ($x:ident, $a:ident, $b:ident, $res:ident, $x_vec:ident, $a_vec:ident, $b_vec:ident, $res_vec:ident, $op:expr, |$bb_out:ident| $op_bb_out:expr) => {{
         let $x = if let Some((start, offset)) = $x.evaluations_range() {
             &$x_vec[start..][..offset]
@@ -1091,7 +1088,7 @@ macro_rules! op_mle3_range_pool {
 
 /// deal with x * a + b
 #[macro_export]
-macro_rules! op_mle_xa_b_pool {
+macro_rules! op_mle_xa_b {
     (|$x:ident, $a:ident, $b:ident, $res:ident| $op:expr, $pool_e:ident, $pool_b:ident, |$bb_out:ident| $op_bb_out:expr) => {
         match (&$x.evaluations(), &$a.evaluations(), &$b.evaluations()) {
             (
@@ -1100,7 +1097,7 @@ macro_rules! op_mle_xa_b_pool {
                 $crate::mle::FieldType::Base(b_vec),
             ) => {
                 let res_vec = $pool_b.borrow();
-                op_mle3_range_pool!(
+                op_mle3_range!(
                     $x,
                     $a,
                     $b,
@@ -1119,7 +1116,7 @@ macro_rules! op_mle_xa_b_pool {
                 $crate::mle::FieldType::Base(b_vec),
             ) => {
                 let res_vec = $pool_e.borrow();
-                op_mle3_range_pool!(
+                op_mle3_range!(
                     $x,
                     $a,
                     $b,
@@ -1138,7 +1135,7 @@ macro_rules! op_mle_xa_b_pool {
                 $crate::mle::FieldType::Ext(b_vec),
             ) => {
                 let res_vec = $pool_e.borrow();
-                op_mle3_range_pool!(
+                op_mle3_range!(
                     $x,
                     $a,
                     $b,
@@ -1160,7 +1157,7 @@ macro_rules! op_mle_xa_b_pool {
         }
     };
     (|$x:ident, $a:ident, $b:ident, $res:ident| $op:expr, $pool_e:ident, $pool_b:ident) => {
-        op_mle_xa_b_pool!(|$x, $a, $b, $res| $op, $pool_e, $pool_b, |out| out)
+        op_mle_xa_b!(|$x, $a, $b, $res| $op, $pool_e, $pool_b, |out| out)
     };
 }