chore(avm): remove codegen (all but flavor)

barretenberg/cpp/src/barretenberg/vm2/constraining/benchmark/relations_acc.bench.cpp

@@ -7,9 +7,9 @@
 #include "barretenberg/common/constexpr_utils.hpp"
 #include "barretenberg/relations/relation_parameters.hpp"
 #include "barretenberg/vm2/common/field.hpp"
+#include "barretenberg/vm2/constraining/full_row.hpp"
 #include "barretenberg/vm2/generated/columns.hpp"
 #include "barretenberg/vm2/generated/flavor.hpp"
-#include "barretenberg/vm2/generated/full_row.hpp"
 
 using namespace benchmark;
 using namespace bb::avm2;
@@ -97,4 +97,4 @@ int main(int argc, char** argv)
 
     ::benchmark::Initialize(&argc, argv);
     ::benchmark::RunSpecifiedBenchmarks();
-}
+}

barretenberg/cpp/src/barretenberg/vm2/generated/full_row.hpp → barretenberg/cpp/src/barretenberg/vm2/constraining/full_row.hpp

@@ -1,7 +1,6 @@
-// AUTOGENERATED FILE
 #pragma once
 
-#include "columns.hpp"
+#include "barretenberg/vm2/generated/columns.hpp"
 
 namespace bb::avm2 {
 

barretenberg/cpp/src/barretenberg/vm2/constraining/polynomials.hpp

@@ -1,11 +1,11 @@
 #pragma once
 
-#include "barretenberg/vm2/generated/prover.hpp"
+#include "barretenberg/vm2/constraining/prover.hpp"
 #include "barretenberg/vm2/tracegen/trace_container.hpp"
 
 namespace bb::avm2::constraining {
 
 // Computes the polynomials from the trace, and destroys it in the process.
 AvmProver::ProverPolynomials compute_polynomials(tracegen::TraceContainer& trace);
 
-} // namespace bb::avm2::constraining
+} // namespace bb::avm2::constraining

barretenberg/cpp/src/barretenberg/vm2/generated/prover.cpp → barretenberg/cpp/src/barretenberg/vm2/constraining/prover.cpp

@@ -1,5 +1,5 @@
-// AUTOGENERATED FILE
-#include "prover.hpp"
+#include "barretenberg/vm2/constraining/prover.hpp"
+
 #include "barretenberg/commitment_schemes/claim.hpp"
 #include "barretenberg/commitment_schemes/commitment_key.hpp"
 #include "barretenberg/commitment_schemes/shplonk/shplemini.hpp"
@@ -155,4 +155,4 @@ HonkProof AvmProver::construct_proof()
     return export_proof();
 }
 
-} // namespace bb::avm2
+} // namespace bb::avm2

barretenberg/cpp/src/barretenberg/vm2/generated/prover.hpp → barretenberg/cpp/src/barretenberg/vm2/constraining/prover.hpp

@@ -5,7 +5,7 @@
 #include "barretenberg/relations/relation_parameters.hpp"
 #include "barretenberg/sumcheck/sumcheck_output.hpp"
 #include "barretenberg/transcript/transcript.hpp"
-#include "flavor.hpp"
+#include "barretenberg/vm2/generated/flavor.hpp"
 
 namespace bb::avm2 {
 
@@ -61,4 +61,4 @@ class AvmProver {
     HonkProof proof;
 };
 
-} // namespace bb::avm2
+} // namespace bb::avm2

barretenberg/cpp/src/barretenberg/vm2/generated/verifier.cpp → barretenberg/cpp/src/barretenberg/vm2/constraining/verifier.cpp

@@ -1,5 +1,5 @@
-// AUTOGENERATED FILE
-#include "verifier.hpp"
+#include "barretenberg/vm2/constraining/verifier.hpp"
+
 #include "barretenberg/commitment_schemes/shplonk/shplemini.hpp"
 #include "barretenberg/common/log.hpp"
 #include "barretenberg/numeric/bitop/get_msb.hpp"

barretenberg/cpp/src/barretenberg/vm2/generated/verifier.hpp → barretenberg/cpp/src/barretenberg/vm2/constraining/verifier.hpp

@@ -1,9 +1,8 @@
-// AUTOGENERATED FILE
 #pragma once
 
 #include "barretenberg/plonk/proof_system/types/proof.hpp"
 #include "barretenberg/sumcheck/sumcheck.hpp"
