Merge branch 'chiquito-2024' into language-server

privacy-scaling-explorations · Jun 17, 2024 · e7c5373 · e7c5373
2 parents ddf9fa3 + 67b945d
commit e7c5373
Show file tree

Hide file tree

Showing 29 changed files with 1,311 additions and 291 deletions.
diff --git a/examples/blake2f.rs b/examples/blake2f.rs
@@ -2,7 +2,9 @@ use chiquito::{
     frontend::dsl::{
         cb::{eq, select, table},
         lb::LookupTable,
-        super_circuit, CircuitContext, StepTypeSetupContext, StepTypeWGHandler,
+        super_circuit,
+        trace::DSLTraceGenerator,
+        CircuitContext, StepTypeSetupContext, StepTypeWGHandler,
     },
     plonkish::{
         backend::halo2::{chiquitoSuperCircuit2Halo2, ChiquitoHalo2SuperCircuit},
@@ -15,7 +17,6 @@ use chiquito::{
     },
     poly::ToExpr,
     sbpir::query::Queriable,
-    wit_gen::DSLTraceGenerator,
 };
 use halo2_proofs::{
     dev::MockProver,

diff --git a/examples/factorial.rs b/examples/factorial.rs
@@ -2,7 +2,8 @@ use std::hash::Hash;
 
 use chiquito::{
     field::Field,
-    frontend::dsl::circuit, // main function for constructing an AST circuit
+    frontend::dsl::{circuit, trace::DSLTraceGenerator}, /* main function for constructing an AST
+                                                         * circuit */
     plonkish::{
         backend::halo2::{chiquito2Halo2, ChiquitoHalo2Circuit},
         compiler::{
@@ -13,14 +14,13 @@ use chiquito::{
         },
         ir::{assignments::AssignmentGenerator, Circuit},
     }, /* compiles to
-                             * Chiquito Halo2
-                             * backend,
-                             * which can be
-                             * integrated into
-                             * Halo2
-                             * circuit */
+        * Chiquito Halo2
+        * backend,
+        * which can be
+        * integrated into
+        * Halo2
+        * circuit */
     poly::ToField,
-    wit_gen::DSLTraceGenerator,
 };
 use halo2_proofs::{dev::MockProver, halo2curves::bn256::Fr};
 

diff --git a/examples/fibo_with_padding.rs b/examples/fibo_with_padding.rs
@@ -2,7 +2,8 @@ use std::hash::Hash;
 
 use chiquito::{
     field::Field,
-    frontend::dsl::circuit, // main function for constructing an AST circuit
+    frontend::dsl::{circuit, trace::DSLTraceGenerator}, /* main function for constructing an AST
+                                                         * circuit */
     plonkish::{
         backend::halo2::{chiquito2Halo2, ChiquitoHalo2Circuit},
         compiler::{
@@ -13,14 +14,13 @@ use chiquito::{
         },
         ir::{assignments::AssignmentGenerator, Circuit},
     }, /* compiles to
-                             * Chiquito Halo2
-                             * backend,
-                             * which can be
-                             * integrated into
-                             * Halo2
-                             * circuit */
+        * Chiquito Halo2
+        * backend,
+        * which can be
+        * integrated into
+        * Halo2
+        * circuit */
     poly::ToField,
-    wit_gen::DSLTraceGenerator,
 };
 use halo2_proofs::{dev::MockProver, halo2curves::bn256::Fr};
 

diff --git a/examples/fibonacci.rs b/examples/fibonacci.rs
@@ -2,7 +2,8 @@ use std::hash::Hash;
 
 use chiquito::{
     field::Field,
-    frontend::dsl::circuit, // main function for constructing an AST circuit
+    frontend::dsl::{circuit, trace::DSLTraceGenerator}, /* main function for constructing an AST
+                                                         * circuit */
     plonkish::{
         backend::{
             halo2::{chiquito2Halo2, ChiquitoHalo2Circuit},
@@ -16,15 +17,14 @@ use chiquito::{
         },
         ir::{assignments::AssignmentGenerator, Circuit},
     }, /* compiles to
-                             * Chiquito Halo2
-                             * backend,
-                             * which can be
-                             * integrated into
-                             * Halo2
-                             * circuit */
+        * Chiquito Halo2
+        * backend,
+        * which can be
+        * integrated into
+        * Halo2
+        * circuit */
     poly::ToField,
     sbpir::SBPIR,
-    wit_gen::DSLTraceGenerator,
 };
 use halo2_proofs::dev::MockProver;
 

diff --git a/examples/keccak.rs b/examples/keccak.rs
@@ -1,5 +1,7 @@
 use chiquito::{
-    frontend::dsl::{lb::LookupTable, super_circuit, CircuitContext, StepTypeWGHandler},
+    frontend::dsl::{
+        lb::LookupTable, super_circuit, trace::DSLTraceGenerator, CircuitContext, StepTypeWGHandler,
+    },
     plonkish::{
         backend::halo2::{chiquitoSuperCircuit2Halo2, ChiquitoHalo2SuperCircuit},
         compiler::{
@@ -11,7 +13,6 @@ use chiquito::{
     },
     poly::ToExpr,
     sbpir::query::Queriable,
-    wit_gen::DSLTraceGenerator,
 };
 use std::{hash::Hash, ops::Neg};
 

diff --git a/examples/mimc7.rs b/examples/mimc7.rs
@@ -6,7 +6,7 @@ use halo2_proofs::{
 };
 
 use chiquito::{
-    frontend::dsl::{lb::LookupTable, super_circuit, CircuitContext},
+    frontend::dsl::{lb::LookupTable, super_circuit, trace::DSLTraceGenerator, CircuitContext},
     plonkish::{
         backend::halo2::{chiquitoSuperCircuit2Halo2, ChiquitoHalo2SuperCircuit},
         compiler::{
@@ -15,7 +15,6 @@ use chiquito::{
         ir::sc::SuperCircuit,
     },
     sbpir::query::Queriable,
-    wit_gen::DSLTraceGenerator,
 };
 
 use mimc7_constants::ROUND_CONSTANTS;

diff --git a/examples/poseidon.rs b/examples/poseidon.rs
@@ -1,5 +1,5 @@
 use chiquito::{
-    frontend::dsl::{lb::LookupTable, super_circuit, CircuitContext},
+    frontend::dsl::{lb::LookupTable, super_circuit, trace::DSLTraceGenerator, CircuitContext},
     plonkish::{
         backend::halo2::{chiquitoSuperCircuit2Halo2, ChiquitoHalo2SuperCircuit},
         compiler::{
@@ -10,7 +10,6 @@ use chiquito::{
         ir::sc::SuperCircuit,
     },
     sbpir::query::Queriable,
-    wit_gen::DSLTraceGenerator,
 };
 
 use std::hash::Hash;

diff --git a/src/compiler/abepi.rs b/src/compiler/abepi.rs
@@ -418,8 +418,6 @@ impl<F: From<u64> + TryInto<u32> + Clone + Debug, V: Clone + Debug> CompilationU
         let next_step = Expression::Query(dsym, id);
         result.extend(self.compile_expression(next_step));
 
-        println!("{:#?}", result);
-
         result
     }
 }
-Original file line number
+Diff line change
@@ Expand Up @@
             let next_step = Expression::Query(dsym, id);
             result.extend(self.compile_expression(next_step));
-            println!("{:#?}", result);
             result
         }
     }
@@ Expand Down @@