feat(avm): support col arrays and add keccak cols

Author: fcarreiro

barretenberg/cpp/pil/vm2/execution.pil

@@ -10,6 +10,7 @@ include "range_check.pil";
 include "bitwise.pil";
 include "merkle_check.pil";
 include "memory.pil";
+include "keccakf1600.pil";
 include "precomputed.pil";
 include "sha256.pil";
 include "ecc.pil";

barretenberg/cpp/pil/vm2/keccakf1600.pil

@@ -0,0 +1,8 @@
+namespace keccakf1600;
+
+// Dummy.
+pol commit keccak[1000];
+
+// Dummy.
+keccak[0] = keccak[0];
+keccak[1] = keccak[1];

barretenberg/cpp/src/barretenberg/vm2/common/macros.hpp

@@ -4,7 +4,8 @@
 // The following defines a FOR_EACH recursive macro.
 // It can be used as: FOR_EACH(macro, a1, a2, a3, ..., aN)
 // If something starts failing when adding columns, add another layer here.
-#define EXPAND(...) EXPAND5(EXPAND5(EXPAND5(EXPAND5(__VA_ARGS__))))
+#define EXPAND(...) EXPAND6(EXPAND6(EXPAND6(EXPAND6(__VA_ARGS__))))
+#define EXPAND6(...) EXPAND5(EXPAND5(EXPAND5(EXPAND5(__VA_ARGS__))))
 #define EXPAND5(...) EXPAND4(EXPAND4(EXPAND4(EXPAND4(__VA_ARGS__))))
 #define EXPAND4(...) EXPAND3(EXPAND3(EXPAND3(EXPAND3(__VA_ARGS__))))
 #define EXPAND3(...) EXPAND2(EXPAND2(EXPAND2(EXPAND2(__VA_ARGS__))))
@@ -13,4 +14,4 @@
 #define PARENS ()
 #define FOR_EACH(macro, ...) __VA_OPT__(EXPAND(FOR_EACH_HELPER(macro, __VA_ARGS__)))
 #define FOR_EACH_HELPER(macro, a1, ...) macro(a1) __VA_OPT__(FOR_EACH_AGAIN PARENS(macro, __VA_ARGS__))
-#define FOR_EACH_AGAIN() FOR_EACH_HELPER
+#define FOR_EACH_AGAIN() FOR_EACH_HELPER

barretenberg/cpp/src/barretenberg/vm2/generated/columns.hpp

@@ -15,6 +15,7 @@
 #include "relations/execution.hpp"
 #include "relations/ff_gt.hpp"
 #include "relations/instr_fetching.hpp"
+#include "relations/keccakf1600.hpp"
 #include "relations/memory.hpp"
 #include "relations/merkle_check.hpp"
 #include "relations/nullifier_check.hpp"
