chore(avm): avoid including flavor where possible (#7361)

The Flavor is difficult for the compiler to process.
AztecProtocol · Jul 8, 2024 · dbdffd6 · dbdffd6
1 parent 6329833
commit dbdffd6
Show file tree

Hide file tree

Showing 19 changed files with 589 additions and 456 deletions.
diff --git a/barretenberg/cpp/src/barretenberg/bb/main.cpp b/barretenberg/cpp/src/barretenberg/bb/main.cpp
@@ -9,6 +9,7 @@
 #ifndef DISABLE_AZTEC_VM
 #include "barretenberg/vm/avm_trace/avm_common.hpp"
 #include "barretenberg/vm/avm_trace/avm_execution.hpp"
+#include "barretenberg/vm/avm_trace/stats.hpp"
 #endif
 #include "config.hpp"
 #include "get_bn254_crs.hpp"

diff --git a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_common.hpp b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_common.hpp
@@ -3,8 +3,9 @@
 #include "barretenberg/common/throw_or_abort.hpp"
 #include "barretenberg/serialize/msgpack.hpp"
 #include "barretenberg/vm/avm_trace/constants.hpp"
-#include "barretenberg/vm/avm_trace/stats.hpp"
-#include "barretenberg/vm/generated/avm_flavor.hpp"
+
+#include "barretenberg/vm/generated/avm_flavor_settings.hpp"
+#include "barretenberg/vm/generated/avm_full_row.hpp"
 
 #include <array>
 #include <cstdint>
@@ -13,8 +14,7 @@
 
 namespace bb::avm_trace {
 
-using Flavor = bb::AvmFlavor;
-using FF = Flavor::FF;
+using FF = AvmFlavorSettings::FF;
 
 // To toggle all relevant unit tests with proving, set the env variable "AVM_ENABLE_FULL_PROVING".
 static const bool ENABLE_PROVING = std::getenv("AVM_ENABLE_FULL_PROVING") != nullptr;

diff --git a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_execution.cpp b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_execution.cpp
@@ -13,7 +13,6 @@
 #include "barretenberg/vm/avm_trace/constants.hpp"
 #include "barretenberg/vm/generated/avm_circuit_builder.hpp"
 #include "barretenberg/vm/generated/avm_composer.hpp"
-#include "barretenberg/vm/generated/avm_flavor.hpp"
 
 #include <cassert>
 #include <cstddef>

diff --git a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_execution.hpp b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_execution.hpp
@@ -4,6 +4,7 @@
 #include "barretenberg/vm/avm_trace/avm_common.hpp"
 #include "barretenberg/vm/avm_trace/avm_instructions.hpp"
 #include "barretenberg/vm/avm_trace/avm_trace.hpp"
+#include "barretenberg/vm/generated/avm_flavor.hpp"
 
 #include <cstddef>
 #include <cstdint>

diff --git a/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_trace.hpp b/barretenberg/cpp/src/barretenberg/vm/avm_trace/avm_trace.hpp
@@ -16,7 +16,6 @@
 #include "barretenberg/vm/avm_trace/gadgets/avm_pedersen.hpp"
 #include "barretenberg/vm/avm_trace/gadgets/avm_poseidon2.hpp"
 #include "barretenberg/vm/avm_trace/gadgets/avm_sha256.hpp"
-#include "barretenberg/vm/generated/avm_circuit_builder.hpp"
 
 namespace bb::avm_trace {