-#include "flavor.hpp"
+#include "barretenberg/vm2/generated/flavor.hpp"
 
 namespace bb::avm2 {
 
@@ -36,4 +35,4 @@ class AvmVerifier {
     FF evaluate_public_input_column(const std::vector<FF>& points, std::vector<FF> challenges);
 };
 
-} // namespace bb::avm2
+} // namespace bb::avm2

barretenberg/cpp/src/barretenberg/vm2/debugger.cpp

@@ -8,9 +8,9 @@
 
 #include "barretenberg/numeric/uint256/uint256.hpp"
 #include "barretenberg/vm2/common/field.hpp"
+#include "barretenberg/vm2/constraining/full_row.hpp"
 #include "barretenberg/vm2/generated/columns.hpp"
 #include "barretenberg/vm2/generated/flavor.hpp"
-#include "barretenberg/vm2/generated/full_row.hpp"
 #include "barretenberg/vm2/tracegen/lib/trace_conversion.hpp"
 
 namespace bb::avm2 {
@@ -222,4 +222,4 @@ void InteractiveDebugger::test_relation(const std::string& relation_name, std::o
     }
 }
 
-} // namespace bb::avm2
+} // namespace bb::avm2

barretenberg/cpp/src/barretenberg/vm2/generated/flavor.hpp

@@ -445,54 +445,9 @@ class AvmFlavor {
       public:
         VerifierCommitments_(const std::shared_ptr<VerificationKey>& verification_key)
         {
-            this->precomputed_as_unary = verification_key->precomputed_as_unary;
-            this->precomputed_bitwise_input_a = verification_key->precomputed_bitwise_input_a;
-            this->precomputed_bitwise_input_b = verification_key->precomputed_bitwise_input_b;
-            this->precomputed_bitwise_op_id = verification_key->precomputed_bitwise_op_id;
-            this->precomputed_bitwise_output = verification_key->precomputed_bitwise_output;
-            this->precomputed_clk = verification_key->precomputed_clk;
-            this->precomputed_exec_opcode = verification_key->precomputed_exec_opcode;
-            this->precomputed_first_row = verification_key->precomputed_first_row;
-            this->precomputed_instr_size = verification_key->precomputed_instr_size;
-            this->precomputed_integral_tag_length = verification_key->precomputed_integral_tag_length;
-            this->precomputed_opcode_out_of_range = verification_key->precomputed_opcode_out_of_range;
-            this->precomputed_p_decomposition_limb = verification_key->precomputed_p_decomposition_limb;
-            this->precomputed_p_decomposition_limb_index = verification_key->precomputed_p_decomposition_limb_index;
-            this->precomputed_p_decomposition_radix = verification_key->precomputed_p_decomposition_radix;
-            this->precomputed_power_of_2 = verification_key->precomputed_power_of_2;
-            this->precomputed_sel_bitwise = verification_key->precomputed_sel_bitwise;
-            this->precomputed_sel_has_tag = verification_key->precomputed_sel_has_tag;
-            this->precomputed_sel_integral_tag = verification_key->precomputed_sel_integral_tag;
-            this->precomputed_sel_mem_tag_out_of_range = verification_key->precomputed_sel_mem_tag_out_of_range;
-            this->precomputed_sel_op_dc_0 = verification_key->precomputed_sel_op_dc_0;
-            this->precomputed_sel_op_dc_1 = verification_key->precomputed_sel_op_dc_1;
-            this->precomputed_sel_op_dc_10 = verification_key->precomputed_sel_op_dc_10;
-            this->precomputed_sel_op_dc_11 = verification_key->precomputed_sel_op_dc_11;
-            this->precomputed_sel_op_dc_12 = verification_key->precomputed_sel_op_dc_12;
-            this->precomputed_sel_op_dc_13 = verification_key->precomputed_sel_op_dc_13;
-            this->precomputed_sel_op_dc_14 = verification_key->precomputed_sel_op_dc_14;
-            this->precomputed_sel_op_dc_15 = verification_key->precomputed_sel_op_dc_15;
-            this->precomputed_sel_op_dc_16 = verification_key->precomputed_sel_op_dc_16;
-            this->precomputed_sel_op_dc_17 = verification_key->precomputed_sel_op_dc_17;
-            this->precomputed_sel_op_dc_2 = verification_key->precomputed_sel_op_dc_2;
-            this->precomputed_sel_op_dc_3 = verification_key->precomputed_sel_op_dc_3;
-            this->precomputed_sel_op_dc_4 = verification_key->precomputed_sel_op_dc_4;
-            this->precomputed_sel_op_dc_5 = verification_key->precomputed_sel_op_dc_5;
-            this->precomputed_sel_op_dc_6 = verification_key->precomputed_sel_op_dc_6;
-            this->precomputed_sel_op_dc_7 = verification_key->precomputed_sel_op_dc_7;
-            this->precomputed_sel_op_dc_8 = verification_key->precomputed_sel_op_dc_8;
-            this->precomputed_sel_op_dc_9 = verification_key->precomputed_sel_op_dc_9;
-            this->precomputed_sel_p_decomposition = verification_key->precomputed_sel_p_decomposition;
-            this->precomputed_sel_range_16 = verification_key->precomputed_sel_range_16;
-            this->precomputed_sel_range_8 = verification_key->precomputed_sel_range_8;
-            this->precomputed_sel_sha256_compression = verification_key->precomputed_sel_sha256_compression;
-            this->precomputed_sel_tag_is_op2 = verification_key->precomputed_sel_tag_is_op2;
-            this->precomputed_sel_to_radix_safe_limbs = verification_key->precomputed_sel_to_radix_safe_limbs;
-            this->precomputed_sel_unary = verification_key->precomputed_sel_unary;
-            this->precomputed_sha256_compression_round_constant =
-                verification_key->precomputed_sha256_compression_round_constant;
-            this->precomputed_to_radix_safe_limbs = verification_key->precomputed_to_radix_safe_limbs;
-            this->precomputed_zero = verification_key->precomputed_zero;
+            for (auto [commitment, vk_commitment] : zip_view(this->get_precomputed(), verification_key->get_all())) {
+                commitment = vk_commitment;
+            }
         }
     };
 

