chore(avm): rearrange files (#7723)

One step closer to being able to create parallel VMs again (like the Spike VM). * Moved common files under `bb/vm` * Moved AVM files to `bb/vm/avm` and removed the prefixes * Moved relations from a random folder in bb to `bb/vm/avm/generated/relations` * Deleted old leftover files in `bb/relations/generated/avm/` Now everything generated is truly under `generated`
AztecProtocol · Aug 1, 2024 · 3270662 · 3270662
1 parent 0d83cde
commit 3270662
Show file tree

Hide file tree

Showing 173 changed files with 331 additions and 1,252 deletions.
diff --git a/barretenberg/cpp/src/barretenberg/bb/main.cpp b/barretenberg/cpp/src/barretenberg/bb/main.cpp
@@ -13,8 +13,8 @@
 
 #include <cstddef>
 #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/common.hpp"
+#include "barretenberg/vm/avm/trace/execution.hpp"
 #include "barretenberg/vm/stats.hpp"
 #endif
 #include "config.hpp"

diff --git a/barretenberg/cpp/src/barretenberg/relations/generated/avm/declare_views.hpp b/barretenberg/cpp/src/barretenberg/relations/generated/avm/declare_views.hpp
diff --git a/barretenberg/cpp/src/barretenberg/relations/generated/avm/perm_cd_mem.hpp b/barretenberg/cpp/src/barretenberg/relations/generated/avm/perm_cd_mem.hpp
diff --git a/barretenberg/cpp/src/barretenberg/relations/generated/avm/perm_main_cd_copy.hpp b/barretenberg/cpp/src/barretenberg/relations/generated/avm/perm_main_cd_copy.hpp
diff --git a/barretenberg/cpp/src/barretenberg/relations/generated/avm/perm_main_return.hpp b/barretenberg/cpp/src/barretenberg/relations/generated/avm/perm_main_return.hpp
diff --git a/barretenberg/cpp/src/barretenberg/relations/generated/avm/perm_return_mem.hpp b/barretenberg/cpp/src/barretenberg/relations/generated/avm/perm_return_mem.hpp
diff --git a/...berg/vm/generated/avm_circuit_builder.cpp → ...berg/vm/avm/generated/circuit_builder.cpp b/...berg/vm/generated/avm_circuit_builder.cpp → ...berg/vm/avm/generated/circuit_builder.cpp
@@ -1,5 +1,5 @@
 // AUTOGENERATED FILE
-#include "barretenberg/vm/generated/avm_circuit_builder.hpp"
+#include "barretenberg/vm/avm/generated/circuit_builder.hpp"
 
 #include <mutex>
 

diff --git a/...berg/vm/generated/avm_circuit_builder.hpp → ...berg/vm/avm/generated/circuit_builder.hpp b/...berg/vm/generated/avm_circuit_builder.hpp → ...berg/vm/avm/generated/circuit_builder.hpp
@@ -5,8 +5,8 @@
 
 #include "barretenberg/stdlib_circuit_builders/circuit_builder_base.hpp"
 
-#include "barretenberg/vm/generated/avm_flavor.hpp"
-#include "barretenberg/vm/generated/avm_full_row.hpp"
+#include "barretenberg/vm/avm/generated/flavor.hpp"
+#include "barretenberg/vm/avm/generated/full_row.hpp"
 
 namespace bb {
 

diff --git a/...arretenberg/vm/generated/avm_composer.cpp → ...arretenberg/vm/avm/generated/composer.cpp b/...arretenberg/vm/generated/avm_composer.cpp → ...arretenberg/vm/avm/generated/composer.cpp
@@ -1,10 +1,10 @@
 // AUTOGENERATED FILE
-#include "barretenberg/vm/generated/avm_composer.hpp"
+#include "barretenberg/vm/avm/generated/composer.hpp"
 
 #include "barretenberg/plonk_honk_shared/composer/composer_lib.hpp"
 #include "barretenberg/plonk_honk_shared/composer/permutation_lib.hpp"
-#include "barretenberg/vm/generated/avm_circuit_builder.hpp"
-#include "barretenberg/vm/generated/avm_verifier.hpp"
+#include "barretenberg/vm/avm/generated/circuit_builder.hpp"
+#include "barretenberg/vm/avm/generated/verifier.hpp"
 
 namespace bb {
 

diff --git a/...arretenberg/vm/generated/avm_composer.hpp → ...arretenberg/vm/avm/generated/composer.hpp b/...arretenberg/vm/generated/avm_composer.hpp → ...arretenberg/vm/avm/generated/composer.hpp
@@ -3,9 +3,9 @@
 
 #include "barretenberg/plonk_honk_shared/composer/composer_lib.hpp"
 #include "barretenberg/srs/global_crs.hpp"
-#include "barretenberg/vm/generated/avm_circuit_builder.hpp"
-#include "barretenberg/vm/generated/avm_prover.hpp"
-#include "barretenberg/vm/generated/avm_verifier.hpp"
+#include "barretenberg/vm/avm/generated/circuit_builder.hpp"
+#include "barretenberg/vm/avm/generated/prover.hpp"
+#include "barretenberg/vm/avm/generated/verifier.hpp"
 
 namespace bb {