From b9af9ed514a86f63d43dd4d170f9c24fe64918ee Mon Sep 17 00:00:00 2001 From: jeanmon Date: Thu, 27 Jun 2024 08:43:49 +0000 Subject: [PATCH] Use prefix op_ for every instruction in avm_trace.hpp --- .../vm/avm_trace/avm_execution.cpp | 26 ++-- .../barretenberg/vm/avm_trace/avm_trace.cpp | 14 +- .../barretenberg/vm/avm_trace/avm_trace.hpp | 20 +-- .../vm/tests/avm_arithmetic.test.cpp | 128 +++++++++--------- .../vm/tests/avm_bitwise.test.cpp | 14 +- .../barretenberg/vm/tests/avm_cast.test.cpp | 30 ++-- .../vm/tests/avm_comparison.test.cpp | 16 +-- .../vm/tests/avm_control_flow.test.cpp | 26 ++-- .../barretenberg/vm/tests/avm_gas.test.cpp | 2 +- .../vm/tests/avm_indirect_mem.test.cpp | 6 +- .../vm/tests/avm_inter_table.test.cpp | 6 +- .../vm/tests/avm_mem_opcodes.test.cpp | 28 ++-- .../barretenberg/vm/tests/avm_memory.test.cpp | 14 +- 13 files changed, 165 insertions(+), 165 deletions(-) diff --git a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_execution.cpp b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_execution.cpp index 58d70459076b..f055af7abe12 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_execution.cpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_execution.cpp @@ -433,11 +433,11 @@ std::vector Execution::gen_trace(std::vector const& instructio break; // Execution Environment - Calldata case OpCode::CALLDATACOPY: - trace_builder.calldata_copy(std::get(inst.operands.at(0)), - std::get(inst.operands.at(1)), - std::get(inst.operands.at(2)), - std::get(inst.operands.at(3)), - calldata); + trace_builder.op_calldata_copy(std::get(inst.operands.at(0)), + std::get(inst.operands.at(1)), + std::get(inst.operands.at(2)), + std::get(inst.operands.at(3)), + calldata); break; // Machine State - Gas case OpCode::L2GASLEFT: @@ -543,18 +543,18 @@ std::vector Execution::gen_trace(std::vector const& instructio break; // Machine State - Internal Control Flow case OpCode::JUMP: - trace_builder.jump(std::get(inst.operands.at(0))); + trace_builder.op_jump(std::get(inst.operands.at(0))); break; case OpCode::JUMPI: - trace_builder.jumpi(std::get(inst.operands.at(0)), - std::get(inst.operands.at(1)), - std::get(inst.operands.at(2))); + trace_builder.op_jumpi(std::get(inst.operands.at(0)), + std::get(inst.operands.at(1)), + std::get(inst.operands.at(2))); break; case OpCode::INTERNALCALL: - trace_builder.internal_call(std::get(inst.operands.at(0))); + trace_builder.op_internal_call(std::get(inst.operands.at(0))); break; case OpCode::INTERNALRETURN: - trace_builder.internal_return(); + trace_builder.op_internal_return(); break; // Machine State - Memory case OpCode::SET: { @@ -599,7 +599,7 @@ std::vector Execution::gen_trace(std::vector const& instructio break; // Control Flow - Contract Calls case OpCode::RETURN: { - auto ret = trace_builder.return_op(std::get(inst.operands.at(0)), + auto ret = trace_builder.op_return(std::get(inst.operands.at(0)), std::get(inst.operands.at(1)), std::get(inst.operands.at(2))); returndata.insert(returndata.end(), ret.begin(), ret.end()); @@ -609,7 +609,7 @@ std::vector Execution::gen_trace(std::vector const& instructio case OpCode::DEBUGLOG: // We want a noop, but we need to execute something that both advances the PC, // and adds a valid row to the trace. - trace_builder.jump(pc + 1); + trace_builder.op_jump(pc + 1); break; case OpCode::CALL: trace_builder.op_call(std::get(inst.operands.at(0)), diff --git a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_trace.cpp b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_trace.cpp index ac2f3977c72d..b1f7109c6d54 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_trace.cpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_trace.cpp @@ -1888,7 +1888,7 @@ void AvmTraceBuilder::op_div( * @param dst_offset The starting index of memory where calldata will be copied to. * @param call_data_mem The vector containing calldata. */ -void AvmTraceBuilder::calldata_copy( +void AvmTraceBuilder::op_calldata_copy( uint8_t indirect, uint32_t cd_offset, uint32_t copy_size, uint32_t dst_offset, std::vector const& call_data_mem) { // We parallelize storing memory operations in chunk of 3, i.e., 1 per intermediate register. @@ -1998,7 +1998,7 @@ void AvmTraceBuilder::calldata_copy( // Credit to SEAN for coming up with this revert opcode std::vector AvmTraceBuilder::op_revert(uint8_t indirect, uint32_t ret_offset, uint32_t ret_size) { - return return_op(indirect, ret_offset, ret_size); + return op_return(indirect, ret_offset, ret_size); } /** @@ -2016,7 +2016,7 @@ std::vector AvmTraceBuilder::op_revert(uint8_t indirect, uint32_t ret_offset * @param ret_size The number of elements to be returned. * @return The returned memory region as a std::vector. */ -std::vector AvmTraceBuilder::return_op(uint8_t indirect, uint32_t ret_offset, uint32_t ret_size) +std::vector AvmTraceBuilder::op_return(uint8_t indirect, uint32_t ret_offset, uint32_t ret_size) { if (ret_size == 0) { halt(); @@ -2212,7 +2212,7 @@ void AvmTraceBuilder::op_dagasleft(uint8_t indirect, uint32_t dst_offset) * * @param jmp_dest - The destination to jump to */ -void AvmTraceBuilder::jump(uint32_t jmp_dest) +void AvmTraceBuilder::op_jump(uint32_t jmp_dest) { auto clk = static_cast(main_trace.size()) + 1; @@ -2242,7 +2242,7 @@ void AvmTraceBuilder::jump(uint32_t jmp_dest) * @param jmp_dest The destination to jump to * @param cond_offset Offset of the condition */ -void AvmTraceBuilder::jumpi(uint8_t indirect, uint32_t jmp_dest, uint32_t cond_offset) +void AvmTraceBuilder::op_jumpi(uint8_t indirect, uint32_t jmp_dest, uint32_t cond_offset) { auto clk = static_cast(main_trace.size()) + 1; @@ -2304,7 +2304,7 @@ void AvmTraceBuilder::jumpi(uint8_t indirect, uint32_t jmp_dest, uint32_t cond_o * * @param jmp_dest - The destination to jump to */ -void AvmTraceBuilder::internal_call(uint32_t jmp_dest) +void AvmTraceBuilder::op_internal_call(uint32_t jmp_dest) { auto clk = static_cast(main_trace.size()) + 1; @@ -2350,7 +2350,7 @@ void AvmTraceBuilder::internal_call(uint32_t jmp_dest) * TODO(https://github.com/AztecProtocol/aztec-packages/issues/3740): This function MUST come after a call * instruction. */ -void AvmTraceBuilder::internal_return() +void AvmTraceBuilder::op_internal_return() { auto clk = static_cast(main_trace.size()) + 1; diff --git a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_trace.hpp b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_trace.hpp index e40708292a82..951dd1eb6d8e 100644 --- a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_trace.hpp +++ b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_trace.hpp @@ -140,17 +140,17 @@ class AvmTraceBuilder { void op_dagasleft(uint8_t indirect, uint32_t dst_offset); // Jump to a given program counter. - void jump(uint32_t jmp_dest); + void op_jump(uint32_t jmp_dest); // Jump conditionally to a given program counter. - void jumpi(uint8_t indirect, uint32_t jmp_dest, uint32_t cond_offset); + void op_jumpi(uint8_t indirect, uint32_t jmp_dest, uint32_t cond_offset); // Jump to a given program counter; storing the return location on a call stack. // TODO(md): this program counter MUST be an operand to the OPCODE. - void internal_call(uint32_t jmp_dest); + void op_internal_call(uint32_t jmp_dest); // Return from a jump. - void internal_return(); + void op_internal_return(); // Halt -> stop program execution. void halt(); @@ -158,18 +158,18 @@ class AvmTraceBuilder { // CALLDATACOPY opcode with direct/indirect memory access, i.e., // direct: M[dst_offset:dst_offset+copy_size] = calldata[cd_offset:cd_offset+copy_size] // indirect: M[M[dst_offset]:M[dst_offset]+copy_size] = calldata[cd_offset:cd_offset+copy_size] - void calldata_copy(uint8_t indirect, - uint32_t cd_offset, - uint32_t copy_size, - uint32_t dst_offset, - std::vector const& call_data_mem); + void op_calldata_copy(uint8_t indirect, + uint32_t cd_offset, + uint32_t copy_size, + uint32_t dst_offset, + std::vector const& call_data_mem); // REVERT Opcode (that just call return under the hood for now) std::vector op_revert(uint8_t indirect, uint32_t ret_offset, uint32_t ret_size); // RETURN opcode with direct and indirect memory access, i.e., // direct: return(M[ret_offset:ret_offset+ret_size]) // indirect: return(M[M[ret_offset]:M[ret_offset]+ret_size]) - std::vector return_op(uint8_t indirect, uint32_t ret_offset, uint32_t ret_size); + std::vector op_return(uint8_t indirect, uint32_t ret_offset, uint32_t ret_size); // Calls void op_call(uint8_t indirect, diff --git a/barretenberg/cpp/src/barretenberg/vm/tests/avm_arithmetic.test.cpp b/barretenberg/cpp/src/barretenberg/vm/tests/avm_arithmetic.test.cpp index fa7c78ab02f4..314c723aca6c 100644 --- a/barretenberg/cpp/src/barretenberg/vm/tests/avm_arithmetic.test.cpp +++ b/barretenberg/cpp/src/barretenberg/vm/tests/avm_arithmetic.test.cpp @@ -226,7 +226,7 @@ class AvmArithmeticTests : public ::testing::Test { trace_builder.op_set(0, a, addr_a, tag); trace_builder.op_set(0, b, addr_b, tag); trace_builder.op_eq(0, addr_a, addr_b, addr_c, tag); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); return trace_builder.finalize(); } @@ -368,11 +368,11 @@ std::vector> positive_op_div_test_values = { { // Test on basic addition over finite field type. TEST_F(AvmArithmeticTestsFF, addition) { - trace_builder.calldata_copy(0, 0, 3, 0, std::vector{ 37, 4, 11 }); + trace_builder.op_calldata_copy(0, 0, 3, 0, std::vector{ 37, 4, 11 }); // Memory layout: [37,4,11,0,0,0,....] trace_builder.op_add(0, 0, 1, 4, AvmMemoryTag::FF); // [37,4,11,0,41,0,....] - trace_builder.return_op(0, 0, 5); + trace_builder.op_return(0, 0, 5); auto trace = trace_builder.finalize(); auto alu_row = common_validate_add(trace, FF(37), FF(4), FF(41), FF(0), FF(1), FF(4), AvmMemoryTag::FF); @@ -387,11 +387,11 @@ TEST_F(AvmArithmeticTestsFF, addition) // Test on basic subtraction over finite field type. TEST_F(AvmArithmeticTestsFF, subtraction) { - trace_builder.calldata_copy(0, 0, 3, 0, std::vector{ 8, 4, 17 }); + trace_builder.op_calldata_copy(0, 0, 3, 0, std::vector{ 8, 4, 17 }); // Memory layout: [8,4,17,0,0,0,....] trace_builder.op_sub(0, 2, 0, 1, AvmMemoryTag::FF); // [8,9,17,0,0,0....] - trace_builder.return_op(0, 0, 3); + trace_builder.op_return(0, 0, 3); auto trace = trace_builder.finalize(); auto alu_row = common_validate_sub(trace, FF(17), FF(8), FF(9), FF(2), FF(0), FF(1), AvmMemoryTag::FF); @@ -406,11 +406,11 @@ TEST_F(AvmArithmeticTestsFF, subtraction) // Test on basic multiplication over finite field type. TEST_F(AvmArithmeticTestsFF, multiplication) { - trace_builder.calldata_copy(0, 0, 3, 0, std::vector{ 5, 0, 20 }); + trace_builder.op_calldata_copy(0, 0, 3, 0, std::vector{ 5, 0, 20 }); // Memory layout: [5,0,20,0,0,0,....] trace_builder.op_mul(0, 2, 0, 1, AvmMemoryTag::FF); // [5,100,20,0,0,0....] - trace_builder.return_op(0, 0, 3); + trace_builder.op_return(0, 0, 3); auto trace = trace_builder.finalize(); auto alu_row_index = common_validate_mul(trace, FF(20), FF(5), FF(100), FF(2), FF(0), FF(1), AvmMemoryTag::FF); @@ -426,11 +426,11 @@ TEST_F(AvmArithmeticTestsFF, multiplication) // Test on multiplication by zero over finite field type. TEST_F(AvmArithmeticTestsFF, multiplicationByZero) { - trace_builder.calldata_copy(0, 0, 1, 0, std::vector{ 127 }); + trace_builder.op_calldata_copy(0, 0, 1, 0, std::vector{ 127 }); // Memory layout: [127,0,0,0,0,0,....] trace_builder.op_mul(0, 0, 1, 2, AvmMemoryTag::FF); // [127,0,0,0,0,0....] - trace_builder.return_op(0, 0, 3); + trace_builder.op_return(0, 0, 3); auto trace = trace_builder.finalize(); auto alu_row_index = common_validate_mul(trace, FF(127), FF(0), FF(0), FF(0), FF(1), FF(2), AvmMemoryTag::FF); @@ -446,11 +446,11 @@ TEST_F(AvmArithmeticTestsFF, multiplicationByZero) // Test on basic division over finite field type. TEST_F(AvmArithmeticTestsFF, fDivision) { - trace_builder.calldata_copy(0, 0, 2, 0, std::vector{ 15, 315 }); + trace_builder.op_calldata_copy(0, 0, 2, 0, std::vector{ 15, 315 }); // Memory layout: [15,315,0,0,0,0,....] trace_builder.op_fdiv(0, 1, 0, 2); // [15,315,21,0,0,0....] - trace_builder.return_op(0, 0, 3); + trace_builder.op_return(0, 0, 3); auto trace = trace_builder.finalize(); // Find the first row enabling the fdiv selector @@ -469,11 +469,11 @@ TEST_F(AvmArithmeticTestsFF, fDivision) // Test on division with zero numerator over finite field type. TEST_F(AvmArithmeticTestsFF, fDivisionNumeratorZero) { - trace_builder.calldata_copy(0, 0, 1, 0, std::vector{ 15 }); + trace_builder.op_calldata_copy(0, 0, 1, 0, std::vector{ 15 }); // Memory layout: [15,0,0,0,0,0,....] trace_builder.op_fdiv(0, 1, 0, 0); // [0,0,0,0,0,0....] - trace_builder.return_op(0, 0, 3); + trace_builder.op_return(0, 0, 3); auto trace = trace_builder.finalize(); // Find the first row enabling the fdiv selector @@ -493,7 +493,7 @@ TEST_F(AvmArithmeticTestsFF, fDivisionNumeratorZero) // We check that the operator error flag is raised. TEST_F(AvmArithmeticTestsFF, fDivisionByZeroError) { - trace_builder.calldata_copy(0, 0, 1, 0, std::vector{ 15 }); + trace_builder.op_calldata_copy(0, 0, 1, 0, std::vector{ 15 }); // Memory layout: [15,0,0,0,0,0,....] trace_builder.op_fdiv(0, 0, 1, 2); // [15,0,0,0,0,0....] @@ -543,7 +543,7 @@ TEST_F(AvmArithmeticTestsFF, fDivisionZeroByZeroError) // No check on the evaluation is performed here. TEST_F(AvmArithmeticTestsFF, mixedOperationsWithError) { - trace_builder.calldata_copy(0, 0, 3, 2, std::vector{ 45, 23, 12 }); + trace_builder.op_calldata_copy(0, 0, 3, 2, std::vector{ 45, 23, 12 }); // Memory layout: [0,0,45,23,12,0,0,0,....] trace_builder.op_add(0, 2, 3, 4, AvmMemoryTag::FF); // [0,0,45,23,68,0,0,0,....] @@ -566,9 +566,9 @@ TEST_F(AvmArithmeticTestsFF, equality) { // Pick a field-sized number FF elem = FF::modulus - FF(1); - trace_builder.calldata_copy(0, 0, 3, 0, std::vector{ elem, elem, 1 }); + trace_builder.op_calldata_copy(0, 0, 3, 0, std::vector{ elem, elem, 1 }); trace_builder.op_eq(0, 0, 1, 2, AvmMemoryTag::FF); // Memory Layout [q - 1, q -1, 1,0..] - trace_builder.return_op(0, 0, 3); + trace_builder.op_return(0, 0, 3); auto trace = trace_builder.finalize(); auto alu_row_index = common_validate_eq(trace, elem, elem, FF(1), FF(0), FF(1), FF(2), AvmMemoryTag::FF); @@ -583,9 +583,9 @@ TEST_F(AvmArithmeticTestsFF, equality) TEST_F(AvmArithmeticTestsFF, nonEquality) { FF elem = FF::modulus - FF(1); - trace_builder.calldata_copy(0, 0, 3, 0, std::vector{ elem, elem + FF(1), 0 }); + trace_builder.op_calldata_copy(0, 0, 3, 0, std::vector{ elem, elem + FF(1), 0 }); trace_builder.op_eq(0, 0, 1, 2, AvmMemoryTag::FF); // Memory Layout [q - 1, q, 1,0..] - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); auto alu_row_index = common_validate_eq(trace, elem, FF(0), FF(0), FF(0), FF(1), FF(2), AvmMemoryTag::FF); @@ -603,7 +603,7 @@ TEST_P(AvmArithmeticTestsDiv, division) trace_builder.op_set(0, uint128_t(a), 0, mem_tag); trace_builder.op_set(0, uint128_t(b), 1, mem_tag); trace_builder.op_div(0, 0, 1, 2, mem_tag); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); common_validate_div(trace, a, b, output, 0, 1, 2, mem_tag); @@ -652,7 +652,7 @@ TEST_F(AvmArithmeticTestsU8, addition) // Memory layout: [62,29,0,0,0,....] trace_builder.op_add(0, 0, 1, 2, AvmMemoryTag::U8); // [62,29,91,0,0,....] - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); auto alu_row = common_validate_add(trace, FF(62), FF(29), FF(91), FF(0), FF(1), FF(2), AvmMemoryTag::U8); @@ -673,7 +673,7 @@ TEST_F(AvmArithmeticTestsU8, additionCarry) // Memory layout: [159,100,0,0,0,....] trace_builder.op_add(0, 0, 1, 2, AvmMemoryTag::U8); // [159,100,3,0,0,....] - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); auto alu_row = common_validate_add(trace, FF(159), FF(100), FF(3), FF(0), FF(1), FF(2), AvmMemoryTag::U8); @@ -695,7 +695,7 @@ TEST_F(AvmArithmeticTestsU8, subtraction) // Memory layout: [162,29,0,0,0,....] trace_builder.op_sub(0, 0, 1, 2, AvmMemoryTag::U8); // [162,29,133,0,0,....] - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); auto alu_row = common_validate_sub(trace, FF(162), FF(29), FF(133), FF(0), FF(1), FF(2), AvmMemoryTag::U8); @@ -717,7 +717,7 @@ TEST_F(AvmArithmeticTestsU8, subtractionCarry) // Memory layout: [5,29,0,0,0,....] trace_builder.op_sub(0, 0, 1, 2, AvmMemoryTag::U8); // [5,29,232,0,0,....] - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); auto alu_row = common_validate_sub(trace, FF(5), FF(29), FF(232), FF(0), FF(1), FF(2), AvmMemoryTag::U8); @@ -745,7 +745,7 @@ TEST_F(AvmArithmeticTestsU8, multiplication) trace_builder.op_set(0, 15, 1, AvmMemoryTag::U8); trace_builder.op_mul(0, 0, 1, 2, AvmMemoryTag::U8); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); auto alu_row_index = common_validate_mul(trace, FF(13), FF(15), FF(195), FF(0), FF(1), FF(2), AvmMemoryTag::U8); @@ -768,7 +768,7 @@ TEST_F(AvmArithmeticTestsU8, multiplicationOverflow) trace_builder.op_set(0, 170, 1, AvmMemoryTag::U8); trace_builder.op_mul(0, 0, 1, 2, AvmMemoryTag::U8); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); auto alu_row_index = common_validate_mul(trace, FF(200), FF(170), FF(208), FF(0), FF(1), FF(2), AvmMemoryTag::U8); @@ -822,7 +822,7 @@ TEST_F(AvmArithmeticTestsU16, addition) trace_builder.op_set(0, 33005, 546, AvmMemoryTag::U16); trace_builder.op_add(0, 546, 119, 5, AvmMemoryTag::U16); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); auto alu_row = @@ -844,7 +844,7 @@ TEST_F(AvmArithmeticTestsU16, additionCarry) trace_builder.op_set(0, 1000, 1, AvmMemoryTag::U16); trace_builder.op_add(0, 1, 0, 0, AvmMemoryTag::U16); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); auto alu_row = @@ -866,7 +866,7 @@ TEST_F(AvmArithmeticTestsU16, subtraction) trace_builder.op_set(0, 33005, 546, AvmMemoryTag::U16); trace_builder.op_sub(0, 546, 119, 5, AvmMemoryTag::U16); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); auto alu_row = @@ -890,7 +890,7 @@ TEST_F(AvmArithmeticTestsU16, subtractionCarry) trace_builder.op_set(0, 1000, 1, AvmMemoryTag::U16); trace_builder.op_sub(0, 1, 0, 0, AvmMemoryTag::U16); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); auto alu_row = @@ -919,7 +919,7 @@ TEST_F(AvmArithmeticTestsU16, multiplication) trace_builder.op_set(0, 245, 1, AvmMemoryTag::U16); trace_builder.op_mul(0, 0, 1, 2, AvmMemoryTag::U16); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); auto alu_row_index = @@ -944,7 +944,7 @@ TEST_F(AvmArithmeticTestsU16, multiplicationOverflow) trace_builder.op_set(0, 1024, 1, AvmMemoryTag::U16); trace_builder.op_mul(0, 0, 1, 2, AvmMemoryTag::U16); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); auto alu_row_index = common_validate_mul(trace, FF(512), FF(1024), FF(0), FF(0), FF(1), FF(2), AvmMemoryTag::U16); @@ -1000,7 +1000,7 @@ TEST_F(AvmArithmeticTestsU32, addition) trace_builder.op_set(0, 1234567891, 9, AvmMemoryTag::U32); trace_builder.op_add(0, 8, 9, 0, AvmMemoryTag::U32); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); auto alu_row = common_validate_add( @@ -1023,7 +1023,7 @@ TEST_F(AvmArithmeticTestsU32, additionCarry) trace_builder.op_set(0, 2293, 9, AvmMemoryTag::U32); trace_builder.op_add(0, 8, 9, 0, AvmMemoryTag::U32); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); auto alu_row = @@ -1045,7 +1045,7 @@ TEST_F(AvmArithmeticTestsU32, subtraction) trace_builder.op_set(0, 1234567891, 9, AvmMemoryTag::U32); trace_builder.op_sub(0, 8, 9, 0, AvmMemoryTag::U32); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); auto alu_row = common_validate_sub( @@ -1072,7 +1072,7 @@ TEST_F(AvmArithmeticTestsU32, subtractionCarry) trace_builder.op_set(0, 3210987654, 9, AvmMemoryTag::U32); trace_builder.op_sub(0, 9, 8, 0, AvmMemoryTag::U32); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); auto alu_row = common_validate_sub( @@ -1103,7 +1103,7 @@ TEST_F(AvmArithmeticTestsU32, multiplication) trace_builder.op_set(0, 11111, 1, AvmMemoryTag::U32); trace_builder.op_mul(0, 0, 1, 2, AvmMemoryTag::U32); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); auto alu_row_index = @@ -1132,7 +1132,7 @@ TEST_F(AvmArithmeticTestsU32, multiplicationOverflow) trace_builder.op_set(0, 13 << 22, 1, AvmMemoryTag::U32); trace_builder.op_mul(0, 0, 1, 2, AvmMemoryTag::U32); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); auto alu_row_index = @@ -1197,7 +1197,7 @@ TEST_F(AvmArithmeticTestsU64, addition) trace_builder.op_set(0, b, 9, AvmMemoryTag::U64); trace_builder.op_add(0, 8, 9, 9, AvmMemoryTag::U64); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); auto alu_row = common_validate_add(trace, FF(a), FF(b), FF(c), FF(8), FF(9), FF(9), AvmMemoryTag::U64); @@ -1227,7 +1227,7 @@ TEST_F(AvmArithmeticTestsU64, additionCarry) trace_builder.op_set(0, b, 1, AvmMemoryTag::U64); trace_builder.op_add(0, 0, 1, 0, AvmMemoryTag::U64); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); auto alu_row = common_validate_add(trace, FF(a), FF(b), FF(c), FF(0), FF(1), FF(0), AvmMemoryTag::U64); @@ -1255,7 +1255,7 @@ TEST_F(AvmArithmeticTestsU64, subtraction) trace_builder.op_set(0, b, 9, AvmMemoryTag::U64); trace_builder.op_sub(0, 8, 9, 9, AvmMemoryTag::U64); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); auto alu_row = common_validate_sub(trace, FF(a), FF(b), FF(c), FF(8), FF(9), FF(9), AvmMemoryTag::U64); @@ -1287,7 +1287,7 @@ TEST_F(AvmArithmeticTestsU64, subtractionCarry) trace_builder.op_set(0, b, 1, AvmMemoryTag::U64); trace_builder.op_sub(0, 0, 1, 0, AvmMemoryTag::U64); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); auto alu_row = common_validate_sub(trace, FF(a), FF(b), FF(c), FF(0), FF(1), FF(0), AvmMemoryTag::U64); @@ -1315,7 +1315,7 @@ TEST_F(AvmArithmeticTestsU64, multiplication) trace_builder.op_set(0, 555444333, 1, AvmMemoryTag::U64); trace_builder.op_mul(0, 0, 1, 2, AvmMemoryTag::U64); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); auto alu_row_index = common_validate_mul( @@ -1348,7 +1348,7 @@ TEST_F(AvmArithmeticTestsU64, multiplicationOverflow) trace_builder.op_set(0, b, 1, AvmMemoryTag::U64); trace_builder.op_mul(0, 0, 1, 2, AvmMemoryTag::U64); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); auto alu_row_index = common_validate_mul(trace, FF(a), FF(b), FF(1), FF(0), FF(1), FF(2), AvmMemoryTag::U64); @@ -1414,7 +1414,7 @@ TEST_F(AvmArithmeticTestsU128, addition) trace_builder.op_set(0, b, 9, AvmMemoryTag::U128); trace_builder.op_add(0, 8, 9, 9, AvmMemoryTag::U128); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); auto alu_row = common_validate_add(trace, @@ -1454,7 +1454,7 @@ TEST_F(AvmArithmeticTestsU128, additionCarry) trace_builder.op_set(0, b, 9, AvmMemoryTag::U128); trace_builder.op_add(0, 8, 9, 9, AvmMemoryTag::U128); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); auto alu_row = common_validate_add(trace, @@ -1493,7 +1493,7 @@ TEST_F(AvmArithmeticTestsU128, subtraction) trace_builder.op_set(0, b, 9, AvmMemoryTag::U128); trace_builder.op_sub(0, 8, 9, 9, AvmMemoryTag::U128); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); auto alu_row = common_validate_sub(trace, @@ -1535,7 +1535,7 @@ TEST_F(AvmArithmeticTestsU128, subtractionCarry) trace_builder.op_set(0, b, 9, AvmMemoryTag::U128); trace_builder.op_sub(0, 8, 9, 9, AvmMemoryTag::U128); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); auto alu_row = common_validate_sub(trace, @@ -1573,7 +1573,7 @@ TEST_F(AvmArithmeticTestsU128, multiplication) FF c{ uint256_t{ 0xA7DDA0BAE60CA3A5, 0x70289AEB0, 0, 0 } }; trace_builder.op_mul(0, 0, 1, 2, AvmMemoryTag::U128); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); auto alu_row_index = common_validate_mul( @@ -1612,7 +1612,7 @@ TEST_F(AvmArithmeticTestsU128, multiplicationOverflow) trace_builder.op_set(0, b, 1, AvmMemoryTag::U128); trace_builder.op_mul(0, 0, 1, 2, AvmMemoryTag::U128); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); auto alu_row_index = common_validate_mul(trace, @@ -1758,7 +1758,7 @@ TEST_F(AvmArithmeticNegativeTestsFF, multiplication) // Test on basic incorrect division over finite field type. TEST_F(AvmArithmeticNegativeTestsFF, fDivision) { - trace_builder.calldata_copy(0, 0, 2, 0, std::vector{ 15, 315 }); + trace_builder.op_calldata_copy(0, 0, 2, 0, std::vector{ 15, 315 }); // Memory layout: [15,315,0,0,0,0,....] trace_builder.op_fdiv(0, 1, 0, 2); // [15,315,21,0,0,0....] @@ -1775,7 +1775,7 @@ TEST_F(AvmArithmeticNegativeTestsFF, fDivision) // in the trace. TEST_F(AvmArithmeticNegativeTestsFF, fDivisionNoZeroButError) { - trace_builder.calldata_copy(0, 0, 2, 0, std::vector{ 15, 315 }); + trace_builder.op_calldata_copy(0, 0, 2, 0, std::vector{ 15, 315 }); // Memory layout: [15,315,0,0,0,0,....] trace_builder.op_fdiv(0, 1, 0, 2); // [15,315,21,0,0,0....] @@ -1801,7 +1801,7 @@ TEST_F(AvmArithmeticNegativeTestsFF, fDivisionNoZeroButError) // Test with finite field division by zero occurs and no error is raised (remove error flag) TEST_F(AvmArithmeticNegativeTestsFF, fDivisionByZeroNoError) { - trace_builder.calldata_copy(0, 0, 1, 0, std::vector{ 15 }); + trace_builder.op_calldata_copy(0, 0, 1, 0, std::vector{ 15 }); // Memory layout: [15,0,0,0,0,0,....] trace_builder.op_fdiv(0, 0, 1, 2); // [15,0,0,0,0,0....] @@ -1837,7 +1837,7 @@ TEST_F(AvmArithmeticNegativeTestsFF, fDivisionZeroByZeroNoError) // Test with finite field division using a wrong read instruction tag TEST_F(AvmArithmeticNegativeTestsFF, fDivisionWrongRInTag) { - trace_builder.calldata_copy(0, 0, 1, 0, std::vector{ 18, 6 }); + trace_builder.op_calldata_copy(0, 0, 1, 0, std::vector{ 18, 6 }); // Memory layout: [18,6,0,0,0,0,....] trace_builder.op_fdiv(0, 0, 1, 2); // [18,6,3,0,0,0....] trace_builder.halt(); @@ -1855,7 +1855,7 @@ TEST_F(AvmArithmeticNegativeTestsFF, fDivisionWrongRInTag) // Test with finite field division using a wrong write instruction tag TEST_F(AvmArithmeticNegativeTestsFF, fDivisionWrongWInTag) { - trace_builder.calldata_copy(0, 0, 1, 0, std::vector{ 18, 6 }); + trace_builder.op_calldata_copy(0, 0, 1, 0, std::vector{ 18, 6 }); // Memory layout: [18,6,0,0,0,0,....] trace_builder.op_fdiv(0, 0, 1, 2); // [18,6,3,0,0,0....] trace_builder.halt(); @@ -1874,11 +1874,11 @@ TEST_F(AvmArithmeticNegativeTestsFF, fDivisionWrongWInTag) // the addition, subtraction, multiplication. TEST_F(AvmArithmeticNegativeTestsFF, operationWithErrorFlag1) { - trace_builder.calldata_copy(0, 0, 3, 0, std::vector{ 37, 4, 11 }); + trace_builder.op_calldata_copy(0, 0, 3, 0, std::vector{ 37, 4, 11 }); // Memory layout: [37,4,11,0,0,0,....] trace_builder.op_add(0, 0, 1, 4, AvmMemoryTag::FF); // [37,4,11,0,41,0,....] - trace_builder.return_op(0, 0, 5); + trace_builder.op_return(0, 0, 5); trace_builder.halt(); auto trace = trace_builder.finalize(); @@ -1893,11 +1893,11 @@ TEST_F(AvmArithmeticNegativeTestsFF, operationWithErrorFlag1) TEST_F(AvmArithmeticNegativeTestsFF, operationWithErrorFlag2) { - trace_builder.calldata_copy(0, 0, 3, 0, std::vector{ 8, 4, 17 }); + trace_builder.op_calldata_copy(0, 0, 3, 0, std::vector{ 8, 4, 17 }); // Memory layout: [8,4,17,0,0,0,....] trace_builder.op_sub(0, 2, 0, 1, AvmMemoryTag::FF); // [8,9,17,0,0,0....] - trace_builder.return_op(0, 0, 3); + trace_builder.op_return(0, 0, 3); auto trace = trace_builder.finalize(); // Find the first row enabling the subtraction selector @@ -1911,11 +1911,11 @@ TEST_F(AvmArithmeticNegativeTestsFF, operationWithErrorFlag2) TEST_F(AvmArithmeticNegativeTestsFF, operationWithErrorFlag3) { - trace_builder.calldata_copy(0, 0, 3, 0, std::vector{ 5, 0, 20 }); + trace_builder.op_calldata_copy(0, 0, 3, 0, std::vector{ 5, 0, 20 }); // Memory layout: [5,0,20,0,0,0,....] trace_builder.op_mul(0, 2, 0, 1, AvmMemoryTag::FF); // [5,100,20,0,0,0....] - trace_builder.return_op(0, 0, 3); + trace_builder.op_return(0, 0, 3); auto trace = trace_builder.finalize(); // Find the first row enabling the multiplication selector @@ -1954,9 +1954,9 @@ TEST_F(AvmArithmeticNegativeTestsFF, nonBooleanEq) TEST_F(AvmArithmeticNegativeTestsFF, eqOutputWrongTag) { FF elem = FF::modulus - FF(15); - trace_builder.calldata_copy(0, 0, 2, 0, std::vector{ elem, elem }); + trace_builder.op_calldata_copy(0, 0, 2, 0, std::vector{ elem, elem }); trace_builder.op_eq(0, 0, 1, 2, AvmMemoryTag::FF); // Memory Layout [elem, elem, 1, 0..] - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); // Find the first row enabling the eq selector @@ -2306,7 +2306,7 @@ TEST_F(AvmArithmeticNegativeTestsU128, multiplicationSecondRowNoOp) trace_builder.op_set(0, 4, 1, AvmMemoryTag::U128); trace_builder.op_mul(0, 0, 1, 2, AvmMemoryTag::U128); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); auto alu_row_index = common_validate_mul(trace, FF(3), FF(4), FF(12), FF(0), FF(1), FF(2), AvmMemoryTag::U128); diff --git a/barretenberg/cpp/src/barretenberg/vm/tests/avm_bitwise.test.cpp b/barretenberg/cpp/src/barretenberg/vm/tests/avm_bitwise.test.cpp index 482d397cbcc1..387da11f11b4 100644 --- a/barretenberg/cpp/src/barretenberg/vm/tests/avm_bitwise.test.cpp +++ b/barretenberg/cpp/src/barretenberg/vm/tests/avm_bitwise.test.cpp @@ -469,7 +469,7 @@ TEST_P(AvmBitwiseTestsNot, ParamTest) const auto [a, output] = operands; trace_builder.op_set(0, a, 0, mem_tag); trace_builder.op_not(0, 0, 1, mem_tag); // [1,254,0,0,....] - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); FF ff_a = FF(uint256_t::from_uint128(a)); FF ff_output = FF(uint256_t::from_uint128(output)); @@ -488,7 +488,7 @@ TEST_P(AvmBitwiseTestsAnd, AllAndTest) trace_builder.op_set(0, uint128_t(a), 0, mem_tag); trace_builder.op_set(0, uint128_t(b), 1, mem_tag); trace_builder.op_and(0, 0, 1, 2, mem_tag); - trace_builder.return_op(0, 2, 1); + trace_builder.op_return(0, 2, 1); auto trace = trace_builder.finalize(); common_validate_bit_op(trace, 0, a, b, output, FF(0), FF(1), FF(2), mem_tag); @@ -505,7 +505,7 @@ TEST_P(AvmBitwiseTestsOr, AllOrTest) trace_builder.op_set(0, uint128_t(a), 0, mem_tag); trace_builder.op_set(0, uint128_t(b), 1, mem_tag); trace_builder.op_or(0, 0, 1, 2, mem_tag); - trace_builder.return_op(0, 2, 1); + trace_builder.op_return(0, 2, 1); auto trace = trace_builder.finalize(); common_validate_bit_op(trace, 1, a, b, output, FF(0), FF(1), FF(2), mem_tag); @@ -522,7 +522,7 @@ TEST_P(AvmBitwiseTestsXor, AllXorTest) trace_builder.op_set(0, uint128_t(a), 0, mem_tag); trace_builder.op_set(0, uint128_t(b), 1, mem_tag); trace_builder.op_xor(0, 0, 1, 2, mem_tag); - trace_builder.return_op(0, 2, 1); + trace_builder.op_return(0, 2, 1); auto trace = trace_builder.finalize(); common_validate_bit_op(trace, 2, a, b, output, FF(0), FF(1), FF(2), mem_tag); @@ -540,7 +540,7 @@ TEST_P(AvmBitwiseTestsShr, AllShrTest) trace_builder.op_set(0, uint128_t(a), 0, mem_tag); trace_builder.op_set(0, uint128_t(b), 1, mem_tag); trace_builder.op_shr(0, 0, 1, 2, mem_tag); - trace_builder.return_op(0, 2, 1); + trace_builder.op_return(0, 2, 1); auto trace = trace_builder.finalize(); common_validate_shift_op(trace, a, b, output, FF(0), FF(1), FF(2), mem_tag, true); validate_trace(std::move(trace), public_inputs); @@ -557,7 +557,7 @@ TEST_P(AvmBitwiseTestsShl, AllShlTest) trace_builder.op_set(0, uint128_t(a), 0, mem_tag); trace_builder.op_set(0, uint128_t(b), 1, mem_tag); trace_builder.op_shl(0, 0, 1, 2, mem_tag); - trace_builder.return_op(0, 2, 1); + trace_builder.op_return(0, 2, 1); auto trace = trace_builder.finalize(); common_validate_shift_op(trace, a, b, output, FF(0), FF(1), FF(2), mem_tag, false); @@ -719,7 +719,7 @@ TEST_F(AvmBitwiseNegativeTestsFF, UndefinedOverFF) trace_builder.op_not(0, 0, 1, AvmMemoryTag::U8); // Finally, we will have a write in row 3 of the mem_trace to copy the result // from the op_not operation. - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); // Manually update the memory tags in the relevant trace; auto trace = trace_builder.finalize(); // TODO(ilyas): When the SET opcodes applies relational constraints, this will fail diff --git a/barretenberg/cpp/src/barretenberg/vm/tests/avm_cast.test.cpp b/barretenberg/cpp/src/barretenberg/vm/tests/avm_cast.test.cpp index 446215b1ec00..80629cd9e576 100644 --- a/barretenberg/cpp/src/barretenberg/vm/tests/avm_cast.test.cpp +++ b/barretenberg/cpp/src/barretenberg/vm/tests/avm_cast.test.cpp @@ -34,7 +34,7 @@ class AvmCastTests : public ::testing::Test { { trace_builder.op_set(0, a, src_address, src_tag); trace_builder.op_cast(0, src_address, dst_address, dst_tag); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); trace = trace_builder.finalize(); gen_indices(); } @@ -171,9 +171,9 @@ TEST_F(AvmCastTests, noTruncationFFToU32) TEST_F(AvmCastTests, truncationFFToU16ModMinus1) { - trace_builder.calldata_copy(0, 0, 1, 0, { FF(FF::modulus - 1) }); + trace_builder.op_calldata_copy(0, 0, 1, 0, { FF(FF::modulus - 1) }); trace_builder.op_cast(0, 0, 1, AvmMemoryTag::U16); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); trace = trace_builder.finalize(); gen_indices(); @@ -182,9 +182,9 @@ TEST_F(AvmCastTests, truncationFFToU16ModMinus1) TEST_F(AvmCastTests, truncationFFToU16ModMinus2) { - trace_builder.calldata_copy(0, 0, 1, 0, { FF(FF::modulus_minus_two) }); + trace_builder.op_calldata_copy(0, 0, 1, 0, { FF(FF::modulus_minus_two) }); trace_builder.op_cast(0, 0, 1, AvmMemoryTag::U16); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); trace = trace_builder.finalize(); gen_indices(); @@ -208,7 +208,7 @@ TEST_F(AvmCastTests, indirectAddrTruncationU64ToU8) trace_builder.op_set(0, 11, 1, AvmMemoryTag::U32); trace_builder.op_set(0, 256'000'000'203UL, 10, AvmMemoryTag::U64); trace_builder.op_cast(3, 0, 1, AvmMemoryTag::U8); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); trace = trace_builder.finalize(); gen_indices(); @@ -223,7 +223,7 @@ TEST_F(AvmCastTests, indirectAddrWrongResolutionU64ToU8) trace_builder.op_set(0, 11, 6, AvmMemoryTag::U32); trace_builder.op_set(0, 4234, 10, AvmMemoryTag::U64); trace_builder.op_cast(3, 5, 6, AvmMemoryTag::U8); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); trace = trace_builder.finalize(); auto row = std::ranges::find_if(trace.begin(), trace.end(), [](Row r) { return r.main_sel_op_cast == FF(1); }); @@ -291,9 +291,9 @@ TEST_F(AvmCastNegativeTests, wrongOutputAluIc) TEST_F(AvmCastNegativeTests, wrongLimbDecompositionInput) { - trace_builder.calldata_copy(0, 0, 1, 0, { FF(FF::modulus_minus_two) }); + trace_builder.op_calldata_copy(0, 0, 1, 0, { FF(FF::modulus_minus_two) }); trace_builder.op_cast(0, 0, 1, AvmMemoryTag::U16); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); trace = trace_builder.finalize(); gen_indices(); @@ -314,9 +314,9 @@ TEST_F(AvmCastNegativeTests, wrongPSubALo) TEST_F(AvmCastNegativeTests, wrongPSubAHi) { - trace_builder.calldata_copy(0, 0, 1, 0, { FF(FF::modulus_minus_two - 987) }); + trace_builder.op_calldata_copy(0, 0, 1, 0, { FF(FF::modulus_minus_two - 987) }); trace_builder.op_cast(0, 0, 1, AvmMemoryTag::U16); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); trace = trace_builder.finalize(); gen_indices(); @@ -352,9 +352,9 @@ TEST_F(AvmCastNegativeTests, wrongRangeCheckDecompositionLo) TEST_F(AvmCastNegativeTests, wrongRangeCheckDecompositionHi) { - trace_builder.calldata_copy(0, 0, 1, 0, { FF(FF::modulus_minus_two - 987) }); + trace_builder.op_calldata_copy(0, 0, 1, 0, { FF(FF::modulus_minus_two - 987) }); trace_builder.op_cast(0, 0, 1, AvmMemoryTag::U16); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); trace = trace_builder.finalize(); gen_indices(); @@ -396,9 +396,9 @@ TEST_F(AvmCastNegativeTests, wrongCopySubLoForRangeCheck) TEST_F(AvmCastNegativeTests, wrongCopySubHiForRangeCheck) { - trace_builder.calldata_copy(0, 0, 1, 0, { FF(FF::modulus_minus_two - 972836) }); + trace_builder.op_calldata_copy(0, 0, 1, 0, { FF(FF::modulus_minus_two - 972836) }); trace_builder.op_cast(0, 0, 1, AvmMemoryTag::U128); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); trace = trace_builder.finalize(); gen_indices(); diff --git a/barretenberg/cpp/src/barretenberg/vm/tests/avm_comparison.test.cpp b/barretenberg/cpp/src/barretenberg/vm/tests/avm_comparison.test.cpp index 0f0f4ebac527..0ed161a8afd7 100644 --- a/barretenberg/cpp/src/barretenberg/vm/tests/avm_comparison.test.cpp +++ b/barretenberg/cpp/src/barretenberg/vm/tests/avm_comparison.test.cpp @@ -107,13 +107,13 @@ TEST_P(AvmCmpTestsLT, ParamTest) const auto [params, mem_tag] = GetParam(); const auto [a, b, c] = params; if (mem_tag == AvmMemoryTag::FF) { - trace_builder.calldata_copy(0, 0, 2, 0, std::vector{ a, b }); + trace_builder.op_calldata_copy(0, 0, 2, 0, std::vector{ a, b }); } else { trace_builder.op_set(0, uint128_t(a), 0, mem_tag); trace_builder.op_set(0, uint128_t(b), 1, mem_tag); } trace_builder.op_lt(0, 0, 1, 2, mem_tag); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); // Get the row in the avm with the LT selector set @@ -139,13 +139,13 @@ TEST_P(AvmCmpTestsLTE, ParamTest) const auto [params, mem_tag] = GetParam(); const auto [a, b, c] = params; if (mem_tag == AvmMemoryTag::FF) { - trace_builder.calldata_copy(0, 0, 2, 0, std::vector{ a, b }); + trace_builder.op_calldata_copy(0, 0, 2, 0, std::vector{ a, b }); } else { trace_builder.op_set(0, uint128_t(a), 0, mem_tag); trace_builder.op_set(0, uint128_t(b), 1, mem_tag); } trace_builder.op_lte(0, 0, 1, 2, mem_tag); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); auto row = std::ranges::find_if(trace.begin(), trace.end(), [](Row r) { return r.main_sel_op_lte == FF(1); }); @@ -309,9 +309,9 @@ TEST_P(AvmCmpNegativeTestsLT, ParamTest) const auto [failure, params] = GetParam(); const auto [failure_string, failure_mode] = failure; const auto [a, b, output] = params; - trace_builder.calldata_copy(0, 0, 3, 0, std::vector{ a, b, output }); + trace_builder.op_calldata_copy(0, 0, 3, 0, std::vector{ a, b, output }); trace_builder.op_lt(0, 0, 1, 2, AvmMemoryTag::FF); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); std::function select_row = [](Row r) { return r.main_sel_op_lt == FF(1); }; trace = gen_mutated_trace_cmp(trace, select_row, output, failure_mode, false); @@ -327,9 +327,9 @@ TEST_P(AvmCmpNegativeTestsLTE, ParamTest) const auto [failure, params] = GetParam(); const auto [failure_string, failure_mode] = failure; const auto [a, b, output] = params; - trace_builder.calldata_copy(0, 0, 3, 0, std::vector{ a, b, output }); + trace_builder.op_calldata_copy(0, 0, 3, 0, std::vector{ a, b, output }); trace_builder.op_lte(0, 0, 1, 2, AvmMemoryTag::FF); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); std::function select_row = [](Row r) { return r.main_sel_op_lte == FF(1); }; trace = gen_mutated_trace_cmp(trace, select_row, output, failure_mode, true); diff --git a/barretenberg/cpp/src/barretenberg/vm/tests/avm_control_flow.test.cpp b/barretenberg/cpp/src/barretenberg/vm/tests/avm_control_flow.test.cpp index 616bdd5f1267..31d4facca5e9 100644 --- a/barretenberg/cpp/src/barretenberg/vm/tests/avm_control_flow.test.cpp +++ b/barretenberg/cpp/src/barretenberg/vm/tests/avm_control_flow.test.cpp @@ -63,7 +63,7 @@ TEST_F(AvmControlFlowTests, simpleCall) // pc opcode // 0 INTERNAL_CALL(pc=4) // 4 HALT - trace_builder.internal_call(CALL_PC); + trace_builder.op_internal_call(CALL_PC); trace_builder.halt(); auto trace = trace_builder.finalize(); @@ -98,7 +98,7 @@ TEST_F(AvmControlFlowTests, simpleJump) // pc opcode // 0 JUMP(pc=4) // 4 HALT - trace_builder.jump(JUMP_PC); + trace_builder.op_jump(JUMP_PC); trace_builder.halt(); auto trace = trace_builder.finalize(); @@ -132,8 +132,8 @@ TEST_F(AvmControlFlowTests, simpleCallAndReturn) // 0 INTERNAL_CALL(pc=20) // 20 INTERNAL_RETURN // 1 HALT - trace_builder.internal_call(CALL_PC); - trace_builder.internal_return(); + trace_builder.op_internal_call(CALL_PC); + trace_builder.op_internal_return(); trace_builder.halt(); auto trace = trace_builder.finalize(); @@ -191,15 +191,15 @@ TEST_F(AvmControlFlowTests, multipleCallsAndReturns) // 22 INTERNAL_RETURN // 421 INTERNAL_RETURN // 1 HALT - trace_builder.internal_call(CALL_PC_1); - trace_builder.internal_call(CALL_PC_2); - trace_builder.internal_call(CALL_PC_3); - trace_builder.internal_return(); - trace_builder.internal_call(CALL_PC_4); - trace_builder.internal_return(); - trace_builder.jump(JUMP_PC_1); - trace_builder.internal_return(); - trace_builder.internal_return(); + trace_builder.op_internal_call(CALL_PC_1); + trace_builder.op_internal_call(CALL_PC_2); + trace_builder.op_internal_call(CALL_PC_3); + trace_builder.op_internal_return(); + trace_builder.op_internal_call(CALL_PC_4); + trace_builder.op_internal_return(); + trace_builder.op_jump(JUMP_PC_1); + trace_builder.op_internal_return(); + trace_builder.op_internal_return(); trace_builder.halt(); auto trace = trace_builder.finalize(); diff --git a/barretenberg/cpp/src/barretenberg/vm/tests/avm_gas.test.cpp b/barretenberg/cpp/src/barretenberg/vm/tests/avm_gas.test.cpp index 2666bb40e018..8cd841fa0713 100644 --- a/barretenberg/cpp/src/barretenberg/vm/tests/avm_gas.test.cpp +++ b/barretenberg/cpp/src/barretenberg/vm/tests/avm_gas.test.cpp @@ -61,7 +61,7 @@ TEST_F(AvmGasPositiveTests, gasAdd) auto apply_opcodes = [=](AvmTraceBuilder& trace_builder) { // trace_builder.set() trace_builder.op_add(0, 1, 2, 3, AvmMemoryTag::FF); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); }; auto checks = [=](const std::vector& trace) { diff --git a/barretenberg/cpp/src/barretenberg/vm/tests/avm_indirect_mem.test.cpp b/barretenberg/cpp/src/barretenberg/vm/tests/avm_indirect_mem.test.cpp index f45924769244..ccead55c438a 100644 --- a/barretenberg/cpp/src/barretenberg/vm/tests/avm_indirect_mem.test.cpp +++ b/barretenberg/cpp/src/barretenberg/vm/tests/avm_indirect_mem.test.cpp @@ -41,7 +41,7 @@ TEST_F(AvmIndirectMemTests, allIndirectAdd) // All indirect flags are encoded as 7 = 1 + 2 + 4 trace_builder.op_add(7, 0, 1, 2, AvmMemoryTag::U16); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); // Find the first row enabling the addition selector @@ -87,7 +87,7 @@ TEST_F(AvmIndirectMemTests, indirectOutputSub) // The indirect flag is encoded as 4 trace_builder.op_sub(4, 50, 51, 5, AvmMemoryTag::U128); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); // Find the first row enabling the subtraction selector @@ -133,7 +133,7 @@ TEST_F(AvmIndirectMemTests, indirectInputAMul) // The indirect flag is encoded as 1 trace_builder.op_mul(1, 1000, 101, 102, AvmMemoryTag::U64); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); auto trace = trace_builder.finalize(); // Find the first row enabling the multiplication selector diff --git a/barretenberg/cpp/src/barretenberg/vm/tests/avm_inter_table.test.cpp b/barretenberg/cpp/src/barretenberg/vm/tests/avm_inter_table.test.cpp index 098dbb0c181c..400d0a480b4c 100644 --- a/barretenberg/cpp/src/barretenberg/vm/tests/avm_inter_table.test.cpp +++ b/barretenberg/cpp/src/barretenberg/vm/tests/avm_inter_table.test.cpp @@ -57,7 +57,7 @@ class AvmPermMainAluNegativeTests : public AvmInterTableTests { trace_builder.op_add(0, 0, 1, 1, AvmMemoryTag::U64); // 19 + 15 = 34 trace_builder.op_add(0, 0, 1, 1, AvmMemoryTag::U64); // 19 + 34 = 53 trace_builder.op_mul(0, 0, 1, 2, AvmMemoryTag::U64); // 19 * 53 = 1007 - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); trace = trace_builder.finalize(); @@ -152,7 +152,7 @@ class AvmRangeCheckNegativeTests : public AvmInterTableTests { trace_builder.op_set(0, a, 0, tag); trace_builder.op_set(0, b, 1, tag); trace_builder.op_add(0, 0, 1, 2, tag); // 7 + 8 = 15 - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); trace = trace_builder.finalize(min_trace_size); // Find the row with addition operation and retrieve clk. @@ -401,7 +401,7 @@ class AvmPermMainMemNegativeTests : public AvmInterTableTests { trace_builder.op_set(0, a, 52, AvmMemoryTag::U8); trace_builder.op_set(0, b, 11, AvmMemoryTag::U8); trace_builder.op_sub(0, 52, 11, 55, AvmMemoryTag::U8); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); trace = trace_builder.finalize(); diff --git a/barretenberg/cpp/src/barretenberg/vm/tests/avm_mem_opcodes.test.cpp b/barretenberg/cpp/src/barretenberg/vm/tests/avm_mem_opcodes.test.cpp index 71bfcbbe39e7..7114919ee69a 100644 --- a/barretenberg/cpp/src/barretenberg/vm/tests/avm_mem_opcodes.test.cpp +++ b/barretenberg/cpp/src/barretenberg/vm/tests/avm_mem_opcodes.test.cpp @@ -56,7 +56,7 @@ class AvmMemOpcodeTests : public ::testing::Test { } trace_builder.op_mov(indirect ? 3 : 0, src_offset, dst_offset); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); trace = trace_builder.finalize(); } @@ -67,7 +67,7 @@ class AvmMemOpcodeTests : public ::testing::Test { trace_builder.op_set(0, mov_a ? 9871 : 0, 20, AvmMemoryTag::U64); // Non-zero/zero condition value (we move a/b) trace_builder.op_cmov(0, 10, 11, 20, 12); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); trace = trace_builder.finalize(); compute_cmov_indices(0); @@ -361,7 +361,7 @@ TEST_F(AvmMemOpcodeTests, uninitializedValueMov) { trace_builder.op_set(0, 4, 1, AvmMemoryTag::U32); trace_builder.op_mov(0, 0, 1); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); trace = trace_builder.finalize(); validate_mov_trace(false, 0, 0, 1, AvmMemoryTag::U0); @@ -372,7 +372,7 @@ TEST_F(AvmMemOpcodeTests, indUninitializedValueMov) trace_builder.op_set(0, 1, 3, AvmMemoryTag::U32); trace_builder.op_set(0, 4, 1, AvmMemoryTag::U32); trace_builder.op_mov(3, 2, 3); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); trace = trace_builder.finalize(); validate_mov_trace(true, 0, 2, 3, AvmMemoryTag::U0, 0, 1, true); @@ -390,7 +390,7 @@ TEST_F(AvmMemOpcodeTests, indirectMovInvalidAddressTag) trace_builder.op_set(0, 16, 101, AvmMemoryTag::U128); // This will make the indirect load failing. trace_builder.op_set(0, 5, 15, AvmMemoryTag::FF); trace_builder.op_mov(3, 100, 101); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); trace = trace_builder.finalize(); compute_mov_indices(true); @@ -417,7 +417,7 @@ TEST_F(AvmMemOpcodeTests, allDirectCMovA) trace_builder.op_set(0, 8, 12, AvmMemoryTag::U32); // Target, should be overwritten trace_builder.op_cmov(0, 10, 11, 20, 12); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); trace = trace_builder.finalize(); compute_cmov_indices(0); @@ -434,7 +434,7 @@ TEST_F(AvmMemOpcodeTests, allDirectCMovB) trace_builder.op_set(0, 8, 12, AvmMemoryTag::U32); // Target, should be overwritten trace_builder.op_cmov(0, 10, 11, 20, 12); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); trace = trace_builder.finalize(); compute_cmov_indices(0); @@ -451,7 +451,7 @@ TEST_F(AvmMemOpcodeTests, allDirectCMovConditionUninitialized) // value. It will be therefore zero. (we move b) trace_builder.op_cmov(0, 10, 11, 20, 12); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); trace = trace_builder.finalize(); compute_cmov_indices(0); @@ -467,7 +467,7 @@ TEST_F(AvmMemOpcodeTests, allDirectCMovOverwriteA) trace_builder.op_set(0, 0, 20, AvmMemoryTag::U64); // Zero condition value (we move b) trace_builder.op_cmov(0, 10, 11, 20, 10); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); trace = trace_builder.finalize(); compute_cmov_indices(0); @@ -494,7 +494,7 @@ TEST_F(AvmMemOpcodeTests, allIndirectCMovA) trace_builder.op_set(0, 8, 12, AvmMemoryTag::U32); // Target, should be overwritten trace_builder.op_cmov(15, 110, 111, 120, 112); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); trace = trace_builder.finalize(); compute_cmov_indices(15); @@ -506,7 +506,7 @@ TEST_F(AvmMemOpcodeTests, allIndirectCMovA) TEST_F(AvmMemOpcodeTests, allIndirectCMovAllUnitialized) { trace_builder.op_cmov(15, 10, 11, 20, 10); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); trace = trace_builder.finalize(); compute_cmov_indices(15); @@ -521,7 +521,7 @@ TEST_F(AvmMemOpcodeTests, allIndirectCMovAllUnitialized) TEST_F(AvmMemOpcodeTests, directSet) { trace_builder.op_set(0, 5683, 99, AvmMemoryTag::U128); - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); trace = trace_builder.finalize(); compute_index_c(1, false); @@ -549,7 +549,7 @@ TEST_F(AvmMemOpcodeTests, indirectSet) { trace_builder.op_set(0, 100, 10, AvmMemoryTag::U32); trace_builder.op_set(1, 1979, 10, AvmMemoryTag::U64); // Set 1979 at memory index 100 - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); trace = trace_builder.finalize(); compute_index_c(2, true); @@ -589,7 +589,7 @@ TEST_F(AvmMemOpcodeTests, indirectSetWrongTag) { trace_builder.op_set(0, 100, 10, AvmMemoryTag::U8); // The address 100 has incorrect tag U8. trace_builder.op_set(1, 1979, 10, AvmMemoryTag::U64); // Set 1979 at memory index 100 - trace_builder.return_op(0, 0, 0); + trace_builder.op_return(0, 0, 0); trace = trace_builder.finalize(); compute_index_c(2, true); diff --git a/barretenberg/cpp/src/barretenberg/vm/tests/avm_memory.test.cpp b/barretenberg/cpp/src/barretenberg/vm/tests/avm_memory.test.cpp index 5dcfe52e0dfa..4d3b6fd18a9c 100644 --- a/barretenberg/cpp/src/barretenberg/vm/tests/avm_memory.test.cpp +++ b/barretenberg/cpp/src/barretenberg/vm/tests/avm_memory.test.cpp @@ -36,7 +36,7 @@ class AvmMemoryTests : public ::testing::Test { // The proof must pass and we check that the AVM error is raised. TEST_F(AvmMemoryTests, mismatchedTagAddOperation) { - trace_builder.calldata_copy(0, 0, 2, 0, std::vector{ 98, 12 }); + trace_builder.op_calldata_copy(0, 0, 2, 0, std::vector{ 98, 12 }); trace_builder.op_add(0, 0, 1, 4, AvmMemoryTag::U8); trace_builder.halt(); @@ -161,7 +161,7 @@ TEST_F(AvmMemoryTests, readWriteConsistencyValViolation) // Memory layout: [4,9,0,0,0,0,....] trace_builder.op_mul(0, 1, 0, 2, AvmMemoryTag::U8); // [4,9,36,0,0,0.....] - trace_builder.return_op(0, 2, 1); // Return single memory word at position 2 (36) + trace_builder.op_return(0, 2, 1); // Return single memory word at position 2 (36) auto trace = trace_builder.finalize(); // Find the row with multiplication operation @@ -191,7 +191,7 @@ TEST_F(AvmMemoryTests, readWriteConsistencyTagViolation) // Memory layout: [4,9,0,0,0,0,....] trace_builder.op_mul(0, 1, 0, 2, AvmMemoryTag::U8); // [4,9,36,0,0,0.....] - trace_builder.return_op(0, 2, 1); // Return single memory word at position 2 (36) + trace_builder.op_return(0, 2, 1); // Return single memory word at position 2 (36) auto trace = trace_builder.finalize(); // Find the row with multiplication operation @@ -216,7 +216,7 @@ TEST_F(AvmMemoryTests, readWriteConsistencyTagViolation) // Testing violation that a memory read at uninitialized location must have value 0. TEST_F(AvmMemoryTests, readUninitializedMemoryViolation) { - trace_builder.return_op(0, 1, 1); // Return single memory word at position 1 + trace_builder.op_return(0, 1, 1); // Return single memory word at position 1 auto trace = trace_builder.finalize(); trace[1].mem_val = 9; @@ -228,7 +228,7 @@ TEST_F(AvmMemoryTests, readUninitializedMemoryViolation) // must raise a VM error. TEST_F(AvmMemoryTests, mismatchedTagErrorViolation) { - trace_builder.calldata_copy(0, 0, 2, 0, std::vector{ 98, 12 }); + trace_builder.op_calldata_copy(0, 0, 2, 0, std::vector{ 98, 12 }); trace_builder.op_sub(0, 0, 1, 4, AvmMemoryTag::U8); trace_builder.halt(); @@ -262,7 +262,7 @@ TEST_F(AvmMemoryTests, mismatchedTagErrorViolation) // must not set a VM error. TEST_F(AvmMemoryTests, consistentTagNoErrorViolation) { - trace_builder.calldata_copy(0, 0, 2, 0, std::vector{ 84, 7 }); + trace_builder.op_calldata_copy(0, 0, 2, 0, std::vector{ 84, 7 }); trace_builder.op_fdiv(0, 0, 1, 4); trace_builder.halt(); @@ -288,7 +288,7 @@ TEST_F(AvmMemoryTests, consistentTagNoErrorViolation) // Testing violation that a write operation must not set a VM error. TEST_F(AvmMemoryTests, noErrorTagWriteViolation) { - trace_builder.calldata_copy(0, 0, 2, 0, std::vector{ 84, 7 }); + trace_builder.op_calldata_copy(0, 0, 2, 0, std::vector{ 84, 7 }); trace_builder.op_fdiv(0, 0, 1, 4); trace_builder.halt();