barretenberg/cpp/src/barretenberg/vm2/proving_helper.cpp

@@ -11,9 +11,9 @@
 #include "barretenberg/vm2/common/constants.hpp"
 #include "barretenberg/vm2/constraining/check_circuit.hpp"
 #include "barretenberg/vm2/constraining/polynomials.hpp"
+#include "barretenberg/vm2/constraining/prover.hpp"
+#include "barretenberg/vm2/constraining/verifier.hpp"
 #include "barretenberg/vm2/debugger.hpp"
-#include "barretenberg/vm2/generated/prover.hpp"
-#include "barretenberg/vm2/generated/verifier.hpp"
 
 namespace bb::avm2 {
 namespace {
@@ -112,4 +112,4 @@ bool AvmProvingHelper::verify(const AvmProvingHelper::Proof& proof, const Public
     return AVM_TRACK_TIME_V("proving/verify_proof", verifier.verify_proof(proof, pi.to_columns()));
 }
 
-} // namespace bb::avm2
+} // namespace bb::avm2

barretenberg/cpp/src/barretenberg/vm2/proving_helper.hpp

@@ -2,8 +2,8 @@
 
 #include "barretenberg/honk/proof_system/types/proof.hpp"
 #include "barretenberg/vm2/common/avm_inputs.hpp"
-#include "barretenberg/vm2/generated/prover.hpp"
-#include "barretenberg/vm2/generated/verifier.hpp"
+#include "barretenberg/vm2/constraining/prover.hpp"
+#include "barretenberg/vm2/constraining/verifier.hpp"
 #include "barretenberg/vm2/tracegen/trace_container.hpp"
 
 namespace bb::avm2 {
@@ -19,4 +19,4 @@ class AvmProvingHelper {
     bool verify(const Proof& proof, const PublicInputs& pi, const VkData& vk_data);
 };
 
-} // namespace bb::avm2
+} // namespace bb::avm2

barretenberg/cpp/src/barretenberg/vm2/tracegen/alu_trace.test.cpp

@@ -3,8 +3,8 @@
 
 #include <cstdint>
 
+#include "barretenberg/vm2/constraining/full_row.hpp"
 #include "barretenberg/vm2/generated/flavor_settings.hpp"
-#include "barretenberg/vm2/generated/full_row.hpp"
 #include "barretenberg/vm2/testing/macros.hpp"
 #include "barretenberg/vm2/tracegen/alu_trace.hpp"
 #include "barretenberg/vm2/tracegen/test_trace_container.hpp"

