7080: several bug fixes

Author: jeanmon

barretenberg/cpp/pil/avm/mem.pil

@@ -172,7 +172,7 @@ namespace mem(256);
     // The new column one_min_inv is set to 1 - (r_in_tag - tag)^(-1) when tag_err == 1
     // but must be set to 0 when tags are matching and tag_err = 0
     #[MEM_IN_TAG_CONSISTENCY_1]
-    (1 - skip_check_tag) * (1 - rw) * ((r_in_tag - tag) * (1 - one_min_inv) - tag_err) = 0;
+    tag * (1 - skip_check_tag) * (1 - rw) * ((r_in_tag - tag) * (1 - one_min_inv) - tag_err) = 0;
     #[MEM_IN_TAG_CONSISTENCY_2]
     (1 - tag_err) * one_min_inv = 0;
 

barretenberg/cpp/src/barretenberg/relations/generated/avm/mem.hpp

@@ -112,7 +112,7 @@ template <typename FF_> class memImpl {
 
     static constexpr std::array<size_t, 41> SUBRELATION_PARTIAL_LENGTHS{
         3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 2, 3, 4, 3, 4, 3, 4, 3, 3,
-        3, 4, 4, 4, 4, 4, 5, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
+        3, 4, 4, 4, 4, 4, 6, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
     };
 
     template <typename ContainerOverSubrelations, typename AllEntities>
@@ -364,7 +364,7 @@ template <typename FF_> class memImpl {
         {
             Avm_DECLARE_VIEWS(27);
 
-            auto tmp = (((-mem_skip_check_tag + FF(1)) * (-mem_rw + FF(1))) *
+            auto tmp = (((mem_tag * (-mem_skip_check_tag + FF(1))) * (-mem_rw + FF(1))) *
                         (((mem_r_in_tag - mem_tag) * (-mem_one_min_inv + FF(1))) - mem_tag_err));
             tmp *= scaling_factor;
             std::get<27>(evals) += tmp;

barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_mem_trace.cpp

@@ -150,7 +150,7 @@ bool AvmMemTraceBuilder::load_from_mem_trace(uint8_t space_id,
     AvmMemoryTag m_tag = mem_space.contains(addr) ? mem_space.at(addr).tag : AvmMemoryTag::U0;
 
     if (m_tag == AvmMemoryTag::U0 || m_tag == r_in_tag) {
-        insert_in_mem_trace(space_id, clk, sub_clk, addr, val, r_in_tag, r_in_tag, w_in_tag, false);
+        insert_in_mem_trace(space_id, clk, sub_clk, addr, val, m_tag, r_in_tag, w_in_tag, false);
         return true;
     }
 

barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_trace.cpp

@@ -2678,7 +2678,7 @@ void AvmTraceBuilder::op_call([[maybe_unused]] uint8_t indirect,
         .main_mem_addr_a = read_ind_gas_offset.val,
         .main_mem_addr_b = addr_offset,
         .main_mem_addr_c = read_ind_args_offset.val,
-        .main_pc = FF(pc++),
+        .main_pc = FF(pc),
         .main_r_in_tag = FF(static_cast<uint32_t>(AvmMemoryTag::FF)),
         .main_sel_mem_op_a = FF(1),
         .main_sel_mem_op_b = FF(1),
@@ -2725,10 +2725,13 @@ void AvmTraceBuilder::op_call([[maybe_unused]] uint8_t indirect,
                           AvmMemoryTag::FF,
                           internal_return_ptr,
                           hint.return_data);
-    clk++;
+
+    // The last call to write_slice_to_memory() might have written more than one row.
+    clk = static_cast<uint32_t>(main_trace.size()) + 1;
     write_slice_to_memory(
         call_ptr, clk, success_offset, AvmMemoryTag::U0, AvmMemoryTag::U8, internal_return_ptr, { hint.success });
     external_call_counter++;
+    pc++;
 }
 
 void AvmTraceBuilder::op_get_contract_instance(uint8_t indirect, uint32_t address_offset, uint32_t dst_offset)
@@ -3685,7 +3688,7 @@ void AvmTraceBuilder::op_variable_msm(uint8_t indirect,
         .main_internal_return_ptr = FF(internal_return_ptr),
         .main_mem_addr_a = FF(direct_points_offset),
         .main_mem_addr_b = FF(direct_scalars_offset),
-        .main_pc = FF(pc++),
+        .main_pc = FF(pc),
         .main_r_in_tag = FF(static_cast<uint32_t>(AvmMemoryTag::FF)),
         .main_sel_mem_op_a = FF(1),
         .main_sel_mem_op_b = FF(1),
@@ -3882,6 +3885,8 @@ void AvmTraceBuilder::op_variable_msm(uint8_t indirect,
         .main_sel_mem_op_a = FF(1),
         .main_w_in_tag = FF(static_cast<uint32_t>(AvmMemoryTag::U8)),
     });
+
+    pc++;
 }
 // Finalise Lookup Counts
 //