feat: support bberg lookups

asm_to_pil/src/vm_to_constrained.rs

@@ -180,6 +180,7 @@ impl<T: FieldElement> ASMPILConverter<T> {
 
         self.pil.push(PilStatement::PlookupIdentity(
             0,
+            None,
             SelectedExpressions {
                 selector: None,
                 expressions: self
@@ -417,8 +418,8 @@ impl<T: FieldElement> ASMPILConverter<T> {
                         }
                     } else {
                         match &mut statement {
-                            PilStatement::PermutationIdentity(_, _, left, _)
-                            | PilStatement::PlookupIdentity(_, left, _) => {
+                            PilStatement::PermutationIdentity(_, _attr, left, _)
+                            | PilStatement::PlookupIdentity(_, _attr, left, _) => {
                                 assert!(
                                     left.selector.is_none(),
                                     "LHS selector not supported, could and-combine with instruction flag later."

ast/src/parsed/display.rs

@@ -390,7 +390,7 @@ impl<T: Display> Display for PilStatement<T> {
                     write!(f, "{expression} = 0;")
                 }
             }
-            PilStatement::PlookupIdentity(_, left, right) => write!(f, "{left} in {right};"),
+            PilStatement::PlookupIdentity(_, _, left, right) => write!(f, "{left} in {right};"),
             PilStatement::PermutationIdentity(
                 _, //
                 _, //

ast/src/parsed/mod.rs

@@ -37,6 +37,7 @@ pub enum PilStatement<T> {
     PolynomialIdentity(usize, Option<String>, Expression<T>),
     PlookupIdentity(
         usize,
+        Option<String>,
         SelectedExpressions<Expression<T>>,
         SelectedExpressions<Expression<T>>,
     ),

ast/src/parsed/visitor.rs

@@ -192,7 +192,7 @@ impl<T> ExpressionVisitable<Expression<T, NamespacedPolynomialReference>> for Pi
     {
         match self {
             PilStatement::Expression(_, e) => e.visit_expressions_mut(f, o),
-            PilStatement::PlookupIdentity(_, left, right)
+            PilStatement::PlookupIdentity(_, _, left, right)
             | PilStatement::PermutationIdentity(
                 _, //
                 _, //
@@ -234,7 +234,7 @@ impl<T> ExpressionVisitable<Expression<T, NamespacedPolynomialReference>> for Pi
     {
         match self {
             PilStatement::Expression(_, e) => e.visit_expressions(f, o),
-            PilStatement::PlookupIdentity(_, left, right)
+            PilStatement::PlookupIdentity(_, _, left, right)
             | PilStatement::PermutationIdentity(
                 _, //
                 _, //

bberg/src/circuit_builder.rs

@@ -28,6 +28,7 @@ fn circuit_hpp_includes(name: &str, relations: &[String], permutations: &[String
     #include \"barretenberg/ecc/curves/bn254/fr.hpp\"
     #include \"barretenberg/proof_system/circuit_builder/circuit_builder_base.hpp\"
     #include \"barretenberg/relations/generic_permutation/generic_permutation_relation.hpp\"
+    #include \"barretenberg/relations/generic_lookup/generic_lookup_relation.hpp\"
     #include \"barretenberg/honk/proof_system/logderivative_library.hpp\"
 
     #include \"barretenberg/flavor/generated/{name}_flavor.hpp\"
@@ -86,12 +87,12 @@ impl CircuitBuilder for BBFiles {
                     relation_name = relation_name
                 )
         };
-        let check_permutation_transformation = |permutation_name: &String| {
+        let check_lookup_transformation = |lookup_name: &String| {
             format!(
-                    "if (!evaluate_permutation.template operator()<honk::sumcheck::{permutation_name}_relation<FF>>(\"{permutation_name}\")) {{
+                    "if (!evaluate_logderivative.template operator()<honk::sumcheck::{lookup_name}_relation<FF>>(\"{lookup_name}\")) {{
                         return false;
                     }}",
-                    permutation_name = permutation_name
+                    lookup_name = lookup_name
                 )
         };
 
@@ -100,11 +101,11 @@ impl CircuitBuilder for BBFiles {
         let all_poly_shifts = map_with_newline(to_be_shifted, all_polys_transformation);
         let check_circuit_for_each_relation =
             map_with_newline(relations, check_circuit_transformation);
-        let check_circuit_for_each_permutation =
-            map_with_newline(permutations, check_permutation_transformation);
+        let check_circuit_for_each_lookup =
+            map_with_newline(permutations, check_lookup_transformation);
 
-        let (params, permutation_check_closure) = if !permutations.is_empty() {
-            (get_params(), get_permutation_check_closure())
+        let (params, lookup_check_closure) = if !permutations.is_empty() {
+            (get_params(), get_lookup_check_closure())
         } else {
             ("", "".to_owned())
         };
@@ -166,11 +167,11 @@ class {name}CircuitBuilder {{
 
             {relation_check_closure}
 
-            {permutation_check_closure}
+            {lookup_check_closure}
 
             {check_circuit_for_each_relation}
 
-            {check_circuit_for_each_permutation}
+            {check_circuit_for_each_lookup}
 
             return true;
         }}
@@ -199,28 +200,28 @@ class {name}CircuitBuilder {{
     }
 }
 
-fn get_permutation_check_closure() -> String {
+fn get_lookup_check_closure() -> String {
     "
-            const auto evaluate_permutation = [&]<typename PermutationSettings>(const std::string& permutation_name) {
+            const auto evaluate_logderivative = [&]<typename LogDerivativeSettings>(const std::string& lookup_name) {
 
-                // Check the tuple permutation relation
+                // Check the logderivative relation
                 proof_system::honk::logderivative_library::compute_logderivative_inverse<
                     Flavor,
-                    PermutationSettings>(
+                    LogDerivativeSettings>(
                     polys, params, num_rows);
 
-                typename PermutationSettings::SumcheckArrayOfValuesOverSubrelations
-                    permutation_result;
+                typename LogDerivativeSettings::SumcheckArrayOfValuesOverSubrelations
+                    lookup_result;
 
-                for (auto& r : permutation_result) {
+                for (auto& r : lookup_result) {
                     r = 0;
                 }
                 for (size_t i = 0; i < num_rows; ++i) {
-                    PermutationSettings::accumulate(permutation_result, polys.get_row(i), params, 1);
+                    LogDerivativeSettings::accumulate(lookup_result, polys.get_row(i), params, 1);
                 }
-                for (auto r : permutation_result) {
+                for (auto r : lookup_result) {
                     if (r != 0) {
-                        info(\"Tuple \", permutation_name, \" failed.\");
+                        info(\"Lookup \", lookup_name, \" failed.\");
                         return false;
                     }
                 }

bberg/src/lib.rs

@@ -3,6 +3,7 @@ mod circuit_builder;
 mod composer_builder;
 mod file_writer;
 mod flavor_builder;
+pub mod lookup_builder;
 pub mod permutation_builder;
 mod prover_builder;
 mod relation_builder;