feat: make uniform circuit as feature and support regex for phantom

Cargo.toml

@@ -4,6 +4,7 @@ exclude = ["third-party/wasmi", "crates/playground"]
 
 [workspace.dependencies]
 anyhow = { version = "1.0.68", features = ["backtrace"] }
+cfg-if = "1.0.0"
 halo2aggregator-s = { git = "https://github.com/DelphinusLab/halo2aggregator-s.git", branch = "main", features = ["unsafe"] }
 halo2_proofs = { git = "https://github.com/DelphinusLab/halo2-gpu-specific.git", default-features = true }
 parity-wasm = { version = "0.42.0", features = ["sign_ext"] }

crates/cli/Cargo.toml

@@ -28,3 +28,4 @@ circuits-batcher = { git = "https://github.com/DelphinusLab/continuation-batcher
 [features]
 default = []
 cuda = ["delphinus-zkwasm/cuda"]
+uniform-circuit = ["delphinus-zkwasm/uniform-circuit"]

crates/zkwasm/Cargo.toml

@@ -27,6 +27,7 @@ sha2 = "0.10.6"
 poseidon = { git = "https://github.com/lanbones/poseidon" }
 
 anyhow.workspace = true
+cfg-if.workspace = true
 halo2aggregator-s.workspace = true
 halo2_proofs.workspace = true
 parity-wasm.workspace = true
@@ -42,3 +43,4 @@ rusty-fork = "0.3.0"
 [features]
 default = []
 cuda = ["halo2_proofs/cuda", "specs/cuda"]
+uniform-circuit = []

crates/zkwasm/src/circuits/image_table/assign.rs

@@ -19,22 +19,44 @@ impl<F: FieldExt> ImageTableChip<F> {
             |region| {
                 let mut ctx = Context::new(region);
 
-                macro_rules! assign_one_line {
-                    ($v: expr) => {{
-                        let cell = ctx
-                            .region
-                            .assign_advice(
-                                || "image table",
-                                self.config.col,
-                                ctx.offset,
-                                || Ok($v),
-                            )?
-                            .cell();
+                cfg_if::cfg_if! {
+                    if #[cfg(feature="uniform-circuit")] {
+                        macro_rules! assign_one_line {
+                            ($v: expr) => {{
+                                let cell = ctx
+                                    .region
+                                    .assign_advice(
+                                        || "image table",
+                                        self.config.col,
+                                        ctx.offset,
+                                        || Ok($v),
+                                    )?
+                                    .cell();
 
-                        ctx.next();
+                                ctx.next();
 
-                        cell
-                    }};
+                                cell
+                            }};
+                        }
+                    } else {
+                        macro_rules! assign_one_line {
+                            ($v: expr) => {{
+                                let cell = ctx
+                                    .region
+                                    .assign_fixed(
+                                        || "image table",
+                                        self.config.col,
+                                        ctx.offset,
+                                        || Ok($v),
+                                    )?
+                                    .cell();
+
+                                ctx.next();
+
+                                cell
+                            }};
+                        }
+                    }
                 }
 
                 let entry_fid_cell = assign_one_line!(image_table.entry_fid);

crates/zkwasm/src/circuits/image_table/configure.rs

@@ -7,12 +7,26 @@ use halo2_proofs::plonk::VirtualCells;
 use specs::encode::image_table::ImageTableEncoder;
 
 use super::ImageTableConfig;
-use super::IMAGE_COL_NAME;
-use crate::curr;
 
 impl<F: FieldExt> ImageTableConfig<F> {
+    fn expr(&self, meta: &mut VirtualCells<F>) -> Expression<F> {
+        cfg_if::cfg_if! {
+            if #[cfg(feature="uniform-circuit")] {
+                crate::curr!(meta, self.col)
+            } else {
+                crate::fixed_curr!(meta, self.col)
+            }
+        }
+    }
+
     pub(in crate::circuits) fn configure(meta: &mut ConstraintSystem<F>) -> Self {
-        let col = meta.named_advice_column(IMAGE_COL_NAME.to_owned());
+        cfg_if::cfg_if! {
+            if #[cfg(feature="uniform-circuit")] {
+                let col = meta.named_advice_column(super::IMAGE_COL_NAME.to_owned());
+            } else {
+                let col = meta.fixed_column();
+            }
+        }
         meta.enable_equality(col);
         Self {
             col,
@@ -29,7 +43,7 @@ impl<F: FieldExt> ImageTableConfig<F> {
         meta.lookup_any(key, |meta| {
             vec![(
                 ImageTableEncoder::Instruction.encode(expr(meta)),
-                curr!(meta, self.col),
+                self.expr(meta),
             )]
         });
     }
@@ -43,7 +57,7 @@ impl<F: FieldExt> ImageTableConfig<F> {
         meta.lookup_any(key, |meta| {
             vec![(
                 ImageTableEncoder::InitMemory.encode(expr(meta)),
-                curr!(meta, self.col),
+                self.expr(meta),
             )]
         });
     }
@@ -57,7 +71,7 @@ impl<F: FieldExt> ImageTableConfig<F> {
         meta.lookup_any(key, |meta| {
             vec![(
                 ImageTableEncoder::BrTable.encode(expr(meta)),
-                curr!(meta, self.col),
+                self.expr(meta),
             )]
         });
     }

crates/zkwasm/src/circuits/image_table/mod.rs

@@ -1,5 +1,4 @@
 use halo2_proofs::arithmetic::FieldExt;
-use halo2_proofs::plonk::Advice;
 use halo2_proofs::plonk::Column;
 use num_bigint::BigUint;
 use specs::brtable::BrTable;
@@ -198,9 +197,17 @@ impl<F: FieldExt> EncodeCompilationTableValues<F> for CompilationTable {
     }
 }
 
+#[cfg(feature = "uniform-circuit")]
 #[derive(Clone)]
 pub struct ImageTableConfig<F: FieldExt> {
-    col: Column<Advice>,
+    col: Column<halo2_proofs::plonk::Advice>,
+    _mark: PhantomData<F>,
+}
+
+#[cfg(not(feature = "uniform-circuit"))]
+#[derive(Clone)]
+pub struct ImageTableConfig<F: FieldExt> {
+    col: Column<halo2_proofs::plonk::Fixed>,
     _mark: PhantomData<F>,
 }
 

crates/zkwasm/src/loader/mod.rs

@@ -1,7 +1,6 @@
 use anyhow::Result;
 use halo2_proofs::arithmetic::MultiMillerLoop;
 use halo2_proofs::dev::MockProver;
-use halo2_proofs::plonk::get_advice_commitments_from_transcript;
 use halo2_proofs::plonk::keygen_vk;
 use halo2_proofs::plonk::verify_proof;
 use halo2_proofs::plonk::SingleVerifier;
@@ -25,7 +24,6 @@ use crate::checksum::CompilationTableWithParams;
 use crate::checksum::ImageCheckSum;
 use crate::circuits::config::init_zkwasm_runtime;
 use crate::circuits::config::set_zkwasm_k;
-use crate::circuits::image_table::IMAGE_COL_NAME;
 use crate::circuits::TestCircuit;
 use crate::circuits::ZkWasmCircuitBuilder;
 use crate::loader::err::Error;
@@ -51,9 +49,7 @@ pub struct ZkWasmLoader<E: MultiMillerLoop, Arg, EnvBuilder: HostEnvBuilder<Arg
     k: u32,
     module: wasmi::Module,
     phantom_functions: Vec<String>,
-    _data_arg: PhantomData<Arg>,
-    _data_builder: PhantomData<EnvBuilder>,
-    _data_e: PhantomData<E>,
+    _mark: PhantomData<(Arg, EnvBuilder, E)>,
 }
 
 impl<E: MultiMillerLoop, T, EnvBuilder: HostEnvBuilder<Arg = T>> ZkWasmLoader<E, T, EnvBuilder> {
@@ -115,6 +111,11 @@ impl<E: MultiMillerLoop, T, EnvBuilder: HostEnvBuilder<Arg = T>> ZkWasmLoader<E,
         Ok(builder.build_circuit::<E::Scalar>())
     }
 
+    /// Create a ZkWasm Loader
+    /// Arguments:
+    /// - k: the size of circuit
+    /// - image: wasm binary
+    /// - phantom_functions: regular expressions of phantom function
     pub fn new(k: u32, image: Vec<u8>, phantom_functions: Vec<String>) -> Result<Self> {
         set_zkwasm_k(k);
 
@@ -124,9 +125,7 @@ impl<E: MultiMillerLoop, T, EnvBuilder: HostEnvBuilder<Arg = T>> ZkWasmLoader<E,
             k,
             module,
             phantom_functions,
-            _data_e: PhantomData,
-            _data_builder: PhantomData,
-            _data_arg: PhantomData,
+            _mark: PhantomData,
         };
 
         loader.precheck()?;
@@ -255,7 +254,11 @@ impl<E: MultiMillerLoop, T, EnvBuilder: HostEnvBuilder<Arg = T>> ZkWasmLoader<E,
         )
         .unwrap();
 
+        #[cfg(feature = "uniform-circuit")]
         {
+            use crate::circuits::image_table::IMAGE_COL_NAME;
+            use halo2_proofs::plonk::get_advice_commitments_from_transcript;
+
             let img_col_idx = vkey
                 .cs
                 .named_advices

crates/zkwasm/src/test/mod.rs

@@ -23,6 +23,7 @@ mod test_wasm_instructions;
 mod spec;
 mod test_rlp;
 mod test_start;
+#[cfg(feature = "uniform-circuit")]
 mod test_uniform_verifier;
 
 /// Create circuit with trace and run mock test.