From 3a26a38e33adbca2424c78243f87b5f7a55ac8d6 Mon Sep 17 00:00:00 2001 From: dbanks12 Date: Tue, 22 Oct 2024 20:23:23 +0000 Subject: [PATCH] chore!: ToRadixLE -> ToRadixBE in Brillig and AVM --- avm-transpiler/src/opcodes.rs | 4 +- avm-transpiler/src/transpile.rs | 2 +- .../cpp/pil/avm/gadgets/conversion.pil | 7 +- barretenberg/cpp/pil/avm/main.pil | 10 +- .../vm/avm/generated/circuit_builder.cpp | 5 +- .../barretenberg/vm/avm/generated/flavor.cpp | 1043 ++++++++--------- .../barretenberg/vm/avm/generated/flavor.hpp | 6 +- .../vm/avm/generated/full_row.cpp | 10 +- .../vm/avm/generated/full_row.hpp | 7 +- .../vm/avm/generated/relations/conversion.hpp | 2 +- .../vm/avm/generated/relations/kernel.hpp | 200 ++-- .../vm/avm/generated/relations/main.hpp | 337 +++--- .../generated/relations/perm_main_conv.hpp | 14 +- .../vm/avm/tests/execution.test.cpp | 32 +- .../vm/avm/trace/deserialization.cpp | 2 +- .../barretenberg/vm/avm/trace/execution.cpp | 4 +- .../barretenberg/vm/avm/trace/fixed_gas.cpp | 2 +- .../barretenberg/vm/avm/trace/fixed_gas.hpp | 2 +- .../vm/avm/trace/gadgets/conversion_trace.cpp | 19 +- .../vm/avm/trace/gadgets/conversion_trace.hpp | 4 +- .../src/barretenberg/vm/avm/trace/opcode.cpp | 4 +- .../src/barretenberg/vm/avm/trace/opcode.hpp | 2 +- .../src/barretenberg/vm/avm/trace/trace.cpp | 18 +- .../src/barretenberg/vm/avm/trace/trace.hpp | 2 +- .../src/barretenberg/vm/aztec_constants.hpp | 6 +- .../crates/types/src/constants.nr | 6 +- .../acvm-repo/brillig_vm/src/black_box.rs | 10 +- .../src/brillig/brillig_gen/brillig_block.rs | 4 +- .../brillig/brillig_ir/codegen_intrinsic.rs | 5 +- yarn-project/circuits.js/src/constants.gen.ts | 6 +- yarn-project/simulator/src/avm/avm_gas.ts | 4 +- .../src/avm/opcodes/conversion.test.ts | 34 +- .../simulator/src/avm/opcodes/conversion.ts | 15 +- .../serialization/bytecode_serialization.ts | 4 +- .../instruction_serialization.ts | 2 +- 35 files changed, 911 insertions(+), 923 deletions(-) diff --git a/avm-transpiler/src/opcodes.rs b/avm-transpiler/src/opcodes.rs index e10f8639df4..9e60aee398f 100644 --- a/avm-transpiler/src/opcodes.rs +++ b/avm-transpiler/src/opcodes.rs @@ -77,7 +77,7 @@ pub enum AvmOpcode { ECADD, MSM, // Conversions - TORADIXLE, + TORADIXBE, } impl AvmOpcode { @@ -171,7 +171,7 @@ impl AvmOpcode { AvmOpcode::ECADD => "ECADD", AvmOpcode::MSM => "MSM", // Conversions - AvmOpcode::TORADIXLE => "TORADIXLE", + AvmOpcode::TORADIXBE => "TORADIXBE", } } } diff --git a/avm-transpiler/src/transpile.rs b/avm-transpiler/src/transpile.rs index a1240378368..0ecf6f4ad85 100644 --- a/avm-transpiler/src/transpile.rs +++ b/avm-transpiler/src/transpile.rs @@ -1042,7 +1042,7 @@ fn handle_black_box_function(avm_instrs: &mut Vec, operation: &B let radix_offset = radix.to_usize() as u32; avm_instrs.push(AvmInstruction { - opcode: AvmOpcode::TORADIXLE, + opcode: AvmOpcode::TORADIXBE, indirect: Some( AddressingModeBuilder::default() .direct_operand(input) diff --git a/barretenberg/cpp/pil/avm/gadgets/conversion.pil b/barretenberg/cpp/pil/avm/gadgets/conversion.pil index 5ab45ee45b1..2209261fa9d 100644 --- a/barretenberg/cpp/pil/avm/gadgets/conversion.pil +++ b/barretenberg/cpp/pil/avm/gadgets/conversion.pil @@ -3,11 +3,12 @@ namespace conversion(256); pol commit clk; // Selector for Radix Operation - pol commit sel_to_radix_le; - sel_to_radix_le * (1 - sel_to_radix_le) = 0; + pol commit sel_to_radix_be; + sel_to_radix_be * (1 - sel_to_radix_be) = 0; - // ===== DRAFT: Planned Constraints for To Radix LE + // ===== DRAFT: Planned Constraints for To Radix BE // Similar to the binary trace; multi-row decomposition of the input using the number of limbs specified as the row count. + // TODO: modify this draft plan to work for big-endian To Radix // (1) limb_ctr' - limb_ctr + 1 = 0; // Next row decrements the limb_ctr // (2) Check equality to 0 of limb_ctr to terminate the operations. // (3) An accumulation column to track the partial re-composition of the limbs diff --git a/barretenberg/cpp/pil/avm/main.pil b/barretenberg/cpp/pil/avm/main.pil index 89be52246ff..a6a50a1d536 100644 --- a/barretenberg/cpp/pil/avm/main.pil +++ b/barretenberg/cpp/pil/avm/main.pil @@ -83,7 +83,7 @@ namespace main(256); pol commit opcode_val; //===== Gadget Selectors ====================================================== - pol commit sel_op_radix_le; + pol commit sel_op_radix_be; pol commit sel_op_sha256; pol commit sel_op_poseidon2; pol commit sel_op_keccak; @@ -241,7 +241,7 @@ namespace main(256); sel_op_sload * (1 - sel_op_sload) = 0; sel_op_sstore * (1 - sel_op_sstore) = 0; - sel_op_radix_le * (1 - sel_op_radix_le) = 0; + sel_op_radix_be * (1 - sel_op_radix_be) = 0; sel_op_sha256 * (1 - sel_op_sha256) = 0; sel_op_poseidon2 * (1 - sel_op_poseidon2) = 0; sel_op_keccak * (1 - sel_op_keccak) = 0; @@ -414,7 +414,7 @@ namespace main(256); pol SEL_ALL_ALU = SEL_ALU_R_TAG + SEL_ALU_W_TAG; pol SEL_ALL_LEFTGAS = sel_op_dagasleft + sel_op_l2gasleft; pol SEL_ALL_BINARY = sel_op_and + sel_op_or + sel_op_xor; - pol SEL_ALL_GADGET = sel_op_radix_le + sel_op_sha256 + sel_op_poseidon2 + sel_op_keccak + pol SEL_ALL_GADGET = sel_op_radix_be + sel_op_sha256 + sel_op_poseidon2 + sel_op_keccak + sel_op_ecadd + sel_op_msm; pol SEL_ALL_MEMORY = sel_op_mov + sel_op_set; pol OPCODE_SELECTORS = sel_op_fdiv + sel_op_calldata_copy + sel_op_get_contract_instance @@ -535,9 +535,9 @@ namespace main(256); binary.start {binary.clk, binary.acc_ia, binary.acc_ib, binary.acc_ic, binary.op_id, binary.in_tag}; #[PERM_MAIN_CONV] - sel_op_radix_le {clk, ia, ib, ic, id} + sel_op_radix_be {clk, ia, ib, ic, id} is - conversion.sel_to_radix_le {conversion.clk, conversion.input, conversion.radix, conversion.num_limbs, conversion.output_bits}; + conversion.sel_to_radix_be {conversion.clk, conversion.input, conversion.radix, conversion.num_limbs, conversion.output_bits}; #[PERM_MAIN_SHA256] sel_op_sha256 {clk, ia, ib, ic} 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 9fdd479444a..fe255a95d29 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/circuit_builder.cpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/circuit_builder.cpp @@ -166,7 +166,7 @@ AvmCircuitBuilder::ProverPolynomials AvmCircuitBuilder::compute_polynomials() co polys.conversion_num_limbs.set_if_valid_index(i, rows[i].conversion_num_limbs); polys.conversion_output_bits.set_if_valid_index(i, rows[i].conversion_output_bits); polys.conversion_radix.set_if_valid_index(i, rows[i].conversion_radix); - polys.conversion_sel_to_radix_le.set_if_valid_index(i, rows[i].conversion_sel_to_radix_le); + polys.conversion_sel_to_radix_be.set_if_valid_index(i, rows[i].conversion_sel_to_radix_be); polys.keccakf1600_clk.set_if_valid_index(i, rows[i].keccakf1600_clk); polys.keccakf1600_input.set_if_valid_index(i, rows[i].keccakf1600_input); polys.keccakf1600_output.set_if_valid_index(i, rows[i].keccakf1600_output); @@ -281,7 +281,7 @@ AvmCircuitBuilder::ProverPolynomials AvmCircuitBuilder::compute_polynomials() co polys.main_sel_op_nullifier_exists.set_if_valid_index(i, rows[i].main_sel_op_nullifier_exists); polys.main_sel_op_or.set_if_valid_index(i, rows[i].main_sel_op_or); polys.main_sel_op_poseidon2.set_if_valid_index(i, rows[i].main_sel_op_poseidon2); - polys.main_sel_op_radix_le.set_if_valid_index(i, rows[i].main_sel_op_radix_le); + polys.main_sel_op_radix_be.set_if_valid_index(i, rows[i].main_sel_op_radix_be); polys.main_sel_op_sender.set_if_valid_index(i, rows[i].main_sel_op_sender); polys.main_sel_op_set.set_if_valid_index(i, rows[i].main_sel_op_set); polys.main_sel_op_sha256.set_if_valid_index(i, rows[i].main_sel_op_sha256); @@ -290,7 +290,6 @@ AvmCircuitBuilder::ProverPolynomials AvmCircuitBuilder::compute_polynomials() co polys.main_sel_op_sload.set_if_valid_index(i, rows[i].main_sel_op_sload); polys.main_sel_op_sstore.set_if_valid_index(i, rows[i].main_sel_op_sstore); polys.main_sel_op_static_call.set_if_valid_index(i, rows[i].main_sel_op_static_call); - polys.main_sel_op_storage_address.set_if_valid_index(i, rows[i].main_sel_op_storage_address); polys.main_sel_op_sub.set_if_valid_index(i, rows[i].main_sel_op_sub); polys.main_sel_op_timestamp.set_if_valid_index(i, rows[i].main_sel_op_timestamp); polys.main_sel_op_transaction_fee.set_if_valid_index(i, rows[i].main_sel_op_transaction_fee); diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.cpp index 0ea433e4c55..9a469ff0c16 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.cpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.cpp @@ -123,7 +123,7 @@ AvmFlavor::AllConstRefValues::AllConstRefValues( , conversion_num_limbs(il[115]) , conversion_output_bits(il[116]) , conversion_radix(il[117]) - , conversion_sel_to_radix_le(il[118]) + , conversion_sel_to_radix_be(il[118]) , keccakf1600_clk(il[119]) , keccakf1600_input(il[120]) , keccakf1600_output(il[121]) @@ -231,7 +231,7 @@ AvmFlavor::AllConstRefValues::AllConstRefValues( , 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_radix_be(il[226]) , main_sel_op_sender(il[227]) , main_sel_op_set(il[228]) , main_sel_op_sha256(il[229]) @@ -240,521 +240,520 @@ AvmFlavor::AllConstRefValues::AllConstRefValues( , main_sel_op_sload(il[232]) , main_sel_op_sstore(il[233]) , main_sel_op_static_call(il[234]) - , 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]) + , 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_input_addr(il[562]) + , poseidon2_mem_addr_read_a(il[563]) + , poseidon2_mem_addr_read_b(il[564]) + , poseidon2_mem_addr_read_c(il[565]) + , poseidon2_mem_addr_read_d(il[566]) + , poseidon2_mem_addr_write_a(il[567]) + , poseidon2_mem_addr_write_b(il[568]) + , poseidon2_mem_addr_write_c(il[569]) + , poseidon2_mem_addr_write_d(il[570]) + , poseidon2_output_addr(il[571]) + , poseidon2_sel_poseidon_perm(il[572]) + , poseidon2_space_id(il[573]) + , range_check_alu_rng_chk(il[574]) + , range_check_clk(il[575]) + , range_check_cmp_hi_bits_rng_chk(il[576]) + , range_check_cmp_lo_bits_rng_chk(il[577]) + , range_check_dyn_diff(il[578]) + , range_check_dyn_rng_chk_bits(il[579]) + , range_check_dyn_rng_chk_pow_2(il[580]) + , range_check_gas_da_rng_chk(il[581]) + , range_check_gas_l2_rng_chk(il[582]) + , range_check_is_lte_u112(il[583]) + , range_check_is_lte_u128(il[584]) + , range_check_is_lte_u16(il[585]) + , range_check_is_lte_u32(il[586]) + , range_check_is_lte_u48(il[587]) + , range_check_is_lte_u64(il[588]) + , range_check_is_lte_u80(il[589]) + , range_check_is_lte_u96(il[590]) + , range_check_mem_rng_chk(il[591]) + , range_check_rng_chk_bits(il[592]) + , range_check_sel_lookup_0(il[593]) + , range_check_sel_lookup_1(il[594]) + , range_check_sel_lookup_2(il[595]) + , range_check_sel_lookup_3(il[596]) + , range_check_sel_lookup_4(il[597]) + , range_check_sel_lookup_5(il[598]) + , range_check_sel_lookup_6(il[599]) + , range_check_sel_rng_chk(il[600]) + , range_check_u16_r0(il[601]) + , range_check_u16_r1(il[602]) + , range_check_u16_r2(il[603]) + , range_check_u16_r3(il[604]) + , range_check_u16_r4(il[605]) + , range_check_u16_r5(il[606]) + , range_check_u16_r6(il[607]) + , range_check_u16_r7(il[608]) + , range_check_value(il[609]) + , sha256_clk(il[610]) + , sha256_input(il[611]) + , sha256_output(il[612]) + , sha256_sel_sha256_compression(il[613]) + , sha256_state(il[614]) + , slice_addr(il[615]) + , slice_clk(il[616]) + , slice_cnt(il[617]) + , slice_col_offset(il[618]) + , slice_one_min_inv(il[619]) + , slice_sel_cd_cpy(il[620]) + , slice_sel_mem_active(il[621]) + , slice_sel_return(il[622]) + , slice_sel_start(il[623]) + , slice_space_id(il[624]) + , slice_val(il[625]) + , lookup_rng_chk_pow_2_counts(il[626]) + , lookup_rng_chk_diff_counts(il[627]) + , lookup_rng_chk_0_counts(il[628]) + , lookup_rng_chk_1_counts(il[629]) + , lookup_rng_chk_2_counts(il[630]) + , lookup_rng_chk_3_counts(il[631]) + , lookup_rng_chk_4_counts(il[632]) + , lookup_rng_chk_5_counts(il[633]) + , lookup_rng_chk_6_counts(il[634]) + , lookup_rng_chk_7_counts(il[635]) + , lookup_pow_2_0_counts(il[636]) + , lookup_pow_2_1_counts(il[637]) + , lookup_byte_lengths_counts(il[638]) + , lookup_byte_operations_counts(il[639]) + , lookup_opcode_gas_counts(il[640]) + , kernel_output_lookup_counts(il[641]) + , lookup_into_kernel_counts(il[642]) + , lookup_cd_value_counts(il[643]) + , lookup_ret_value_counts(il[644]) + , incl_main_tag_err_counts(il[645]) + , incl_mem_tag_err_counts(il[646]) + , perm_rng_mem_inv(il[647]) + , perm_rng_cmp_lo_inv(il[648]) + , perm_rng_cmp_hi_inv(il[649]) + , perm_rng_alu_inv(il[650]) + , perm_cmp_alu_inv(il[651]) + , perm_rng_gas_l2_inv(il[652]) + , perm_rng_gas_da_inv(il[653]) + , perm_l2_start_gas_inv(il[654]) + , perm_da_start_gas_inv(il[655]) + , perm_l2_end_gas_inv(il[656]) + , perm_da_end_gas_inv(il[657]) + , perm_pos_mem_read_a_inv(il[658]) + , perm_pos_mem_read_b_inv(il[659]) + , perm_pos_mem_read_c_inv(il[660]) + , perm_pos_mem_read_d_inv(il[661]) + , perm_pos_mem_write_a_inv(il[662]) + , perm_pos_mem_write_b_inv(il[663]) + , perm_pos_mem_write_c_inv(il[664]) + , perm_pos_mem_write_d_inv(il[665]) + , perm_slice_mem_inv(il[666]) + , perm_main_alu_inv(il[667]) + , perm_main_bin_inv(il[668]) + , perm_main_conv_inv(il[669]) + , perm_main_sha256_inv(il[670]) + , perm_main_pos2_perm_inv(il[671]) + , perm_main_slice_inv(il[672]) + , perm_main_mem_a_inv(il[673]) + , perm_main_mem_b_inv(il[674]) + , perm_main_mem_c_inv(il[675]) + , perm_main_mem_d_inv(il[676]) + , perm_main_mem_ind_addr_a_inv(il[677]) + , perm_main_mem_ind_addr_b_inv(il[678]) + , perm_main_mem_ind_addr_c_inv(il[679]) + , perm_main_mem_ind_addr_d_inv(il[680]) + , lookup_rng_chk_pow_2_inv(il[681]) + , lookup_rng_chk_diff_inv(il[682]) + , lookup_rng_chk_0_inv(il[683]) + , lookup_rng_chk_1_inv(il[684]) + , lookup_rng_chk_2_inv(il[685]) + , lookup_rng_chk_3_inv(il[686]) + , lookup_rng_chk_4_inv(il[687]) + , lookup_rng_chk_5_inv(il[688]) + , lookup_rng_chk_6_inv(il[689]) + , lookup_rng_chk_7_inv(il[690]) + , lookup_pow_2_0_inv(il[691]) + , lookup_pow_2_1_inv(il[692]) + , lookup_byte_lengths_inv(il[693]) + , lookup_byte_operations_inv(il[694]) + , lookup_opcode_gas_inv(il[695]) + , kernel_output_lookup_inv(il[696]) + , lookup_into_kernel_inv(il[697]) + , lookup_cd_value_inv(il[698]) + , lookup_ret_value_inv(il[699]) + , incl_main_tag_err_inv(il[700]) + , incl_mem_tag_err_inv(il[701]) + , binary_acc_ia_shift(il[702]) + , binary_acc_ib_shift(il[703]) + , binary_acc_ic_shift(il[704]) + , binary_mem_tag_ctr_shift(il[705]) + , binary_op_id_shift(il[706]) + , cmp_a_hi_shift(il[707]) + , cmp_a_lo_shift(il[708]) + , cmp_b_hi_shift(il[709]) + , cmp_b_lo_shift(il[710]) + , cmp_cmp_rng_ctr_shift(il[711]) + , cmp_op_gt_shift(il[712]) + , cmp_p_sub_a_hi_shift(il[713]) + , cmp_p_sub_a_lo_shift(il[714]) + , cmp_p_sub_b_hi_shift(il[715]) + , cmp_p_sub_b_lo_shift(il[716]) + , cmp_sel_rng_chk_shift(il[717]) + , main_da_gas_remaining_shift(il[718]) + , main_emit_l2_to_l1_msg_write_offset_shift(il[719]) + , main_emit_note_hash_write_offset_shift(il[720]) + , main_emit_nullifier_write_offset_shift(il[721]) + , main_emit_unencrypted_log_write_offset_shift(il[722]) + , main_internal_return_ptr_shift(il[723]) + , main_l1_to_l2_msg_exists_write_offset_shift(il[724]) + , main_l2_gas_remaining_shift(il[725]) + , main_note_hash_exist_write_offset_shift(il[726]) + , main_nullifier_exists_write_offset_shift(il[727]) + , main_nullifier_non_exists_write_offset_shift(il[728]) + , main_pc_shift(il[729]) + , main_sel_execution_end_shift(il[730]) + , main_sel_execution_row_shift(il[731]) + , main_sload_write_offset_shift(il[732]) + , main_sstore_write_offset_shift(il[733]) + , mem_glob_addr_shift(il[734]) + , mem_rw_shift(il[735]) + , mem_sel_mem_shift(il[736]) + , mem_tag_shift(il[737]) + , mem_tsp_shift(il[738]) + , mem_val_shift(il[739]) + , slice_addr_shift(il[740]) + , slice_clk_shift(il[741]) + , slice_cnt_shift(il[742]) + , slice_col_offset_shift(il[743]) + , slice_sel_cd_cpy_shift(il[744]) + , slice_sel_mem_active_shift(il[745]) + , slice_sel_return_shift(il[746]) + , slice_sel_start_shift(il[747]) + , slice_space_id_shift(il[748]) {} AvmFlavor::ProverPolynomials::ProverPolynomials(ProvingKey& proving_key) @@ -889,7 +888,7 @@ AvmFlavor::AllConstRefValues AvmFlavor::ProverPolynomials::get_row(size_t row_id conversion_num_limbs[row_idx], conversion_output_bits[row_idx], conversion_radix[row_idx], - conversion_sel_to_radix_le[row_idx], + conversion_sel_to_radix_be[row_idx], keccakf1600_clk[row_idx], keccakf1600_input[row_idx], keccakf1600_output[row_idx], @@ -997,7 +996,7 @@ AvmFlavor::AllConstRefValues AvmFlavor::ProverPolynomials::get_row(size_t row_id main_sel_op_nullifier_exists[row_idx], main_sel_op_or[row_idx], main_sel_op_poseidon2[row_idx], - main_sel_op_radix_le[row_idx], + main_sel_op_radix_be[row_idx], main_sel_op_sender[row_idx], main_sel_op_set[row_idx], main_sel_op_sha256[row_idx], @@ -1006,7 +1005,6 @@ AvmFlavor::AllConstRefValues AvmFlavor::ProverPolynomials::get_row(size_t row_id main_sel_op_sload[row_idx], main_sel_op_sstore[row_idx], main_sel_op_static_call[row_idx], - main_sel_op_storage_address[row_idx], main_sel_op_sub[row_idx], main_sel_op_timestamp[row_idx], main_sel_op_transaction_fee[row_idx], @@ -1643,7 +1641,7 @@ AvmFlavor::CommitmentLabels::CommitmentLabels() Base::conversion_num_limbs = "CONVERSION_NUM_LIMBS"; Base::conversion_output_bits = "CONVERSION_OUTPUT_BITS"; Base::conversion_radix = "CONVERSION_RADIX"; - Base::conversion_sel_to_radix_le = "CONVERSION_SEL_TO_RADIX_LE"; + Base::conversion_sel_to_radix_be = "CONVERSION_SEL_TO_RADIX_BE"; Base::keccakf1600_clk = "KECCAKF1600_CLK"; Base::keccakf1600_input = "KECCAKF1600_INPUT"; Base::keccakf1600_output = "KECCAKF1600_OUTPUT"; @@ -1751,7 +1749,7 @@ AvmFlavor::CommitmentLabels::CommitmentLabels() Base::main_sel_op_nullifier_exists = "MAIN_SEL_OP_NULLIFIER_EXISTS"; Base::main_sel_op_or = "MAIN_SEL_OP_OR"; Base::main_sel_op_poseidon2 = "MAIN_SEL_OP_POSEIDON2"; - Base::main_sel_op_radix_le = "MAIN_SEL_OP_RADIX_LE"; + Base::main_sel_op_radix_be = "MAIN_SEL_OP_RADIX_BE"; Base::main_sel_op_sender = "MAIN_SEL_OP_SENDER"; Base::main_sel_op_set = "MAIN_SEL_OP_SET"; Base::main_sel_op_sha256 = "MAIN_SEL_OP_SHA256"; @@ -1760,7 +1758,6 @@ AvmFlavor::CommitmentLabels::CommitmentLabels() Base::main_sel_op_sload = "MAIN_SEL_OP_SLOAD"; Base::main_sel_op_sstore = "MAIN_SEL_OP_SSTORE"; Base::main_sel_op_static_call = "MAIN_SEL_OP_STATIC_CALL"; - Base::main_sel_op_storage_address = "MAIN_SEL_OP_STORAGE_ADDRESS"; Base::main_sel_op_sub = "MAIN_SEL_OP_SUB"; Base::main_sel_op_timestamp = "MAIN_SEL_OP_TIMESTAMP"; Base::main_sel_op_transaction_fee = "MAIN_SEL_OP_TRANSACTION_FEE"; diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.hpp index 891952fb82c..93b91d8a3f0 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.hpp @@ -93,7 +93,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 -#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_storage_address, 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_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_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 +#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_be, 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_be, 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_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_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 #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_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, 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.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 @@ -122,12 +122,12 @@ class AvmFlavor { static constexpr bool HasZK = false; static constexpr size_t NUM_PRECOMPUTED_ENTITIES = 21; - static constexpr size_t NUM_WITNESS_ENTITIES = 682; + 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 = 750; + static constexpr size_t NUM_ALL_ENTITIES = 749; // 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.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/full_row.cpp index 304dcde4352..27177639d4c 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/full_row.cpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/full_row.cpp @@ -137,7 +137,7 @@ template std::vector AvmFullRow::names() "conversion_num_limbs", "conversion_output_bits", "conversion_radix", - "conversion_sel_to_radix_le", + "conversion_sel_to_radix_be", "keccakf1600_clk", "keccakf1600_input", "keccakf1600_output", @@ -245,7 +245,7 @@ template std::vector AvmFullRow::names() "main_sel_op_nullifier_exists", "main_sel_op_or", "main_sel_op_poseidon2", - "main_sel_op_radix_le", + "main_sel_op_radix_be", "main_sel_op_sender", "main_sel_op_set", "main_sel_op_sha256", @@ -254,7 +254,6 @@ template std::vector AvmFullRow::names() "main_sel_op_sload", "main_sel_op_sstore", "main_sel_op_static_call", - "main_sel_op_storage_address", "main_sel_op_sub", "main_sel_op_timestamp", "main_sel_op_transaction_fee", @@ -845,7 +844,7 @@ template RefVector AvmFullRow::as_vector() const conversion_num_limbs, conversion_output_bits, conversion_radix, - conversion_sel_to_radix_le, + conversion_sel_to_radix_be, keccakf1600_clk, keccakf1600_input, keccakf1600_output, @@ -953,7 +952,7 @@ template RefVector AvmFullRow::as_vector() const main_sel_op_nullifier_exists, main_sel_op_or, main_sel_op_poseidon2, - main_sel_op_radix_le, + main_sel_op_radix_be, main_sel_op_sender, main_sel_op_set, main_sel_op_sha256, @@ -962,7 +961,6 @@ template RefVector AvmFullRow::as_vector() const main_sel_op_sload, main_sel_op_sstore, main_sel_op_static_call, - main_sel_op_storage_address, main_sel_op_sub, main_sel_op_timestamp, main_sel_op_transaction_fee, 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 ffce87c5b36..d9575e29360 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/full_row.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/full_row.hpp @@ -128,7 +128,7 @@ template struct AvmFullRow { FF conversion_num_limbs{}; FF conversion_output_bits{}; FF conversion_radix{}; - FF conversion_sel_to_radix_le{}; + FF conversion_sel_to_radix_be{}; FF keccakf1600_clk{}; FF keccakf1600_input{}; FF keccakf1600_output{}; @@ -236,7 +236,7 @@ template struct AvmFullRow { FF main_sel_op_nullifier_exists{}; FF main_sel_op_or{}; FF main_sel_op_poseidon2{}; - FF main_sel_op_radix_le{}; + FF main_sel_op_radix_be{}; FF main_sel_op_sender{}; FF main_sel_op_set{}; FF main_sel_op_sha256{}; @@ -245,7 +245,6 @@ template struct AvmFullRow { FF main_sel_op_sload{}; FF main_sel_op_sstore{}; FF main_sel_op_static_call{}; - FF main_sel_op_storage_address{}; FF main_sel_op_sub{}; FF main_sel_op_timestamp{}; FF main_sel_op_transaction_fee{}; @@ -717,7 +716,7 @@ template struct AvmFullRow { RefVector as_vector() const; static std::vector names(); - static constexpr size_t SIZE = 703; + static constexpr size_t SIZE = 702; }; template std::ostream& operator<<(std::ostream& os, AvmFullRow const& row); diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/conversion.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/conversion.hpp index ec82a7624ae..e39957ed8bb 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/conversion.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/conversion.hpp @@ -21,7 +21,7 @@ template class conversionImpl { { using Accumulator = typename std::tuple_element_t<0, ContainerOverSubrelations>; - auto tmp = (new_term.conversion_sel_to_radix_le * (FF(1) - new_term.conversion_sel_to_radix_le)); + auto tmp = (new_term.conversion_sel_to_radix_be * (FF(1) - new_term.conversion_sel_to_radix_be)); tmp *= scaling_factor; std::get<0>(evals) += typename Accumulator::View(tmp); } diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/kernel.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/kernel.hpp index 25607e0e926..3f00d3edafc 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/kernel.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/kernel.hpp @@ -10,9 +10,9 @@ template class kernelImpl { public: using FF = FF_; - static constexpr std::array SUBRELATION_PARTIAL_LENGTHS = { 3, 3, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 }; + static constexpr std::array SUBRELATION_PARTIAL_LENGTHS = { 3, 3, 4, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 4, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 }; template void static accumulate(ContainerOverSubrelations& evals, @@ -22,7 +22,6 @@ template class kernelImpl { { const auto constants_SENDER_KERNEL_INPUTS_COL_OFFSET = FF(0); const auto constants_ADDRESS_KERNEL_INPUTS_COL_OFFSET = FF(1); - const auto constants_STORAGE_ADDRESS_KERNEL_INPUTS_COL_OFFSET = FF(1); const auto constants_FUNCTION_SELECTOR_KERNEL_INPUTS_COL_OFFSET = FF(2); const auto constants_IS_STATIC_CALL_KERNEL_INPUTS_COL_OFFSET = FF(3); const auto constants_CHAIN_ID_KERNEL_INPUTS_COL_OFFSET = FF(4); @@ -42,18 +41,16 @@ template class kernelImpl { const auto constants_START_EMIT_NULLIFIER_WRITE_OFFSET = FF(144); const auto constants_START_EMIT_L2_TO_L1_MSG_WRITE_OFFSET = FF(160); const auto constants_START_EMIT_UNENCRYPTED_LOG_WRITE_OFFSET = FF(162); - const auto main_KERNEL_INPUT_SELECTORS = - (((((((((((new_term.main_sel_op_address + new_term.main_sel_op_storage_address) + - new_term.main_sel_op_sender) + - new_term.main_sel_op_function_selector) + - new_term.main_sel_op_transaction_fee) + - new_term.main_sel_op_chain_id) + - new_term.main_sel_op_version) + - new_term.main_sel_op_block_number) + - new_term.main_sel_op_timestamp) + - new_term.main_sel_op_fee_per_l2_gas) + - new_term.main_sel_op_fee_per_da_gas) + - new_term.main_sel_op_is_static_call); + const auto main_KERNEL_INPUT_SELECTORS = ((((((((((new_term.main_sel_op_address + new_term.main_sel_op_sender) + + new_term.main_sel_op_function_selector) + + new_term.main_sel_op_transaction_fee) + + new_term.main_sel_op_chain_id) + + new_term.main_sel_op_version) + + new_term.main_sel_op_block_number) + + new_term.main_sel_op_timestamp) + + new_term.main_sel_op_fee_per_l2_gas) + + new_term.main_sel_op_fee_per_da_gas) + + new_term.main_sel_op_is_static_call); const auto main_KERNEL_OUTPUT_SELECTORS = ((((((((new_term.main_sel_op_note_hash_exists + new_term.main_sel_op_emit_note_hash) + new_term.main_sel_op_nullifier_exists) + @@ -156,111 +153,104 @@ template class kernelImpl { } { using Accumulator = typename std::tuple_element_t<11, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_storage_address * - (new_term.main_kernel_in_offset - constants_STORAGE_ADDRESS_KERNEL_INPUTS_COL_OFFSET)); - tmp *= scaling_factor; - std::get<11>(evals) += typename Accumulator::View(tmp); - } - { - using Accumulator = typename std::tuple_element_t<12, ContainerOverSubrelations>; auto tmp = (new_term.main_sel_op_sender * (new_term.main_kernel_in_offset - constants_SENDER_KERNEL_INPUTS_COL_OFFSET)); tmp *= scaling_factor; - std::get<12>(evals) += typename Accumulator::View(tmp); + std::get<11>(evals) += typename Accumulator::View(tmp); } { - using Accumulator = typename std::tuple_element_t<13, ContainerOverSubrelations>; + using Accumulator = typename std::tuple_element_t<12, ContainerOverSubrelations>; auto tmp = (new_term.main_sel_op_function_selector * (new_term.main_kernel_in_offset - constants_FUNCTION_SELECTOR_KERNEL_INPUTS_COL_OFFSET)); tmp *= scaling_factor; - std::get<13>(evals) += typename Accumulator::View(tmp); + std::get<12>(evals) += typename Accumulator::View(tmp); } { - using Accumulator = typename std::tuple_element_t<14, ContainerOverSubrelations>; + using Accumulator = typename std::tuple_element_t<13, ContainerOverSubrelations>; auto tmp = (new_term.main_sel_op_transaction_fee * (new_term.main_kernel_in_offset - constants_TRANSACTION_FEE_KERNEL_INPUTS_COL_OFFSET)); tmp *= scaling_factor; - std::get<14>(evals) += typename Accumulator::View(tmp); + std::get<13>(evals) += typename Accumulator::View(tmp); } { - using Accumulator = typename std::tuple_element_t<15, ContainerOverSubrelations>; + using Accumulator = typename std::tuple_element_t<14, ContainerOverSubrelations>; auto tmp = (new_term.main_sel_op_is_static_call * (new_term.main_kernel_in_offset - constants_IS_STATIC_CALL_KERNEL_INPUTS_COL_OFFSET)); tmp *= scaling_factor; - std::get<15>(evals) += typename Accumulator::View(tmp); + std::get<14>(evals) += typename Accumulator::View(tmp); } { - using Accumulator = typename std::tuple_element_t<16, ContainerOverSubrelations>; + using Accumulator = typename std::tuple_element_t<15, ContainerOverSubrelations>; auto tmp = (new_term.main_sel_op_chain_id * (new_term.main_kernel_in_offset - constants_CHAIN_ID_KERNEL_INPUTS_COL_OFFSET)); tmp *= scaling_factor; - std::get<16>(evals) += typename Accumulator::View(tmp); + std::get<15>(evals) += typename Accumulator::View(tmp); } { - using Accumulator = typename std::tuple_element_t<17, ContainerOverSubrelations>; + using Accumulator = typename std::tuple_element_t<16, ContainerOverSubrelations>; auto tmp = (new_term.main_sel_op_version * (new_term.main_kernel_in_offset - constants_VERSION_KERNEL_INPUTS_COL_OFFSET)); tmp *= scaling_factor; - std::get<17>(evals) += typename Accumulator::View(tmp); + std::get<16>(evals) += typename Accumulator::View(tmp); } { - using Accumulator = typename std::tuple_element_t<18, ContainerOverSubrelations>; + using Accumulator = typename std::tuple_element_t<17, ContainerOverSubrelations>; auto tmp = (new_term.main_sel_op_block_number * (new_term.main_kernel_in_offset - constants_BLOCK_NUMBER_KERNEL_INPUTS_COL_OFFSET)); tmp *= scaling_factor; - std::get<18>(evals) += typename Accumulator::View(tmp); + std::get<17>(evals) += typename Accumulator::View(tmp); } { - using Accumulator = typename std::tuple_element_t<19, ContainerOverSubrelations>; + using Accumulator = typename std::tuple_element_t<18, ContainerOverSubrelations>; auto tmp = (new_term.main_sel_op_timestamp * (new_term.main_kernel_in_offset - constants_TIMESTAMP_KERNEL_INPUTS_COL_OFFSET)); tmp *= scaling_factor; - std::get<19>(evals) += typename Accumulator::View(tmp); + std::get<18>(evals) += typename Accumulator::View(tmp); } { - using Accumulator = typename std::tuple_element_t<20, ContainerOverSubrelations>; + using Accumulator = typename std::tuple_element_t<19, ContainerOverSubrelations>; auto tmp = (new_term.main_sel_op_fee_per_da_gas * (new_term.main_kernel_in_offset - constants_FEE_PER_DA_GAS_KERNEL_INPUTS_COL_OFFSET)); tmp *= scaling_factor; - std::get<20>(evals) += typename Accumulator::View(tmp); + std::get<19>(evals) += typename Accumulator::View(tmp); } { - using Accumulator = typename std::tuple_element_t<21, ContainerOverSubrelations>; + using Accumulator = typename std::tuple_element_t<20, ContainerOverSubrelations>; auto tmp = (new_term.main_sel_op_fee_per_l2_gas * (new_term.main_kernel_in_offset - constants_FEE_PER_L2_GAS_KERNEL_INPUTS_COL_OFFSET)); tmp *= scaling_factor; - std::get<21>(evals) += typename Accumulator::View(tmp); + std::get<20>(evals) += typename Accumulator::View(tmp); } { - using Accumulator = typename std::tuple_element_t<22, ContainerOverSubrelations>; + using Accumulator = typename std::tuple_element_t<21, ContainerOverSubrelations>; auto tmp = (new_term.main_sel_op_note_hash_exists * (new_term.main_kernel_out_offset - (constants_START_NOTE_HASH_EXISTS_WRITE_OFFSET + new_term.main_note_hash_exist_write_offset))); tmp *= scaling_factor; - std::get<22>(evals) += typename Accumulator::View(tmp); + std::get<21>(evals) += typename Accumulator::View(tmp); } { - using Accumulator = typename std::tuple_element_t<23, ContainerOverSubrelations>; + using Accumulator = typename std::tuple_element_t<22, ContainerOverSubrelations>; auto tmp = (new_term.main_sel_first * new_term.main_note_hash_exist_write_offset); tmp *= scaling_factor; - std::get<23>(evals) += typename Accumulator::View(tmp); + std::get<22>(evals) += typename Accumulator::View(tmp); } { - using Accumulator = typename std::tuple_element_t<24, ContainerOverSubrelations>; + using Accumulator = typename std::tuple_element_t<23, ContainerOverSubrelations>; auto tmp = (new_term.main_sel_op_emit_note_hash * (new_term.main_kernel_out_offset - (constants_START_EMIT_NOTE_HASH_WRITE_OFFSET + new_term.main_emit_note_hash_write_offset))); tmp *= scaling_factor; - std::get<24>(evals) += typename Accumulator::View(tmp); + std::get<23>(evals) += typename Accumulator::View(tmp); } { - using Accumulator = typename std::tuple_element_t<25, ContainerOverSubrelations>; + using Accumulator = typename std::tuple_element_t<24, ContainerOverSubrelations>; auto tmp = (new_term.main_sel_first * new_term.main_emit_note_hash_write_offset); tmp *= scaling_factor; - std::get<25>(evals) += typename Accumulator::View(tmp); + std::get<24>(evals) += typename Accumulator::View(tmp); } { - using Accumulator = typename std::tuple_element_t<26, ContainerOverSubrelations>; + using Accumulator = typename std::tuple_element_t<25, ContainerOverSubrelations>; auto tmp = (new_term.main_sel_op_nullifier_exists * (new_term.main_kernel_out_offset - ((new_term.main_ib * @@ -268,115 +258,115 @@ template class kernelImpl { ((FF(1) - new_term.main_ib) * (constants_START_NULLIFIER_NON_EXISTS_OFFSET + new_term.main_nullifier_non_exists_write_offset))))); tmp *= scaling_factor; - std::get<26>(evals) += typename Accumulator::View(tmp); + std::get<25>(evals) += typename Accumulator::View(tmp); } { - using Accumulator = typename std::tuple_element_t<27, ContainerOverSubrelations>; + using Accumulator = typename std::tuple_element_t<26, ContainerOverSubrelations>; auto tmp = (new_term.main_sel_first * new_term.main_nullifier_exists_write_offset); tmp *= scaling_factor; - std::get<27>(evals) += typename Accumulator::View(tmp); + std::get<26>(evals) += typename Accumulator::View(tmp); } { - using Accumulator = typename std::tuple_element_t<28, ContainerOverSubrelations>; + using Accumulator = typename std::tuple_element_t<27, ContainerOverSubrelations>; auto tmp = (new_term.main_sel_first * new_term.main_nullifier_non_exists_write_offset); tmp *= scaling_factor; - std::get<28>(evals) += typename Accumulator::View(tmp); + std::get<27>(evals) += typename Accumulator::View(tmp); } { - using Accumulator = typename std::tuple_element_t<29, ContainerOverSubrelations>; + using Accumulator = typename std::tuple_element_t<28, ContainerOverSubrelations>; auto tmp = (new_term.main_sel_op_emit_nullifier * (new_term.main_kernel_out_offset - (constants_START_EMIT_NULLIFIER_WRITE_OFFSET + new_term.main_emit_nullifier_write_offset))); tmp *= scaling_factor; - std::get<29>(evals) += typename Accumulator::View(tmp); + std::get<28>(evals) += typename Accumulator::View(tmp); } { - using Accumulator = typename std::tuple_element_t<30, ContainerOverSubrelations>; + using Accumulator = typename std::tuple_element_t<29, ContainerOverSubrelations>; auto tmp = (new_term.main_sel_first * new_term.main_emit_nullifier_write_offset); tmp *= scaling_factor; - std::get<30>(evals) += typename Accumulator::View(tmp); + std::get<29>(evals) += typename Accumulator::View(tmp); } { - using Accumulator = typename std::tuple_element_t<31, ContainerOverSubrelations>; + using Accumulator = typename std::tuple_element_t<30, ContainerOverSubrelations>; auto tmp = (new_term.main_sel_op_l1_to_l2_msg_exists * (new_term.main_kernel_out_offset - (constants_START_L1_TO_L2_MSG_EXISTS_WRITE_OFFSET + new_term.main_l1_to_l2_msg_exists_write_offset))); tmp *= scaling_factor; - std::get<31>(evals) += typename Accumulator::View(tmp); + std::get<30>(evals) += typename Accumulator::View(tmp); } { - using Accumulator = typename std::tuple_element_t<32, ContainerOverSubrelations>; + using Accumulator = typename std::tuple_element_t<31, ContainerOverSubrelations>; auto tmp = (new_term.main_sel_first * new_term.main_l1_to_l2_msg_exists_write_offset); tmp *= scaling_factor; - std::get<32>(evals) += typename Accumulator::View(tmp); + std::get<31>(evals) += typename Accumulator::View(tmp); } { - using Accumulator = typename std::tuple_element_t<33, ContainerOverSubrelations>; + using Accumulator = typename std::tuple_element_t<32, ContainerOverSubrelations>; auto tmp = (new_term.main_sel_op_emit_unencrypted_log * (new_term.main_kernel_out_offset - (constants_START_EMIT_UNENCRYPTED_LOG_WRITE_OFFSET + new_term.main_emit_unencrypted_log_write_offset))); tmp *= scaling_factor; - std::get<33>(evals) += typename Accumulator::View(tmp); + std::get<32>(evals) += typename Accumulator::View(tmp); } { - using Accumulator = typename std::tuple_element_t<34, ContainerOverSubrelations>; + using Accumulator = typename std::tuple_element_t<33, ContainerOverSubrelations>; auto tmp = (new_term.main_sel_first * new_term.main_emit_unencrypted_log_write_offset); tmp *= scaling_factor; - std::get<34>(evals) += typename Accumulator::View(tmp); + std::get<33>(evals) += typename Accumulator::View(tmp); } { - using Accumulator = typename std::tuple_element_t<35, ContainerOverSubrelations>; + using Accumulator = typename std::tuple_element_t<34, ContainerOverSubrelations>; auto tmp = (new_term.main_sel_op_emit_l2_to_l1_msg * (new_term.main_kernel_out_offset - (constants_START_EMIT_L2_TO_L1_MSG_WRITE_OFFSET + new_term.main_emit_l2_to_l1_msg_write_offset))); tmp *= scaling_factor; - std::get<35>(evals) += typename Accumulator::View(tmp); + std::get<34>(evals) += typename Accumulator::View(tmp); } { - using Accumulator = typename std::tuple_element_t<36, ContainerOverSubrelations>; + using Accumulator = typename std::tuple_element_t<35, ContainerOverSubrelations>; auto tmp = (new_term.main_sel_first * new_term.main_emit_l2_to_l1_msg_write_offset); tmp *= scaling_factor; - std::get<36>(evals) += typename Accumulator::View(tmp); + std::get<35>(evals) += typename Accumulator::View(tmp); } { - using Accumulator = typename std::tuple_element_t<37, ContainerOverSubrelations>; + using Accumulator = typename std::tuple_element_t<36, ContainerOverSubrelations>; auto tmp = (new_term.main_sel_op_sload * (new_term.main_kernel_out_offset - (constants_START_SLOAD_WRITE_OFFSET + new_term.main_sload_write_offset))); tmp *= scaling_factor; - std::get<37>(evals) += typename Accumulator::View(tmp); + std::get<36>(evals) += typename Accumulator::View(tmp); } { - using Accumulator = typename std::tuple_element_t<38, ContainerOverSubrelations>; + using Accumulator = typename std::tuple_element_t<37, ContainerOverSubrelations>; auto tmp = (new_term.main_sel_first * new_term.main_sload_write_offset); tmp *= scaling_factor; - std::get<38>(evals) += typename Accumulator::View(tmp); + std::get<37>(evals) += typename Accumulator::View(tmp); } { - using Accumulator = typename std::tuple_element_t<39, ContainerOverSubrelations>; + using Accumulator = typename std::tuple_element_t<38, ContainerOverSubrelations>; auto tmp = (new_term.main_sel_op_sstore * (new_term.main_kernel_out_offset - (constants_START_SSTORE_WRITE_OFFSET + new_term.main_sstore_write_offset))); tmp *= scaling_factor; - std::get<39>(evals) += typename Accumulator::View(tmp); + std::get<38>(evals) += typename Accumulator::View(tmp); } { - using Accumulator = typename std::tuple_element_t<40, ContainerOverSubrelations>; + using Accumulator = typename std::tuple_element_t<39, ContainerOverSubrelations>; auto tmp = (new_term.main_sel_first * new_term.main_sstore_write_offset); tmp *= scaling_factor; - std::get<40>(evals) += typename Accumulator::View(tmp); + std::get<39>(evals) += typename Accumulator::View(tmp); } { - using Accumulator = typename std::tuple_element_t<41, ContainerOverSubrelations>; + using Accumulator = typename std::tuple_element_t<40, ContainerOverSubrelations>; auto tmp = (main_KERNEL_INPUT_SELECTORS * (FF(1) - new_term.main_sel_q_kernel_lookup)); tmp *= scaling_factor; - std::get<41>(evals) += typename Accumulator::View(tmp); + std::get<40>(evals) += typename Accumulator::View(tmp); } { - using Accumulator = typename std::tuple_element_t<42, ContainerOverSubrelations>; + using Accumulator = typename std::tuple_element_t<41, ContainerOverSubrelations>; auto tmp = (main_KERNEL_OUTPUT_SELECTORS * (FF(1) - new_term.main_sel_q_kernel_output_lookup)); tmp *= scaling_factor; - std::get<42>(evals) += typename Accumulator::View(tmp); + std::get<41>(evals) += typename Accumulator::View(tmp); } } }; @@ -411,48 +401,46 @@ template class kernel : public Relation> { case 10: return "ADDRESS_KERNEL"; case 11: - return "STORAGE_ADDRESS_KERNEL"; - case 12: return "SENDER_KERNEL"; - case 13: + case 12: return "FUNCTION_SELECTOR_KERNEL"; - case 14: + case 13: return "FEE_TRANSACTION_FEE_KERNEL"; - case 15: + case 14: return "IS_STATIC_CALL_KERNEL"; - case 16: + case 15: return "CHAIN_ID_KERNEL"; - case 17: + case 16: return "VERSION_KERNEL"; - case 18: + case 17: return "BLOCK_NUMBER_KERNEL"; - case 19: + case 18: return "TIMESTAMP_KERNEL"; - case 20: + case 19: return "FEE_DA_GAS_KERNEL"; - case 21: + case 20: return "FEE_L2_GAS_KERNEL"; - case 22: + case 21: return "NOTE_HASH_KERNEL_OUTPUT"; - case 24: + case 23: return "EMIT_NOTE_HASH_KERNEL_OUTPUT"; - case 26: + case 25: return "NULLIFIER_EXISTS_KERNEL_OUTPUT"; - case 29: + case 28: return "EMIT_NULLIFIER_KERNEL_OUTPUT"; - case 31: + case 30: return "L1_TO_L2_MSG_EXISTS_KERNEL_OUTPUT"; - case 33: + case 32: return "EMIT_UNENCRYPTED_LOG_KERNEL_OUTPUT"; - case 35: + case 34: return "EMIT_L2_TO_L1_MSGS_KERNEL_OUTPUT"; - case 37: + case 36: return "SLOAD_KERNEL_OUTPUT"; - case 39: + case 38: return "SSTORE_KERNEL_OUTPUT"; - case 41: + case 40: return "KERNEL_INPUT_ACTIVE_CHECK"; - case 42: + case 41: return "KERNEL_OUTPUT_ACTIVE_CHECK"; } return std::to_string(index); diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/main.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/main.hpp index d387d759c7e..257ab6eb453 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/main.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/main.hpp @@ -10,11 +10,10 @@ template class mainImpl { public: using FF = FF_; - static constexpr std::array SUBRELATION_PARTIAL_LENGTHS = { - 2, 3, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 4, 4, 3, 3, 3, 3, 4, 3, - 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 5, 3, 3, 4, 4, 3, 3, 3, 3, 4, 3, 3, 3, 3, 4, 2, 2 + static constexpr std::array SUBRELATION_PARTIAL_LENGTHS = { + 2, 3, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, + 5, 4, 4, 3, 3, 3, 3, 4, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 5, 5, 3, 3, 4, 4, 3, 3, 3, 3, 4, 3, 3, 3, 3, 4, 2, 2 }; template @@ -26,18 +25,16 @@ template class mainImpl { const auto constants_MEM_TAG_FF = FF(0); const auto constants_MEM_TAG_U1 = FF(1); const auto constants_misc_INTERNAL_CALL_SPACE_ID = FF(255); - const auto main_KERNEL_INPUT_SELECTORS = - (((((((((((new_term.main_sel_op_address + new_term.main_sel_op_storage_address) + - new_term.main_sel_op_sender) + - new_term.main_sel_op_function_selector) + - new_term.main_sel_op_transaction_fee) + - new_term.main_sel_op_chain_id) + - new_term.main_sel_op_version) + - new_term.main_sel_op_block_number) + - new_term.main_sel_op_timestamp) + - new_term.main_sel_op_fee_per_l2_gas) + - new_term.main_sel_op_fee_per_da_gas) + - new_term.main_sel_op_is_static_call); + const auto main_KERNEL_INPUT_SELECTORS = ((((((((((new_term.main_sel_op_address + new_term.main_sel_op_sender) + + new_term.main_sel_op_function_selector) + + new_term.main_sel_op_transaction_fee) + + new_term.main_sel_op_chain_id) + + new_term.main_sel_op_version) + + new_term.main_sel_op_block_number) + + new_term.main_sel_op_timestamp) + + new_term.main_sel_op_fee_per_l2_gas) + + new_term.main_sel_op_fee_per_da_gas) + + new_term.main_sel_op_is_static_call); const auto main_KERNEL_OUTPUT_SELECTORS = ((((((((new_term.main_sel_op_note_hash_exists + new_term.main_sel_op_emit_note_hash) + new_term.main_sel_op_nullifier_exists) + @@ -68,7 +65,7 @@ template class mainImpl { const auto main_SEL_ALL_BINARY = ((new_term.main_sel_op_and + new_term.main_sel_op_or) + new_term.main_sel_op_xor); const auto main_SEL_ALL_GADGET = - (((((new_term.main_sel_op_radix_le + new_term.main_sel_op_sha256) + new_term.main_sel_op_poseidon2) + + (((((new_term.main_sel_op_radix_be + new_term.main_sel_op_sha256) + new_term.main_sel_op_poseidon2) + new_term.main_sel_op_keccak) + new_term.main_sel_op_ecadd) + new_term.main_sel_op_msm); @@ -114,672 +111,666 @@ template class mainImpl { } { using Accumulator = typename std::tuple_element_t<4, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_storage_address * (FF(1) - new_term.main_sel_op_storage_address)); + auto tmp = (new_term.main_sel_op_sender * (FF(1) - new_term.main_sel_op_sender)); tmp *= scaling_factor; std::get<4>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<5, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_sender * (FF(1) - new_term.main_sel_op_sender)); + auto tmp = (new_term.main_sel_op_function_selector * (FF(1) - new_term.main_sel_op_function_selector)); tmp *= scaling_factor; std::get<5>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<6, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_function_selector * (FF(1) - new_term.main_sel_op_function_selector)); + auto tmp = (new_term.main_sel_op_transaction_fee * (FF(1) - new_term.main_sel_op_transaction_fee)); tmp *= scaling_factor; std::get<6>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<7, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_transaction_fee * (FF(1) - new_term.main_sel_op_transaction_fee)); + auto tmp = (new_term.main_sel_op_chain_id * (FF(1) - new_term.main_sel_op_chain_id)); tmp *= scaling_factor; std::get<7>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<8, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_chain_id * (FF(1) - new_term.main_sel_op_chain_id)); + auto tmp = (new_term.main_sel_op_version * (FF(1) - new_term.main_sel_op_version)); tmp *= scaling_factor; std::get<8>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<9, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_version * (FF(1) - new_term.main_sel_op_version)); + auto tmp = (new_term.main_sel_op_block_number * (FF(1) - new_term.main_sel_op_block_number)); tmp *= scaling_factor; std::get<9>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<10, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_block_number * (FF(1) - new_term.main_sel_op_block_number)); + auto tmp = (new_term.main_sel_op_timestamp * (FF(1) - new_term.main_sel_op_timestamp)); tmp *= scaling_factor; std::get<10>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<11, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_timestamp * (FF(1) - new_term.main_sel_op_timestamp)); + auto tmp = (new_term.main_sel_op_fee_per_l2_gas * (FF(1) - new_term.main_sel_op_fee_per_l2_gas)); tmp *= scaling_factor; std::get<11>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<12, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_fee_per_l2_gas * (FF(1) - new_term.main_sel_op_fee_per_l2_gas)); + auto tmp = (new_term.main_sel_op_fee_per_da_gas * (FF(1) - new_term.main_sel_op_fee_per_da_gas)); tmp *= scaling_factor; std::get<12>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<13, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_fee_per_da_gas * (FF(1) - new_term.main_sel_op_fee_per_da_gas)); + auto tmp = (new_term.main_sel_op_is_static_call * (FF(1) - new_term.main_sel_op_is_static_call)); tmp *= scaling_factor; std::get<13>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<14, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_is_static_call * (FF(1) - new_term.main_sel_op_is_static_call)); + auto tmp = (new_term.main_sel_op_l2gasleft * (FF(1) - new_term.main_sel_op_l2gasleft)); tmp *= scaling_factor; std::get<14>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<15, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_l2gasleft * (FF(1) - new_term.main_sel_op_l2gasleft)); + auto tmp = (new_term.main_sel_op_dagasleft * (FF(1) - new_term.main_sel_op_dagasleft)); tmp *= scaling_factor; std::get<15>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<16, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_dagasleft * (FF(1) - new_term.main_sel_op_dagasleft)); + auto tmp = (new_term.main_sel_op_note_hash_exists * (FF(1) - new_term.main_sel_op_note_hash_exists)); tmp *= scaling_factor; std::get<16>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<17, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_note_hash_exists * (FF(1) - new_term.main_sel_op_note_hash_exists)); + auto tmp = (new_term.main_sel_op_emit_note_hash * (FF(1) - new_term.main_sel_op_emit_note_hash)); tmp *= scaling_factor; std::get<17>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<18, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_emit_note_hash * (FF(1) - new_term.main_sel_op_emit_note_hash)); + auto tmp = (new_term.main_sel_op_nullifier_exists * (FF(1) - new_term.main_sel_op_nullifier_exists)); tmp *= scaling_factor; std::get<18>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<19, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_nullifier_exists * (FF(1) - new_term.main_sel_op_nullifier_exists)); + auto tmp = (new_term.main_sel_op_emit_nullifier * (FF(1) - new_term.main_sel_op_emit_nullifier)); tmp *= scaling_factor; std::get<19>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<20, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_emit_nullifier * (FF(1) - new_term.main_sel_op_emit_nullifier)); + auto tmp = (new_term.main_sel_op_l1_to_l2_msg_exists * (FF(1) - new_term.main_sel_op_l1_to_l2_msg_exists)); tmp *= scaling_factor; std::get<20>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<21, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_l1_to_l2_msg_exists * (FF(1) - new_term.main_sel_op_l1_to_l2_msg_exists)); + auto tmp = + (new_term.main_sel_op_emit_unencrypted_log * (FF(1) - new_term.main_sel_op_emit_unencrypted_log)); tmp *= scaling_factor; std::get<21>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<22, ContainerOverSubrelations>; - auto tmp = - (new_term.main_sel_op_emit_unencrypted_log * (FF(1) - new_term.main_sel_op_emit_unencrypted_log)); + auto tmp = (new_term.main_sel_op_emit_l2_to_l1_msg * (FF(1) - new_term.main_sel_op_emit_l2_to_l1_msg)); tmp *= scaling_factor; std::get<22>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<23, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_emit_l2_to_l1_msg * (FF(1) - new_term.main_sel_op_emit_l2_to_l1_msg)); + auto tmp = + (new_term.main_sel_op_get_contract_instance * (FF(1) - new_term.main_sel_op_get_contract_instance)); tmp *= scaling_factor; std::get<23>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<24, ContainerOverSubrelations>; - auto tmp = - (new_term.main_sel_op_get_contract_instance * (FF(1) - new_term.main_sel_op_get_contract_instance)); + auto tmp = (new_term.main_sel_op_sload * (FF(1) - new_term.main_sel_op_sload)); tmp *= scaling_factor; std::get<24>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<25, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_sload * (FF(1) - new_term.main_sel_op_sload)); + auto tmp = (new_term.main_sel_op_sstore * (FF(1) - new_term.main_sel_op_sstore)); tmp *= scaling_factor; std::get<25>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<26, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_sstore * (FF(1) - new_term.main_sel_op_sstore)); + auto tmp = (new_term.main_sel_op_radix_be * (FF(1) - new_term.main_sel_op_radix_be)); tmp *= scaling_factor; std::get<26>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<27, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_radix_le * (FF(1) - new_term.main_sel_op_radix_le)); + auto tmp = (new_term.main_sel_op_sha256 * (FF(1) - new_term.main_sel_op_sha256)); tmp *= scaling_factor; std::get<27>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<28, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_sha256 * (FF(1) - new_term.main_sel_op_sha256)); + auto tmp = (new_term.main_sel_op_poseidon2 * (FF(1) - new_term.main_sel_op_poseidon2)); tmp *= scaling_factor; std::get<28>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<29, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_poseidon2 * (FF(1) - new_term.main_sel_op_poseidon2)); + auto tmp = (new_term.main_sel_op_keccak * (FF(1) - new_term.main_sel_op_keccak)); tmp *= scaling_factor; std::get<29>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<30, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_keccak * (FF(1) - new_term.main_sel_op_keccak)); + auto tmp = (new_term.main_sel_op_ecadd * (FF(1) - new_term.main_sel_op_ecadd)); tmp *= scaling_factor; std::get<30>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<31, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_ecadd * (FF(1) - new_term.main_sel_op_ecadd)); + auto tmp = (new_term.main_sel_op_msm * (FF(1) - new_term.main_sel_op_msm)); tmp *= scaling_factor; std::get<31>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<32, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_msm * (FF(1) - new_term.main_sel_op_msm)); + auto tmp = (new_term.main_sel_op_add * (FF(1) - new_term.main_sel_op_add)); tmp *= scaling_factor; std::get<32>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<33, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_add * (FF(1) - new_term.main_sel_op_add)); + auto tmp = (new_term.main_sel_op_sub * (FF(1) - new_term.main_sel_op_sub)); tmp *= scaling_factor; std::get<33>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<34, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_sub * (FF(1) - new_term.main_sel_op_sub)); + auto tmp = (new_term.main_sel_op_mul * (FF(1) - new_term.main_sel_op_mul)); tmp *= scaling_factor; std::get<34>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<35, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_mul * (FF(1) - new_term.main_sel_op_mul)); + auto tmp = (new_term.main_sel_op_div * (FF(1) - new_term.main_sel_op_div)); tmp *= scaling_factor; std::get<35>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<36, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_div * (FF(1) - new_term.main_sel_op_div)); + auto tmp = (new_term.main_sel_op_fdiv * (FF(1) - new_term.main_sel_op_fdiv)); tmp *= scaling_factor; std::get<36>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<37, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_fdiv * (FF(1) - new_term.main_sel_op_fdiv)); + auto tmp = (new_term.main_sel_op_not * (FF(1) - new_term.main_sel_op_not)); tmp *= scaling_factor; std::get<37>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<38, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_not * (FF(1) - new_term.main_sel_op_not)); + auto tmp = (new_term.main_sel_op_eq * (FF(1) - new_term.main_sel_op_eq)); tmp *= scaling_factor; std::get<38>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<39, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_eq * (FF(1) - new_term.main_sel_op_eq)); + auto tmp = (new_term.main_sel_op_and * (FF(1) - new_term.main_sel_op_and)); tmp *= scaling_factor; std::get<39>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<40, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_and * (FF(1) - new_term.main_sel_op_and)); + auto tmp = (new_term.main_sel_op_or * (FF(1) - new_term.main_sel_op_or)); tmp *= scaling_factor; std::get<40>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<41, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_or * (FF(1) - new_term.main_sel_op_or)); + auto tmp = (new_term.main_sel_op_xor * (FF(1) - new_term.main_sel_op_xor)); tmp *= scaling_factor; std::get<41>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<42, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_xor * (FF(1) - new_term.main_sel_op_xor)); + auto tmp = (new_term.main_sel_op_cast * (FF(1) - new_term.main_sel_op_cast)); tmp *= scaling_factor; std::get<42>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<43, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_cast * (FF(1) - new_term.main_sel_op_cast)); + auto tmp = (new_term.main_sel_op_lt * (FF(1) - new_term.main_sel_op_lt)); tmp *= scaling_factor; std::get<43>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<44, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_lt * (FF(1) - new_term.main_sel_op_lt)); + auto tmp = (new_term.main_sel_op_lte * (FF(1) - new_term.main_sel_op_lte)); tmp *= scaling_factor; std::get<44>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<45, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_lte * (FF(1) - new_term.main_sel_op_lte)); + auto tmp = (new_term.main_sel_op_shl * (FF(1) - new_term.main_sel_op_shl)); tmp *= scaling_factor; std::get<45>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<46, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_shl * (FF(1) - new_term.main_sel_op_shl)); + auto tmp = (new_term.main_sel_op_shr * (FF(1) - new_term.main_sel_op_shr)); tmp *= scaling_factor; std::get<46>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<47, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_shr * (FF(1) - new_term.main_sel_op_shr)); + auto tmp = (new_term.main_sel_op_internal_call * (FF(1) - new_term.main_sel_op_internal_call)); tmp *= scaling_factor; std::get<47>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<48, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_internal_call * (FF(1) - new_term.main_sel_op_internal_call)); + auto tmp = (new_term.main_sel_op_internal_return * (FF(1) - new_term.main_sel_op_internal_return)); tmp *= scaling_factor; std::get<48>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<49, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_internal_return * (FF(1) - new_term.main_sel_op_internal_return)); + auto tmp = (new_term.main_sel_op_jump * (FF(1) - new_term.main_sel_op_jump)); tmp *= scaling_factor; std::get<49>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<50, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_jump * (FF(1) - new_term.main_sel_op_jump)); + auto tmp = (new_term.main_sel_op_jumpi * (FF(1) - new_term.main_sel_op_jumpi)); tmp *= scaling_factor; std::get<50>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<51, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_jumpi * (FF(1) - new_term.main_sel_op_jumpi)); + auto tmp = (new_term.main_sel_op_external_call * (FF(1) - new_term.main_sel_op_external_call)); tmp *= scaling_factor; std::get<51>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<52, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_external_call * (FF(1) - new_term.main_sel_op_external_call)); + auto tmp = (new_term.main_sel_op_static_call * (FF(1) - new_term.main_sel_op_static_call)); tmp *= scaling_factor; std::get<52>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<53, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_static_call * (FF(1) - new_term.main_sel_op_static_call)); + auto tmp = (new_term.main_sel_op_calldata_copy * (FF(1) - new_term.main_sel_op_calldata_copy)); tmp *= scaling_factor; std::get<53>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<54, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_calldata_copy * (FF(1) - new_term.main_sel_op_calldata_copy)); + auto tmp = (new_term.main_sel_op_external_return * (FF(1) - new_term.main_sel_op_external_return)); tmp *= scaling_factor; std::get<54>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<55, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_external_return * (FF(1) - new_term.main_sel_op_external_return)); + auto tmp = (new_term.main_sel_op_external_revert * (FF(1) - new_term.main_sel_op_external_revert)); tmp *= scaling_factor; std::get<55>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<56, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_external_revert * (FF(1) - new_term.main_sel_op_external_revert)); + auto tmp = (new_term.main_sel_op_set * (FF(1) - new_term.main_sel_op_set)); tmp *= scaling_factor; std::get<56>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<57, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_set * (FF(1) - new_term.main_sel_op_set)); + auto tmp = (new_term.main_sel_op_mov * (FF(1) - new_term.main_sel_op_mov)); tmp *= scaling_factor; std::get<57>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<58, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_mov * (FF(1) - new_term.main_sel_op_mov)); + auto tmp = (new_term.main_op_err * (FF(1) - new_term.main_op_err)); tmp *= scaling_factor; std::get<58>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<59, ContainerOverSubrelations>; - auto tmp = (new_term.main_op_err * (FF(1) - new_term.main_op_err)); + auto tmp = (new_term.main_tag_err * (FF(1) - new_term.main_tag_err)); tmp *= scaling_factor; std::get<59>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<60, ContainerOverSubrelations>; - auto tmp = (new_term.main_tag_err * (FF(1) - new_term.main_tag_err)); + auto tmp = (new_term.main_id_zero * (FF(1) - new_term.main_id_zero)); tmp *= scaling_factor; std::get<60>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<61, ContainerOverSubrelations>; - auto tmp = (new_term.main_id_zero * (FF(1) - new_term.main_id_zero)); + auto tmp = (new_term.main_sel_mem_op_a * (FF(1) - new_term.main_sel_mem_op_a)); tmp *= scaling_factor; std::get<61>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<62, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_mem_op_a * (FF(1) - new_term.main_sel_mem_op_a)); + auto tmp = (new_term.main_sel_mem_op_b * (FF(1) - new_term.main_sel_mem_op_b)); tmp *= scaling_factor; std::get<62>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<63, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_mem_op_b * (FF(1) - new_term.main_sel_mem_op_b)); + auto tmp = (new_term.main_sel_mem_op_c * (FF(1) - new_term.main_sel_mem_op_c)); tmp *= scaling_factor; std::get<63>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<64, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_mem_op_c * (FF(1) - new_term.main_sel_mem_op_c)); + auto tmp = (new_term.main_sel_mem_op_d * (FF(1) - new_term.main_sel_mem_op_d)); tmp *= scaling_factor; std::get<64>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<65, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_mem_op_d * (FF(1) - new_term.main_sel_mem_op_d)); + auto tmp = (new_term.main_rwa * (FF(1) - new_term.main_rwa)); tmp *= scaling_factor; std::get<65>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<66, ContainerOverSubrelations>; - auto tmp = (new_term.main_rwa * (FF(1) - new_term.main_rwa)); + auto tmp = (new_term.main_rwb * (FF(1) - new_term.main_rwb)); tmp *= scaling_factor; std::get<66>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<67, ContainerOverSubrelations>; - auto tmp = (new_term.main_rwb * (FF(1) - new_term.main_rwb)); + auto tmp = (new_term.main_rwc * (FF(1) - new_term.main_rwc)); tmp *= scaling_factor; std::get<67>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<68, ContainerOverSubrelations>; - auto tmp = (new_term.main_rwc * (FF(1) - new_term.main_rwc)); + auto tmp = (new_term.main_rwd * (FF(1) - new_term.main_rwd)); tmp *= scaling_factor; std::get<68>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<69, ContainerOverSubrelations>; - auto tmp = (new_term.main_rwd * (FF(1) - new_term.main_rwd)); + auto tmp = (new_term.main_sel_resolve_ind_addr_a * (FF(1) - new_term.main_sel_resolve_ind_addr_a)); tmp *= scaling_factor; std::get<69>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<70, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_resolve_ind_addr_a * (FF(1) - new_term.main_sel_resolve_ind_addr_a)); + auto tmp = (new_term.main_sel_resolve_ind_addr_b * (FF(1) - new_term.main_sel_resolve_ind_addr_b)); tmp *= scaling_factor; std::get<70>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<71, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_resolve_ind_addr_b * (FF(1) - new_term.main_sel_resolve_ind_addr_b)); + auto tmp = (new_term.main_sel_resolve_ind_addr_c * (FF(1) - new_term.main_sel_resolve_ind_addr_c)); tmp *= scaling_factor; std::get<71>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<72, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_resolve_ind_addr_c * (FF(1) - new_term.main_sel_resolve_ind_addr_c)); + auto tmp = (new_term.main_sel_resolve_ind_addr_d * (FF(1) - new_term.main_sel_resolve_ind_addr_d)); tmp *= scaling_factor; std::get<72>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<73, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_resolve_ind_addr_d * (FF(1) - new_term.main_sel_resolve_ind_addr_d)); + auto tmp = (((new_term.main_sel_op_eq + new_term.main_sel_op_lte) + new_term.main_sel_op_lt) * + (new_term.main_w_in_tag - constants_MEM_TAG_U1)); tmp *= scaling_factor; std::get<73>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<74, ContainerOverSubrelations>; - auto tmp = (((new_term.main_sel_op_eq + new_term.main_sel_op_lte) + new_term.main_sel_op_lt) * - (new_term.main_w_in_tag - constants_MEM_TAG_U1)); + auto tmp = ((new_term.main_sel_op_fdiv * (FF(1) - new_term.main_op_err)) * + ((new_term.main_ic * new_term.main_ib) - new_term.main_ia)); tmp *= scaling_factor; std::get<74>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<75, ContainerOverSubrelations>; - auto tmp = ((new_term.main_sel_op_fdiv * (FF(1) - new_term.main_op_err)) * - ((new_term.main_ic * new_term.main_ib) - new_term.main_ia)); + auto tmp = ((new_term.main_sel_op_fdiv + new_term.main_sel_op_div) * + (((new_term.main_ib * new_term.main_inv) - FF(1)) + new_term.main_op_err)); tmp *= scaling_factor; std::get<75>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<76, ContainerOverSubrelations>; - auto tmp = ((new_term.main_sel_op_fdiv + new_term.main_sel_op_div) * - (((new_term.main_ib * new_term.main_inv) - FF(1)) + new_term.main_op_err)); + auto tmp = (((new_term.main_sel_op_fdiv + new_term.main_sel_op_div) * new_term.main_op_err) * + (FF(1) - new_term.main_inv)); tmp *= scaling_factor; std::get<76>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<77, ContainerOverSubrelations>; - auto tmp = (((new_term.main_sel_op_fdiv + new_term.main_sel_op_div) * new_term.main_op_err) * - (FF(1) - new_term.main_inv)); + auto tmp = (new_term.main_sel_op_fdiv * (new_term.main_r_in_tag - constants_MEM_TAG_FF)); tmp *= scaling_factor; std::get<77>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<78, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_fdiv * (new_term.main_r_in_tag - constants_MEM_TAG_FF)); + auto tmp = (new_term.main_sel_op_fdiv * (new_term.main_w_in_tag - constants_MEM_TAG_FF)); tmp *= scaling_factor; std::get<78>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<79, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_fdiv * (new_term.main_w_in_tag - constants_MEM_TAG_FF)); + auto tmp = (new_term.main_op_err * ((new_term.main_sel_op_fdiv + new_term.main_sel_op_div) - FF(1))); tmp *= scaling_factor; std::get<79>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<80, ContainerOverSubrelations>; - auto tmp = (new_term.main_op_err * ((new_term.main_sel_op_fdiv + new_term.main_sel_op_div) - FF(1))); + auto tmp = (new_term.main_sel_op_jump * (new_term.main_pc_shift - new_term.main_ia)); tmp *= scaling_factor; std::get<80>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<81, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_jump * (new_term.main_pc_shift - new_term.main_ia)); + auto tmp = (new_term.main_sel_op_jumpi * + (((FF(1) - new_term.main_id_zero) * (new_term.main_pc_shift - new_term.main_ia)) + + (new_term.main_id_zero * ((new_term.main_pc_shift - new_term.main_pc) - FF(1))))); tmp *= scaling_factor; std::get<81>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<82, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_jumpi * - (((FF(1) - new_term.main_id_zero) * (new_term.main_pc_shift - new_term.main_ia)) + - (new_term.main_id_zero * ((new_term.main_pc_shift - new_term.main_pc) - FF(1))))); + auto tmp = (new_term.main_sel_op_internal_call * + (new_term.main_internal_return_ptr_shift - (new_term.main_internal_return_ptr + FF(1)))); tmp *= scaling_factor; std::get<82>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<83, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_internal_call * - (new_term.main_internal_return_ptr_shift - (new_term.main_internal_return_ptr + FF(1)))); + auto tmp = + (new_term.main_sel_op_internal_call * (new_term.main_internal_return_ptr - new_term.main_mem_addr_b)); tmp *= scaling_factor; std::get<83>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<84, ContainerOverSubrelations>; - auto tmp = - (new_term.main_sel_op_internal_call * (new_term.main_internal_return_ptr - new_term.main_mem_addr_b)); + auto tmp = (new_term.main_sel_op_internal_call * (new_term.main_pc_shift - new_term.main_ia)); tmp *= scaling_factor; std::get<84>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<85, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_internal_call * (new_term.main_pc_shift - new_term.main_ia)); + auto tmp = (new_term.main_sel_op_internal_call * ((new_term.main_pc + FF(1)) - new_term.main_ib)); tmp *= scaling_factor; std::get<85>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<86, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_internal_call * ((new_term.main_pc + FF(1)) - new_term.main_ib)); + auto tmp = (new_term.main_sel_op_internal_call * (new_term.main_rwb - FF(1))); tmp *= scaling_factor; std::get<86>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<87, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_internal_call * (new_term.main_rwb - FF(1))); + auto tmp = (new_term.main_sel_op_internal_call * (new_term.main_sel_mem_op_b - FF(1))); tmp *= scaling_factor; std::get<87>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<88, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_internal_call * (new_term.main_sel_mem_op_b - FF(1))); + auto tmp = (new_term.main_sel_op_internal_return * + (new_term.main_internal_return_ptr_shift - (new_term.main_internal_return_ptr - FF(1)))); tmp *= scaling_factor; std::get<88>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<89, ContainerOverSubrelations>; auto tmp = (new_term.main_sel_op_internal_return * - (new_term.main_internal_return_ptr_shift - (new_term.main_internal_return_ptr - FF(1)))); + ((new_term.main_internal_return_ptr - FF(1)) - new_term.main_mem_addr_a)); tmp *= scaling_factor; std::get<89>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<90, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_internal_return * - ((new_term.main_internal_return_ptr - FF(1)) - new_term.main_mem_addr_a)); + auto tmp = (new_term.main_sel_op_internal_return * (new_term.main_pc_shift - new_term.main_ia)); tmp *= scaling_factor; std::get<90>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<91, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_internal_return * (new_term.main_pc_shift - new_term.main_ia)); + auto tmp = (new_term.main_sel_op_internal_return * new_term.main_rwa); tmp *= scaling_factor; std::get<91>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<92, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_internal_return * new_term.main_rwa); + auto tmp = (new_term.main_sel_op_internal_return * (new_term.main_sel_mem_op_a - FF(1))); tmp *= scaling_factor; std::get<92>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<93, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_internal_return * (new_term.main_sel_mem_op_a - FF(1))); + auto tmp = ((main_CUR_AND_NEXT_ARE_MAIN * (FF(1) - main_SEL_ALL_CTRL_FLOW)) * + (new_term.main_pc_shift - (new_term.main_pc + FF(1)))); tmp *= scaling_factor; std::get<93>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<94, ContainerOverSubrelations>; auto tmp = ((main_CUR_AND_NEXT_ARE_MAIN * (FF(1) - main_SEL_ALL_CTRL_FLOW)) * - (new_term.main_pc_shift - (new_term.main_pc + FF(1)))); + (new_term.main_internal_return_ptr_shift - new_term.main_internal_return_ptr)); tmp *= scaling_factor; std::get<94>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<95, ContainerOverSubrelations>; - auto tmp = ((main_CUR_AND_NEXT_ARE_MAIN * (FF(1) - main_SEL_ALL_CTRL_FLOW)) * - (new_term.main_internal_return_ptr_shift - new_term.main_internal_return_ptr)); + auto tmp = ((new_term.main_sel_op_internal_call + new_term.main_sel_op_internal_return) * + (new_term.main_space_id - constants_misc_INTERNAL_CALL_SPACE_ID)); tmp *= scaling_factor; std::get<95>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<96, ContainerOverSubrelations>; - auto tmp = ((new_term.main_sel_op_internal_call + new_term.main_sel_op_internal_return) * - (new_term.main_space_id - constants_misc_INTERNAL_CALL_SPACE_ID)); + auto tmp = (((FF(1) - new_term.main_sel_op_internal_call) - new_term.main_sel_op_internal_return) * + (new_term.main_call_ptr - new_term.main_space_id)); tmp *= scaling_factor; std::get<96>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<97, ContainerOverSubrelations>; - auto tmp = (((FF(1) - new_term.main_sel_op_internal_call) - new_term.main_sel_op_internal_return) * - (new_term.main_call_ptr - new_term.main_space_id)); + auto tmp = (new_term.main_sel_op_jumpi * + (((new_term.main_id * new_term.main_inv) - FF(1)) + new_term.main_id_zero)); tmp *= scaling_factor; std::get<97>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<98, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_jumpi * - (((new_term.main_id * new_term.main_inv) - FF(1)) + new_term.main_id_zero)); + auto tmp = ((new_term.main_sel_op_jumpi * new_term.main_id_zero) * (FF(1) - new_term.main_inv)); tmp *= scaling_factor; std::get<98>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<99, ContainerOverSubrelations>; - auto tmp = ((new_term.main_sel_op_jumpi * new_term.main_id_zero) * (FF(1) - new_term.main_inv)); + auto tmp = (new_term.main_sel_mov_ia_to_ic - (new_term.main_sel_op_mov * (FF(1) - new_term.main_id_zero))); tmp *= scaling_factor; std::get<99>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<100, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_mov_ia_to_ic - (new_term.main_sel_op_mov * (FF(1) - new_term.main_id_zero))); + auto tmp = (new_term.main_sel_mov_ia_to_ic * (new_term.main_ia - new_term.main_ic)); tmp *= scaling_factor; std::get<100>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<101, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_mov_ia_to_ic * (new_term.main_ia - new_term.main_ic)); + auto tmp = (new_term.main_sel_mov_ib_to_ic * (new_term.main_ib - new_term.main_ic)); tmp *= scaling_factor; std::get<101>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<102, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_mov_ib_to_ic * (new_term.main_ib - new_term.main_ic)); + auto tmp = (new_term.main_sel_op_mov * (new_term.main_r_in_tag - new_term.main_w_in_tag)); tmp *= scaling_factor; std::get<102>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<103, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_mov * (new_term.main_r_in_tag - new_term.main_w_in_tag)); + auto tmp = (new_term.main_sel_alu - + ((main_SEL_ALL_ALU * (FF(1) - new_term.main_tag_err)) * (FF(1) - new_term.main_op_err))); tmp *= scaling_factor; std::get<103>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<104, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_alu - - ((main_SEL_ALL_ALU * (FF(1) - new_term.main_tag_err)) * (FF(1) - new_term.main_op_err))); + auto tmp = (main_SEL_ALU_R_TAG * (new_term.main_alu_in_tag - new_term.main_r_in_tag)); tmp *= scaling_factor; std::get<104>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<105, ContainerOverSubrelations>; - auto tmp = (main_SEL_ALU_R_TAG * (new_term.main_alu_in_tag - new_term.main_r_in_tag)); + auto tmp = (main_SEL_ALU_W_TAG * (new_term.main_alu_in_tag - new_term.main_w_in_tag)); tmp *= scaling_factor; std::get<105>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<106, ContainerOverSubrelations>; - auto tmp = (main_SEL_ALU_W_TAG * (new_term.main_alu_in_tag - new_term.main_w_in_tag)); + auto tmp = (new_term.main_sel_op_l2gasleft * (new_term.main_ia - new_term.main_l2_gas_remaining_shift)); tmp *= scaling_factor; std::get<106>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<107, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_l2gasleft * (new_term.main_ia - new_term.main_l2_gas_remaining_shift)); + auto tmp = (new_term.main_sel_op_dagasleft * (new_term.main_ia - new_term.main_da_gas_remaining_shift)); tmp *= scaling_factor; std::get<107>(evals) += typename Accumulator::View(tmp); } { using Accumulator = typename std::tuple_element_t<108, ContainerOverSubrelations>; - auto tmp = (new_term.main_sel_op_dagasleft * (new_term.main_ia - new_term.main_da_gas_remaining_shift)); - tmp *= scaling_factor; - std::get<108>(evals) += typename Accumulator::View(tmp); - } - { - using Accumulator = typename std::tuple_element_t<109, ContainerOverSubrelations>; auto tmp = ((new_term.main_ib * (FF(1) - new_term.main_tag_err)) * ((new_term.main_sel_op_calldata_copy + new_term.main_sel_op_external_return) - new_term.main_sel_slice_gadget)); tmp *= scaling_factor; - std::get<109>(evals) += typename Accumulator::View(tmp); + std::get<108>(evals) += typename Accumulator::View(tmp); } { - using Accumulator = typename std::tuple_element_t<110, ContainerOverSubrelations>; + using Accumulator = typename std::tuple_element_t<109, ContainerOverSubrelations>; auto tmp = (new_term.main_bin_op_id - (new_term.main_sel_op_or + (FF(2) * new_term.main_sel_op_xor))); tmp *= scaling_factor; - std::get<110>(evals) += typename Accumulator::View(tmp); + std::get<109>(evals) += typename Accumulator::View(tmp); } { - using Accumulator = typename std::tuple_element_t<111, ContainerOverSubrelations>; + using Accumulator = typename std::tuple_element_t<110, ContainerOverSubrelations>; auto tmp = (new_term.main_sel_bin - ((new_term.main_sel_op_and + new_term.main_sel_op_or) + new_term.main_sel_op_xor)); tmp *= scaling_factor; - std::get<111>(evals) += typename Accumulator::View(tmp); + std::get<110>(evals) += typename Accumulator::View(tmp); } } }; @@ -793,53 +784,53 @@ template class main : public Relation> { switch (index) { case 0: return "OPCODE_SELECTORS"; - case 74: + case 73: return "OUTPUT_U1"; - case 75: + case 74: return "SUBOP_FDIV"; - case 76: + case 75: return "SUBOP_FDIV_ZERO_ERR1"; - case 77: + case 76: return "SUBOP_FDIV_ZERO_ERR2"; - case 78: + case 77: return "SUBOP_FDIV_R_IN_TAG_FF"; - case 79: + case 78: return "SUBOP_FDIV_W_IN_TAG_FF"; - case 80: + case 79: return "SUBOP_ERROR_RELEVANT_OP"; - case 81: + case 80: return "PC_JUMP"; - case 82: + case 81: return "PC_JUMPI"; - case 83: + case 82: return "RETURN_POINTER_INCREMENT"; - case 89: + case 88: return "RETURN_POINTER_DECREMENT"; - case 94: + case 93: return "PC_INCREMENT"; - case 95: + case 94: return "INTERNAL_RETURN_POINTER_CONSISTENCY"; - case 96: + case 95: return "SPACE_ID_INTERNAL"; - case 97: + case 96: return "SPACE_ID_STANDARD_OPCODES"; - case 98: + case 97: return "JMP_CONDITION_RES_1"; - case 99: + case 98: return "JMP_CONDITION_RES_2"; - case 101: + case 100: return "MOV_SAME_VALUE_A"; - case 102: + case 101: return "MOV_SAME_VALUE_B"; - case 103: + case 102: return "MOV_MAIN_SAME_TAG"; - case 107: + case 106: return "L2GASLEFT"; - case 108: + case 107: return "DAGASLEFT"; - case 110: + case 109: return "BIN_SEL_1"; - case 111: + case 110: return "BIN_SEL_2"; } return std::to_string(index); diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/perm_main_conv.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/perm_main_conv.hpp index a97b8c1a046..de82abea0a5 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/perm_main_conv.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/generated/relations/perm_main_conv.hpp @@ -15,15 +15,15 @@ class perm_main_conv_permutation_settings { template static inline auto inverse_polynomial_is_computed_at_row(const AllEntities& in) { - return (in.main_sel_op_radix_le == 1 || in.conversion_sel_to_radix_le == 1); + return (in.main_sel_op_radix_be == 1 || in.conversion_sel_to_radix_be == 1); } template static inline auto get_const_entities(const AllEntities& in) { return std::forward_as_tuple(in.perm_main_conv_inv, - in.main_sel_op_radix_le, - in.main_sel_op_radix_le, - in.conversion_sel_to_radix_le, + in.main_sel_op_radix_be, + in.main_sel_op_radix_be, + in.conversion_sel_to_radix_be, in.main_clk, in.main_ia, in.main_ib, @@ -39,9 +39,9 @@ class perm_main_conv_permutation_settings { template static inline auto get_nonconst_entities(AllEntities& in) { return std::forward_as_tuple(in.perm_main_conv_inv, - in.main_sel_op_radix_le, - in.main_sel_op_radix_le, - in.conversion_sel_to_radix_le, + in.main_sel_op_radix_be, + in.main_sel_op_radix_be, + in.conversion_sel_to_radix_be, in.main_clk, in.main_ia, in.main_ib, diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/tests/execution.test.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/tests/execution.test.cpp index efe26926f36..d2c471b056a 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/tests/execution.test.cpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/tests/execution.test.cpp @@ -715,8 +715,8 @@ TEST_F(AvmExecutionTests, setAndCastOpcodes) validate_trace(std::move(trace), public_inputs); } -// Positive test with TO_RADIX_LE. -TEST_F(AvmExecutionTests, toRadixLeOpcode) +// Positive test with TO_RADIX_BE. +TEST_F(AvmExecutionTests, toRadixBeOpcodeBytes) { std::string bytecode_hex = to_hex(OpCode::SET_8) + // opcode SET "00" // Indirect flag @@ -748,7 +748,7 @@ TEST_F(AvmExecutionTests, toRadixLeOpcode) + to_hex(AvmMemoryTag::U32) + "02" // value 2 (i.e. radix 2 - perform bitwise decomposition) "80" // radix_offset 80 - + to_hex(OpCode::TORADIXLE) + // opcode TO_RADIX_LE + + to_hex(OpCode::TORADIXBE) + // opcode TO_RADIX_BE "03" // Indirect flag "0011" // src_offset 17 (indirect) "0015" // dst_offset 21 (indirect) @@ -768,21 +768,23 @@ TEST_F(AvmExecutionTests, toRadixLeOpcode) auto trace = Execution::gen_trace(instructions, returndata, std::vector{ FF::modulus - FF(1) }, public_inputs_vec); - // Find the first row enabling the TORADIXLE selector + // Find the first row enabling the TORADIXBE selector // Expected output is bitwise decomposition of MODULUS - 1..could hardcode the result but it's a bit long - std::vector expected_output; + size_t num_limbs = 256; + std::vector expected_output(num_limbs); // Extract each bit. - for (size_t i = 0; i < 256; i++) { + for (size_t i = 0; i < num_limbs; i++) { + auto byte_index = num_limbs - i - 1; FF expected_limb = (FF::modulus - 1) >> i & 1; - expected_output.emplace_back(expected_limb); + expected_output[byte_index] = expected_limb; } EXPECT_EQ(returndata, expected_output); validate_trace(std::move(trace), public_inputs, { FF::modulus - FF(1) }, returndata); } -// Positive test with TO_RADIX_LE. -TEST_F(AvmExecutionTests, toRadixLeOpcodeBitsMode) +// Positive test with TO_RADIX_BE. +TEST_F(AvmExecutionTests, toRadixBeOpcodeBitsMode) { std::string bytecode_hex = to_hex(OpCode::SET_8) + // opcode SET "00" // Indirect flag @@ -814,7 +816,7 @@ TEST_F(AvmExecutionTests, toRadixLeOpcodeBitsMode) + to_hex(AvmMemoryTag::U32) + "02" // value 2 (i.e. radix 2 - perform bitwise decomposition) "80" // radix_offset 80 - + to_hex(OpCode::TORADIXLE) + // opcode TO_RADIX_LE + + to_hex(OpCode::TORADIXBE) + // opcode TO_RADIX_BE "03" // Indirect flag "0011" // src_offset 17 (indirect) "0015" // dst_offset 21 (indirect) @@ -834,13 +836,15 @@ TEST_F(AvmExecutionTests, toRadixLeOpcodeBitsMode) auto trace = Execution::gen_trace(instructions, returndata, std::vector{ FF::modulus - FF(1) }, public_inputs_vec); - // Find the first row enabling the TORADIXLE selector + // Find the first row enabling the TORADIXBE selector // Expected output is bitwise decomposition of MODULUS - 1..could hardcode the result but it's a bit long - std::vector expected_output; + size_t num_limbs = 256; + std::vector expected_output(num_limbs); // Extract each bit. - for (size_t i = 0; i < 256; i++) { + for (size_t i = 0; i < num_limbs; i++) { + auto byte_index = num_limbs - i - 1; FF expected_limb = (FF::modulus - 1) >> i & 1; - expected_output.emplace_back(expected_limb); + expected_output[byte_index] = expected_limb; } EXPECT_EQ(returndata, expected_output); diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/trace/deserialization.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/trace/deserialization.cpp index e14c44399bf..c64281232cc 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/trace/deserialization.cpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/trace/deserialization.cpp @@ -176,7 +176,7 @@ const std::unordered_map> OPCODE_WIRE_FORMAT = { OpCode::MSM, { OperandType::INDIRECT8, OperandType::UINT16, OperandType::UINT16, OperandType::UINT16, OperandType::UINT16 } }, // Gadget - Conversion - { OpCode::TORADIXLE, + { OpCode::TORADIXBE, { OperandType::INDIRECT8, OperandType::UINT16, OperandType::UINT16, diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/trace/execution.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/trace/execution.cpp index e7560783e95..173a5a4298f 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/trace/execution.cpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/trace/execution.cpp @@ -734,8 +734,8 @@ std::vector Execution::gen_trace(std::vector const& instructio break; // Conversions - case OpCode::TORADIXLE: - trace_builder.op_to_radix_le(std::get(inst.operands.at(0)), + case OpCode::TORADIXBE: + trace_builder.op_to_radix_be(std::get(inst.operands.at(0)), std::get(inst.operands.at(1)), std::get(inst.operands.at(2)), std::get(inst.operands.at(3)), diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/trace/fixed_gas.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/trace/fixed_gas.cpp index d64c7f3e310..edb550f2b15 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/trace/fixed_gas.cpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/trace/fixed_gas.cpp @@ -87,7 +87,7 @@ const std::unordered_map GAS_COST_TABLE = { { OpCode::KECCAKF1600, make_cost(AVM_KECCAKF1600_BASE_L2_GAS, 0, 0, 0) }, { OpCode::ECADD, make_cost(AVM_ECADD_BASE_L2_GAS, 0, 0, 0) }, { OpCode::MSM, make_cost(AVM_MSM_BASE_L2_GAS, 0, AVM_MSM_DYN_L2_GAS, 0) }, - { OpCode::TORADIXLE, make_cost(AVM_TORADIXLE_BASE_L2_GAS, 0, AVM_TORADIXLE_DYN_L2_GAS, 0) }, + { OpCode::TORADIXBE, make_cost(AVM_TORADIXBE_BASE_L2_GAS, 0, AVM_TORADIXBE_DYN_L2_GAS, 0) }, }; } // namespace diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/trace/fixed_gas.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/trace/fixed_gas.hpp index b91cbf6a598..d157c458bfd 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/trace/fixed_gas.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/trace/fixed_gas.hpp @@ -39,4 +39,4 @@ template void merge_into(DestRow& dest, FixedGasTable::GasRow dest.gas_dyn_da_gas_fixed_table = src.dyn_da_gas_fixed_table; } -} // namespace bb::avm_trace \ No newline at end of file +} // namespace bb::avm_trace diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/trace/gadgets/conversion_trace.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/trace/gadgets/conversion_trace.cpp index 07a4320ec9c..2d855610bed 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/trace/gadgets/conversion_trace.cpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/trace/gadgets/conversion_trace.cpp @@ -14,39 +14,42 @@ void AvmConversionTraceBuilder::reset() } /** - * @brief Build conversion trace and compute the result of a TO_RADIX_LE operation. + * @brief Build conversion trace and compute the result of a TO_RADIX_BE operation. * This operation is only valid for the FF instr_tag and always returns a byte array * - * @param a First operand of the TO_RADIX_LE, the value to be converted + * @param a First operand of the TO_RADIX_BE, the value to be converted * @param radix The upper bound for each limbm 0 <= limb < radix * @param num_limbs The number of limbs to the value into. * @param output_bits Should the output be U1s instead of U8s? * @param clk Clock referring to the operation in the main trace. * - * @return std::vector The LE converted values stored as bytes or bits. + * @return std::vector The BE converted values stored as bytes or bits. */ -std::vector AvmConversionTraceBuilder::op_to_radix_le( +std::vector AvmConversionTraceBuilder::op_to_radix_be( FF const& a, uint32_t radix, uint32_t num_limbs, uint8_t output_bits, uint32_t clk) { + // TODO: constraints for these assertions + ASSERT(num_limbs > 0); ASSERT(radix <= 256); // should never reach here because main trace won't call with bad radix auto a_uint256 = uint256_t(a); auto radix_uint256 = uint256_t(radix); - std::vector bytes_or_bits; + std::vector bytes_or_bits(num_limbs); for (uint32_t i = 0; i < num_limbs; i++) { + auto byte_index = num_limbs - i - 1; auto limb = a_uint256 % radix_uint256; if (output_bits > 0) { - bytes_or_bits.emplace_back(static_cast(limb == 0 ? 0 : 1)); + bytes_or_bits[byte_index] = static_cast(limb == 0 ? 0 : 1); } else { - bytes_or_bits.emplace_back(static_cast(limb)); + bytes_or_bits[byte_index] = static_cast(limb); } a_uint256 /= radix_uint256; } conversion_trace.emplace_back(ConversionTraceEntry{ .conversion_clk = clk, - .to_radix_le_sel = true, + .to_radix_be_sel = true, .input = a, .radix = radix, .num_limbs = num_limbs, diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/trace/gadgets/conversion_trace.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/trace/gadgets/conversion_trace.hpp index cf0ac4723bf..84cb3ea299a 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/trace/gadgets/conversion_trace.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/trace/gadgets/conversion_trace.hpp @@ -13,7 +13,7 @@ class AvmConversionTraceBuilder { public: struct ConversionTraceEntry { uint32_t conversion_clk = 0; - bool to_radix_le_sel = false; + bool to_radix_be_sel = false; FF input{}; uint32_t radix = 0; uint32_t num_limbs = 0; @@ -26,7 +26,7 @@ class AvmConversionTraceBuilder { // Finalize the trace std::vector finalize(); - std::vector op_to_radix_le( + std::vector op_to_radix_be( FF const& a, uint32_t radix, uint32_t num_limbs, uint8_t output_bits, uint32_t clk); private: diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/trace/opcode.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/trace/opcode.cpp index 2d9348eff83..d247fca4661 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/trace/opcode.cpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/trace/opcode.cpp @@ -168,8 +168,8 @@ std::string to_string(OpCode opcode) case OpCode::MSM: return "MSM"; // Conversions - case OpCode::TORADIXLE: - return "TORADIXLE"; + case OpCode::TORADIXBE: + return "TORADIXBE"; // Sentinel case OpCode::LAST_OPCODE_SENTINEL: return "LAST_OPCODE_SENTINEL"; diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/trace/opcode.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/trace/opcode.hpp index 4aef84ee5bf..427ae5831fd 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/trace/opcode.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/trace/opcode.hpp @@ -104,7 +104,7 @@ enum class OpCode : uint8_t { ECADD, MSM, // Conversions - TORADIXLE, + TORADIXBE, // Sentinel LAST_OPCODE_SENTINEL, diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/trace/trace.cpp b/barretenberg/cpp/src/barretenberg/vm/avm/trace/trace.cpp index b1ccbb0f664..75108e450e9 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/trace/trace.cpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/trace/trace.cpp @@ -3161,17 +3161,17 @@ void AvmTraceBuilder::op_variable_msm(uint8_t indirect, **************************************************************************************************/ /** - * @brief To_Radix_LE with direct or indirect memory access. + * @brief To_Radix_BE with direct or indirect memory access. * * @param indirect A byte encoding information about indirect/direct memory access. - * @param src_offset An index in memory pointing to the input of the To_Radix_LE conversion. - * @param dst_offset An index in memory pointing to the output of the To_Radix_LE conversion. + * @param src_offset An index in memory pointing to the input of the To_Radix_BE conversion. + * @param dst_offset An index in memory pointing to the output of the To_Radix_BE conversion. * @param radix_offset An index in memory pointing to the strict upper bound of each converted limb, i.e., 0 <= limb < * radix. * @param num_limbs The number of limbs to the value into. * @param output_bits Should the output be U1s instead of U8s? */ -void AvmTraceBuilder::op_to_radix_le(uint8_t indirect, +void AvmTraceBuilder::op_to_radix_be(uint8_t indirect, uint32_t src_offset, uint32_t dst_offset, uint32_t radix_offset, @@ -3207,12 +3207,12 @@ void AvmTraceBuilder::op_to_radix_le(uint8_t indirect, // Therefore, we do not create any entry in gadget table and we return a vector of 0. std::vector res = error ? std::vector(num_limbs, 0) - : conversion_trace_builder.op_to_radix_le(input, radix, num_limbs, output_bits, clk); + : conversion_trace_builder.op_to_radix_be(input, radix, num_limbs, output_bits, clk); // Constrain gas cost - gas_trace_builder.constrain_gas(clk, OpCode::TORADIXLE, num_limbs); + gas_trace_builder.constrain_gas(clk, OpCode::TORADIXBE, num_limbs); - // This is the row that contains the selector to trigger the sel_op_radix_le + // This is the row that contains the selector to trigger the sel_op_radix_be // In this row, we read the input value and the destination address into register A and B respectively main_trace.push_back(Row{ .main_clk = clk, @@ -3234,7 +3234,7 @@ void AvmTraceBuilder::op_to_radix_le(uint8_t indirect, .main_sel_mem_op_a = FF(1), // TODO:(8603): uncomment //.main_sel_mem_op_b = FF(1), - .main_sel_op_radix_le = FF(1), + .main_sel_op_radix_be = FF(1), .main_sel_resolve_ind_addr_a = FF(static_cast(read_src.is_indirect)), // TODO:(8603): uncomment //.main_sel_resolve_ind_addr_b = FF(static_cast(read_radix.is_indirect)), @@ -3445,7 +3445,7 @@ std::vector AvmTraceBuilder::finalize() for (size_t i = 0; i < conv_trace_size; i++) { auto const& src = conv_trace.at(i); auto& dest = main_trace.at(i); - dest.conversion_sel_to_radix_le = FF(static_cast(src.to_radix_le_sel)); + dest.conversion_sel_to_radix_be = FF(static_cast(src.to_radix_be_sel)); dest.conversion_clk = FF(src.conversion_clk); dest.conversion_input = src.input; dest.conversion_radix = FF(src.radix); diff --git a/barretenberg/cpp/src/barretenberg/vm/avm/trace/trace.hpp b/barretenberg/cpp/src/barretenberg/vm/avm/trace/trace.hpp index 66cc8767930..0aed9cbe440 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm/trace/trace.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm/trace/trace.hpp @@ -158,7 +158,7 @@ class AvmTraceBuilder { uint32_t output_offset, uint32_t point_length_offset); // Conversions - void op_to_radix_le(uint8_t indirect, + void op_to_radix_be(uint8_t indirect, uint32_t src_offset, uint32_t dst_offset, uint32_t radix_offset, diff --git a/barretenberg/cpp/src/barretenberg/vm/aztec_constants.hpp b/barretenberg/cpp/src/barretenberg/vm/aztec_constants.hpp index 20286f4db87..9abf2e7c8bc 100644 --- a/barretenberg/cpp/src/barretenberg/vm/aztec_constants.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/aztec_constants.hpp @@ -35,7 +35,7 @@ #define PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH 674 #define PUBLIC_CONTEXT_INPUTS_LENGTH 41 #define AVM_VERIFICATION_KEY_LENGTH_IN_FIELDS 86 -#define AVM_PROOF_LENGTH_IN_FIELDS 3823 +#define AVM_PROOF_LENGTH_IN_FIELDS 3818 #define AVM_PUBLIC_COLUMN_MAX_SIZE 1024 #define AVM_PUBLIC_INPUTS_FLATTENED_SIZE 2722 #define MEM_TAG_FF 0 @@ -113,7 +113,7 @@ #define AVM_KECCAKF1600_BASE_L2_GAS 300 #define AVM_ECADD_BASE_L2_GAS 62 #define AVM_MSM_BASE_L2_GAS 1000 -#define AVM_TORADIXLE_BASE_L2_GAS 46 +#define AVM_TORADIXBE_BASE_L2_GAS 46 #define AVM_CALLDATACOPY_DYN_L2_GAS 6 #define AVM_EMITUNENCRYPTEDLOG_DYN_L2_GAS 146 #define AVM_CALL_DYN_L2_GAS 4 @@ -121,7 +121,7 @@ #define AVM_RETURN_DYN_L2_GAS 6 #define AVM_REVERT_DYN_L2_GAS 6 #define AVM_MSM_DYN_L2_GAS 100 -#define AVM_TORADIXLE_DYN_L2_GAS 20 +#define AVM_TORADIXBE_DYN_L2_GAS 20 #define AVM_SSTORE_BASE_DA_GAS 512 #define AVM_EMITNOTEHASH_BASE_DA_GAS 512 #define AVM_EMITNULLIFIER_BASE_DA_GAS 512 diff --git a/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr b/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr index 311b47a8264..d6e613a4b27 100644 --- a/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr +++ b/noir-projects/noir-protocol-circuits/crates/types/src/constants.nr @@ -332,7 +332,7 @@ global AVM_VERIFICATION_KEY_LENGTH_IN_FIELDS: u32 = 2 + 21 * 4; // `AVM_PROOF_LENGTH_IN_FIELDS` must be updated when AVM circuit changes. // To determine latest value, hover `COMPUTED_AVM_PROOF_LENGTH_IN_FIELDS` // in barretenberg/cpp/src/barretenberg/vm/avm/generated/flavor.hpp -global AVM_PROOF_LENGTH_IN_FIELDS: u32 = 3823; +global AVM_PROOF_LENGTH_IN_FIELDS: u32 = 3818; global AVM_PUBLIC_COLUMN_MAX_SIZE : u32 = 1024; global AVM_PUBLIC_INPUTS_FLATTENED_SIZE : u32 = 2 * AVM_PUBLIC_COLUMN_MAX_SIZE + PUBLIC_CIRCUIT_PUBLIC_INPUTS_LENGTH; /** @@ -497,7 +497,7 @@ global AVM_SHA256COMPRESSION_BASE_L2_GAS: u32 = 261; global AVM_KECCAKF1600_BASE_L2_GAS: u32 = 300; global AVM_ECADD_BASE_L2_GAS: u32 = 62; global AVM_MSM_BASE_L2_GAS: u32 = 1000; -global AVM_TORADIXLE_BASE_L2_GAS: u32 = 46; +global AVM_TORADIXBE_BASE_L2_GAS: u32 = 46; // Dynamic L2 GAS global AVM_CALLDATACOPY_DYN_L2_GAS: u32 = 6; @@ -508,7 +508,7 @@ global AVM_STATICCALL_DYN_L2_GAS: u32 = 4; global AVM_RETURN_DYN_L2_GAS: u32 = 6; global AVM_REVERT_DYN_L2_GAS: u32 = 6; global AVM_MSM_DYN_L2_GAS: u32 = 100; -global AVM_TORADIXLE_DYN_L2_GAS: u32 = 20; +global AVM_TORADIXBE_DYN_L2_GAS: u32 = 20; // Base DA Gas global AVM_SSTORE_BASE_DA_GAS: u32 = DA_BYTES_PER_FIELD * DA_GAS_PER_BYTE; diff --git a/noir/noir-repo/acvm-repo/brillig_vm/src/black_box.rs b/noir/noir-repo/acvm-repo/brillig_vm/src/black_box.rs index 4201d2ddba2..04f391a812d 100644 --- a/noir/noir-repo/acvm-repo/brillig_vm/src/black_box.rs +++ b/noir/noir-repo/acvm-repo/brillig_vm/src/black_box.rs @@ -330,18 +330,18 @@ pub(crate) fn evaluate_black_box let mut input = BigUint::from_bytes_be(&input.to_be_bytes()); let radix = BigUint::from_bytes_be(&radix.to_be_bytes()); - let mut limbs: Vec> = Vec::with_capacity(output.size); + let mut limbs: Vec> = vec![MemoryValue::default(); output.size]; - for _ in 0..output.size { + for i in (0..output.size).rev() { let limb = &input % &radix; if *output_bits { - limbs.push(MemoryValue::new_integer( + limbs[i] = MemoryValue::new_integer( if limb.is_zero() { 0 } else { 1 }, IntegerBitSize::U1, - )); + ); } else { let limb: u8 = limb.try_into().unwrap(); - limbs.push(MemoryValue::new_integer(limb as u128, IntegerBitSize::U8)); + limbs[i] = MemoryValue::new_integer(limb as u128, IntegerBitSize::U8); }; input /= &radix; } diff --git a/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_block.rs b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_block.rs index deaae6a05cc..1fce11e9fd3 100644 --- a/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_block.rs +++ b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_gen/brillig_block.rs @@ -569,7 +569,7 @@ impl<'block> BrilligBlock<'block> { source, target_array, radix, - matches!(endianness, Endian::Big), + matches!(endianness, Endian::Little), false, ); } @@ -594,7 +594,7 @@ impl<'block> BrilligBlock<'block> { source, target_array, two, - matches!(endianness, Endian::Big), + matches!(endianness, Endian::Little), true, ); diff --git a/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/codegen_intrinsic.rs b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/codegen_intrinsic.rs index 5f4781788f5..ba89823ef13 100644 --- a/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/codegen_intrinsic.rs +++ b/noir/noir-repo/compiler/noirc_evaluator/src/brillig/brillig_ir/codegen_intrinsic.rs @@ -69,7 +69,7 @@ impl BrilligContext< source_field: SingleAddrVariable, target_array: BrilligArray, radix: SingleAddrVariable, - big_endian: bool, + little_endian: bool, output_bits: bool, // If true will generate bit limbs, if false will generate byte limbs ) { assert!(source_field.bit_size == F::max_num_bits()); @@ -79,6 +79,7 @@ impl BrilligContext< let heap_array = self.codegen_brillig_array_to_heap_array(target_array); + // Perform big-endian ToRadix self.black_box_op_instruction(BlackBoxOp::ToRadix { input: source_field.address, radix: radix.address, @@ -86,7 +87,7 @@ impl BrilligContext< output_bits, }); - if big_endian { + if little_endian { let items_len = self.make_usize_constant_instruction(target_array.size.into()); self.codegen_array_reverse(heap_array.pointer, items_len.address); self.deallocate_single_addr(items_len); diff --git a/yarn-project/circuits.js/src/constants.gen.ts b/yarn-project/circuits.js/src/constants.gen.ts index 625bc5c45d3..c6244436c1e 100644 --- a/yarn-project/circuits.js/src/constants.gen.ts +++ b/yarn-project/circuits.js/src/constants.gen.ts @@ -216,7 +216,7 @@ export const TUBE_PROOF_LENGTH = 463; export const HONK_VERIFICATION_KEY_LENGTH_IN_FIELDS = 128; export const CLIENT_IVC_VERIFICATION_KEY_LENGTH_IN_FIELDS = 145; export const AVM_VERIFICATION_KEY_LENGTH_IN_FIELDS = 86; -export const AVM_PROOF_LENGTH_IN_FIELDS = 3823; +export const AVM_PROOF_LENGTH_IN_FIELDS = 3818; export const AVM_PUBLIC_COLUMN_MAX_SIZE = 1024; export const AVM_PUBLIC_INPUTS_FLATTENED_SIZE = 2722; export const MEM_TAG_FF = 0; @@ -294,7 +294,7 @@ export const AVM_SHA256COMPRESSION_BASE_L2_GAS = 261; export const AVM_KECCAKF1600_BASE_L2_GAS = 300; export const AVM_ECADD_BASE_L2_GAS = 62; export const AVM_MSM_BASE_L2_GAS = 1000; -export const AVM_TORADIXLE_BASE_L2_GAS = 46; +export const AVM_TORADIXBE_BASE_L2_GAS = 46; export const AVM_CALLDATACOPY_DYN_L2_GAS = 6; export const AVM_EMITUNENCRYPTEDLOG_DYN_L2_GAS = 146; export const AVM_CALL_DYN_L2_GAS = 4; @@ -302,7 +302,7 @@ export const AVM_STATICCALL_DYN_L2_GAS = 4; export const AVM_RETURN_DYN_L2_GAS = 6; export const AVM_REVERT_DYN_L2_GAS = 6; export const AVM_MSM_DYN_L2_GAS = 100; -export const AVM_TORADIXLE_DYN_L2_GAS = 20; +export const AVM_TORADIXBE_DYN_L2_GAS = 20; export const AVM_SSTORE_BASE_DA_GAS = 512; export const AVM_EMITNOTEHASH_BASE_DA_GAS = 512; export const AVM_EMITNULLIFIER_BASE_DA_GAS = 512; diff --git a/yarn-project/simulator/src/avm/avm_gas.ts b/yarn-project/simulator/src/avm/avm_gas.ts index e2e2c321386..88f1b27d706 100644 --- a/yarn-project/simulator/src/avm/avm_gas.ts +++ b/yarn-project/simulator/src/avm/avm_gas.ts @@ -122,7 +122,7 @@ const BASE_GAS_COSTS: Record = { [Opcode.KECCAKF1600]: makeCost(c.AVM_KECCAKF1600_BASE_L2_GAS, 0), [Opcode.ECADD]: makeCost(c.AVM_ECADD_BASE_L2_GAS, 0), [Opcode.MSM]: makeCost(c.AVM_MSM_BASE_L2_GAS, 0), - [Opcode.TORADIXLE]: makeCost(c.AVM_TORADIXLE_BASE_L2_GAS, 0), + [Opcode.TORADIXBE]: makeCost(c.AVM_TORADIXBE_BASE_L2_GAS, 0), }; const DYNAMIC_GAS_COSTS = new Map([ @@ -134,7 +134,7 @@ const DYNAMIC_GAS_COSTS = new Map([ [Opcode.REVERT_8, makeCost(c.AVM_REVERT_DYN_L2_GAS, 0)], [Opcode.REVERT_16, makeCost(c.AVM_REVERT_DYN_L2_GAS, 0)], [Opcode.MSM, makeCost(c.AVM_MSM_DYN_L2_GAS, 0)], - [Opcode.TORADIXLE, makeCost(c.AVM_TORADIXLE_DYN_L2_GAS, 0)], + [Opcode.TORADIXBE, makeCost(c.AVM_TORADIXBE_DYN_L2_GAS, 0)], ]); /** Returns the fixed base gas cost for a given opcode. */ diff --git a/yarn-project/simulator/src/avm/opcodes/conversion.test.ts b/yarn-project/simulator/src/avm/opcodes/conversion.test.ts index b211848780d..8db134f6d09 100644 --- a/yarn-project/simulator/src/avm/opcodes/conversion.test.ts +++ b/yarn-project/simulator/src/avm/opcodes/conversion.test.ts @@ -2,7 +2,7 @@ import { type AvmContext } from '../avm_context.js'; import { Field, type Uint1, type Uint8, Uint32 } from '../avm_memory_types.js'; import { initContext } from '../fixtures/index.js'; import { Addressing, AddressingMode } from './addressing_mode.js'; -import { ToRadixLE } from './conversion.js'; +import { ToRadixBE } from './conversion.js'; describe('Conversion Opcodes', () => { let context: AvmContext; @@ -11,10 +11,10 @@ describe('Conversion Opcodes', () => { context = initContext(); }); - describe('To Radix LE', () => { + describe('To Radix BE', () => { it('Should (de)serialize correctly', () => { const buf = Buffer.from([ - ToRadixLE.opcode, // opcode + ToRadixBE.opcode, // opcode 1, // indirect ...Buffer.from('1234', 'hex'), // inputStateOffset ...Buffer.from('2345', 'hex'), // outputStateOffset @@ -22,7 +22,7 @@ describe('Conversion Opcodes', () => { ...Buffer.from('0100', 'hex'), // numLimbs ...Buffer.from('01', 'hex'), // outputBits ]); - const inst = new ToRadixLE( + const inst = new ToRadixBE( /*indirect=*/ 1, /*srcOffset=*/ 0x1234, /*dstOffset=*/ 0x2345, @@ -31,7 +31,7 @@ describe('Conversion Opcodes', () => { /*outputBits=*/ 1, ); - expect(ToRadixLE.deserialize(buf)).toEqual(inst); + expect(ToRadixBE.deserialize(buf)).toEqual(inst); expect(inst.serialize()).toEqual(buf); }); @@ -47,13 +47,15 @@ describe('Conversion Opcodes', () => { context.machineState.memory.set(srcOffset, arg); context.machineState.memory.set(radixOffset, radix); - await new ToRadixLE(indirect, srcOffset, dstOffset, radixOffset, numLimbs, outputBits).execute(context); + await new ToRadixBE(indirect, srcOffset, dstOffset, radixOffset, numLimbs, outputBits).execute(context); const resultBuffer: Buffer = Buffer.concat( context.machineState.memory.getSliceAs(dstOffset, numLimbs).map(byte => byte.toBuffer()), ); - // The expected result is the first 10 bits of the input, reversed - const expectedResults = '1011101010100'.split('').reverse().slice(0, numLimbs).map(Number); + // The expected result is the first 10 bits of the input + // Reverse before slice because still only care about the first `numLimb` bytes. + // Then reverse back since we want big endian (as the original string is). + const expectedResults = '1011101010100'.split('').reverse().slice(0, numLimbs).reverse().map(Number); for (let i = 0; i < numLimbs; i++) { expect(resultBuffer.readUInt8(i)).toEqual(expectedResults[i]); } @@ -71,13 +73,15 @@ describe('Conversion Opcodes', () => { context.machineState.memory.set(srcOffset, arg); context.machineState.memory.set(radixOffset, radix); - await new ToRadixLE(indirect, srcOffset, dstOffset, radixOffset, numLimbs, outputBits).execute(context); + await new ToRadixBE(indirect, srcOffset, dstOffset, radixOffset, numLimbs, outputBits).execute(context); const resultBuffer: Buffer = Buffer.concat( context.machineState.memory.getSliceAs(dstOffset, numLimbs).map(byte => byte.toBuffer()), ); - // The expected result is the first 10 bits of the input, reversed - const expectedResults = '1011101010100'.split('').reverse().slice(0, numLimbs).map(Number); + // The expected result is the first 10 bits of the input + // Reverse before slice because still only care about the first `numLimb` bytes. + // Then reverse back since we want big endian (as the original string is). + const expectedResults = '1011101010100'.split('').reverse().slice(0, numLimbs).reverse().map(Number); for (let i = 0; i < numLimbs; i++) { expect(resultBuffer.readUInt8(i)).toEqual(expectedResults[i]); } @@ -106,20 +110,20 @@ describe('Conversion Opcodes', () => { const numLimbs = 32; // 256-bit decomposition const outputBits = 0; // false, output as bytes - await new ToRadixLE(indirect, srcOffset, dstOffset, radixOffset, numLimbs, outputBits).execute(context); + await new ToRadixBE(indirect, srcOffset, dstOffset, radixOffset, numLimbs, outputBits).execute(context); const resultBuffer: Buffer = Buffer.concat( context.machineState.memory.getSliceAs(dstOffsetReal, numLimbs).map(byte => byte.toBuffer()), ); - // The expected result is the input (padded to 256 bits),and reversed + // The expected result is the input (padded to 256 bits) const expectedResults = '1234567890abcdef' .padStart(64, '0') .split('') - .reverse() .map(a => parseInt(a, 16)); // Checking the value in each byte of the buffer is correct for (let i = 0; i < numLimbs; i++) { - expect(resultBuffer.readUInt8(i)).toEqual(expectedResults[2 * i] + expectedResults[2 * i + 1] * 16); + // Compute the expected byte's numerical value from its two hex digits + expect(resultBuffer.readUInt8(i)).toEqual(expectedResults[2 * i] * 16 + expectedResults[2 * i + 1]); } }); }); diff --git a/yarn-project/simulator/src/avm/opcodes/conversion.ts b/yarn-project/simulator/src/avm/opcodes/conversion.ts index a9713f96566..38156debcc0 100644 --- a/yarn-project/simulator/src/avm/opcodes/conversion.ts +++ b/yarn-project/simulator/src/avm/opcodes/conversion.ts @@ -5,9 +5,9 @@ import { Opcode, OperandType } from '../serialization/instruction_serialization. import { Addressing } from './addressing_mode.js'; import { Instruction } from './instruction.js'; -export class ToRadixLE extends Instruction { +export class ToRadixBE extends Instruction { static type: string = 'TORADIXLE'; - static readonly opcode: Opcode = Opcode.TORADIXLE; + static readonly opcode: Opcode = Opcode.TORADIXBE; // Informs (de)serialization. See Instruction.deserialize. static readonly wireFormat: OperandType[] = [ @@ -44,15 +44,18 @@ export class ToRadixLE extends Instruction { let value: bigint = memory.get(srcOffset).toBigInt(); const radix: bigint = memory.get(radixOffset).toBigInt(); + if (this.numLimbs < 1) { + throw new InstructionExecutionError(`ToRadixBE instruction's numLimbs should be > 0 (was ${this.numLimbs})`); + } if (radix > 256) { - throw new InstructionExecutionError(`ToRadixLE instruction's radix should be <= 256 (was ${radix})`); + throw new InstructionExecutionError(`ToRadixBE instruction's radix should be <= 256 (was ${radix})`); } const radixBN: bigint = BigInt(radix); - const limbArray = []; + const limbArray = new Array(this.numLimbs); - for (let i = 0; i < this.numLimbs; i++) { + for (let i = this.numLimbs - 1; i >= 0; i--) { const limb = value % radixBN; - limbArray.push(limb); + limbArray[i] = limb; value /= radixBN; } diff --git a/yarn-project/simulator/src/avm/serialization/bytecode_serialization.ts b/yarn-project/simulator/src/avm/serialization/bytecode_serialization.ts index b60c1f0fec8..8eabfedac2b 100644 --- a/yarn-project/simulator/src/avm/serialization/bytecode_serialization.ts +++ b/yarn-project/simulator/src/avm/serialization/bytecode_serialization.ts @@ -41,7 +41,7 @@ import { Shr, StaticCall, Sub, - ToRadixLE, + ToRadixBE, Xor, } from '../opcodes/index.js'; import { MultiScalarMul } from '../opcodes/multi_scalar_mul.js'; @@ -141,7 +141,7 @@ const INSTRUCTION_SET = () => [Sha256Compression.opcode, Instruction.deserialize.bind(Sha256Compression)], [MultiScalarMul.opcode, Instruction.deserialize.bind(MultiScalarMul)], // Conversions - [ToRadixLE.opcode, Instruction.deserialize.bind(ToRadixLE)], + [ToRadixBE.opcode, Instruction.deserialize.bind(ToRadixBE)], // Future Gadgets -- pending changes in noir // SHA256COMPRESSION, [KeccakF1600.opcode, Instruction.deserialize.bind(KeccakF1600)], diff --git a/yarn-project/simulator/src/avm/serialization/instruction_serialization.ts b/yarn-project/simulator/src/avm/serialization/instruction_serialization.ts index c679b8939a0..10edd3794a1 100644 --- a/yarn-project/simulator/src/avm/serialization/instruction_serialization.ts +++ b/yarn-project/simulator/src/avm/serialization/instruction_serialization.ts @@ -81,7 +81,7 @@ export enum Opcode { ECADD, MSM, // Conversion - TORADIXLE, + TORADIXBE, } // Possible types for an instruction's operand in its wire format. (Keep in sync with CPP code.