Merge b79a9b7 into 7be5bda

AztecProtocol · May 22, 2024 · 97a9178 · 97a9178
2 parents 7be5bda + b79a9b7
commit 97a9178
Show file tree

Hide file tree

Showing 19 changed files with 701 additions and 161 deletions.
diff --git a/barretenberg/cpp/pil/avm/avm_main.pil b/barretenberg/cpp/pil/avm/avm_main.pil
@@ -6,6 +6,7 @@ include "constants.pil";
 include "avm_kernel.pil";
 include "gadgets/avm_conversion.pil";
 include "gadgets/avm_sha256.pil";
+include "gadgets/avm_poseidon2.pil";
 
 namespace avm_main(256);
     // Kernel lookup selector opcodes
@@ -31,6 +32,7 @@ namespace avm_main(256);
     //===== Gadget Selectors ======================================================
     pol commit sel_op_radix_le;
     pol commit sel_op_sha256;
+    pol commit sel_op_poseidon2;
 
     //===== CONSTANT POLYNOMIALS ==================================================
     pol constant clk(i) { i };
@@ -181,6 +183,7 @@ namespace avm_main(256);
 
     sel_op_radix_le * (1 - sel_op_radix_le) = 0;
     sel_op_sha256 * (1 - sel_op_sha256) = 0;
+    sel_op_poseidon2 * (1 - sel_op_poseidon2) = 0;
 
     sel_op_add * (1 - sel_op_add) = 0;
     sel_op_sub * (1 - sel_op_sub) = 0;
@@ -327,7 +330,7 @@ namespace avm_main(256);
     //===== CONTROL_FLOW_CONSISTENCY ============================================
     pol INTERNAL_CALL_STACK_SELECTORS = (first + sel_internal_call + sel_internal_return + sel_halt);
     pol ALL_BINARY_SEL = sel_op_and + sel_op_or + sel_op_xor;
-    pol ALL_GADGET_SEL = sel_op_radix_le + sel_op_sha256;
+    pol ALL_GADGET_SEL = sel_op_radix_le + sel_op_sha256 + sel_op_poseidon2;
     pol ALL_MEMORY_SEL = sel_cmov + sel_mov;
     pol OPCODE_SELECTORS = ALU_ALL_SEL + ALL_BINARY_SEL + ALL_MEMORY_SEL + ALL_GADGET_SEL + KERNEL_SELECTORS;
 
@@ -485,6 +488,11 @@ namespace avm_main(256);
     is
     avm_sha256.sha256_compression_sel {avm_sha256.clk, avm_sha256.state, avm_sha256.input, avm_sha256.output};
 
+    #[PERM_MAIN_POS2_PERM]
+    sel_op_poseidon2 {clk, ia, ib}
+    is
+    avm_poseidon2.poseidon_perm_sel {avm_poseidon2.clk, avm_poseidon2.input, avm_poseidon2.output};
+
     #[PERM_MAIN_MEM_A]
     mem_op_a {clk, space_id, mem_idx_a, ia, rwa
             , r_in_tag, w_in_tag, sel_mov_a, sel_cmov}

diff --git a/barretenberg/cpp/pil/avm/gadgets/avm_poseidon2.pil b/barretenberg/cpp/pil/avm/gadgets/avm_poseidon2.pil
@@ -0,0 +1,13 @@
+include "../avm_main.pil";
+
+namespace avm_poseidon2(256);
+
+    pol commit clk;
+
+    // Selector for Radix Operation
+    pol commit poseidon_perm_sel;
+    poseidon_perm_sel * (1 - poseidon_perm_sel) = 0;
+
+    // These will all be arrays, but we just store the first element for permutation to the main trace for now
+    pol commit input;
+    pol commit output;