perf: remove assertion for perf

DelphinusLab · May 29, 2024 · 90f9da1 · 90f9da1
1 parent 0bc0d65
commit 90f9da1
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 36 deletions.
diff --git a/crates/zkwasm/src/circuits/cell.rs b/crates/zkwasm/src/circuits/cell.rs
@@ -124,13 +124,6 @@ macro_rules! define_cell {
                 ctx: &mut Context<'_, F>,
                 value: F,
             ) -> Result<AssignedCell<F, F>, Error> {
-                assert!(
-                    value <= $limit,
-                    "assigned value {:?} exceeds the limit {:?}",
-                    value,
-                    $limit
-                );
-
                 self.cell.assign(ctx, value)
             }
         }
@@ -145,7 +138,6 @@ define_cell!(AllocatedUnlimitedCell, -F::one());
 #[derive(Debug, Clone, Copy)]
 pub(crate) struct AllocatedCommonRangeCell<F: FieldExt> {
     pub(crate) cell: AllocatedCell<F>,
-    pub(crate) upper_bound: F,
 }
 
 impl<F: FieldExt> CellExpression<F> for AllocatedCommonRangeCell<F> {
@@ -154,13 +146,6 @@ impl<F: FieldExt> CellExpression<F> for AllocatedCommonRangeCell<F> {
     }
 
     fn assign(&self, ctx: &mut Context<'_, F>, value: F) -> Result<AssignedCell<F, F>, Error> {
-        assert!(
-            value <= self.upper_bound,
-            "assigned value {:?} exceeds the limit {:?}",
-            value,
-            self.upper_bound
-        );
-
         self.cell.assign(ctx, value)
     }
 }

diff --git a/crates/zkwasm/src/circuits/etable/allocator.rs b/crates/zkwasm/src/circuits/etable/allocator.rs
@@ -2,7 +2,6 @@ use super::AllocatedU32StateCell;
 use super::EVENT_TABLE_ENTRY_ROWS;
 use crate::circuits::bit_table::BitTableOp;
 use crate::circuits::cell::*;
-use crate::circuits::config::common_range_max;
 use crate::circuits::etable::ConstraintBuilder;
 use crate::circuits::rtable::RangeTableConfig;
 use crate::circuits::traits::ConfigureLookupTable;
