From 85867e374717fea0d596e23bdd4717247a4f0d60 Mon Sep 17 00:00:00 2001 From: jeanmon Date: Thu, 29 Aug 2024 18:38:04 +0000 Subject: [PATCH] 7790: resolve conflict after rebase on master --- .../barretenberg/vm/avm/generated/flavor.hpp | 167 ++++++++++-------- 1 file changed, 89 insertions(+), 78 deletions(-) diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.hpp index 5c36b4f9d93..7f0c22af66d 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.hpp @@ -155,18 +155,19 @@ class AvmFlavor { template using MainRelations_ = std::tuple< // Relations - Avm_vm::alu, - Avm_vm::binary, - Avm_vm::conversion, - Avm_vm::gas, - Avm_vm::keccakf1600, - Avm_vm::kernel, - Avm_vm::main, - Avm_vm::mem, - Avm_vm::mem_slice, - Avm_vm::pedersen, - Avm_vm::poseidon2, - Avm_vm::sha256>; + Avm_vm::alu, + Avm_vm::binary, + Avm_vm::conversion, + Avm_vm::gas, + Avm_vm::keccakf1600, + Avm_vm::kernel, + Avm_vm::main, + Avm_vm::mem, + Avm_vm::mem_slice, + Avm_vm::pedersen, + Avm_vm::poseidon2, + Avm_vm::range_check, + Avm_vm::sha256>; using MainRelations = MainRelations_; @@ -174,72 +175,82 @@ class AvmFlavor { template using LookupRelations_ = std::tuple< // Lookups - incl_main_tag_err_relation, - incl_mem_tag_err_relation, - kernel_output_lookup_relation, - lookup_byte_lengths_relation, - lookup_byte_operations_relation, - lookup_cd_value_relation, - lookup_div_u16_0_relation, - lookup_div_u16_1_relation, - lookup_div_u16_2_relation, - lookup_div_u16_3_relation, - lookup_div_u16_4_relation, - lookup_div_u16_5_relation, - lookup_div_u16_6_relation, - lookup_div_u16_7_relation, - lookup_into_kernel_relation, - lookup_mem_rng_chk_hi_relation, - lookup_mem_rng_chk_lo_relation, - lookup_mem_rng_chk_mid_relation, - lookup_opcode_gas_relation, - lookup_pow_2_0_relation, - lookup_pow_2_1_relation, - lookup_ret_value_relation, - lookup_u16_0_relation, - lookup_u16_1_relation, - lookup_u16_10_relation, - lookup_u16_11_relation, - lookup_u16_12_relation, - lookup_u16_13_relation, - lookup_u16_14_relation, - lookup_u16_2_relation, - lookup_u16_3_relation, - lookup_u16_4_relation, - lookup_u16_5_relation, - lookup_u16_6_relation, - lookup_u16_7_relation, - lookup_u16_8_relation, - lookup_u16_9_relation, - lookup_u8_0_relation, - lookup_u8_1_relation, - perm_main_alu_relation, - perm_main_bin_relation, - perm_main_conv_relation, - perm_main_mem_a_relation, - perm_main_mem_b_relation, - perm_main_mem_c_relation, - perm_main_mem_d_relation, - perm_main_mem_ind_addr_a_relation, - perm_main_mem_ind_addr_b_relation, - perm_main_mem_ind_addr_c_relation, - perm_main_mem_ind_addr_d_relation, - perm_main_pedersen_relation, - perm_main_pos2_perm_relation, - perm_main_slice_relation, - perm_pos_mem_read_a_relation, - perm_pos_mem_read_b_relation, - perm_pos_mem_read_c_relation, - perm_pos_mem_read_d_relation, - perm_pos_mem_write_a_relation, - perm_pos_mem_write_b_relation, - perm_pos_mem_write_c_relation, - perm_pos_mem_write_d_relation, - perm_slice_mem_relation, - range_check_da_gas_hi_relation, - range_check_da_gas_lo_relation, - range_check_l2_gas_hi_relation, - range_check_l2_gas_lo_relation>; + incl_main_tag_err_relation, + incl_mem_tag_err_relation, + kernel_output_lookup_relation, + lookup_byte_lengths_relation, + lookup_byte_operations_relation, + lookup_cd_value_relation, + lookup_div_u16_0_relation, + lookup_div_u16_1_relation, + lookup_div_u16_2_relation, + lookup_div_u16_3_relation, + lookup_div_u16_4_relation, + lookup_div_u16_5_relation, + lookup_div_u16_6_relation, + lookup_div_u16_7_relation, + lookup_into_kernel_relation, + lookup_mem_rng_chk_hi_relation, + lookup_mem_rng_chk_lo_relation, + lookup_mem_rng_chk_mid_relation, + lookup_opcode_gas_relation, + lookup_pow_2_0_relation, + lookup_pow_2_1_relation, + lookup_ret_value_relation, + lookup_rng_chk_0_relation, + lookup_rng_chk_1_relation, + lookup_rng_chk_2_relation, + lookup_rng_chk_3_relation, + lookup_rng_chk_4_relation, + lookup_rng_chk_5_relation, + lookup_rng_chk_6_relation, + lookup_rng_chk_7_relation, + lookup_rng_chk_diff_relation, + lookup_rng_chk_pow_2_relation, + lookup_u16_0_relation, + lookup_u16_1_relation, + lookup_u16_10_relation, + lookup_u16_11_relation, + lookup_u16_12_relation, + lookup_u16_13_relation, + lookup_u16_14_relation, + lookup_u16_2_relation, + lookup_u16_3_relation, + lookup_u16_4_relation, + lookup_u16_5_relation, + lookup_u16_6_relation, + lookup_u16_7_relation, + lookup_u16_8_relation, + lookup_u16_9_relation, + lookup_u8_0_relation, + lookup_u8_1_relation, + perm_main_alu_relation, + perm_main_bin_relation, + perm_main_conv_relation, + perm_main_mem_a_relation, + perm_main_mem_b_relation, + perm_main_mem_c_relation, + perm_main_mem_d_relation, + perm_main_mem_ind_addr_a_relation, + perm_main_mem_ind_addr_b_relation, + perm_main_mem_ind_addr_c_relation, + perm_main_mem_ind_addr_d_relation, + perm_main_pedersen_relation, + perm_main_pos2_perm_relation, + perm_main_slice_relation, + perm_pos_mem_read_a_relation, + perm_pos_mem_read_b_relation, + perm_pos_mem_read_c_relation, + perm_pos_mem_read_d_relation, + perm_pos_mem_write_a_relation, + perm_pos_mem_write_b_relation, + perm_pos_mem_write_c_relation, + perm_pos_mem_write_d_relation, + perm_slice_mem_relation, + range_check_da_gas_hi_relation, + range_check_da_gas_lo_relation, + range_check_l2_gas_hi_relation, + range_check_l2_gas_lo_relation>; using LookupRelations = LookupRelations_;