@@ -50,10 +51,10 @@ namespace bb::avm2 {
 
 struct AvmFlavorVariables {
     static constexpr size_t NUM_PRECOMPUTED_ENTITIES = 45;
-    static constexpr size_t NUM_WITNESS_ENTITIES = 1026;
+    static constexpr size_t NUM_WITNESS_ENTITIES = 2026;
     static constexpr size_t NUM_SHIFTED_ENTITIES = 135;
     static constexpr size_t NUM_WIRES = NUM_WITNESS_ENTITIES + NUM_PRECOMPUTED_ENTITIES;
-    static constexpr size_t NUM_ALL_ENTITIES = 1206;
+    static constexpr size_t NUM_ALL_ENTITIES = 2206;
 
     // Need to be templated for recursive verifier
     template <typename FF_>
@@ -72,6 +73,7 @@ struct AvmFlavorVariables {
         avm2::execution<FF_>,
         avm2::ff_gt<FF_>,
         avm2::instr_fetching<FF_>,
+        avm2::keccakf1600<FF_>,
         avm2::memory<FF_>,
         avm2::merkle_check<FF_>,
         avm2::nullifier_check<FF_>,

barretenberg/cpp/src/barretenberg/vm2/generated/flavor_variables.hpp

@@ -0,0 +1,50 @@
+// AUTOGENERATED FILE
+#pragma once
+
+#include <string_view>
+
+#include "barretenberg/relations/relation_parameters.hpp"
+#include "barretenberg/relations/relation_types.hpp"
+
+namespace bb::avm2 {
+
+template <typename FF_> class keccakf1600Impl {
+  public:
+    using FF = FF_;
+
+    static constexpr std::array<size_t, 2> SUBRELATION_PARTIAL_LENGTHS = { 2, 2 };
+
+    template <typename ContainerOverSubrelations, typename AllEntities>
+    void static accumulate(ContainerOverSubrelations& evals,
+                           const AllEntities& new_term,
+                           [[maybe_unused]] const RelationParameters<FF>&,
+                           [[maybe_unused]] const FF& scaling_factor)
+    {
+
+        {
+            using Accumulator = typename std::tuple_element_t<0, ContainerOverSubrelations>;
+            auto tmp = (new_term.keccakf1600_keccak_0_ - new_term.keccakf1600_keccak_0_);
+            tmp *= scaling_factor;
+            std::get<0>(evals) += typename Accumulator::View(tmp);
+        }
+        {
+            using Accumulator = typename std::tuple_element_t<1, ContainerOverSubrelations>;
+            auto tmp = (new_term.keccakf1600_keccak_1_ - new_term.keccakf1600_keccak_1_);
+            tmp *= scaling_factor;
+            std::get<1>(evals) += typename Accumulator::View(tmp);
+        }
+    }
+};
+
+template <typename FF> class keccakf1600 : public Relation<keccakf1600Impl<FF>> {
+  public:
+    static constexpr const std::string_view NAME = "keccakf1600";
+
+    static std::string get_subrelation_label(size_t index)
+    {
+        switch (index) {}
+        return std::to_string(index);
+    }
+};
+
+} // namespace bb::avm2

barretenberg/cpp/src/barretenberg/vm2/generated/relations/keccakf1600.hpp

@@ -6,10 +6,10 @@ use crate::lookup_builder::{
 use crate::permutation_builder::{get_inverses_from_permutations, Permutation, PermutationBuilder};
 use crate::relation_builder::{get_shifted_polys, RelationBuilder};
 use crate::utils::{flatten, sanitize_name, snake_case, sort_cols};
+use powdr_ast::analyzed::{Analyzed, Symbol};
 
 use dialoguer::Confirm;
 use itertools::Itertools;
-use powdr_ast::analyzed::Analyzed;
 use powdr_number::FieldElement;
 
 /// All of the combinations of columns that are used in a bberg flavor file
@@ -127,27 +127,38 @@ fn get_all_col_names<F: FieldElement>(
     permutations: &[Permutation],
     lookups: &[Lookup],
 ) -> ColumnGroups {
+    // lambda to expand a symbol with length to symbol_0_, symbol_1_, ...
+    // this makes it match the naming used when indexing into arrays
+    let expand_symbol = |sym: &Symbol| {
+        if sym.length.is_some() {
+            (0..sym.length.unwrap())
+                .map(move |i| format!("{}_{}_", sym.absolute_name, i))
+                .collect_vec()
+        } else {
+            vec![sym.absolute_name.clone()]
+        }
+    };
     let constant = sort_cols(
         &analyzed
             .constant_polys_in_source_order()
             .iter()
-            .map(|(sym, _)| sym.absolute_name.clone())
-            .map(|n| sanitize_name(&n))
+            .flat_map(|(sym, _)| expand_symbol(sym))
+            .map(|name| sanitize_name(name.as_str()))
             .collect_vec(),
     );
     let committed = sort_cols(
         &analyzed
             .committed_polys_in_source_order()
             .iter()
-            .map(|(sym, _)| sym.absolute_name.clone())
-            .map(|n| sanitize_name(&n))
+            .flat_map(|(sym, _)| expand_symbol(sym))
+            .map(|name| sanitize_name(name.as_str()))
             .collect_vec(),
     );
     let public = analyzed
         .public_polys_in_source_order()
         .iter()
-        .map(|(sym, _)| sym.absolute_name.clone())
-        .map(|n| sanitize_name(&n))
+        .flat_map(|(sym, _)| expand_symbol(sym))
+        .map(|name| sanitize_name(name.as_str()))
         .collect_vec();
     let to_be_shifted = sort_cols(
         &get_shifted_polys(
@@ -158,12 +169,12 @@ fn get_all_col_names<F: FieldElement>(
                 .collect_vec(),
         )
         .iter()
-        .map(|n| sanitize_name(&n))
+        .map(|name| sanitize_name(name.as_str()))
         .collect_vec(),
     );
     let shifted = to_be_shifted
         .iter()
-        .map(|n| format!("{}_shift", n))
+        .map(|name| format!("{}_shift", name))
         .collect_vec();
 
     let inverses = flatten(&[