@@ -269,7 +268,6 @@ impl AllocatorFreeCellsProfiler {
 
 #[derive(Debug, Clone)]
 pub(crate) struct EventTableCellAllocator<F: FieldExt> {
-    k: u32,
     pub(crate) free_cells: BTreeMap<EventTableCellType, (usize, u32)>,
     all_cols: BTreeMap<EventTableCellType, Vec<Vec<Column<Advice>>>>,
     free_u32_cells: Vec<AllocatedU32Cell<F>>,
@@ -348,13 +346,12 @@ impl<F: FieldExt> EventTableCellAllocator<F> {
 
     pub(super) fn new(
         meta: &mut ConstraintSystem<F>,
-        k: u32,
         sel: Column<Fixed>,
         rtable: &RangeTableConfig<F>,
         mtable: &impl ConfigureLookupTable<F>,
         cols: &mut impl Iterator<Item = Column<Advice>>,
     ) -> Self {
-        let mut allocator = Self::_new(meta, k, sel, rtable, mtable, cols);
+        let mut allocator = Self::_new(meta, sel, rtable, mtable, cols);
         for _ in 0..U32_CELLS {
             let cell = allocator.prepare_alloc_u32_cell();
             allocator.free_u32_cells.push(cell);
@@ -373,7 +370,6 @@ impl<F: FieldExt> EventTableCellAllocator<F> {
 
     fn _new(
         meta: &mut ConstraintSystem<F>,
-        k: u32,
         sel: Column<Fixed>,
         rtable: &RangeTableConfig<F>,
         mtable: &impl ConfigureLookupTable<F>,
@@ -442,7 +438,6 @@ impl<F: FieldExt> EventTableCellAllocator<F> {
         );
 
         Self {
-            k,
             all_cols,
             free_cells: BTreeMap::from_iter(
                 vec![
@@ -510,7 +505,6 @@ impl<F: FieldExt> EventTableCellAllocator<F> {
     pub(crate) fn alloc_common_range_cell(&mut self) -> AllocatedCommonRangeCell<F> {
         AllocatedCommonRangeCell {
             cell: self.alloc(&EventTableCellType::CommonRange),
-            upper_bound: F::from(common_range_max(self.k) as u64),
         }
     }
 

diff --git a/crates/zkwasm/src/circuits/etable/mod.rs b/crates/zkwasm/src/circuits/etable/mod.rs
@@ -231,7 +231,6 @@ pub struct EventTableConfig<F: FieldExt> {
 impl<F: FieldExt> EventTableConfig<F> {
     pub(crate) fn configure(
         meta: &mut ConstraintSystem<F>,
-        k: u32,
         cols: &mut (impl Iterator<Item = Column<Advice>> + Clone),
         rtable: &RangeTableConfig<F>,
         image_table: &ImageTableConfig<F>,
@@ -243,7 +242,7 @@ impl<F: FieldExt> EventTableConfig<F> {
     ) -> EventTableConfig<F> {
         let step_sel = meta.fixed_column();
 
-        let mut allocator = EventTableCellAllocator::new(meta, k, step_sel, rtable, mtable, cols);
+        let mut allocator = EventTableCellAllocator::new(meta, step_sel, rtable, mtable, cols);
 
         let ops = [0; OP_CAPABILITY].map(|_| allocator.alloc_bit_cell());
         let enabled_cell = allocator.alloc_bit_cell();

diff --git a/crates/zkwasm/src/circuits/mtable/allocator.rs b/crates/zkwasm/src/circuits/mtable/allocator.rs
@@ -10,7 +10,6 @@ use halo2_proofs::plonk::Fixed;
 use halo2_proofs::plonk::VirtualCells;
 
 use crate::circuits::cell::*;
-use crate::circuits::config::common_range_max;
 use crate::circuits::rtable::RangeTableConfig;
 use crate::circuits::utils::bit::BitColumn;
 use crate::circuits::utils::common_range::CommonRangeColumn;
@@ -83,7 +82,6 @@ const U64_CELLS: usize = 1;
 
 #[derive(Debug, Clone)]
 pub(super) struct MemoryTableCellAllocator<F: FieldExt> {
-    k: u32,
     all_cols: BTreeMap<MemoryTableCellType, Vec<Column<Advice>>>,
     free_cells: BTreeMap<MemoryTableCellType, (usize, u32)>,
     free_u32_cells: Vec<AllocatedU32Cell<F>>,
@@ -153,12 +151,11 @@ impl<F: FieldExt> MemoryTableCellAllocator<F> {
 
     pub(super) fn new(
         meta: &mut ConstraintSystem<F>,
-        k: u32,
         sel: Column<Fixed>,
         rtable: &RangeTableConfig<F>,
         cols: &mut impl Iterator<Item = Column<Advice>>,
     ) -> Self {
-        let mut allocator = Self::_new(meta, k, sel.clone(), rtable, cols);
+        let mut allocator = Self::_new(meta, sel.clone(), rtable, cols);
         for _ in 0..U32_CELLS {
             let cell = allocator.prepare_alloc_u32_cell();
             allocator.free_u32_cells.push(cell);
@@ -172,7 +169,6 @@ impl<F: FieldExt> MemoryTableCellAllocator<F> {
 
     fn _new(
         meta: &mut ConstraintSystem<F>,
-        k: u32,
         sel: Column<Fixed>,
         rtable: &RangeTableConfig<F>,
         cols: &mut impl Iterator<Item = Column<Advice>>,
@@ -209,7 +205,6 @@ impl<F: FieldExt> MemoryTableCellAllocator<F> {
                 .collect(),
         );
         Self {
-            k,
             all_cols,
             free_cells: BTreeMap::from_iter(
                 vec![
@@ -252,7 +247,6 @@ impl<F: FieldExt> MemoryTableCellAllocator<F> {
     pub(super) fn alloc_common_range_cell(&mut self) -> AllocatedCommonRangeCell<F> {
         AllocatedCommonRangeCell {
             cell: self.alloc(&MemoryTableCellType::CommonRange),
-            upper_bound: F::from(common_range_max(self.k) as u64),
         }
     }
 

diff --git a/crates/zkwasm/src/circuits/mtable/mod.rs b/crates/zkwasm/src/circuits/mtable/mod.rs
@@ -69,14 +69,13 @@ pub struct MemoryTableConfig<F: FieldExt> {
 impl<F: FieldExt> MemoryTableConfig<F> {
     pub(crate) fn configure(
         meta: &mut ConstraintSystem<F>,
-        k: u32,
         cols: &mut (impl Iterator<Item = Column<Advice>> + Clone),
         rtable: &RangeTableConfig<F>,
         image_table: &ImageTableConfig<F>,
     ) -> Self {
         let entry_sel = meta.fixed_column();
 
-        let mut allocator = MemoryTableCellAllocator::new(meta, k, entry_sel, rtable, cols);
+        let mut allocator = MemoryTableCellAllocator::new(meta, entry_sel, rtable, cols);
         allocator.enable_equality(meta, &MemoryTableCellType::CommonRange);
 
         let enabled_cell = allocator.alloc_bit_cell();

diff --git a/crates/zkwasm/src/circuits/zkwasm_circuit/mod.rs b/crates/zkwasm/src/circuits/zkwasm_circuit/mod.rs
@@ -166,8 +166,7 @@ macro_rules! impl_zkwasm_circuit {
 
                 let rtable = RangeTableConfig::configure(meta);
                 let image_table = ImageTableConfig::configure(meta, memory_addr_sel);
-                let mtable =
-                    MemoryTableConfig::configure(meta, k, &mut cols, &rtable, &image_table);
+                let mtable = MemoryTableConfig::configure(meta, &mut cols, &rtable, &image_table);
                 let frame_table = JumpTableConfig::configure(meta, $last_slice);
                 let post_image_table = PostImageTableConfig::configure(
                     meta,
@@ -197,7 +196,6 @@ macro_rules! impl_zkwasm_circuit {
 
                 let etable = EventTableConfig::configure(
                     meta,
-                    k,
                     &mut cols,
                     &rtable,
                     &image_table,