Skip to content

Commit

Permalink
7790: resolve conflict after rebase on master
Browse files Browse the repository at this point in the history
  • Loading branch information
@jeanmon
jeanmon committed Aug 29, 2024
1 parent 26ec3df commit 85867e3
Showing 1 changed file with 89 additions and 78 deletions.
167 changes: 89 additions & 78 deletions barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -155,91 +155,102 @@ class AvmFlavor {
template <typename FF_>
using MainRelations_ = std::tuple<
// Relations
Avm_vm::alu<FF>,
Avm_vm::binary<FF>,
Avm_vm::conversion<FF>,
Avm_vm::gas<FF>,
Avm_vm::keccakf1600<FF>,
Avm_vm::kernel<FF>,
Avm_vm::main<FF>,
Avm_vm::mem<FF>,
Avm_vm::mem_slice<FF>,
Avm_vm::pedersen<FF>,
Avm_vm::poseidon2<FF>,
Avm_vm::sha256<FF>>;
Avm_vm::alu<FF_>,
Avm_vm::binary<FF_>,
Avm_vm::conversion<FF_>,
Avm_vm::gas<FF_>,
Avm_vm::keccakf1600<FF_>,
Avm_vm::kernel<FF_>,
Avm_vm::main<FF_>,
Avm_vm::mem<FF_>,
Avm_vm::mem_slice<FF_>,
Avm_vm::pedersen<FF_>,
Avm_vm::poseidon2<FF_>,
Avm_vm::range_check<FF_>,
Avm_vm::sha256<FF_>>;

using MainRelations = MainRelations_<FF>;

// Need to be templated for recursive verifier
template <typename FF_>
using LookupRelations_ = std::tuple<
// Lookups
incl_main_tag_err_relation<FF>,
incl_mem_tag_err_relation<FF>,
kernel_output_lookup_relation<FF>,
lookup_byte_lengths_relation<FF>,
lookup_byte_operations_relation<FF>,
lookup_cd_value_relation<FF>,
lookup_div_u16_0_relation<FF>,
lookup_div_u16_1_relation<FF>,
lookup_div_u16_2_relation<FF>,
lookup_div_u16_3_relation<FF>,
lookup_div_u16_4_relation<FF>,
lookup_div_u16_5_relation<FF>,
lookup_div_u16_6_relation<FF>,
lookup_div_u16_7_relation<FF>,
lookup_into_kernel_relation<FF>,
lookup_mem_rng_chk_hi_relation<FF>,
lookup_mem_rng_chk_lo_relation<FF>,
lookup_mem_rng_chk_mid_relation<FF>,
lookup_opcode_gas_relation<FF>,
lookup_pow_2_0_relation<FF>,
lookup_pow_2_1_relation<FF>,
lookup_ret_value_relation<FF>,
lookup_u16_0_relation<FF>,
lookup_u16_1_relation<FF>,
lookup_u16_10_relation<FF>,
lookup_u16_11_relation<FF>,
lookup_u16_12_relation<FF>,
lookup_u16_13_relation<FF>,
lookup_u16_14_relation<FF>,
lookup_u16_2_relation<FF>,
lookup_u16_3_relation<FF>,
lookup_u16_4_relation<FF>,
lookup_u16_5_relation<FF>,
lookup_u16_6_relation<FF>,
lookup_u16_7_relation<FF>,
lookup_u16_8_relation<FF>,
lookup_u16_9_relation<FF>,
lookup_u8_0_relation<FF>,
lookup_u8_1_relation<FF>,
perm_main_alu_relation<FF>,
perm_main_bin_relation<FF>,
perm_main_conv_relation<FF>,
perm_main_mem_a_relation<FF>,
perm_main_mem_b_relation<FF>,
perm_main_mem_c_relation<FF>,
perm_main_mem_d_relation<FF>,
perm_main_mem_ind_addr_a_relation<FF>,
perm_main_mem_ind_addr_b_relation<FF>,
perm_main_mem_ind_addr_c_relation<FF>,
perm_main_mem_ind_addr_d_relation<FF>,
perm_main_pedersen_relation<FF>,
perm_main_pos2_perm_relation<FF>,
perm_main_slice_relation<FF>,
perm_pos_mem_read_a_relation<FF>,
perm_pos_mem_read_b_relation<FF>,
perm_pos_mem_read_c_relation<FF>,
perm_pos_mem_read_d_relation<FF>,
perm_pos_mem_write_a_relation<FF>,
perm_pos_mem_write_b_relation<FF>,
perm_pos_mem_write_c_relation<FF>,
perm_pos_mem_write_d_relation<FF>,
perm_slice_mem_relation<FF>,
range_check_da_gas_hi_relation<FF>,
range_check_da_gas_lo_relation<FF>,
range_check_l2_gas_hi_relation<FF>,
range_check_l2_gas_lo_relation<FF>>;
incl_main_tag_err_relation<FF_>,
incl_mem_tag_err_relation<FF_>,
kernel_output_lookup_relation<FF_>,
lookup_byte_lengths_relation<FF_>,
lookup_byte_operations_relation<FF_>,
lookup_cd_value_relation<FF_>,
lookup_div_u16_0_relation<FF_>,
lookup_div_u16_1_relation<FF_>,
lookup_div_u16_2_relation<FF_>,
lookup_div_u16_3_relation<FF_>,
lookup_div_u16_4_relation<FF_>,
lookup_div_u16_5_relation<FF_>,
lookup_div_u16_6_relation<FF_>,
lookup_div_u16_7_relation<FF_>,
lookup_into_kernel_relation<FF_>,
lookup_mem_rng_chk_hi_relation<FF_>,
lookup_mem_rng_chk_lo_relation<FF_>,
lookup_mem_rng_chk_mid_relation<FF_>,
lookup_opcode_gas_relation<FF_>,
lookup_pow_2_0_relation<FF_>,
lookup_pow_2_1_relation<FF_>,
lookup_ret_value_relation<FF_>,
lookup_rng_chk_0_relation<FF_>,
lookup_rng_chk_1_relation<FF_>,
lookup_rng_chk_2_relation<FF_>,
lookup_rng_chk_3_relation<FF_>,
lookup_rng_chk_4_relation<FF_>,
lookup_rng_chk_5_relation<FF_>,
lookup_rng_chk_6_relation<FF_>,
lookup_rng_chk_7_relation<FF_>,
lookup_rng_chk_diff_relation<FF_>,
lookup_rng_chk_pow_2_relation<FF_>,
lookup_u16_0_relation<FF_>,
lookup_u16_1_relation<FF_>,
lookup_u16_10_relation<FF_>,
lookup_u16_11_relation<FF_>,
lookup_u16_12_relation<FF_>,
lookup_u16_13_relation<FF_>,
lookup_u16_14_relation<FF_>,
lookup_u16_2_relation<FF_>,
lookup_u16_3_relation<FF_>,
lookup_u16_4_relation<FF_>,
lookup_u16_5_relation<FF_>,
lookup_u16_6_relation<FF_>,
lookup_u16_7_relation<FF_>,
lookup_u16_8_relation<FF_>,
lookup_u16_9_relation<FF_>,
lookup_u8_0_relation<FF_>,
lookup_u8_1_relation<FF_>,
perm_main_alu_relation<FF_>,
perm_main_bin_relation<FF_>,
perm_main_conv_relation<FF_>,
perm_main_mem_a_relation<FF_>,
perm_main_mem_b_relation<FF_>,
perm_main_mem_c_relation<FF_>,
perm_main_mem_d_relation<FF_>,
perm_main_mem_ind_addr_a_relation<FF_>,
perm_main_mem_ind_addr_b_relation<FF_>,
perm_main_mem_ind_addr_c_relation<FF_>,
perm_main_mem_ind_addr_d_relation<FF_>,
perm_main_pedersen_relation<FF_>,
perm_main_pos2_perm_relation<FF_>,
perm_main_slice_relation<FF_>,
perm_pos_mem_read_a_relation<FF_>,
perm_pos_mem_read_b_relation<FF_>,
perm_pos_mem_read_c_relation<FF_>,
perm_pos_mem_read_d_relation<FF_>,
perm_pos_mem_write_a_relation<FF_>,
perm_pos_mem_write_b_relation<FF_>,
perm_pos_mem_write_c_relation<FF_>,
perm_pos_mem_write_d_relation<FF_>,
perm_slice_mem_relation<FF_>,
range_check_da_gas_hi_relation<FF_>,
range_check_da_gas_lo_relation<FF_>,
range_check_l2_gas_hi_relation<FF_>,
range_check_l2_gas_lo_relation<FF_>>;

using LookupRelations = LookupRelations_<FF>;

Expand Down

0 comments on commit 85867e3

Please sign in to comment.