diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/circuit_builder.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/circuit_builder.cpp index 7ef2d5e928e1..aee4b8bab86c 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/circuit_builder.cpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/circuit_builder.cpp @@ -26,6 +26,7 @@ AvmCircuitBuilder::ProverPolynomials AvmCircuitBuilder::compute_polynomials() co // We create a mapping between the polynomial index and the corresponding column index when row // is expressed as a vector, i.e., column of the trace matrix. + std::unordered_map names_to_col_idx; const auto names = Row::names(); for (size_t i = 0; i < names.size(); i++) { @@ -33,7 +34,7 @@ AvmCircuitBuilder::ProverPolynomials AvmCircuitBuilder::compute_polynomials() co } const auto labels = polys.get_unshifted_labels(); - const size_t num_unshifted = labels.size(); + size_t num_unshifted = labels.size(); // Mapping std::vector polys_to_cols_unshifted_idx(num_unshifted); @@ -55,28 +56,11 @@ AvmCircuitBuilder::ProverPolynomials AvmCircuitBuilder::compute_polynomials() co "circuit_builder/init_polys_unshifted", ({ auto unshifted = polys.get_unshifted(); - // An array which stores for each column of the trace the smallest size of the - // truncated column containing all non-zero elements. - // It is used to allocate the polynomials without memory overhead for the tail of zeros. - std::array col_nonzero_size{}; - - // Computation of size of columns. - // Non-parallel version takes 0.5 second for a trace size of 200k rows. - // A parallel version might be considered in the future. - for (size_t i = 0; i < num_rows; i++) { - const auto row = rows[i].as_vector(); - for (size_t col = 0; col < Row::SIZE; col++) { - if (!row[col].is_zero()) { - col_nonzero_size[col] = i + 1; - } - } - } - // Set of the labels for derived/inverse polynomials. const auto derived_labels = polys.get_derived_labels(); std::set derived_labels_set(derived_labels.begin(), derived_labels.end()); - bb::parallel_for(num_unshifted, [&](size_t i) { + bb::parallel_for(unshifted.size(), [&](size_t i) { auto& poly = unshifted[i]; const auto col_idx = polys_to_cols_unshifted_idx[i]; size_t col_size = 0; @@ -85,7 +69,13 @@ AvmCircuitBuilder::ProverPolynomials AvmCircuitBuilder::compute_polynomials() co if (derived_labels_set.contains(labels[i])) { col_size = num_rows; } else { - col_size = col_nonzero_size[col_idx]; + // We process each column from bottom and stops as soon as we encounter a non-zero entry. + for (size_t j = 0; j < num_rows; j++) { + if (!rows[num_rows - j - 1].as_vector()[col_idx].is_zero()) { + col_size = num_rows - j; + break; + } + } } if (poly.is_empty()) { diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.cpp index 3ee0f6fc7c35..4541fca3ea82 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.cpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.cpp @@ -93,7 +93,6 @@ AvmFlavor::AllConstRefValues::AllConstRefValues( , binary_op_id(il[85]) , binary_sel_bin(il[86]) , binary_start(il[87]) -<<<<<<< HEAD , bytecode_end_latch(il[88]) , bytecode_length_remaining(il[89]) , bytecode_packed(il[90]) @@ -794,1222 +793,6 @@ AvmFlavor::AllConstRefValues::AllConstRefValues( , slice_sel_return_shift(il[785]) , slice_sel_start_shift(il[786]) , slice_space_id_shift(il[787]) -======= - , cmp_a_hi(il[88]) - , cmp_a_lo(il[89]) - , cmp_b_hi(il[90]) - , cmp_b_lo(il[91]) - , cmp_borrow(il[92]) - , cmp_clk(il[93]) - , cmp_cmp_rng_ctr(il[94]) - , cmp_input_a(il[95]) - , cmp_input_b(il[96]) - , cmp_op_eq(il[97]) - , cmp_op_eq_diff_inv(il[98]) - , cmp_op_gt(il[99]) - , cmp_p_a_borrow(il[100]) - , cmp_p_b_borrow(il[101]) - , cmp_p_sub_a_hi(il[102]) - , cmp_p_sub_a_lo(il[103]) - , cmp_p_sub_b_hi(il[104]) - , cmp_p_sub_b_lo(il[105]) - , cmp_range_chk_clk(il[106]) - , cmp_res_hi(il[107]) - , cmp_res_lo(il[108]) - , cmp_result(il[109]) - , cmp_sel_cmp(il[110]) - , cmp_sel_rng_chk(il[111]) - , cmp_shift_sel(il[112]) - , conversion_clk(il[113]) - , conversion_input(il[114]) - , conversion_num_limbs(il[115]) - , conversion_output_bits(il[116]) - , conversion_radix(il[117]) - , conversion_sel_to_radix_le(il[118]) - , keccakf1600_clk(il[119]) - , keccakf1600_input(il[120]) - , keccakf1600_output(il[121]) - , keccakf1600_sel_keccakf1600(il[122]) - , main_abs_da_rem_gas(il[123]) - , main_abs_l2_rem_gas(il[124]) - , main_alu_in_tag(il[125]) - , main_base_da_gas_op_cost(il[126]) - , main_base_l2_gas_op_cost(il[127]) - , main_bin_op_id(il[128]) - , main_call_ptr(il[129]) - , main_da_gas_remaining(il[130]) - , main_da_out_of_gas(il[131]) - , main_dyn_da_gas_op_cost(il[132]) - , main_dyn_gas_multiplier(il[133]) - , main_dyn_l2_gas_op_cost(il[134]) - , main_emit_l2_to_l1_msg_write_offset(il[135]) - , main_emit_note_hash_write_offset(il[136]) - , main_emit_nullifier_write_offset(il[137]) - , main_emit_unencrypted_log_write_offset(il[138]) - , main_ia(il[139]) - , main_ib(il[140]) - , main_ic(il[141]) - , main_id(il[142]) - , main_id_zero(il[143]) - , main_ind_addr_a(il[144]) - , main_ind_addr_b(il[145]) - , main_ind_addr_c(il[146]) - , main_ind_addr_d(il[147]) - , main_internal_return_ptr(il[148]) - , main_inv(il[149]) - , main_is_fake_row(il[150]) - , main_is_gas_accounted(il[151]) - , main_kernel_in_offset(il[152]) - , main_kernel_out_offset(il[153]) - , main_l1_to_l2_msg_exists_write_offset(il[154]) - , main_l2_gas_remaining(il[155]) - , main_l2_out_of_gas(il[156]) - , main_mem_addr_a(il[157]) - , main_mem_addr_b(il[158]) - , main_mem_addr_c(il[159]) - , main_mem_addr_d(il[160]) - , main_note_hash_exist_write_offset(il[161]) - , main_nullifier_exists_write_offset(il[162]) - , main_nullifier_non_exists_write_offset(il[163]) - , main_op_err(il[164]) - , main_opcode_val(il[165]) - , main_pc(il[166]) - , main_r_in_tag(il[167]) - , main_rwa(il[168]) - , main_rwb(il[169]) - , main_rwc(il[170]) - , main_rwd(il[171]) - , main_sel_alu(il[172]) - , main_sel_bin(il[173]) - , main_sel_calldata(il[174]) - , main_sel_execution_end(il[175]) - , main_sel_execution_row(il[176]) - , main_sel_kernel_inputs(il[177]) - , main_sel_kernel_out(il[178]) - , main_sel_mem_op_a(il[179]) - , main_sel_mem_op_b(il[180]) - , main_sel_mem_op_c(il[181]) - , main_sel_mem_op_d(il[182]) - , main_sel_mov_ia_to_ic(il[183]) - , main_sel_mov_ib_to_ic(il[184]) - , main_sel_op_add(il[185]) - , main_sel_op_address(il[186]) - , main_sel_op_and(il[187]) - , main_sel_op_block_number(il[188]) - , main_sel_op_calldata_copy(il[189]) - , main_sel_op_cast(il[190]) - , main_sel_op_chain_id(il[191]) - , main_sel_op_dagasleft(il[192]) - , main_sel_op_div(il[193]) - , main_sel_op_ecadd(il[194]) - , main_sel_op_emit_l2_to_l1_msg(il[195]) - , main_sel_op_emit_note_hash(il[196]) - , main_sel_op_emit_nullifier(il[197]) - , main_sel_op_emit_unencrypted_log(il[198]) - , main_sel_op_eq(il[199]) - , main_sel_op_external_call(il[200]) - , main_sel_op_external_return(il[201]) - , main_sel_op_external_revert(il[202]) - , main_sel_op_fdiv(il[203]) - , main_sel_op_fee_per_da_gas(il[204]) - , main_sel_op_fee_per_l2_gas(il[205]) - , main_sel_op_function_selector(il[206]) - , main_sel_op_get_contract_instance(il[207]) - , main_sel_op_internal_call(il[208]) - , main_sel_op_internal_return(il[209]) - , main_sel_op_is_static_call(il[210]) - , main_sel_op_jump(il[211]) - , main_sel_op_jumpi(il[212]) - , main_sel_op_keccak(il[213]) - , main_sel_op_l1_to_l2_msg_exists(il[214]) - , main_sel_op_l2gasleft(il[215]) - , main_sel_op_lt(il[216]) - , main_sel_op_lte(il[217]) - , main_sel_op_mov(il[218]) - , main_sel_op_msm(il[219]) - , main_sel_op_mul(il[220]) - , main_sel_op_not(il[221]) - , main_sel_op_note_hash_exists(il[222]) - , main_sel_op_nullifier_exists(il[223]) - , main_sel_op_or(il[224]) - , main_sel_op_poseidon2(il[225]) - , main_sel_op_radix_le(il[226]) - , main_sel_op_sender(il[227]) - , main_sel_op_set(il[228]) - , main_sel_op_sha256(il[229]) - , main_sel_op_shl(il[230]) - , main_sel_op_shr(il[231]) - , main_sel_op_sload(il[232]) - , main_sel_op_sstore(il[233]) - , main_sel_op_static_call(il[234]) -<<<<<<< HEAD - , main_sel_op_storage_address(il[235]) - , main_sel_op_sub(il[236]) - , main_sel_op_timestamp(il[237]) - , main_sel_op_transaction_fee(il[238]) - , main_sel_op_version(il[239]) - , main_sel_op_xor(il[240]) - , main_sel_q_kernel_lookup(il[241]) - , main_sel_q_kernel_output_lookup(il[242]) - , main_sel_resolve_ind_addr_a(il[243]) - , main_sel_resolve_ind_addr_b(il[244]) - , main_sel_resolve_ind_addr_c(il[245]) - , main_sel_resolve_ind_addr_d(il[246]) - , main_sel_returndata(il[247]) - , main_sel_rng_16(il[248]) - , main_sel_rng_8(il[249]) - , main_sel_slice_gadget(il[250]) - , main_side_effect_counter(il[251]) - , main_sload_write_offset(il[252]) - , main_space_id(il[253]) - , main_sstore_write_offset(il[254]) - , main_tag_err(il[255]) - , main_w_in_tag(il[256]) - , mem_addr(il[257]) - , mem_clk(il[258]) - , mem_diff(il[259]) - , mem_glob_addr(il[260]) - , mem_last(il[261]) - , mem_lastAccess(il[262]) - , mem_one_min_inv(il[263]) - , mem_r_in_tag(il[264]) - , mem_rw(il[265]) - , mem_sel_mem(il[266]) - , mem_sel_mov_ia_to_ic(il[267]) - , mem_sel_mov_ib_to_ic(il[268]) - , mem_sel_op_a(il[269]) - , mem_sel_op_b(il[270]) - , mem_sel_op_c(il[271]) - , mem_sel_op_d(il[272]) - , mem_sel_op_poseidon_read_a(il[273]) - , mem_sel_op_poseidon_read_b(il[274]) - , mem_sel_op_poseidon_read_c(il[275]) - , mem_sel_op_poseidon_read_d(il[276]) - , mem_sel_op_poseidon_write_a(il[277]) - , mem_sel_op_poseidon_write_b(il[278]) - , mem_sel_op_poseidon_write_c(il[279]) - , mem_sel_op_poseidon_write_d(il[280]) - , mem_sel_op_slice(il[281]) - , mem_sel_resolve_ind_addr_a(il[282]) - , mem_sel_resolve_ind_addr_b(il[283]) - , mem_sel_resolve_ind_addr_c(il[284]) - , mem_sel_resolve_ind_addr_d(il[285]) - , mem_sel_rng_chk(il[286]) - , mem_skip_check_tag(il[287]) - , mem_space_id(il[288]) - , mem_tag(il[289]) - , mem_tag_err(il[290]) - , mem_tsp(il[291]) - , mem_val(il[292]) - , mem_w_in_tag(il[293]) - , poseidon2_B_10_0(il[294]) - , poseidon2_B_10_1(il[295]) - , poseidon2_B_10_2(il[296]) - , poseidon2_B_10_3(il[297]) - , poseidon2_B_11_0(il[298]) - , poseidon2_B_11_1(il[299]) - , poseidon2_B_11_2(il[300]) - , poseidon2_B_11_3(il[301]) - , poseidon2_B_12_0(il[302]) - , poseidon2_B_12_1(il[303]) - , poseidon2_B_12_2(il[304]) - , poseidon2_B_12_3(il[305]) - , poseidon2_B_13_0(il[306]) - , poseidon2_B_13_1(il[307]) - , poseidon2_B_13_2(il[308]) - , poseidon2_B_13_3(il[309]) - , poseidon2_B_14_0(il[310]) - , poseidon2_B_14_1(il[311]) - , poseidon2_B_14_2(il[312]) - , poseidon2_B_14_3(il[313]) - , poseidon2_B_15_0(il[314]) - , poseidon2_B_15_1(il[315]) - , poseidon2_B_15_2(il[316]) - , poseidon2_B_15_3(il[317]) - , poseidon2_B_16_0(il[318]) - , poseidon2_B_16_1(il[319]) - , poseidon2_B_16_2(il[320]) - , poseidon2_B_16_3(il[321]) - , poseidon2_B_17_0(il[322]) - , poseidon2_B_17_1(il[323]) - , poseidon2_B_17_2(il[324]) - , poseidon2_B_17_3(il[325]) - , poseidon2_B_18_0(il[326]) - , poseidon2_B_18_1(il[327]) - , poseidon2_B_18_2(il[328]) - , poseidon2_B_18_3(il[329]) - , poseidon2_B_19_0(il[330]) - , poseidon2_B_19_1(il[331]) - , poseidon2_B_19_2(il[332]) - , poseidon2_B_19_3(il[333]) - , poseidon2_B_20_0(il[334]) - , poseidon2_B_20_1(il[335]) - , poseidon2_B_20_2(il[336]) - , poseidon2_B_20_3(il[337]) - , poseidon2_B_21_0(il[338]) - , poseidon2_B_21_1(il[339]) - , poseidon2_B_21_2(il[340]) - , poseidon2_B_21_3(il[341]) - , poseidon2_B_22_0(il[342]) - , poseidon2_B_22_1(il[343]) - , poseidon2_B_22_2(il[344]) - , poseidon2_B_22_3(il[345]) - , poseidon2_B_23_0(il[346]) - , poseidon2_B_23_1(il[347]) - , poseidon2_B_23_2(il[348]) - , poseidon2_B_23_3(il[349]) - , poseidon2_B_24_0(il[350]) - , poseidon2_B_24_1(il[351]) - , poseidon2_B_24_2(il[352]) - , poseidon2_B_24_3(il[353]) - , poseidon2_B_25_0(il[354]) - , poseidon2_B_25_1(il[355]) - , poseidon2_B_25_2(il[356]) - , poseidon2_B_25_3(il[357]) - , poseidon2_B_26_0(il[358]) - , poseidon2_B_26_1(il[359]) - , poseidon2_B_26_2(il[360]) - , poseidon2_B_26_3(il[361]) - , poseidon2_B_27_0(il[362]) - , poseidon2_B_27_1(il[363]) - , poseidon2_B_27_2(il[364]) - , poseidon2_B_27_3(il[365]) - , poseidon2_B_28_0(il[366]) - , poseidon2_B_28_1(il[367]) - , poseidon2_B_28_2(il[368]) - , poseidon2_B_28_3(il[369]) - , poseidon2_B_29_0(il[370]) - , poseidon2_B_29_1(il[371]) - , poseidon2_B_29_2(il[372]) - , poseidon2_B_29_3(il[373]) - , poseidon2_B_30_0(il[374]) - , poseidon2_B_30_1(il[375]) - , poseidon2_B_30_2(il[376]) - , poseidon2_B_30_3(il[377]) - , poseidon2_B_31_0(il[378]) - , poseidon2_B_31_1(il[379]) - , poseidon2_B_31_2(il[380]) - , poseidon2_B_31_3(il[381]) - , poseidon2_B_32_0(il[382]) - , poseidon2_B_32_1(il[383]) - , poseidon2_B_32_2(il[384]) - , poseidon2_B_32_3(il[385]) - , poseidon2_B_33_0(il[386]) - , poseidon2_B_33_1(il[387]) - , poseidon2_B_33_2(il[388]) - , poseidon2_B_33_3(il[389]) - , poseidon2_B_34_0(il[390]) - , poseidon2_B_34_1(il[391]) - , poseidon2_B_34_2(il[392]) - , poseidon2_B_34_3(il[393]) - , poseidon2_B_35_0(il[394]) - , poseidon2_B_35_1(il[395]) - , poseidon2_B_35_2(il[396]) - , poseidon2_B_35_3(il[397]) - , poseidon2_B_36_0(il[398]) - , poseidon2_B_36_1(il[399]) - , poseidon2_B_36_2(il[400]) - , poseidon2_B_36_3(il[401]) - , poseidon2_B_37_0(il[402]) - , poseidon2_B_37_1(il[403]) - , poseidon2_B_37_2(il[404]) - , poseidon2_B_37_3(il[405]) - , poseidon2_B_38_0(il[406]) - , poseidon2_B_38_1(il[407]) - , poseidon2_B_38_2(il[408]) - , poseidon2_B_38_3(il[409]) - , poseidon2_B_39_0(il[410]) - , poseidon2_B_39_1(il[411]) - , poseidon2_B_39_2(il[412]) - , poseidon2_B_39_3(il[413]) - , poseidon2_B_40_0(il[414]) - , poseidon2_B_40_1(il[415]) - , poseidon2_B_40_2(il[416]) - , poseidon2_B_40_3(il[417]) - , poseidon2_B_41_0(il[418]) - , poseidon2_B_41_1(il[419]) - , poseidon2_B_41_2(il[420]) - , poseidon2_B_41_3(il[421]) - , poseidon2_B_42_0(il[422]) - , poseidon2_B_42_1(il[423]) - , poseidon2_B_42_2(il[424]) - , poseidon2_B_42_3(il[425]) - , poseidon2_B_43_0(il[426]) - , poseidon2_B_43_1(il[427]) - , poseidon2_B_43_2(il[428]) - , poseidon2_B_43_3(il[429]) - , poseidon2_B_44_0(il[430]) - , poseidon2_B_44_1(il[431]) - , poseidon2_B_44_2(il[432]) - , poseidon2_B_44_3(il[433]) - , poseidon2_B_45_0(il[434]) - , poseidon2_B_45_1(il[435]) - , poseidon2_B_45_2(il[436]) - , poseidon2_B_45_3(il[437]) - , poseidon2_B_46_0(il[438]) - , poseidon2_B_46_1(il[439]) - , poseidon2_B_46_2(il[440]) - , poseidon2_B_46_3(il[441]) - , poseidon2_B_47_0(il[442]) - , poseidon2_B_47_1(il[443]) - , poseidon2_B_47_2(il[444]) - , poseidon2_B_47_3(il[445]) - , poseidon2_B_48_0(il[446]) - , poseidon2_B_48_1(il[447]) - , poseidon2_B_48_2(il[448]) - , poseidon2_B_48_3(il[449]) - , poseidon2_B_49_0(il[450]) - , poseidon2_B_49_1(il[451]) - , poseidon2_B_49_2(il[452]) - , poseidon2_B_49_3(il[453]) - , poseidon2_B_4_0(il[454]) - , poseidon2_B_4_1(il[455]) - , poseidon2_B_4_2(il[456]) - , poseidon2_B_4_3(il[457]) - , poseidon2_B_50_0(il[458]) - , poseidon2_B_50_1(il[459]) - , poseidon2_B_50_2(il[460]) - , poseidon2_B_50_3(il[461]) - , poseidon2_B_51_0(il[462]) - , poseidon2_B_51_1(il[463]) - , poseidon2_B_51_2(il[464]) - , poseidon2_B_51_3(il[465]) - , poseidon2_B_52_0(il[466]) - , poseidon2_B_52_1(il[467]) - , poseidon2_B_52_2(il[468]) - , poseidon2_B_52_3(il[469]) - , poseidon2_B_53_0(il[470]) - , poseidon2_B_53_1(il[471]) - , poseidon2_B_53_2(il[472]) - , poseidon2_B_53_3(il[473]) - , poseidon2_B_54_0(il[474]) - , poseidon2_B_54_1(il[475]) - , poseidon2_B_54_2(il[476]) - , poseidon2_B_54_3(il[477]) - , poseidon2_B_55_0(il[478]) - , poseidon2_B_55_1(il[479]) - , poseidon2_B_55_2(il[480]) - , poseidon2_B_55_3(il[481]) - , poseidon2_B_56_0(il[482]) - , poseidon2_B_56_1(il[483]) - , poseidon2_B_56_2(il[484]) - , poseidon2_B_56_3(il[485]) - , poseidon2_B_57_0(il[486]) - , poseidon2_B_57_1(il[487]) - , poseidon2_B_57_2(il[488]) - , poseidon2_B_57_3(il[489]) - , poseidon2_B_58_0(il[490]) - , poseidon2_B_58_1(il[491]) - , poseidon2_B_58_2(il[492]) - , poseidon2_B_58_3(il[493]) - , poseidon2_B_59_0(il[494]) - , poseidon2_B_59_1(il[495]) - , poseidon2_B_59_2(il[496]) - , poseidon2_B_59_3(il[497]) - , poseidon2_B_5_0(il[498]) - , poseidon2_B_5_1(il[499]) - , poseidon2_B_5_2(il[500]) - , poseidon2_B_5_3(il[501]) - , poseidon2_B_6_0(il[502]) - , poseidon2_B_6_1(il[503]) - , poseidon2_B_6_2(il[504]) - , poseidon2_B_6_3(il[505]) - , poseidon2_B_7_0(il[506]) - , poseidon2_B_7_1(il[507]) - , poseidon2_B_7_2(il[508]) - , poseidon2_B_7_3(il[509]) - , poseidon2_B_8_0(il[510]) - , poseidon2_B_8_1(il[511]) - , poseidon2_B_8_2(il[512]) - , poseidon2_B_8_3(il[513]) - , poseidon2_B_9_0(il[514]) - , poseidon2_B_9_1(il[515]) - , poseidon2_B_9_2(il[516]) - , poseidon2_B_9_3(il[517]) - , poseidon2_EXT_LAYER_4(il[518]) - , poseidon2_EXT_LAYER_5(il[519]) - , poseidon2_EXT_LAYER_6(il[520]) - , poseidon2_EXT_LAYER_7(il[521]) - , poseidon2_T_0_4(il[522]) - , poseidon2_T_0_5(il[523]) - , poseidon2_T_0_6(il[524]) - , poseidon2_T_0_7(il[525]) - , poseidon2_T_1_4(il[526]) - , poseidon2_T_1_5(il[527]) - , poseidon2_T_1_6(il[528]) - , poseidon2_T_1_7(il[529]) - , poseidon2_T_2_4(il[530]) - , poseidon2_T_2_5(il[531]) - , poseidon2_T_2_6(il[532]) - , poseidon2_T_2_7(il[533]) - , poseidon2_T_3_4(il[534]) - , poseidon2_T_3_5(il[535]) - , poseidon2_T_3_6(il[536]) - , poseidon2_T_3_7(il[537]) - , poseidon2_T_60_4(il[538]) - , poseidon2_T_60_5(il[539]) - , poseidon2_T_60_6(il[540]) - , poseidon2_T_60_7(il[541]) - , poseidon2_T_61_4(il[542]) - , poseidon2_T_61_5(il[543]) - , poseidon2_T_61_6(il[544]) - , poseidon2_T_61_7(il[545]) - , poseidon2_T_62_4(il[546]) - , poseidon2_T_62_5(il[547]) - , poseidon2_T_62_6(il[548]) - , poseidon2_T_62_7(il[549]) - , poseidon2_T_63_4(il[550]) - , poseidon2_T_63_5(il[551]) - , poseidon2_T_63_6(il[552]) - , poseidon2_T_63_7(il[553]) - , poseidon2_a_0(il[554]) - , poseidon2_a_1(il[555]) - , poseidon2_a_2(il[556]) - , poseidon2_a_3(il[557]) - , poseidon2_b_0(il[558]) - , poseidon2_b_1(il[559]) - , poseidon2_b_2(il[560]) - , poseidon2_b_3(il[561]) - , poseidon2_clk(il[562]) - , poseidon2_input_addr(il[563]) - , poseidon2_mem_addr_read_a(il[564]) - , poseidon2_mem_addr_read_b(il[565]) - , poseidon2_mem_addr_read_c(il[566]) - , poseidon2_mem_addr_read_d(il[567]) - , poseidon2_mem_addr_write_a(il[568]) - , poseidon2_mem_addr_write_b(il[569]) - , poseidon2_mem_addr_write_c(il[570]) - , poseidon2_mem_addr_write_d(il[571]) - , poseidon2_output_addr(il[572]) - , poseidon2_sel_poseidon_perm(il[573]) - , poseidon2_space_id(il[574]) - , range_check_alu_rng_chk(il[575]) - , range_check_clk(il[576]) - , range_check_cmp_hi_bits_rng_chk(il[577]) - , range_check_cmp_lo_bits_rng_chk(il[578]) - , range_check_dyn_diff(il[579]) - , range_check_dyn_rng_chk_bits(il[580]) - , range_check_dyn_rng_chk_pow_2(il[581]) - , range_check_gas_da_rng_chk(il[582]) - , range_check_gas_l2_rng_chk(il[583]) - , range_check_is_lte_u112(il[584]) - , range_check_is_lte_u128(il[585]) - , range_check_is_lte_u16(il[586]) - , range_check_is_lte_u32(il[587]) - , range_check_is_lte_u48(il[588]) - , range_check_is_lte_u64(il[589]) - , range_check_is_lte_u80(il[590]) - , range_check_is_lte_u96(il[591]) - , range_check_mem_rng_chk(il[592]) - , range_check_rng_chk_bits(il[593]) - , range_check_sel_lookup_0(il[594]) - , range_check_sel_lookup_1(il[595]) - , range_check_sel_lookup_2(il[596]) - , range_check_sel_lookup_3(il[597]) - , range_check_sel_lookup_4(il[598]) - , range_check_sel_lookup_5(il[599]) - , range_check_sel_lookup_6(il[600]) - , range_check_sel_rng_chk(il[601]) - , range_check_u16_r0(il[602]) - , range_check_u16_r1(il[603]) - , range_check_u16_r2(il[604]) - , range_check_u16_r3(il[605]) - , range_check_u16_r4(il[606]) - , range_check_u16_r5(il[607]) - , range_check_u16_r6(il[608]) - , range_check_u16_r7(il[609]) - , range_check_value(il[610]) - , sha256_clk(il[611]) - , sha256_input(il[612]) - , sha256_output(il[613]) - , sha256_sel_sha256_compression(il[614]) - , sha256_state(il[615]) - , slice_addr(il[616]) - , slice_clk(il[617]) - , slice_cnt(il[618]) - , slice_col_offset(il[619]) - , slice_one_min_inv(il[620]) - , slice_sel_cd_cpy(il[621]) - , slice_sel_mem_active(il[622]) - , slice_sel_return(il[623]) - , slice_sel_start(il[624]) - , slice_space_id(il[625]) - , slice_val(il[626]) - , lookup_rng_chk_pow_2_counts(il[627]) - , lookup_rng_chk_diff_counts(il[628]) - , lookup_rng_chk_0_counts(il[629]) - , lookup_rng_chk_1_counts(il[630]) - , lookup_rng_chk_2_counts(il[631]) - , lookup_rng_chk_3_counts(il[632]) - , lookup_rng_chk_4_counts(il[633]) - , lookup_rng_chk_5_counts(il[634]) - , lookup_rng_chk_6_counts(il[635]) - , lookup_rng_chk_7_counts(il[636]) - , lookup_pow_2_0_counts(il[637]) - , lookup_pow_2_1_counts(il[638]) - , lookup_byte_lengths_counts(il[639]) - , lookup_byte_operations_counts(il[640]) - , lookup_opcode_gas_counts(il[641]) - , kernel_output_lookup_counts(il[642]) - , lookup_into_kernel_counts(il[643]) - , lookup_cd_value_counts(il[644]) - , lookup_ret_value_counts(il[645]) - , incl_main_tag_err_counts(il[646]) - , incl_mem_tag_err_counts(il[647]) - , perm_rng_mem_inv(il[648]) - , perm_rng_cmp_lo_inv(il[649]) - , perm_rng_cmp_hi_inv(il[650]) - , perm_rng_alu_inv(il[651]) - , perm_cmp_alu_inv(il[652]) - , perm_rng_gas_l2_inv(il[653]) - , perm_rng_gas_da_inv(il[654]) - , perm_l2_start_gas_inv(il[655]) - , perm_da_start_gas_inv(il[656]) - , perm_l2_end_gas_inv(il[657]) - , perm_da_end_gas_inv(il[658]) - , perm_pos_mem_read_a_inv(il[659]) - , perm_pos_mem_read_b_inv(il[660]) - , perm_pos_mem_read_c_inv(il[661]) - , perm_pos_mem_read_d_inv(il[662]) - , perm_pos_mem_write_a_inv(il[663]) - , perm_pos_mem_write_b_inv(il[664]) - , perm_pos_mem_write_c_inv(il[665]) - , perm_pos_mem_write_d_inv(il[666]) - , perm_slice_mem_inv(il[667]) - , perm_main_alu_inv(il[668]) - , perm_main_bin_inv(il[669]) - , perm_main_conv_inv(il[670]) - , perm_main_sha256_inv(il[671]) - , perm_main_pos2_perm_inv(il[672]) - , perm_main_slice_inv(il[673]) - , perm_main_mem_a_inv(il[674]) - , perm_main_mem_b_inv(il[675]) - , perm_main_mem_c_inv(il[676]) - , perm_main_mem_d_inv(il[677]) - , perm_main_mem_ind_addr_a_inv(il[678]) - , perm_main_mem_ind_addr_b_inv(il[679]) - , perm_main_mem_ind_addr_c_inv(il[680]) - , perm_main_mem_ind_addr_d_inv(il[681]) - , lookup_rng_chk_pow_2_inv(il[682]) - , lookup_rng_chk_diff_inv(il[683]) - , lookup_rng_chk_0_inv(il[684]) - , lookup_rng_chk_1_inv(il[685]) - , lookup_rng_chk_2_inv(il[686]) - , lookup_rng_chk_3_inv(il[687]) - , lookup_rng_chk_4_inv(il[688]) - , lookup_rng_chk_5_inv(il[689]) - , lookup_rng_chk_6_inv(il[690]) - , lookup_rng_chk_7_inv(il[691]) - , lookup_pow_2_0_inv(il[692]) - , lookup_pow_2_1_inv(il[693]) - , lookup_byte_lengths_inv(il[694]) - , lookup_byte_operations_inv(il[695]) - , lookup_opcode_gas_inv(il[696]) - , kernel_output_lookup_inv(il[697]) - , lookup_into_kernel_inv(il[698]) - , lookup_cd_value_inv(il[699]) - , lookup_ret_value_inv(il[700]) - , incl_main_tag_err_inv(il[701]) - , incl_mem_tag_err_inv(il[702]) - , binary_acc_ia_shift(il[703]) - , binary_acc_ib_shift(il[704]) - , binary_acc_ic_shift(il[705]) - , binary_mem_tag_ctr_shift(il[706]) - , binary_op_id_shift(il[707]) - , cmp_a_hi_shift(il[708]) - , cmp_a_lo_shift(il[709]) - , cmp_b_hi_shift(il[710]) - , cmp_b_lo_shift(il[711]) - , cmp_cmp_rng_ctr_shift(il[712]) - , cmp_op_gt_shift(il[713]) - , cmp_p_sub_a_hi_shift(il[714]) - , cmp_p_sub_a_lo_shift(il[715]) - , cmp_p_sub_b_hi_shift(il[716]) - , cmp_p_sub_b_lo_shift(il[717]) - , cmp_sel_rng_chk_shift(il[718]) - , main_da_gas_remaining_shift(il[719]) - , main_emit_l2_to_l1_msg_write_offset_shift(il[720]) - , main_emit_note_hash_write_offset_shift(il[721]) - , main_emit_nullifier_write_offset_shift(il[722]) - , main_emit_unencrypted_log_write_offset_shift(il[723]) - , main_internal_return_ptr_shift(il[724]) - , main_l1_to_l2_msg_exists_write_offset_shift(il[725]) - , main_l2_gas_remaining_shift(il[726]) - , main_note_hash_exist_write_offset_shift(il[727]) - , main_nullifier_exists_write_offset_shift(il[728]) - , main_nullifier_non_exists_write_offset_shift(il[729]) - , main_pc_shift(il[730]) - , main_sel_execution_end_shift(il[731]) - , main_sel_execution_row_shift(il[732]) - , main_sload_write_offset_shift(il[733]) - , main_sstore_write_offset_shift(il[734]) - , mem_glob_addr_shift(il[735]) - , mem_rw_shift(il[736]) - , mem_sel_mem_shift(il[737]) - , mem_tag_shift(il[738]) - , mem_tsp_shift(il[739]) - , mem_val_shift(il[740]) - , slice_addr_shift(il[741]) - , slice_clk_shift(il[742]) - , slice_cnt_shift(il[743]) - , slice_col_offset_shift(il[744]) - , slice_sel_cd_cpy_shift(il[745]) - , slice_sel_mem_active_shift(il[746]) - , slice_sel_return_shift(il[747]) - , slice_sel_start_shift(il[748]) - , slice_space_id_shift(il[749]) ->>>>>>> eb84583b4d (Rebase on master and run codegen) -======= - , main_sel_op_sub(il[235]) - , main_sel_op_timestamp(il[236]) - , main_sel_op_transaction_fee(il[237]) - , main_sel_op_version(il[238]) - , main_sel_op_xor(il[239]) - , main_sel_q_kernel_lookup(il[240]) - , main_sel_q_kernel_output_lookup(il[241]) - , main_sel_resolve_ind_addr_a(il[242]) - , main_sel_resolve_ind_addr_b(il[243]) - , main_sel_resolve_ind_addr_c(il[244]) - , main_sel_resolve_ind_addr_d(il[245]) - , main_sel_returndata(il[246]) - , main_sel_rng_16(il[247]) - , main_sel_rng_8(il[248]) - , main_sel_slice_gadget(il[249]) - , main_side_effect_counter(il[250]) - , main_sload_write_offset(il[251]) - , main_space_id(il[252]) - , main_sstore_write_offset(il[253]) - , main_tag_err(il[254]) - , main_w_in_tag(il[255]) - , mem_addr(il[256]) - , mem_clk(il[257]) - , mem_diff(il[258]) - , mem_glob_addr(il[259]) - , mem_last(il[260]) - , mem_lastAccess(il[261]) - , mem_one_min_inv(il[262]) - , mem_r_in_tag(il[263]) - , mem_rw(il[264]) - , mem_sel_mem(il[265]) - , mem_sel_mov_ia_to_ic(il[266]) - , mem_sel_mov_ib_to_ic(il[267]) - , mem_sel_op_a(il[268]) - , mem_sel_op_b(il[269]) - , mem_sel_op_c(il[270]) - , mem_sel_op_d(il[271]) - , mem_sel_op_poseidon_read_a(il[272]) - , mem_sel_op_poseidon_read_b(il[273]) - , mem_sel_op_poseidon_read_c(il[274]) - , mem_sel_op_poseidon_read_d(il[275]) - , mem_sel_op_poseidon_write_a(il[276]) - , mem_sel_op_poseidon_write_b(il[277]) - , mem_sel_op_poseidon_write_c(il[278]) - , mem_sel_op_poseidon_write_d(il[279]) - , mem_sel_op_slice(il[280]) - , mem_sel_resolve_ind_addr_a(il[281]) - , mem_sel_resolve_ind_addr_b(il[282]) - , mem_sel_resolve_ind_addr_c(il[283]) - , mem_sel_resolve_ind_addr_d(il[284]) - , mem_sel_rng_chk(il[285]) - , mem_skip_check_tag(il[286]) - , mem_space_id(il[287]) - , mem_tag(il[288]) - , mem_tag_err(il[289]) - , mem_tsp(il[290]) - , mem_val(il[291]) - , mem_w_in_tag(il[292]) - , poseidon2_B_10_0(il[293]) - , poseidon2_B_10_1(il[294]) - , poseidon2_B_10_2(il[295]) - , poseidon2_B_10_3(il[296]) - , poseidon2_B_11_0(il[297]) - , poseidon2_B_11_1(il[298]) - , poseidon2_B_11_2(il[299]) - , poseidon2_B_11_3(il[300]) - , poseidon2_B_12_0(il[301]) - , poseidon2_B_12_1(il[302]) - , poseidon2_B_12_2(il[303]) - , poseidon2_B_12_3(il[304]) - , poseidon2_B_13_0(il[305]) - , poseidon2_B_13_1(il[306]) - , poseidon2_B_13_2(il[307]) - , poseidon2_B_13_3(il[308]) - , poseidon2_B_14_0(il[309]) - , poseidon2_B_14_1(il[310]) - , poseidon2_B_14_2(il[311]) - , poseidon2_B_14_3(il[312]) - , poseidon2_B_15_0(il[313]) - , poseidon2_B_15_1(il[314]) - , poseidon2_B_15_2(il[315]) - , poseidon2_B_15_3(il[316]) - , poseidon2_B_16_0(il[317]) - , poseidon2_B_16_1(il[318]) - , poseidon2_B_16_2(il[319]) - , poseidon2_B_16_3(il[320]) - , poseidon2_B_17_0(il[321]) - , poseidon2_B_17_1(il[322]) - , poseidon2_B_17_2(il[323]) - , poseidon2_B_17_3(il[324]) - , poseidon2_B_18_0(il[325]) - , poseidon2_B_18_1(il[326]) - , poseidon2_B_18_2(il[327]) - , poseidon2_B_18_3(il[328]) - , poseidon2_B_19_0(il[329]) - , poseidon2_B_19_1(il[330]) - , poseidon2_B_19_2(il[331]) - , poseidon2_B_19_3(il[332]) - , poseidon2_B_20_0(il[333]) - , poseidon2_B_20_1(il[334]) - , poseidon2_B_20_2(il[335]) - , poseidon2_B_20_3(il[336]) - , poseidon2_B_21_0(il[337]) - , poseidon2_B_21_1(il[338]) - , poseidon2_B_21_2(il[339]) - , poseidon2_B_21_3(il[340]) - , poseidon2_B_22_0(il[341]) - , poseidon2_B_22_1(il[342]) - , poseidon2_B_22_2(il[343]) - , poseidon2_B_22_3(il[344]) - , poseidon2_B_23_0(il[345]) - , poseidon2_B_23_1(il[346]) - , poseidon2_B_23_2(il[347]) - , poseidon2_B_23_3(il[348]) - , poseidon2_B_24_0(il[349]) - , poseidon2_B_24_1(il[350]) - , poseidon2_B_24_2(il[351]) - , poseidon2_B_24_3(il[352]) - , poseidon2_B_25_0(il[353]) - , poseidon2_B_25_1(il[354]) - , poseidon2_B_25_2(il[355]) - , poseidon2_B_25_3(il[356]) - , poseidon2_B_26_0(il[357]) - , poseidon2_B_26_1(il[358]) - , poseidon2_B_26_2(il[359]) - , poseidon2_B_26_3(il[360]) - , poseidon2_B_27_0(il[361]) - , poseidon2_B_27_1(il[362]) - , poseidon2_B_27_2(il[363]) - , poseidon2_B_27_3(il[364]) - , poseidon2_B_28_0(il[365]) - , poseidon2_B_28_1(il[366]) - , poseidon2_B_28_2(il[367]) - , poseidon2_B_28_3(il[368]) - , poseidon2_B_29_0(il[369]) - , poseidon2_B_29_1(il[370]) - , poseidon2_B_29_2(il[371]) - , poseidon2_B_29_3(il[372]) - , poseidon2_B_30_0(il[373]) - , poseidon2_B_30_1(il[374]) - , poseidon2_B_30_2(il[375]) - , poseidon2_B_30_3(il[376]) - , poseidon2_B_31_0(il[377]) - , poseidon2_B_31_1(il[378]) - , poseidon2_B_31_2(il[379]) - , poseidon2_B_31_3(il[380]) - , poseidon2_B_32_0(il[381]) - , poseidon2_B_32_1(il[382]) - , poseidon2_B_32_2(il[383]) - , poseidon2_B_32_3(il[384]) - , poseidon2_B_33_0(il[385]) - , poseidon2_B_33_1(il[386]) - , poseidon2_B_33_2(il[387]) - , poseidon2_B_33_3(il[388]) - , poseidon2_B_34_0(il[389]) - , poseidon2_B_34_1(il[390]) - , poseidon2_B_34_2(il[391]) - , poseidon2_B_34_3(il[392]) - , poseidon2_B_35_0(il[393]) - , poseidon2_B_35_1(il[394]) - , poseidon2_B_35_2(il[395]) - , poseidon2_B_35_3(il[396]) - , poseidon2_B_36_0(il[397]) - , poseidon2_B_36_1(il[398]) - , poseidon2_B_36_2(il[399]) - , poseidon2_B_36_3(il[400]) - , poseidon2_B_37_0(il[401]) - , poseidon2_B_37_1(il[402]) - , poseidon2_B_37_2(il[403]) - , poseidon2_B_37_3(il[404]) - , poseidon2_B_38_0(il[405]) - , poseidon2_B_38_1(il[406]) - , poseidon2_B_38_2(il[407]) - , poseidon2_B_38_3(il[408]) - , poseidon2_B_39_0(il[409]) - , poseidon2_B_39_1(il[410]) - , poseidon2_B_39_2(il[411]) - , poseidon2_B_39_3(il[412]) - , poseidon2_B_40_0(il[413]) - , poseidon2_B_40_1(il[414]) - , poseidon2_B_40_2(il[415]) - , poseidon2_B_40_3(il[416]) - , poseidon2_B_41_0(il[417]) - , poseidon2_B_41_1(il[418]) - , poseidon2_B_41_2(il[419]) - , poseidon2_B_41_3(il[420]) - , poseidon2_B_42_0(il[421]) - , poseidon2_B_42_1(il[422]) - , poseidon2_B_42_2(il[423]) - , poseidon2_B_42_3(il[424]) - , poseidon2_B_43_0(il[425]) - , poseidon2_B_43_1(il[426]) - , poseidon2_B_43_2(il[427]) - , poseidon2_B_43_3(il[428]) - , poseidon2_B_44_0(il[429]) - , poseidon2_B_44_1(il[430]) - , poseidon2_B_44_2(il[431]) - , poseidon2_B_44_3(il[432]) - , poseidon2_B_45_0(il[433]) - , poseidon2_B_45_1(il[434]) - , poseidon2_B_45_2(il[435]) - , poseidon2_B_45_3(il[436]) - , poseidon2_B_46_0(il[437]) - , poseidon2_B_46_1(il[438]) - , poseidon2_B_46_2(il[439]) - , poseidon2_B_46_3(il[440]) - , poseidon2_B_47_0(il[441]) - , poseidon2_B_47_1(il[442]) - , poseidon2_B_47_2(il[443]) - , poseidon2_B_47_3(il[444]) - , poseidon2_B_48_0(il[445]) - , poseidon2_B_48_1(il[446]) - , poseidon2_B_48_2(il[447]) - , poseidon2_B_48_3(il[448]) - , poseidon2_B_49_0(il[449]) - , poseidon2_B_49_1(il[450]) - , poseidon2_B_49_2(il[451]) - , poseidon2_B_49_3(il[452]) - , poseidon2_B_4_0(il[453]) - , poseidon2_B_4_1(il[454]) - , poseidon2_B_4_2(il[455]) - , poseidon2_B_4_3(il[456]) - , poseidon2_B_50_0(il[457]) - , poseidon2_B_50_1(il[458]) - , poseidon2_B_50_2(il[459]) - , poseidon2_B_50_3(il[460]) - , poseidon2_B_51_0(il[461]) - , poseidon2_B_51_1(il[462]) - , poseidon2_B_51_2(il[463]) - , poseidon2_B_51_3(il[464]) - , poseidon2_B_52_0(il[465]) - , poseidon2_B_52_1(il[466]) - , poseidon2_B_52_2(il[467]) - , poseidon2_B_52_3(il[468]) - , poseidon2_B_53_0(il[469]) - , poseidon2_B_53_1(il[470]) - , poseidon2_B_53_2(il[471]) - , poseidon2_B_53_3(il[472]) - , poseidon2_B_54_0(il[473]) - , poseidon2_B_54_1(il[474]) - , poseidon2_B_54_2(il[475]) - , poseidon2_B_54_3(il[476]) - , poseidon2_B_55_0(il[477]) - , poseidon2_B_55_1(il[478]) - , poseidon2_B_55_2(il[479]) - , poseidon2_B_55_3(il[480]) - , poseidon2_B_56_0(il[481]) - , poseidon2_B_56_1(il[482]) - , poseidon2_B_56_2(il[483]) - , poseidon2_B_56_3(il[484]) - , poseidon2_B_57_0(il[485]) - , poseidon2_B_57_1(il[486]) - , poseidon2_B_57_2(il[487]) - , poseidon2_B_57_3(il[488]) - , poseidon2_B_58_0(il[489]) - , poseidon2_B_58_1(il[490]) - , poseidon2_B_58_2(il[491]) - , poseidon2_B_58_3(il[492]) - , poseidon2_B_59_0(il[493]) - , poseidon2_B_59_1(il[494]) - , poseidon2_B_59_2(il[495]) - , poseidon2_B_59_3(il[496]) - , poseidon2_B_5_0(il[497]) - , poseidon2_B_5_1(il[498]) - , poseidon2_B_5_2(il[499]) - , poseidon2_B_5_3(il[500]) - , poseidon2_B_6_0(il[501]) - , poseidon2_B_6_1(il[502]) - , poseidon2_B_6_2(il[503]) - , poseidon2_B_6_3(il[504]) - , poseidon2_B_7_0(il[505]) - , poseidon2_B_7_1(il[506]) - , poseidon2_B_7_2(il[507]) - , poseidon2_B_7_3(il[508]) - , poseidon2_B_8_0(il[509]) - , poseidon2_B_8_1(il[510]) - , poseidon2_B_8_2(il[511]) - , poseidon2_B_8_3(il[512]) - , poseidon2_B_9_0(il[513]) - , poseidon2_B_9_1(il[514]) - , poseidon2_B_9_2(il[515]) - , poseidon2_B_9_3(il[516]) - , poseidon2_EXT_LAYER_4(il[517]) - , poseidon2_EXT_LAYER_5(il[518]) - , poseidon2_EXT_LAYER_6(il[519]) - , poseidon2_EXT_LAYER_7(il[520]) - , poseidon2_T_0_4(il[521]) - , poseidon2_T_0_5(il[522]) - , poseidon2_T_0_6(il[523]) - , poseidon2_T_0_7(il[524]) - , poseidon2_T_1_4(il[525]) - , poseidon2_T_1_5(il[526]) - , poseidon2_T_1_6(il[527]) - , poseidon2_T_1_7(il[528]) - , poseidon2_T_2_4(il[529]) - , poseidon2_T_2_5(il[530]) - , poseidon2_T_2_6(il[531]) - , poseidon2_T_2_7(il[532]) - , poseidon2_T_3_4(il[533]) - , poseidon2_T_3_5(il[534]) - , poseidon2_T_3_6(il[535]) - , poseidon2_T_3_7(il[536]) - , poseidon2_T_60_4(il[537]) - , poseidon2_T_60_5(il[538]) - , poseidon2_T_60_6(il[539]) - , poseidon2_T_60_7(il[540]) - , poseidon2_T_61_4(il[541]) - , poseidon2_T_61_5(il[542]) - , poseidon2_T_61_6(il[543]) - , poseidon2_T_61_7(il[544]) - , poseidon2_T_62_4(il[545]) - , poseidon2_T_62_5(il[546]) - , poseidon2_T_62_6(il[547]) - , poseidon2_T_62_7(il[548]) - , poseidon2_T_63_4(il[549]) - , poseidon2_T_63_5(il[550]) - , poseidon2_T_63_6(il[551]) - , poseidon2_T_63_7(il[552]) - , poseidon2_a_0(il[553]) - , poseidon2_a_1(il[554]) - , poseidon2_a_2(il[555]) - , poseidon2_a_3(il[556]) - , poseidon2_b_0(il[557]) - , poseidon2_b_1(il[558]) - , poseidon2_b_2(il[559]) - , poseidon2_b_3(il[560]) - , poseidon2_clk(il[561]) - , poseidon2_full_a_0(il[562]) - , poseidon2_full_a_1(il[563]) - , poseidon2_full_a_2(il[564]) - , poseidon2_full_a_3(il[565]) - , poseidon2_full_b_0(il[566]) - , poseidon2_full_b_1(il[567]) - , poseidon2_full_b_2(il[568]) - , poseidon2_full_b_3(il[569]) - , poseidon2_full_clk(il[570]) - , poseidon2_full_end_poseidon(il[571]) - , poseidon2_full_execute_poseidon_perm(il[572]) - , poseidon2_full_input_0(il[573]) - , poseidon2_full_input_1(il[574]) - , poseidon2_full_input_2(il[575]) - , poseidon2_full_input_len(il[576]) - , poseidon2_full_num_perm_rounds_rem(il[577]) - , poseidon2_full_num_perm_rounds_rem_inv(il[578]) - , poseidon2_full_output(il[579]) - , poseidon2_full_padding(il[580]) - , poseidon2_full_sel_poseidon(il[581]) - , poseidon2_full_start_poseidon(il[582]) - , poseidon2_input_addr(il[583]) - , poseidon2_mem_addr_read_a(il[584]) - , poseidon2_mem_addr_read_b(il[585]) - , poseidon2_mem_addr_read_c(il[586]) - , poseidon2_mem_addr_read_d(il[587]) - , poseidon2_mem_addr_write_a(il[588]) - , poseidon2_mem_addr_write_b(il[589]) - , poseidon2_mem_addr_write_c(il[590]) - , poseidon2_mem_addr_write_d(il[591]) - , poseidon2_output_addr(il[592]) - , poseidon2_sel_poseidon_perm(il[593]) - , poseidon2_sel_poseidon_perm_immediate(il[594]) - , poseidon2_sel_poseidon_perm_mem_op(il[595]) - , poseidon2_space_id(il[596]) - , range_check_alu_rng_chk(il[597]) - , range_check_clk(il[598]) - , range_check_cmp_hi_bits_rng_chk(il[599]) - , range_check_cmp_lo_bits_rng_chk(il[600]) - , range_check_dyn_diff(il[601]) - , range_check_dyn_rng_chk_bits(il[602]) - , range_check_dyn_rng_chk_pow_2(il[603]) - , range_check_gas_da_rng_chk(il[604]) - , range_check_gas_l2_rng_chk(il[605]) - , range_check_is_lte_u112(il[606]) - , range_check_is_lte_u128(il[607]) - , range_check_is_lte_u16(il[608]) - , range_check_is_lte_u32(il[609]) - , range_check_is_lte_u48(il[610]) - , range_check_is_lte_u64(il[611]) - , range_check_is_lte_u80(il[612]) - , range_check_is_lte_u96(il[613]) - , range_check_mem_rng_chk(il[614]) - , range_check_rng_chk_bits(il[615]) - , range_check_sel_lookup_0(il[616]) - , range_check_sel_lookup_1(il[617]) - , range_check_sel_lookup_2(il[618]) - , range_check_sel_lookup_3(il[619]) - , range_check_sel_lookup_4(il[620]) - , range_check_sel_lookup_5(il[621]) - , range_check_sel_lookup_6(il[622]) - , range_check_sel_rng_chk(il[623]) - , range_check_u16_r0(il[624]) - , range_check_u16_r1(il[625]) - , range_check_u16_r2(il[626]) - , range_check_u16_r3(il[627]) - , range_check_u16_r4(il[628]) - , range_check_u16_r5(il[629]) - , range_check_u16_r6(il[630]) - , range_check_u16_r7(il[631]) - , range_check_value(il[632]) - , sha256_clk(il[633]) - , sha256_input(il[634]) - , sha256_output(il[635]) - , sha256_sel_sha256_compression(il[636]) - , sha256_state(il[637]) - , slice_addr(il[638]) - , slice_clk(il[639]) - , slice_cnt(il[640]) - , slice_col_offset(il[641]) - , slice_one_min_inv(il[642]) - , slice_sel_cd_cpy(il[643]) - , slice_sel_mem_active(il[644]) - , slice_sel_return(il[645]) - , slice_sel_start(il[646]) - , slice_space_id(il[647]) - , slice_val(il[648]) - , lookup_rng_chk_pow_2_counts(il[649]) - , lookup_rng_chk_diff_counts(il[650]) - , lookup_rng_chk_0_counts(il[651]) - , lookup_rng_chk_1_counts(il[652]) - , lookup_rng_chk_2_counts(il[653]) - , lookup_rng_chk_3_counts(il[654]) - , lookup_rng_chk_4_counts(il[655]) - , lookup_rng_chk_5_counts(il[656]) - , lookup_rng_chk_6_counts(il[657]) - , lookup_rng_chk_7_counts(il[658]) - , lookup_pow_2_0_counts(il[659]) - , lookup_pow_2_1_counts(il[660]) - , lookup_byte_lengths_counts(il[661]) - , lookup_byte_operations_counts(il[662]) - , lookup_opcode_gas_counts(il[663]) - , kernel_output_lookup_counts(il[664]) - , lookup_into_kernel_counts(il[665]) - , lookup_cd_value_counts(il[666]) - , lookup_ret_value_counts(il[667]) - , incl_main_tag_err_counts(il[668]) - , incl_mem_tag_err_counts(il[669]) - , perm_rng_mem_inv(il[670]) - , perm_rng_cmp_lo_inv(il[671]) - , perm_rng_cmp_hi_inv(il[672]) - , perm_rng_alu_inv(il[673]) - , perm_cmp_alu_inv(il[674]) - , perm_rng_gas_l2_inv(il[675]) - , perm_rng_gas_da_inv(il[676]) - , perm_l2_start_gas_inv(il[677]) - , perm_da_start_gas_inv(il[678]) - , perm_l2_end_gas_inv(il[679]) - , perm_da_end_gas_inv(il[680]) - , perm_pos_mem_read_a_inv(il[681]) - , perm_pos_mem_read_b_inv(il[682]) - , perm_pos_mem_read_c_inv(il[683]) - , perm_pos_mem_read_d_inv(il[684]) - , perm_pos_mem_write_a_inv(il[685]) - , perm_pos_mem_write_b_inv(il[686]) - , perm_pos_mem_write_c_inv(il[687]) - , perm_pos_mem_write_d_inv(il[688]) - , perm_pos2_fixed_pos2_perm_inv(il[689]) - , perm_slice_mem_inv(il[690]) - , perm_main_alu_inv(il[691]) - , perm_main_bin_inv(il[692]) - , perm_main_conv_inv(il[693]) - , perm_main_sha256_inv(il[694]) - , perm_main_pos2_perm_inv(il[695]) - , perm_main_slice_inv(il[696]) - , perm_main_mem_a_inv(il[697]) - , perm_main_mem_b_inv(il[698]) - , perm_main_mem_c_inv(il[699]) - , perm_main_mem_d_inv(il[700]) - , perm_main_mem_ind_addr_a_inv(il[701]) - , perm_main_mem_ind_addr_b_inv(il[702]) - , perm_main_mem_ind_addr_c_inv(il[703]) - , perm_main_mem_ind_addr_d_inv(il[704]) - , lookup_rng_chk_pow_2_inv(il[705]) - , lookup_rng_chk_diff_inv(il[706]) - , lookup_rng_chk_0_inv(il[707]) - , lookup_rng_chk_1_inv(il[708]) - , lookup_rng_chk_2_inv(il[709]) - , lookup_rng_chk_3_inv(il[710]) - , lookup_rng_chk_4_inv(il[711]) - , lookup_rng_chk_5_inv(il[712]) - , lookup_rng_chk_6_inv(il[713]) - , lookup_rng_chk_7_inv(il[714]) - , lookup_pow_2_0_inv(il[715]) - , lookup_pow_2_1_inv(il[716]) - , lookup_byte_lengths_inv(il[717]) - , lookup_byte_operations_inv(il[718]) - , lookup_opcode_gas_inv(il[719]) - , kernel_output_lookup_inv(il[720]) - , lookup_into_kernel_inv(il[721]) - , lookup_cd_value_inv(il[722]) - , lookup_ret_value_inv(il[723]) - , incl_main_tag_err_inv(il[724]) - , incl_mem_tag_err_inv(il[725]) - , binary_acc_ia_shift(il[726]) - , binary_acc_ib_shift(il[727]) - , binary_acc_ic_shift(il[728]) - , binary_mem_tag_ctr_shift(il[729]) - , binary_op_id_shift(il[730]) - , cmp_a_hi_shift(il[731]) - , cmp_a_lo_shift(il[732]) - , cmp_b_hi_shift(il[733]) - , cmp_b_lo_shift(il[734]) - , cmp_cmp_rng_ctr_shift(il[735]) - , cmp_op_gt_shift(il[736]) - , cmp_p_sub_a_hi_shift(il[737]) - , cmp_p_sub_a_lo_shift(il[738]) - , cmp_p_sub_b_hi_shift(il[739]) - , cmp_p_sub_b_lo_shift(il[740]) - , cmp_sel_rng_chk_shift(il[741]) - , main_da_gas_remaining_shift(il[742]) - , main_emit_l2_to_l1_msg_write_offset_shift(il[743]) - , main_emit_note_hash_write_offset_shift(il[744]) - , main_emit_nullifier_write_offset_shift(il[745]) - , main_emit_unencrypted_log_write_offset_shift(il[746]) - , main_internal_return_ptr_shift(il[747]) - , main_l1_to_l2_msg_exists_write_offset_shift(il[748]) - , main_l2_gas_remaining_shift(il[749]) - , main_note_hash_exist_write_offset_shift(il[750]) - , main_nullifier_exists_write_offset_shift(il[751]) - , main_nullifier_non_exists_write_offset_shift(il[752]) - , main_pc_shift(il[753]) - , main_sel_execution_end_shift(il[754]) - , main_sel_execution_row_shift(il[755]) - , main_sload_write_offset_shift(il[756]) - , main_sstore_write_offset_shift(il[757]) - , mem_glob_addr_shift(il[758]) - , mem_rw_shift(il[759]) - , mem_sel_mem_shift(il[760]) - , mem_tag_shift(il[761]) - , mem_tsp_shift(il[762]) - , mem_val_shift(il[763]) - , poseidon2_full_a_0_shift(il[764]) - , poseidon2_full_a_1_shift(il[765]) - , poseidon2_full_a_2_shift(il[766]) - , poseidon2_full_a_3_shift(il[767]) - , poseidon2_full_execute_poseidon_perm_shift(il[768]) - , poseidon2_full_input_0_shift(il[769]) - , poseidon2_full_input_1_shift(il[770]) - , poseidon2_full_input_2_shift(il[771]) - , poseidon2_full_num_perm_rounds_rem_shift(il[772]) - , poseidon2_full_sel_poseidon_shift(il[773]) - , poseidon2_full_start_poseidon_shift(il[774]) - , slice_addr_shift(il[775]) - , slice_clk_shift(il[776]) - , slice_cnt_shift(il[777]) - , slice_col_offset_shift(il[778]) - , slice_sel_cd_cpy_shift(il[779]) - , slice_sel_mem_active_shift(il[780]) - , slice_sel_return_shift(il[781]) - , slice_sel_start_shift(il[782]) - , slice_space_id_shift(il[783]) ->>>>>>> 3d279e3a98 (Rebase on master) {} AvmFlavor::ProverPolynomials::ProverPolynomials(ProvingKey& proving_key) diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.hpp index 72a10056d580..fe548d4e0f9f 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.hpp @@ -95,15 +95,7 @@ template using tuple_cat_t = decltype(std::tuple_cat(std:: // The entities that will be used in the flavor. // clang-format off #define PRECOMPUTED_ENTITIES byte_lookup_sel_bin, byte_lookup_table_byte_lengths, byte_lookup_table_in_tags, byte_lookup_table_input_a, byte_lookup_table_input_b, byte_lookup_table_op_id, byte_lookup_table_output, gas_base_da_gas_fixed_table, gas_base_l2_gas_fixed_table, gas_dyn_da_gas_fixed_table, gas_dyn_l2_gas_fixed_table, gas_sel_gas_cost, main_clk, main_sel_da_end_gas_kernel_input, main_sel_da_start_gas_kernel_input, main_sel_first, main_sel_l2_end_gas_kernel_input, main_sel_l2_start_gas_kernel_input, main_sel_start_exec, main_zeroes, powers_power_of_2 -<<<<<<< HEAD -<<<<<<< HEAD #define WIRE_ENTITIES main_kernel_inputs, main_kernel_value_out, main_kernel_side_effect_out, main_kernel_metadata_out, main_calldata, main_returndata, alu_a_hi, alu_a_lo, alu_b_hi, alu_b_lo, alu_b_pow, alu_c_hi, alu_c_lo, alu_cf, alu_clk, alu_cmp_gadget_gt, alu_cmp_gadget_input_a, alu_cmp_gadget_input_b, alu_cmp_gadget_result, alu_cmp_gadget_sel, alu_ff_tag, alu_ia, alu_ib, alu_ic, alu_in_tag, alu_max_bits_sub_b_bits, alu_max_bits_sub_b_pow, alu_op_add, alu_op_cast, alu_op_div, alu_op_eq, alu_op_lt, alu_op_lte, alu_op_mul, alu_op_not, alu_op_shl, alu_op_shr, alu_op_sub, alu_partial_prod_hi, alu_partial_prod_lo, alu_range_check_input_value, alu_range_check_num_bits, alu_range_check_sel, alu_remainder, alu_sel_alu, alu_sel_cmp, alu_sel_shift_which, alu_u128_tag, alu_u16_tag, alu_u1_tag, alu_u32_tag, alu_u64_tag, alu_u8_tag, alu_zero_shift, binary_acc_ia, binary_acc_ib, binary_acc_ic, binary_clk, binary_ia_bytes, binary_ib_bytes, binary_ic_bytes, binary_in_tag, binary_mem_tag_ctr, binary_mem_tag_ctr_inv, binary_op_id, binary_sel_bin, binary_start, bytecode_end_latch, bytecode_length_remaining, bytecode_packed, bytecode_running_hash, cmp_a_hi, cmp_a_lo, cmp_b_hi, cmp_b_lo, cmp_borrow, cmp_clk, cmp_cmp_rng_ctr, cmp_input_a, cmp_input_b, cmp_op_eq, cmp_op_eq_diff_inv, cmp_op_gt, cmp_p_a_borrow, cmp_p_b_borrow, cmp_p_sub_a_hi, cmp_p_sub_a_lo, cmp_p_sub_b_hi, cmp_p_sub_b_lo, cmp_range_chk_clk, cmp_res_hi, cmp_res_lo, cmp_result, cmp_sel_cmp, cmp_sel_rng_chk, cmp_shift_sel, conversion_clk, conversion_input, conversion_num_limbs, conversion_output_bits, conversion_radix, conversion_sel_to_radix_le, keccakf1600_clk, keccakf1600_input, keccakf1600_output, keccakf1600_sel_keccakf1600, main_abs_da_rem_gas, main_abs_l2_rem_gas, main_alu_in_tag, main_base_da_gas_op_cost, main_base_l2_gas_op_cost, main_bin_op_id, main_call_ptr, main_da_gas_remaining, main_da_out_of_gas, main_dyn_da_gas_op_cost, main_dyn_gas_multiplier, main_dyn_l2_gas_op_cost, main_emit_l2_to_l1_msg_write_offset, main_emit_note_hash_write_offset, main_emit_nullifier_write_offset, main_emit_unencrypted_log_write_offset, main_ia, main_ib, main_ic, main_id, main_id_zero, main_ind_addr_a, main_ind_addr_b, main_ind_addr_c, main_ind_addr_d, main_internal_return_ptr, main_inv, main_is_fake_row, main_is_gas_accounted, main_kernel_in_offset, main_kernel_out_offset, main_l1_to_l2_msg_exists_write_offset, main_l2_gas_remaining, main_l2_out_of_gas, main_mem_addr_a, main_mem_addr_b, main_mem_addr_c, main_mem_addr_d, main_note_hash_exist_write_offset, main_nullifier_exists_write_offset, main_nullifier_non_exists_write_offset, main_op_err, main_opcode_val, main_pc, main_r_in_tag, main_rwa, main_rwb, main_rwc, main_rwd, main_sel_alu, main_sel_bin, main_sel_calldata, main_sel_execution_end, main_sel_execution_row, main_sel_kernel_inputs, main_sel_kernel_out, main_sel_mem_op_a, main_sel_mem_op_b, main_sel_mem_op_c, main_sel_mem_op_d, main_sel_mov_ia_to_ic, main_sel_mov_ib_to_ic, main_sel_op_add, main_sel_op_address, main_sel_op_and, main_sel_op_block_number, main_sel_op_calldata_copy, main_sel_op_cast, main_sel_op_chain_id, main_sel_op_dagasleft, main_sel_op_div, main_sel_op_ecadd, main_sel_op_emit_l2_to_l1_msg, main_sel_op_emit_note_hash, main_sel_op_emit_nullifier, main_sel_op_emit_unencrypted_log, main_sel_op_eq, main_sel_op_external_call, main_sel_op_external_return, main_sel_op_external_revert, main_sel_op_fdiv, main_sel_op_fee_per_da_gas, main_sel_op_fee_per_l2_gas, main_sel_op_function_selector, main_sel_op_get_contract_instance, main_sel_op_internal_call, main_sel_op_internal_return, main_sel_op_is_static_call, main_sel_op_jump, main_sel_op_jumpi, main_sel_op_keccak, main_sel_op_l1_to_l2_msg_exists, main_sel_op_l2gasleft, main_sel_op_lt, main_sel_op_lte, main_sel_op_mov, main_sel_op_msm, main_sel_op_mul, main_sel_op_not, main_sel_op_note_hash_exists, main_sel_op_nullifier_exists, main_sel_op_or, main_sel_op_poseidon2, main_sel_op_radix_le, main_sel_op_sender, main_sel_op_set, main_sel_op_sha256, main_sel_op_shl, main_sel_op_shr, main_sel_op_sload, main_sel_op_sstore, main_sel_op_static_call, main_sel_op_sub, main_sel_op_timestamp, main_sel_op_transaction_fee, main_sel_op_version, main_sel_op_xor, main_sel_q_kernel_lookup, main_sel_q_kernel_output_lookup, main_sel_resolve_ind_addr_a, main_sel_resolve_ind_addr_b, main_sel_resolve_ind_addr_c, main_sel_resolve_ind_addr_d, main_sel_returndata, main_sel_rng_16, main_sel_rng_8, main_sel_slice_gadget, main_side_effect_counter, main_sload_write_offset, main_space_id, main_sstore_write_offset, main_tag_err, main_w_in_tag, mem_addr, mem_clk, mem_diff, mem_glob_addr, mem_last, mem_lastAccess, mem_one_min_inv, mem_r_in_tag, mem_rw, mem_sel_mem, mem_sel_mov_ia_to_ic, mem_sel_mov_ib_to_ic, mem_sel_op_a, mem_sel_op_b, mem_sel_op_c, mem_sel_op_d, mem_sel_op_poseidon_read_a, mem_sel_op_poseidon_read_b, mem_sel_op_poseidon_read_c, mem_sel_op_poseidon_read_d, mem_sel_op_poseidon_write_a, mem_sel_op_poseidon_write_b, mem_sel_op_poseidon_write_c, mem_sel_op_poseidon_write_d, mem_sel_op_slice, mem_sel_resolve_ind_addr_a, mem_sel_resolve_ind_addr_b, mem_sel_resolve_ind_addr_c, mem_sel_resolve_ind_addr_d, mem_sel_rng_chk, mem_skip_check_tag, mem_space_id, mem_tag, mem_tag_err, mem_tsp, mem_val, mem_w_in_tag, poseidon2_B_10_0, poseidon2_B_10_1, poseidon2_B_10_2, poseidon2_B_10_3, poseidon2_B_11_0, poseidon2_B_11_1, poseidon2_B_11_2, poseidon2_B_11_3, poseidon2_B_12_0, poseidon2_B_12_1, poseidon2_B_12_2, poseidon2_B_12_3, poseidon2_B_13_0, poseidon2_B_13_1, poseidon2_B_13_2, poseidon2_B_13_3, poseidon2_B_14_0, poseidon2_B_14_1, poseidon2_B_14_2, poseidon2_B_14_3, poseidon2_B_15_0, poseidon2_B_15_1, poseidon2_B_15_2, poseidon2_B_15_3, poseidon2_B_16_0, poseidon2_B_16_1, poseidon2_B_16_2, poseidon2_B_16_3, poseidon2_B_17_0, poseidon2_B_17_1, poseidon2_B_17_2, poseidon2_B_17_3, poseidon2_B_18_0, poseidon2_B_18_1, poseidon2_B_18_2, poseidon2_B_18_3, poseidon2_B_19_0, poseidon2_B_19_1, poseidon2_B_19_2, poseidon2_B_19_3, poseidon2_B_20_0, poseidon2_B_20_1, poseidon2_B_20_2, poseidon2_B_20_3, poseidon2_B_21_0, poseidon2_B_21_1, poseidon2_B_21_2, poseidon2_B_21_3, poseidon2_B_22_0, poseidon2_B_22_1, poseidon2_B_22_2, poseidon2_B_22_3, poseidon2_B_23_0, poseidon2_B_23_1, poseidon2_B_23_2, poseidon2_B_23_3, poseidon2_B_24_0, poseidon2_B_24_1, poseidon2_B_24_2, poseidon2_B_24_3, poseidon2_B_25_0, poseidon2_B_25_1, poseidon2_B_25_2, poseidon2_B_25_3, poseidon2_B_26_0, poseidon2_B_26_1, poseidon2_B_26_2, poseidon2_B_26_3, poseidon2_B_27_0, poseidon2_B_27_1, poseidon2_B_27_2, poseidon2_B_27_3, poseidon2_B_28_0, poseidon2_B_28_1, poseidon2_B_28_2, poseidon2_B_28_3, poseidon2_B_29_0, poseidon2_B_29_1, poseidon2_B_29_2, poseidon2_B_29_3, poseidon2_B_30_0, poseidon2_B_30_1, poseidon2_B_30_2, poseidon2_B_30_3, poseidon2_B_31_0, poseidon2_B_31_1, poseidon2_B_31_2, poseidon2_B_31_3, poseidon2_B_32_0, poseidon2_B_32_1, poseidon2_B_32_2, poseidon2_B_32_3, poseidon2_B_33_0, poseidon2_B_33_1, poseidon2_B_33_2, poseidon2_B_33_3, poseidon2_B_34_0, poseidon2_B_34_1, poseidon2_B_34_2, poseidon2_B_34_3, poseidon2_B_35_0, poseidon2_B_35_1, poseidon2_B_35_2, poseidon2_B_35_3, poseidon2_B_36_0, poseidon2_B_36_1, poseidon2_B_36_2, poseidon2_B_36_3, poseidon2_B_37_0, poseidon2_B_37_1, poseidon2_B_37_2, poseidon2_B_37_3, poseidon2_B_38_0, poseidon2_B_38_1, poseidon2_B_38_2, poseidon2_B_38_3, poseidon2_B_39_0, poseidon2_B_39_1, poseidon2_B_39_2, poseidon2_B_39_3, poseidon2_B_40_0, poseidon2_B_40_1, poseidon2_B_40_2, poseidon2_B_40_3, poseidon2_B_41_0, poseidon2_B_41_1, poseidon2_B_41_2, poseidon2_B_41_3, poseidon2_B_42_0, poseidon2_B_42_1, poseidon2_B_42_2, poseidon2_B_42_3, poseidon2_B_43_0, poseidon2_B_43_1, poseidon2_B_43_2, poseidon2_B_43_3, poseidon2_B_44_0, poseidon2_B_44_1, poseidon2_B_44_2, poseidon2_B_44_3, poseidon2_B_45_0, poseidon2_B_45_1, poseidon2_B_45_2, poseidon2_B_45_3, poseidon2_B_46_0, poseidon2_B_46_1, poseidon2_B_46_2, poseidon2_B_46_3, poseidon2_B_47_0, poseidon2_B_47_1, poseidon2_B_47_2, poseidon2_B_47_3, poseidon2_B_48_0, poseidon2_B_48_1, poseidon2_B_48_2, poseidon2_B_48_3, poseidon2_B_49_0, poseidon2_B_49_1, poseidon2_B_49_2, poseidon2_B_49_3, poseidon2_B_4_0, poseidon2_B_4_1, poseidon2_B_4_2, poseidon2_B_4_3, poseidon2_B_50_0, poseidon2_B_50_1, poseidon2_B_50_2, poseidon2_B_50_3, poseidon2_B_51_0, poseidon2_B_51_1, poseidon2_B_51_2, poseidon2_B_51_3, poseidon2_B_52_0, poseidon2_B_52_1, poseidon2_B_52_2, poseidon2_B_52_3, poseidon2_B_53_0, poseidon2_B_53_1, poseidon2_B_53_2, poseidon2_B_53_3, poseidon2_B_54_0, poseidon2_B_54_1, poseidon2_B_54_2, poseidon2_B_54_3, poseidon2_B_55_0, poseidon2_B_55_1, poseidon2_B_55_2, poseidon2_B_55_3, poseidon2_B_56_0, poseidon2_B_56_1, poseidon2_B_56_2, poseidon2_B_56_3, poseidon2_B_57_0, poseidon2_B_57_1, poseidon2_B_57_2, poseidon2_B_57_3, poseidon2_B_58_0, poseidon2_B_58_1, poseidon2_B_58_2, poseidon2_B_58_3, poseidon2_B_59_0, poseidon2_B_59_1, poseidon2_B_59_2, poseidon2_B_59_3, poseidon2_B_5_0, poseidon2_B_5_1, poseidon2_B_5_2, poseidon2_B_5_3, poseidon2_B_6_0, poseidon2_B_6_1, poseidon2_B_6_2, poseidon2_B_6_3, poseidon2_B_7_0, poseidon2_B_7_1, poseidon2_B_7_2, poseidon2_B_7_3, poseidon2_B_8_0, poseidon2_B_8_1, poseidon2_B_8_2, poseidon2_B_8_3, poseidon2_B_9_0, poseidon2_B_9_1, poseidon2_B_9_2, poseidon2_B_9_3, poseidon2_EXT_LAYER_4, poseidon2_EXT_LAYER_5, poseidon2_EXT_LAYER_6, poseidon2_EXT_LAYER_7, poseidon2_T_0_4, poseidon2_T_0_5, poseidon2_T_0_6, poseidon2_T_0_7, poseidon2_T_1_4, poseidon2_T_1_5, poseidon2_T_1_6, poseidon2_T_1_7, poseidon2_T_2_4, poseidon2_T_2_5, poseidon2_T_2_6, poseidon2_T_2_7, poseidon2_T_3_4, poseidon2_T_3_5, poseidon2_T_3_6, poseidon2_T_3_7, poseidon2_T_60_4, poseidon2_T_60_5, poseidon2_T_60_6, poseidon2_T_60_7, poseidon2_T_61_4, poseidon2_T_61_5, poseidon2_T_61_6, poseidon2_T_61_7, poseidon2_T_62_4, poseidon2_T_62_5, poseidon2_T_62_6, poseidon2_T_62_7, poseidon2_T_63_4, poseidon2_T_63_5, poseidon2_T_63_6, poseidon2_T_63_7, poseidon2_a_0, poseidon2_a_1, poseidon2_a_2, poseidon2_a_3, poseidon2_b_0, poseidon2_b_1, poseidon2_b_2, poseidon2_b_3, poseidon2_clk, poseidon2_full_a_0, poseidon2_full_a_1, poseidon2_full_a_2, poseidon2_full_a_3, poseidon2_full_b_0, poseidon2_full_b_1, poseidon2_full_b_2, poseidon2_full_b_3, poseidon2_full_clk, poseidon2_full_end_poseidon, poseidon2_full_execute_poseidon_perm, poseidon2_full_input_0, poseidon2_full_input_1, poseidon2_full_input_2, poseidon2_full_input_len, poseidon2_full_num_perm_rounds_rem, poseidon2_full_num_perm_rounds_rem_inv, poseidon2_full_output, poseidon2_full_padding, poseidon2_full_sel_poseidon, poseidon2_full_start_poseidon, poseidon2_input_addr, poseidon2_mem_addr_read_a, poseidon2_mem_addr_read_b, poseidon2_mem_addr_read_c, poseidon2_mem_addr_read_d, poseidon2_mem_addr_write_a, poseidon2_mem_addr_write_b, poseidon2_mem_addr_write_c, poseidon2_mem_addr_write_d, poseidon2_output_addr, poseidon2_sel_poseidon_perm, poseidon2_sel_poseidon_perm_immediate, poseidon2_sel_poseidon_perm_mem_op, poseidon2_space_id, range_check_alu_rng_chk, range_check_clk, range_check_cmp_hi_bits_rng_chk, range_check_cmp_lo_bits_rng_chk, range_check_dyn_diff, range_check_dyn_rng_chk_bits, range_check_dyn_rng_chk_pow_2, range_check_gas_da_rng_chk, range_check_gas_l2_rng_chk, range_check_is_lte_u112, range_check_is_lte_u128, range_check_is_lte_u16, range_check_is_lte_u32, range_check_is_lte_u48, range_check_is_lte_u64, range_check_is_lte_u80, range_check_is_lte_u96, range_check_mem_rng_chk, range_check_rng_chk_bits, range_check_sel_lookup_0, range_check_sel_lookup_1, range_check_sel_lookup_2, range_check_sel_lookup_3, range_check_sel_lookup_4, range_check_sel_lookup_5, range_check_sel_lookup_6, range_check_sel_rng_chk, range_check_u16_r0, range_check_u16_r1, range_check_u16_r2, range_check_u16_r3, range_check_u16_r4, range_check_u16_r5, range_check_u16_r6, range_check_u16_r7, range_check_value, sha256_clk, sha256_input, sha256_output, sha256_sel_sha256_compression, sha256_state, slice_addr, slice_clk, slice_cnt, slice_col_offset, slice_one_min_inv, slice_sel_cd_cpy, slice_sel_mem_active, slice_sel_return, slice_sel_start, slice_space_id, slice_val, lookup_rng_chk_pow_2_counts, lookup_rng_chk_diff_counts, lookup_rng_chk_0_counts, lookup_rng_chk_1_counts, lookup_rng_chk_2_counts, lookup_rng_chk_3_counts, lookup_rng_chk_4_counts, lookup_rng_chk_5_counts, lookup_rng_chk_6_counts, lookup_rng_chk_7_counts, lookup_pow_2_0_counts, lookup_pow_2_1_counts, lookup_byte_lengths_counts, lookup_byte_operations_counts, lookup_opcode_gas_counts, kernel_output_lookup_counts, lookup_into_kernel_counts, lookup_cd_value_counts, lookup_ret_value_counts, incl_main_tag_err_counts, incl_mem_tag_err_counts -======= -<<<<<<< HEAD -======= ->>>>>>> 3d279e3a98 (Rebase on master) -#define WIRE_ENTITIES main_kernel_inputs, main_kernel_value_out, main_kernel_side_effect_out, main_kernel_metadata_out, main_calldata, main_returndata, alu_a_hi, alu_a_lo, alu_b_hi, alu_b_lo, alu_b_pow, alu_c_hi, alu_c_lo, alu_cf, alu_clk, alu_cmp_gadget_gt, alu_cmp_gadget_input_a, alu_cmp_gadget_input_b, alu_cmp_gadget_result, alu_cmp_gadget_sel, alu_ff_tag, alu_ia, alu_ib, alu_ic, alu_in_tag, alu_max_bits_sub_b_bits, alu_max_bits_sub_b_pow, alu_op_add, alu_op_cast, alu_op_div, alu_op_eq, alu_op_lt, alu_op_lte, alu_op_mul, alu_op_not, alu_op_shl, alu_op_shr, alu_op_sub, alu_partial_prod_hi, alu_partial_prod_lo, alu_range_check_input_value, alu_range_check_num_bits, alu_range_check_sel, alu_remainder, alu_sel_alu, alu_sel_cmp, alu_sel_shift_which, alu_u128_tag, alu_u16_tag, alu_u1_tag, alu_u32_tag, alu_u64_tag, alu_u8_tag, alu_zero_shift, binary_acc_ia, binary_acc_ib, binary_acc_ic, binary_clk, binary_ia_bytes, binary_ib_bytes, binary_ic_bytes, binary_in_tag, binary_mem_tag_ctr, binary_mem_tag_ctr_inv, binary_op_id, binary_sel_bin, binary_start, cmp_a_hi, cmp_a_lo, cmp_b_hi, cmp_b_lo, cmp_borrow, cmp_clk, cmp_cmp_rng_ctr, cmp_input_a, cmp_input_b, cmp_op_eq, cmp_op_eq_diff_inv, cmp_op_gt, cmp_p_a_borrow, cmp_p_b_borrow, cmp_p_sub_a_hi, cmp_p_sub_a_lo, cmp_p_sub_b_hi, cmp_p_sub_b_lo, cmp_range_chk_clk, cmp_res_hi, cmp_res_lo, cmp_result, cmp_sel_cmp, cmp_sel_rng_chk, cmp_shift_sel, conversion_clk, conversion_input, conversion_num_limbs, conversion_output_bits, conversion_radix, conversion_sel_to_radix_le, keccakf1600_clk, keccakf1600_input, keccakf1600_output, keccakf1600_sel_keccakf1600, main_abs_da_rem_gas, main_abs_l2_rem_gas, main_alu_in_tag, main_base_da_gas_op_cost, main_base_l2_gas_op_cost, main_bin_op_id, main_call_ptr, main_da_gas_remaining, main_da_out_of_gas, main_dyn_da_gas_op_cost, main_dyn_gas_multiplier, main_dyn_l2_gas_op_cost, main_emit_l2_to_l1_msg_write_offset, main_emit_note_hash_write_offset, main_emit_nullifier_write_offset, main_emit_unencrypted_log_write_offset, main_ia, main_ib, main_ic, main_id, main_id_zero, main_ind_addr_a, main_ind_addr_b, main_ind_addr_c, main_ind_addr_d, main_internal_return_ptr, main_inv, main_is_fake_row, main_is_gas_accounted, main_kernel_in_offset, main_kernel_out_offset, main_l1_to_l2_msg_exists_write_offset, main_l2_gas_remaining, main_l2_out_of_gas, main_mem_addr_a, main_mem_addr_b, main_mem_addr_c, main_mem_addr_d, main_note_hash_exist_write_offset, main_nullifier_exists_write_offset, main_nullifier_non_exists_write_offset, main_op_err, main_opcode_val, main_pc, main_r_in_tag, main_rwa, main_rwb, main_rwc, main_rwd, main_sel_alu, main_sel_bin, main_sel_calldata, main_sel_execution_end, main_sel_execution_row, main_sel_kernel_inputs, main_sel_kernel_out, main_sel_mem_op_a, main_sel_mem_op_b, main_sel_mem_op_c, main_sel_mem_op_d, main_sel_mov_ia_to_ic, main_sel_mov_ib_to_ic, main_sel_op_add, main_sel_op_address, main_sel_op_and, main_sel_op_block_number, main_sel_op_calldata_copy, main_sel_op_cast, main_sel_op_chain_id, main_sel_op_dagasleft, main_sel_op_div, main_sel_op_ecadd, main_sel_op_emit_l2_to_l1_msg, main_sel_op_emit_note_hash, main_sel_op_emit_nullifier, main_sel_op_emit_unencrypted_log, main_sel_op_eq, main_sel_op_external_call, main_sel_op_external_return, main_sel_op_external_revert, main_sel_op_fdiv, main_sel_op_fee_per_da_gas, main_sel_op_fee_per_l2_gas, main_sel_op_function_selector, main_sel_op_get_contract_instance, main_sel_op_internal_call, main_sel_op_internal_return, main_sel_op_is_static_call, main_sel_op_jump, main_sel_op_jumpi, main_sel_op_keccak, main_sel_op_l1_to_l2_msg_exists, main_sel_op_l2gasleft, main_sel_op_lt, main_sel_op_lte, main_sel_op_mov, main_sel_op_msm, main_sel_op_mul, main_sel_op_not, main_sel_op_note_hash_exists, main_sel_op_nullifier_exists, main_sel_op_or, main_sel_op_poseidon2, main_sel_op_radix_le, main_sel_op_sender, main_sel_op_set, main_sel_op_sha256, main_sel_op_shl, main_sel_op_shr, main_sel_op_sload, main_sel_op_sstore, main_sel_op_static_call, main_sel_op_sub, main_sel_op_timestamp, main_sel_op_transaction_fee, main_sel_op_version, main_sel_op_xor, main_sel_q_kernel_lookup, main_sel_q_kernel_output_lookup, main_sel_resolve_ind_addr_a, main_sel_resolve_ind_addr_b, main_sel_resolve_ind_addr_c, main_sel_resolve_ind_addr_d, main_sel_returndata, main_sel_rng_16, main_sel_rng_8, main_sel_slice_gadget, main_side_effect_counter, main_sload_write_offset, main_space_id, main_sstore_write_offset, main_tag_err, main_w_in_tag, mem_addr, mem_clk, mem_diff, mem_glob_addr, mem_last, mem_lastAccess, mem_one_min_inv, mem_r_in_tag, mem_rw, mem_sel_mem, mem_sel_mov_ia_to_ic, mem_sel_mov_ib_to_ic, mem_sel_op_a, mem_sel_op_b, mem_sel_op_c, mem_sel_op_d, mem_sel_op_poseidon_read_a, mem_sel_op_poseidon_read_b, mem_sel_op_poseidon_read_c, mem_sel_op_poseidon_read_d, mem_sel_op_poseidon_write_a, mem_sel_op_poseidon_write_b, mem_sel_op_poseidon_write_c, mem_sel_op_poseidon_write_d, mem_sel_op_slice, mem_sel_resolve_ind_addr_a, mem_sel_resolve_ind_addr_b, mem_sel_resolve_ind_addr_c, mem_sel_resolve_ind_addr_d, mem_sel_rng_chk, mem_skip_check_tag, mem_space_id, mem_tag, mem_tag_err, mem_tsp, mem_val, mem_w_in_tag, poseidon2_B_10_0, poseidon2_B_10_1, poseidon2_B_10_2, poseidon2_B_10_3, poseidon2_B_11_0, poseidon2_B_11_1, poseidon2_B_11_2, poseidon2_B_11_3, poseidon2_B_12_0, poseidon2_B_12_1, poseidon2_B_12_2, poseidon2_B_12_3, poseidon2_B_13_0, poseidon2_B_13_1, poseidon2_B_13_2, poseidon2_B_13_3, poseidon2_B_14_0, poseidon2_B_14_1, poseidon2_B_14_2, poseidon2_B_14_3, poseidon2_B_15_0, poseidon2_B_15_1, poseidon2_B_15_2, poseidon2_B_15_3, poseidon2_B_16_0, poseidon2_B_16_1, poseidon2_B_16_2, poseidon2_B_16_3, poseidon2_B_17_0, poseidon2_B_17_1, poseidon2_B_17_2, poseidon2_B_17_3, poseidon2_B_18_0, poseidon2_B_18_1, poseidon2_B_18_2, poseidon2_B_18_3, poseidon2_B_19_0, poseidon2_B_19_1, poseidon2_B_19_2, poseidon2_B_19_3, poseidon2_B_20_0, poseidon2_B_20_1, poseidon2_B_20_2, poseidon2_B_20_3, poseidon2_B_21_0, poseidon2_B_21_1, poseidon2_B_21_2, poseidon2_B_21_3, poseidon2_B_22_0, poseidon2_B_22_1, poseidon2_B_22_2, poseidon2_B_22_3, poseidon2_B_23_0, poseidon2_B_23_1, poseidon2_B_23_2, poseidon2_B_23_3, poseidon2_B_24_0, poseidon2_B_24_1, poseidon2_B_24_2, poseidon2_B_24_3, poseidon2_B_25_0, poseidon2_B_25_1, poseidon2_B_25_2, poseidon2_B_25_3, poseidon2_B_26_0, poseidon2_B_26_1, poseidon2_B_26_2, poseidon2_B_26_3, poseidon2_B_27_0, poseidon2_B_27_1, poseidon2_B_27_2, poseidon2_B_27_3, poseidon2_B_28_0, poseidon2_B_28_1, poseidon2_B_28_2, poseidon2_B_28_3, poseidon2_B_29_0, poseidon2_B_29_1, poseidon2_B_29_2, poseidon2_B_29_3, poseidon2_B_30_0, poseidon2_B_30_1, poseidon2_B_30_2, poseidon2_B_30_3, poseidon2_B_31_0, poseidon2_B_31_1, poseidon2_B_31_2, poseidon2_B_31_3, poseidon2_B_32_0, poseidon2_B_32_1, poseidon2_B_32_2, poseidon2_B_32_3, poseidon2_B_33_0, poseidon2_B_33_1, poseidon2_B_33_2, poseidon2_B_33_3, poseidon2_B_34_0, poseidon2_B_34_1, poseidon2_B_34_2, poseidon2_B_34_3, poseidon2_B_35_0, poseidon2_B_35_1, poseidon2_B_35_2, poseidon2_B_35_3, poseidon2_B_36_0, poseidon2_B_36_1, poseidon2_B_36_2, poseidon2_B_36_3, poseidon2_B_37_0, poseidon2_B_37_1, poseidon2_B_37_2, poseidon2_B_37_3, poseidon2_B_38_0, poseidon2_B_38_1, poseidon2_B_38_2, poseidon2_B_38_3, poseidon2_B_39_0, poseidon2_B_39_1, poseidon2_B_39_2, poseidon2_B_39_3, poseidon2_B_40_0, poseidon2_B_40_1, poseidon2_B_40_2, poseidon2_B_40_3, poseidon2_B_41_0, poseidon2_B_41_1, poseidon2_B_41_2, poseidon2_B_41_3, poseidon2_B_42_0, poseidon2_B_42_1, poseidon2_B_42_2, poseidon2_B_42_3, poseidon2_B_43_0, poseidon2_B_43_1, poseidon2_B_43_2, poseidon2_B_43_3, poseidon2_B_44_0, poseidon2_B_44_1, poseidon2_B_44_2, poseidon2_B_44_3, poseidon2_B_45_0, poseidon2_B_45_1, poseidon2_B_45_2, poseidon2_B_45_3, poseidon2_B_46_0, poseidon2_B_46_1, poseidon2_B_46_2, poseidon2_B_46_3, poseidon2_B_47_0, poseidon2_B_47_1, poseidon2_B_47_2, poseidon2_B_47_3, poseidon2_B_48_0, poseidon2_B_48_1, poseidon2_B_48_2, poseidon2_B_48_3, poseidon2_B_49_0, poseidon2_B_49_1, poseidon2_B_49_2, poseidon2_B_49_3, poseidon2_B_4_0, poseidon2_B_4_1, poseidon2_B_4_2, poseidon2_B_4_3, poseidon2_B_50_0, poseidon2_B_50_1, poseidon2_B_50_2, poseidon2_B_50_3, poseidon2_B_51_0, poseidon2_B_51_1, poseidon2_B_51_2, poseidon2_B_51_3, poseidon2_B_52_0, poseidon2_B_52_1, poseidon2_B_52_2, poseidon2_B_52_3, poseidon2_B_53_0, poseidon2_B_53_1, poseidon2_B_53_2, poseidon2_B_53_3, poseidon2_B_54_0, poseidon2_B_54_1, poseidon2_B_54_2, poseidon2_B_54_3, poseidon2_B_55_0, poseidon2_B_55_1, poseidon2_B_55_2, poseidon2_B_55_3, poseidon2_B_56_0, poseidon2_B_56_1, poseidon2_B_56_2, poseidon2_B_56_3, poseidon2_B_57_0, poseidon2_B_57_1, poseidon2_B_57_2, poseidon2_B_57_3, poseidon2_B_58_0, poseidon2_B_58_1, poseidon2_B_58_2, poseidon2_B_58_3, poseidon2_B_59_0, poseidon2_B_59_1, poseidon2_B_59_2, poseidon2_B_59_3, poseidon2_B_5_0, poseidon2_B_5_1, poseidon2_B_5_2, poseidon2_B_5_3, poseidon2_B_6_0, poseidon2_B_6_1, poseidon2_B_6_2, poseidon2_B_6_3, poseidon2_B_7_0, poseidon2_B_7_1, poseidon2_B_7_2, poseidon2_B_7_3, poseidon2_B_8_0, poseidon2_B_8_1, poseidon2_B_8_2, poseidon2_B_8_3, poseidon2_B_9_0, poseidon2_B_9_1, poseidon2_B_9_2, poseidon2_B_9_3, poseidon2_EXT_LAYER_4, poseidon2_EXT_LAYER_5, poseidon2_EXT_LAYER_6, poseidon2_EXT_LAYER_7, poseidon2_T_0_4, poseidon2_T_0_5, poseidon2_T_0_6, poseidon2_T_0_7, poseidon2_T_1_4, poseidon2_T_1_5, poseidon2_T_1_6, poseidon2_T_1_7, poseidon2_T_2_4, poseidon2_T_2_5, poseidon2_T_2_6, poseidon2_T_2_7, poseidon2_T_3_4, poseidon2_T_3_5, poseidon2_T_3_6, poseidon2_T_3_7, poseidon2_T_60_4, poseidon2_T_60_5, poseidon2_T_60_6, poseidon2_T_60_7, poseidon2_T_61_4, poseidon2_T_61_5, poseidon2_T_61_6, poseidon2_T_61_7, poseidon2_T_62_4, poseidon2_T_62_5, poseidon2_T_62_6, poseidon2_T_62_7, poseidon2_T_63_4, poseidon2_T_63_5, poseidon2_T_63_6, poseidon2_T_63_7, poseidon2_a_0, poseidon2_a_1, poseidon2_a_2, poseidon2_a_3, poseidon2_b_0, poseidon2_b_1, poseidon2_b_2, poseidon2_b_3, poseidon2_clk, poseidon2_full_a_0, poseidon2_full_a_1, poseidon2_full_a_2, poseidon2_full_a_3, poseidon2_full_b_0, poseidon2_full_b_1, poseidon2_full_b_2, poseidon2_full_b_3, poseidon2_full_clk, poseidon2_full_end_poseidon, poseidon2_full_execute_poseidon_perm, poseidon2_full_input_0, poseidon2_full_input_1, poseidon2_full_input_2, poseidon2_full_input_len, poseidon2_full_num_perm_rounds_rem, poseidon2_full_num_perm_rounds_rem_inv, poseidon2_full_output, poseidon2_full_padding, poseidon2_full_sel_poseidon, poseidon2_full_start_poseidon, poseidon2_input_addr, poseidon2_mem_addr_read_a, poseidon2_mem_addr_read_b, poseidon2_mem_addr_read_c, poseidon2_mem_addr_read_d, poseidon2_mem_addr_write_a, poseidon2_mem_addr_write_b, poseidon2_mem_addr_write_c, poseidon2_mem_addr_write_d, poseidon2_output_addr, poseidon2_sel_poseidon_perm, poseidon2_sel_poseidon_perm_immediate, poseidon2_sel_poseidon_perm_mem_op, poseidon2_space_id, range_check_alu_rng_chk, range_check_clk, range_check_cmp_hi_bits_rng_chk, range_check_cmp_lo_bits_rng_chk, range_check_dyn_diff, range_check_dyn_rng_chk_bits, range_check_dyn_rng_chk_pow_2, range_check_gas_da_rng_chk, range_check_gas_l2_rng_chk, range_check_is_lte_u112, range_check_is_lte_u128, range_check_is_lte_u16, range_check_is_lte_u32, range_check_is_lte_u48, range_check_is_lte_u64, range_check_is_lte_u80, range_check_is_lte_u96, range_check_mem_rng_chk, range_check_rng_chk_bits, range_check_sel_lookup_0, range_check_sel_lookup_1, range_check_sel_lookup_2, range_check_sel_lookup_3, range_check_sel_lookup_4, range_check_sel_lookup_5, range_check_sel_lookup_6, range_check_sel_rng_chk, range_check_u16_r0, range_check_u16_r1, range_check_u16_r2, range_check_u16_r3, range_check_u16_r4, range_check_u16_r5, range_check_u16_r6, range_check_u16_r7, range_check_value, sha256_clk, sha256_input, sha256_output, sha256_sel_sha256_compression, sha256_state, slice_addr, slice_clk, slice_cnt, slice_col_offset, slice_one_min_inv, slice_sel_cd_cpy, slice_sel_mem_active, slice_sel_return, slice_sel_start, slice_space_id, slice_val, lookup_rng_chk_pow_2_counts, lookup_rng_chk_diff_counts, lookup_rng_chk_0_counts, lookup_rng_chk_1_counts, lookup_rng_chk_2_counts, lookup_rng_chk_3_counts, lookup_rng_chk_4_counts, lookup_rng_chk_5_counts, lookup_rng_chk_6_counts, lookup_rng_chk_7_counts, lookup_pow_2_0_counts, lookup_pow_2_1_counts, lookup_byte_lengths_counts, lookup_byte_operations_counts, lookup_opcode_gas_counts, kernel_output_lookup_counts, lookup_into_kernel_counts, lookup_cd_value_counts, lookup_ret_value_counts, incl_main_tag_err_counts, incl_mem_tag_err_counts ->>>>>>> eb84583b4d (Rebase on master and run codegen) #define DERIVED_WITNESS_ENTITIES perm_rng_mem_inv, perm_rng_cmp_lo_inv, perm_rng_cmp_hi_inv, perm_rng_alu_inv, perm_cmp_alu_inv, perm_rng_gas_l2_inv, perm_rng_gas_da_inv, perm_l2_start_gas_inv, perm_da_start_gas_inv, perm_l2_end_gas_inv, perm_da_end_gas_inv, perm_pos_mem_read_a_inv, perm_pos_mem_read_b_inv, perm_pos_mem_read_c_inv, perm_pos_mem_read_d_inv, perm_pos_mem_write_a_inv, perm_pos_mem_write_b_inv, perm_pos_mem_write_c_inv, perm_pos_mem_write_d_inv, perm_pos2_fixed_pos2_perm_inv, perm_slice_mem_inv, perm_main_alu_inv, perm_main_bin_inv, perm_main_conv_inv, perm_main_sha256_inv, perm_main_pos2_perm_inv, perm_main_slice_inv, perm_main_mem_a_inv, perm_main_mem_b_inv, perm_main_mem_c_inv, perm_main_mem_d_inv, perm_main_mem_ind_addr_a_inv, perm_main_mem_ind_addr_b_inv, perm_main_mem_ind_addr_c_inv, perm_main_mem_ind_addr_d_inv, lookup_rng_chk_pow_2_inv, lookup_rng_chk_diff_inv, lookup_rng_chk_0_inv, lookup_rng_chk_1_inv, lookup_rng_chk_2_inv, lookup_rng_chk_3_inv, lookup_rng_chk_4_inv, lookup_rng_chk_5_inv, lookup_rng_chk_6_inv, lookup_rng_chk_7_inv, lookup_pow_2_0_inv, lookup_pow_2_1_inv, lookup_byte_lengths_inv, lookup_byte_operations_inv, lookup_opcode_gas_inv, kernel_output_lookup_inv, lookup_into_kernel_inv, lookup_cd_value_inv, lookup_ret_value_inv, incl_main_tag_err_inv, incl_mem_tag_err_inv #define SHIFTED_ENTITIES binary_acc_ia_shift, binary_acc_ib_shift, binary_acc_ic_shift, binary_mem_tag_ctr_shift, binary_op_id_shift, cmp_a_hi_shift, cmp_a_lo_shift, cmp_b_hi_shift, cmp_b_lo_shift, cmp_cmp_rng_ctr_shift, cmp_op_gt_shift, cmp_p_sub_a_hi_shift, cmp_p_sub_a_lo_shift, cmp_p_sub_b_hi_shift, cmp_p_sub_b_lo_shift, cmp_sel_rng_chk_shift, main_da_gas_remaining_shift, main_emit_l2_to_l1_msg_write_offset_shift, main_emit_note_hash_write_offset_shift, main_emit_nullifier_write_offset_shift, main_emit_unencrypted_log_write_offset_shift, main_internal_return_ptr_shift, main_l1_to_l2_msg_exists_write_offset_shift, main_l2_gas_remaining_shift, main_note_hash_exist_write_offset_shift, main_nullifier_exists_write_offset_shift, main_nullifier_non_exists_write_offset_shift, main_pc_shift, main_sel_execution_end_shift, main_sel_execution_row_shift, main_sload_write_offset_shift, main_sstore_write_offset_shift, mem_glob_addr_shift, mem_rw_shift, mem_sel_mem_shift, mem_tag_shift, mem_tsp_shift, mem_val_shift, poseidon2_full_a_0_shift, poseidon2_full_a_1_shift, poseidon2_full_a_2_shift, poseidon2_full_a_3_shift, poseidon2_full_execute_poseidon_perm_shift, poseidon2_full_input_0_shift, poseidon2_full_input_1_shift, poseidon2_full_input_2_shift, poseidon2_full_num_perm_rounds_rem_shift, poseidon2_full_sel_poseidon_shift, poseidon2_full_start_poseidon_shift, slice_addr_shift, slice_clk_shift, slice_cnt_shift, slice_col_offset_shift, slice_sel_cd_cpy_shift, slice_sel_mem_active_shift, slice_sel_return_shift, slice_sel_start_shift, slice_space_id_shift #define TO_BE_SHIFTED(e) e.binary_acc_ia, e.binary_acc_ib, e.binary_acc_ic, e.binary_mem_tag_ctr, e.binary_op_id, e.cmp_a_hi, e.cmp_a_lo, e.cmp_b_hi, e.cmp_b_lo, e.cmp_cmp_rng_ctr, e.cmp_op_gt, e.cmp_p_sub_a_hi, e.cmp_p_sub_a_lo, e.cmp_p_sub_b_hi, e.cmp_p_sub_b_lo, e.cmp_sel_rng_chk, e.main_da_gas_remaining, e.main_emit_l2_to_l1_msg_write_offset, e.main_emit_note_hash_write_offset, e.main_emit_nullifier_write_offset, e.main_emit_unencrypted_log_write_offset, e.main_internal_return_ptr, e.main_l1_to_l2_msg_exists_write_offset, e.main_l2_gas_remaining, e.main_note_hash_exist_write_offset, e.main_nullifier_exists_write_offset, e.main_nullifier_non_exists_write_offset, e.main_pc, e.main_sel_execution_end, e.main_sel_execution_row, e.main_sload_write_offset, e.main_sstore_write_offset, e.mem_glob_addr, e.mem_rw, e.mem_sel_mem, e.mem_tag, e.mem_tsp, e.mem_val, e.poseidon2_full_a_0, e.poseidon2_full_a_1, e.poseidon2_full_a_2, e.poseidon2_full_a_3, e.poseidon2_full_execute_poseidon_perm, e.poseidon2_full_input_0, e.poseidon2_full_input_1, e.poseidon2_full_input_2, e.poseidon2_full_num_perm_rounds_rem, e.poseidon2_full_sel_poseidon, e.poseidon2_full_start_poseidon, e.slice_addr, e.slice_clk, e.slice_cnt, e.slice_col_offset, e.slice_sel_cd_cpy, e.slice_sel_mem_active, e.slice_sel_return, e.slice_sel_start, e.slice_space_id @@ -132,35 +124,12 @@ class AvmFlavor { static constexpr bool HasZK = false; static constexpr size_t NUM_PRECOMPUTED_ENTITIES = 21; -<<<<<<< HEAD -<<<<<<< HEAD static constexpr size_t NUM_WITNESS_ENTITIES = 709; -======= -<<<<<<< HEAD -======= ->>>>>>> 3d279e3a98 (Rebase on master) - static constexpr size_t NUM_WITNESS_ENTITIES = 705; ->>>>>>> eb84583b4d (Rebase on master and run codegen) static constexpr size_t NUM_SHIFTED_ENTITIES = 58; static constexpr size_t NUM_WIRES = NUM_WITNESS_ENTITIES + NUM_PRECOMPUTED_ENTITIES; // We have two copies of the witness entities, so we subtract the number of fixed ones (they have no shift), one for // the unshifted and one for the shifted -<<<<<<< HEAD static constexpr size_t NUM_ALL_ENTITIES = 788; -======= - static constexpr size_t NUM_ALL_ENTITIES = 784; -<<<<<<< HEAD -======= - static constexpr size_t NUM_WITNESS_ENTITIES = 681; - static constexpr size_t NUM_SHIFTED_ENTITIES = 47; - static constexpr size_t NUM_WIRES = NUM_WITNESS_ENTITIES + NUM_PRECOMPUTED_ENTITIES; - // We have two copies of the witness entities, so we subtract the number of fixed ones (they have no shift), one for - // the unshifted and one for the shifted - static constexpr size_t NUM_ALL_ENTITIES = 749; ->>>>>>> e89fbe81cb (Rebase on master and run codegen) ->>>>>>> eb84583b4d (Rebase on master and run codegen) -======= ->>>>>>> 3d279e3a98 (Rebase on master) // The total number of witnesses including shifts and derived entities. static constexpr size_t NUM_ALL_WITNESS_ENTITIES = NUM_WITNESS_ENTITIES + NUM_SHIFTED_ENTITIES; diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/full_row.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/full_row.hpp index f6a5adf090c9..68a3b8f44577 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/full_row.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/full_row.hpp @@ -744,19 +744,7 @@ template struct AvmFullRow { RefVector as_vector() const; static std::vector names(); -<<<<<<< HEAD -<<<<<<< HEAD static constexpr size_t SIZE = 730; -======= -<<<<<<< HEAD - static constexpr size_t SIZE = 726; -======= - static constexpr size_t SIZE = 702; ->>>>>>> e89fbe81cb (Rebase on master and run codegen) ->>>>>>> eb84583b4d (Rebase on master and run codegen) -======= - static constexpr size_t SIZE = 726; ->>>>>>> 3d279e3a98 (Rebase on master) }; template std::ostream& operator<<(std::ostream& os, AvmFullRow const& row);