chore(avm): full row cleanup

barretenberg/cpp/src/barretenberg/vm/avm/generated/circuit_builder.cpp

@@ -58,14 +58,14 @@ AvmCircuitBuilder::ProverPolynomials AvmCircuitBuilder::compute_polynomials() co
                        // An array which stores for each column of the trace the smallest size of the
                        // truncated column containing all non-zero elements.
                        // It is used to allocate the polynomials without memory overhead for the tail of zeros.
-                       std::array<size_t, Row::SIZE> col_nonzero_size{};
+                       std::array<size_t, NUM_COLUMNS_WITH_SHIFTS> col_nonzero_size{};
 
                        // Computation of size of columns.
                        // Non-parallel version takes 0.5 second for a trace size of 200k rows.
                        // A parallel version might be considered in the future.
                        for (size_t i = 0; i < num_rows; i++) {
                            const auto& row = rows[i];
-                           for (size_t col = 0; col < Row::SIZE; col++) {
+                           for (size_t col = 0; col < col_nonzero_size.size(); col++) {
                                if (!row.get_column(static_cast<ColumnAndShifts>(col)).is_zero()) {
                                    col_nonzero_size[col] = i + 1;
                                }

barretenberg/cpp/src/barretenberg/vm/avm/generated/full_row.hpp

@@ -1,11 +1,6 @@
 // AUTOGENERATED FILE
 #pragma once
 
-#include <sstream>
-#include <string>
-#include <vector>
-
-#include "barretenberg/common/ref_vector.hpp"
 #include "columns.hpp"
 
 namespace bb::avm {
@@ -15,8 +10,6 @@ template <typename FF_> struct AvmFullRow {
 
     FF AVM_ALL_ENTITIES;
 
-    static constexpr size_t SIZE = 764;
-
     // Risky but oh so efficient.
     FF& get_column(ColumnAndShifts col)
     {
@@ -31,8 +24,6 @@ template <typename FF_> struct AvmFullRow {
     }
 };
 
-template <typename FF> std::ostream& operator<<(std::ostream& os, AvmFullRow<FF> const& row);
-
 } // namespace bb::avm
 
 namespace bb {

barretenberg/cpp/src/barretenberg/vm/avm/trace/execution.cpp

@@ -130,7 +130,7 @@ std::unordered_map</*relation*/ std::string, /*degrees*/ std::string> get_relati
 void show_trace_info(const auto& trace)
 {
     vinfo("Built trace size: ", trace.size(), " (next power: 2^", std::bit_width(trace.size()), ")");
-    vinfo("Number of columns: ", trace.front().SIZE);
+    vinfo("Number of columns: ", avm::NUM_COLUMNS_WITH_SHIFTS);
     vinfo("Relation degrees: ", []() {
         std::string result;
         for (const auto& [key, value] : sorted_entries(get_relations_degrees())) {

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

@@ -1,11 +1,6 @@
 // AUTOGENERATED FILE
 #pragma once
 
-#include <sstream>
-#include <string>
-#include <vector>
-
-#include "barretenberg/common/ref_vector.hpp"
 #include "columns.hpp"
 
 namespace bb::avm2 {
@@ -15,8 +10,6 @@ template <typename FF_> struct AvmFullRow {
 
     FF AVM2_ALL_ENTITIES;
 
-    static constexpr size_t SIZE = 398;
-
     // Risky but oh so efficient.
     FF& get_column(ColumnAndShifts col)
     {
@@ -31,8 +24,6 @@ template <typename FF_> struct AvmFullRow {
     }
 };
 
-template <typename FF> std::ostream& operator<<(std::ostream& os, AvmFullRow<FF> const& row);
-
 } // namespace bb::avm2
 
 namespace bb {

bb-pilcom/bb-pil-backend/src/circuit_builder.rs

@@ -7,7 +7,6 @@ pub trait CircuitBuilder {
     fn create_circuit_builder_cpp(&mut self, name: &str, all_cols_without_inverses: &[String]);
 
     fn create_full_row_hpp(&mut self, name: &str, all_cols: &[String]);
-    fn create_full_row_cpp(&mut self, name: &str, all_cols: &[String]);
 }
 
 impl CircuitBuilder for BBFiles {
@@ -71,24 +70,4 @@ impl CircuitBuilder for BBFiles {
 
         self.write_file(None, "full_row.hpp", &hpp);
     }
-
-    fn create_full_row_cpp(&mut self, name: &str, all_cols: &[String]) {
-        let mut handlebars = Handlebars::new();
-
-        let data = &json!({
-            "name": name,
-            "all_cols": all_cols,
-        });
-
-        handlebars
-            .register_template_string(
-                "full_row.cpp",
-                std::str::from_utf8(include_bytes!("../templates/full_row.cpp.hbs")).unwrap(),
-            )
-            .unwrap();
-
-        let cpp = handlebars.render("full_row.cpp", data).unwrap();
-
-        self.write_file(None, "full_row.cpp", &cpp);
-    }
 }

bb-pilcom/bb-pil-backend/src/vm_builder.rs

@@ -102,7 +102,6 @@ pub fn analyzed_to_cpp<F: FieldElement>(
 
     // ----------------------- Create the full row files -----------------------
     bb_files.create_full_row_hpp(vm_name, &all_cols);
-    bb_files.create_full_row_cpp(vm_name, &all_cols);
 
     // ----------------------- Create the flavor files -----------------------
     bb_files.create_flavor_hpp(

bb-pilcom/bb-pil-backend/templates/circuit_builder.cpp.hbs

@@ -58,14 +58,14 @@ AvmCircuitBuilder::ProverPolynomials AvmCircuitBuilder::compute_polynomials() co
             // An array which stores for each column of the trace the smallest size of the
             // truncated column containing all non-zero elements.
             // It is used to allocate the polynomials without memory overhead for the tail of zeros.
-            std::array<size_t, Row::SIZE> col_nonzero_size{};
+            std::array<size_t, NUM_COLUMNS_WITH_SHIFTS> col_nonzero_size{};
 
             // Computation of size of columns.
             // Non-parallel version takes 0.5 second for a trace size of 200k rows.
             // A parallel version might be considered in the future.
             for (size_t i = 0; i < num_rows; i++) {
                 const auto& row = rows[i];
-                for (size_t col = 0; col < Row::SIZE; col++) {
+                for (size_t col = 0; col < col_nonzero_size.size(); col++) {
                     if (!row.get_column(static_cast<ColumnAndShifts>(col)).is_zero()) {
                         col_nonzero_size[col] = i + 1;
                     }

bb-pilcom/bb-pil-backend/templates/full_row.hpp.hbs

@@ -1,11 +1,6 @@
 // AUTOGENERATED FILE
 #pragma once
 
-#include <string>
-#include <sstream>
-#include <vector>
-
-#include "barretenberg/common/ref_vector.hpp"
 #include "columns.hpp"
 
 namespace bb::{{snakeCase name}} {
@@ -16,8 +11,6 @@ struct AvmFullRow {
 
     FF {{shoutySnakeCase name}}_ALL_ENTITIES;
 
-    static constexpr size_t SIZE = {{len all_cols}};
-
     // Risky but oh so efficient.
     FF& get_column(ColumnAndShifts col)
     {
@@ -32,8 +25,6 @@ struct AvmFullRow {
     }
 };
 
-template <typename FF> std::ostream& operator<<(std::ostream& os, AvmFullRow<FF> const& row);
-
 } // namespace bb::{{snakeCase name}}
 
 namespace bb {