Merge branch 'chiquito-2024' into rutefig/231-applying-cse-to-compiler

privacy-scaling-explorations · Aug 22, 2024 · 8ed9a5f · 8ed9a5f
2 parents 5b878ea + c07f98d
commit 8ed9a5f
Show file tree

Hide file tree

Showing 20 changed files with 1,327 additions and 384 deletions.
diff --git a/examples/blake2f.rs b/examples/blake2f.rs
@@ -4,7 +4,7 @@ use chiquito::{
         lb::LookupTable,
         super_circuit,
         trace::DSLTraceGenerator,
-        CircuitContext, StepTypeSetupContext, StepTypeWGHandler,
+        CircuitContextLegacy, StepTypeSetupContext, StepTypeWGHandler,
     },
     plonkish::{
         backend::halo2_legacy::{chiquitoSuperCircuit2Halo2, ChiquitoHalo2SuperCircuit},
@@ -127,7 +127,10 @@ pub fn split_to_4bits_values<F: PrimeField + Hash>(vec_values: &[u64]) -> Vec<Ve
         .collect()
 }
 
-fn blake2f_iv_table<F: PrimeField + Hash>(ctx: &mut CircuitContext<F>, _: usize) -> LookupTable {
+fn blake2f_iv_table<F: PrimeField + Hash>(
+    ctx: &mut CircuitContextLegacy<F>,
+    _: usize,
+) -> LookupTable {
     let lookup_iv_row: Queriable<F> = ctx.fixed("iv row");
     let lookup_iv_value: Queriable<F> = ctx.fixed("iv value");
 
@@ -144,7 +147,10 @@ fn blake2f_iv_table<F: PrimeField + Hash>(ctx: &mut CircuitContext<F>, _: usize)
 }
 
 // For range checking
-fn blake2f_4bits_table<F: PrimeField + Hash>(ctx: &mut CircuitContext<F>, _: usize) -> LookupTable {
+fn blake2f_4bits_table<F: PrimeField + Hash>(
+    ctx: &mut CircuitContextLegacy<F>,
+    _: usize,
+) -> LookupTable {
     let lookup_4bits_row: Queriable<F> = ctx.fixed("4bits row");
     let lookup_4bits_value: Queriable<F> = ctx.fixed("4bits value");
 
@@ -160,7 +166,7 @@ fn blake2f_4bits_table<F: PrimeField + Hash>(ctx: &mut CircuitContext<F>, _: usi
 }
 
 fn blake2f_xor_4bits_table<F: PrimeField + Hash>(
-    ctx: &mut CircuitContext<F>,
+    ctx: &mut CircuitContextLegacy<F>,
     _: usize,
 ) -> LookupTable {
     let lookup_xor_row: Queriable<F> = ctx.fixed("xor row");
@@ -526,7 +532,7 @@ fn g_setup<F: PrimeField + Hash>(
 }
 
 fn blake2f_circuit<F: PrimeField + Hash>(
-    ctx: &mut CircuitContext<F, DSLTraceGenerator<F, InputValues>>,
+    ctx: &mut CircuitContextLegacy<F, DSLTraceGenerator<F, InputValues>>,
     params: CircuitParams,
 ) {
     let v_vec: Vec<Queriable<F>> = (0..V_LEN)

diff --git a/examples/factorial.rs b/examples/factorial.rs
@@ -2,8 +2,9 @@ use std::hash::Hash;
 
 use chiquito::{
     field::Field,
-    frontend::dsl::{circuit, trace::DSLTraceGenerator}, /* main function for constructing an AST
-                                                         * circuit */
+    frontend::dsl::{circuit_legacy, trace::DSLTraceGenerator}, /* main function for constructing
+                                                                * an AST
+                                                                * circuit */
     plonkish::{
         backend::halo2_legacy::{chiquito2Halo2, ChiquitoHalo2Circuit},
         compiler::{
@@ -42,7 +43,7 @@ fn generate<F: Field + From<u64> + Hash>() -> PlonkishCompilationResult<F, DSLTr
 
     use chiquito::frontend::dsl::cb::*; // functions for constraint building
 
-    let factorial_circuit = circuit::<F, u32, _>("factorial", |ctx| {
+    let factorial_circuit = circuit_legacy::<F, u32, _>("factorial", |ctx| {
         let i = ctx.shared("i");
         let x = ctx.forward("x");
 

diff --git a/examples/fibo_with_padding.rs b/examples/fibo_with_padding.rs
@@ -2,8 +2,9 @@ use std::hash::Hash;
 
 use chiquito::{
     field::Field,
-    frontend::dsl::{circuit, trace::DSLTraceGenerator}, /* main function for constructing an AST
-                                                         * circuit */
+    frontend::dsl::{circuit_legacy, trace::DSLTraceGenerator}, /* main function for constructing
+                                                                * an AST
+                                                                * circuit */
     plonkish::{
         backend::halo2_legacy::{chiquito2Halo2, ChiquitoHalo2Circuit},
         compiler::{
@@ -37,7 +38,7 @@ fn fibo_circuit<F: Field + From<u64> + Hash>(
         sbpir::ExposeOffset::*, // for exposing witnesses
     };
 
-    let fibo = circuit::<F, u32, _>("fibonacci", |ctx| {
+    let fibo = circuit_legacy::<F, u32, _>("fibonacci", |ctx| {
         // Example table for 7 rounds:
         // |    step_type    |  a |  b |  c |  n |
         // ---------------------------------------

diff --git a/examples/fibonacci.rs b/examples/fibonacci.rs
@@ -2,8 +2,9 @@ use std::hash::Hash;
 
 use chiquito::{
     field::Field,
-    frontend::dsl::{circuit, trace::DSLTraceGenerator}, /* main function for constructing an AST
-                                                         * circuit */
+    frontend::dsl::{circuit_legacy, trace::DSLTraceGenerator}, /* main function for constructing
+                                                                * an AST
+                                                                * circuit */
     plonkish::{
         backend::{
             halo2_legacy::{chiquito2Halo2, ChiquitoHalo2Circuit},
@@ -50,7 +51,7 @@ fn fibo_circuit<F: Field + From<u64> + Hash>() -> FiboReturn<F> {
 
     use chiquito::frontend::dsl::cb::*; // functions for constraint building
 
-    let fibo = circuit::<F, (), _>("fibonacci", |ctx| {
+    let fibo = circuit_legacy::<F, (), _>("fibonacci", |ctx| {
         // the following objects (forward signals, steptypes) are defined on the circuit-level
 
         // forward signals can have constraints across different steps

diff --git a/examples/keccak.rs b/examples/keccak.rs
@@ -1,6 +1,7 @@
 use chiquito::{
     frontend::dsl::{
-        lb::LookupTable, super_circuit, trace::DSLTraceGenerator, CircuitContext, StepTypeWGHandler,
+        lb::LookupTable, super_circuit, trace::DSLTraceGenerator, CircuitContextLegacy,
+        StepTypeWGHandler,
     },
     plonkish::{
         backend::halo2_legacy::{chiquitoSuperCircuit2Halo2, ChiquitoHalo2SuperCircuit},
@@ -231,7 +232,7 @@ fn eval_keccak_f_to_bit_vec4<F: PrimeField<Repr = [u8; 32]>>(value1: F, value2:
 }
 
 fn keccak_xor_table_batch2<F: PrimeField + Eq + Hash>(
-    ctx: &mut CircuitContext<F>,
+    ctx: &mut CircuitContextLegacy<F>,
     lens: usize,
 ) -> LookupTable {
     use chiquito::frontend::dsl::cb::*;
@@ -254,7 +255,7 @@ fn keccak_xor_table_batch2<F: PrimeField + Eq + Hash>(
 }
 
 fn keccak_xor_table_batch3<F: PrimeField + Eq + Hash>(
-    ctx: &mut CircuitContext<F>,
+    ctx: &mut CircuitContextLegacy<F>,
     lens: usize,
 ) -> LookupTable {
     use chiquito::frontend::dsl::cb::*;
@@ -280,7 +281,7 @@ fn keccak_xor_table_batch3<F: PrimeField + Eq + Hash>(
 }
 
 fn keccak_xor_table_batch4<F: PrimeField + Eq + Hash>(
-    ctx: &mut CircuitContext<F>,
+    ctx: &mut CircuitContextLegacy<F>,
     lens: usize,
 ) -> LookupTable {
     use chiquito::frontend::dsl::cb::*;
@@ -306,7 +307,7 @@ fn keccak_xor_table_batch4<F: PrimeField + Eq + Hash>(
 }
 
 fn keccak_chi_table<F: PrimeField + Eq + Hash>(
-    ctx: &mut CircuitContext<F>,
+    ctx: &mut CircuitContextLegacy<F>,
     lens: usize,
 ) -> LookupTable {
     use chiquito::frontend::dsl::cb::*;
@@ -332,7 +333,7 @@ fn keccak_chi_table<F: PrimeField + Eq + Hash>(
 }
 
 fn keccak_pack_table<F: PrimeField + Eq + Hash>(
-    ctx: &mut CircuitContext<F>,
+    ctx: &mut CircuitContextLegacy<F>,
     _: usize,
 ) -> LookupTable {
     use chiquito::frontend::dsl::cb::*;
@@ -362,7 +363,7 @@ fn keccak_pack_table<F: PrimeField + Eq + Hash>(
 }
 
 fn keccak_round_constants_table<F: PrimeField + Eq + Hash>(
-    ctx: &mut CircuitContext<F>,
+    ctx: &mut CircuitContextLegacy<F>,
     lens: usize,
 ) -> LookupTable {
     use chiquito::frontend::dsl::cb::*;
@@ -722,7 +723,7 @@ fn eval_keccak_f_one_round<F: PrimeField<Repr = [u8; 32]> + Eq + Hash>(
 }
 
 fn keccak_circuit<F: PrimeField<Repr = [u8; 32]> + Eq + Hash>(
-    ctx: &mut CircuitContext<F, DSLTraceGenerator<F, KeccakCircuit>>,
+    ctx: &mut CircuitContextLegacy<F, DSLTraceGenerator<F, KeccakCircuit>>,
     param: CircuitParams,
 ) {
     use chiquito::frontend::dsl::cb::*;

diff --git a/examples/mimc7.rs b/examples/mimc7.rs
@@ -6,7 +6,9 @@ use halo2_proofs::{
 };
 
 use chiquito::{
-    frontend::dsl::{lb::LookupTable, super_circuit, trace::DSLTraceGenerator, CircuitContext},
+    frontend::dsl::{
+        lb::LookupTable, super_circuit, trace::DSLTraceGenerator, CircuitContextLegacy,
+    },
     plonkish::{
         backend::halo2_legacy::{chiquitoSuperCircuit2Halo2, ChiquitoHalo2SuperCircuit},
         compiler::{
@@ -23,7 +25,7 @@ use mimc7_constants::ROUND_CONSTANTS;
 pub const ROUNDS: usize = 91;
 
 fn mimc7_constants<F: PrimeField + Eq + Hash>(
-    ctx: &mut CircuitContext<F, DSLTraceGenerator<F>>,
+    ctx: &mut CircuitContextLegacy<F, DSLTraceGenerator<F>>,
     _: (),
 ) -> LookupTable {
     use chiquito::frontend::dsl::cb::*;
@@ -49,7 +51,7 @@ fn mimc7_constants<F: PrimeField + Eq + Hash>(
 }
 
 fn mimc7_circuit<F: PrimeField + Eq + Hash>(
-    ctx: &mut CircuitContext<F, DSLTraceGenerator<F, (F, F)>>,
+    ctx: &mut CircuitContextLegacy<F, DSLTraceGenerator<F, (F, F)>>,
     constants: LookupTable,
 ) {
     use chiquito::frontend::dsl::cb::*;

diff --git a/examples/poseidon.rs b/examples/poseidon.rs
@@ -1,5 +1,7 @@
 use chiquito::{
-    frontend::dsl::{lb::LookupTable, super_circuit, trace::DSLTraceGenerator, CircuitContext},
+    frontend::dsl::{
+        lb::LookupTable, super_circuit, trace::DSLTraceGenerator, CircuitContextLegacy,
+    },
     plonkish::{
         backend::halo2_legacy::{chiquitoSuperCircuit2Halo2, ChiquitoHalo2SuperCircuit},
         compiler::{
@@ -49,7 +51,7 @@ struct CircuitParams {
 }
 
 fn poseidon_constants_table<F: PrimeField + Eq + Hash>(
-    ctx: &mut CircuitContext<F>,
+    ctx: &mut CircuitContextLegacy<F>,
     param_t: usize,
 ) -> LookupTable {
     use chiquito::frontend::dsl::cb::*;
@@ -75,7 +77,7 @@ fn poseidon_constants_table<F: PrimeField + Eq + Hash>(
 }
 
 fn poseidon_matrix_table<F: PrimeField + Eq + Hash>(
-    ctx: &mut CircuitContext<F>,
+    ctx: &mut CircuitContextLegacy<F>,
     param_t: usize,
 ) -> LookupTable {
     use chiquito::frontend::dsl::cb::*;
@@ -97,7 +99,7 @@ fn poseidon_matrix_table<F: PrimeField + Eq + Hash>(
 }
 
 fn poseidon_circuit<F: PrimeField + Eq + Hash>(
-    ctx: &mut CircuitContext<F, DSLTraceGenerator<F, ValuesAndLens<F>>>,
+    ctx: &mut CircuitContextLegacy<F, DSLTraceGenerator<F, ValuesAndLens<F>>>,
     param: CircuitParams,
 ) {
     use chiquito::frontend::dsl::cb::*;