barretenberg/cpp/src/barretenberg/vm2/tracegen/bitwise_trace.test.cpp

@@ -3,8 +3,8 @@
 
 #include <cstdint>
 
+#include "barretenberg/vm2/constraining/full_row.hpp"
 #include "barretenberg/vm2/generated/flavor_settings.hpp"
-#include "barretenberg/vm2/generated/full_row.hpp"
 #include "barretenberg/vm2/testing/macros.hpp"
 #include "barretenberg/vm2/tracegen/bitwise_trace.hpp"
 #include "barretenberg/vm2/tracegen/test_trace_container.hpp"

barretenberg/cpp/src/barretenberg/vm2/tracegen/bytecode_trace.test.cpp

@@ -9,8 +9,8 @@
 #include <vector>
 
 #include "barretenberg/vm2/common/instruction_spec.hpp"
+#include "barretenberg/vm2/constraining/full_row.hpp"
 #include "barretenberg/vm2/generated/flavor_settings.hpp"
-#include "barretenberg/vm2/generated/full_row.hpp"
 #include "barretenberg/vm2/testing/fixtures.hpp"
 #include "barretenberg/vm2/testing/macros.hpp"
 #include "barretenberg/vm2/tracegen/bytecode_trace.hpp"

barretenberg/cpp/src/barretenberg/vm2/tracegen/class_id_derivation_trace.test.cpp

@@ -3,8 +3,8 @@
 
 #include <cstdint>
 
+#include "barretenberg/vm2/constraining/full_row.hpp"
 #include "barretenberg/vm2/generated/flavor_settings.hpp"
-#include "barretenberg/vm2/generated/full_row.hpp"
 #include "barretenberg/vm2/testing/macros.hpp"
 #include "barretenberg/vm2/tracegen/class_id_derivation_trace.hpp"
 #include "barretenberg/vm2/tracegen/test_trace_container.hpp"

barretenberg/cpp/src/barretenberg/vm2/tracegen/lib/trace_conversion.hpp

@@ -3,8 +3,8 @@
 #include <optional>
 
 #include "barretenberg/vm2/common/field.hpp"
+#include "barretenberg/vm2/constraining/full_row.hpp"
 #include "barretenberg/vm2/generated/columns.hpp"
-#include "barretenberg/vm2/generated/full_row.hpp"
 
 namespace bb::avm2::tracegen {
 

barretenberg/cpp/src/barretenberg/vm2/tracegen/merkle_check_trace.test.cpp

@@ -6,8 +6,8 @@
 
 #include "barretenberg/crypto/poseidon2/poseidon2.hpp"
 #include "barretenberg/vm2/common/field.hpp"
+#include "barretenberg/vm2/constraining/full_row.hpp"
 #include "barretenberg/vm2/generated/flavor_settings.hpp"
-#include "barretenberg/vm2/generated/full_row.hpp"
 #include "barretenberg/vm2/tracegen/merkle_check_trace.hpp"
 #include "barretenberg/vm2/tracegen/test_trace_container.hpp"
 

barretenberg/cpp/src/barretenberg/vm2/tracegen/range_check_trace.test.cpp

@@ -3,8 +3,8 @@
 
 #include <cstdint>
 
+#include "barretenberg/vm2/constraining/full_row.hpp"
 #include "barretenberg/vm2/generated/flavor_settings.hpp"
-#include "barretenberg/vm2/generated/full_row.hpp"
 #include "barretenberg/vm2/tracegen/range_check_trace.hpp"
 #include "barretenberg/vm2/tracegen/test_trace_container.hpp"
 

barretenberg/cpp/src/barretenberg/vm2/tracegen/test_trace_container.hpp

@@ -3,8 +3,8 @@
 #include <unordered_map>
 #include <vector>
 
+#include "barretenberg/vm2/constraining/full_row.hpp"
 #include "barretenberg/vm2/generated/columns.hpp"
-#include "barretenberg/vm2/generated/full_row.hpp"
 #include "barretenberg/vm2/tracegen/trace_container.hpp"
 
 namespace bb::avm2::tracegen {
@@ -30,4 +30,4 @@ class TestTraceContainer : public TraceContainer {
     RowTraceContainer as_rows() const;
 };
 
-} // namespace bb::avm2::tracegen
+} // namespace bb::avm2::tracegen