feat: Support disabling aztec vm in non-wasm builds

barretenberg/cpp/CMakeLists.txt

@@ -27,6 +27,7 @@ endif(DOXYGEN_FOUND)
 
 option(DISABLE_ASM "Disable custom assembly" OFF)
 option(DISABLE_ADX "Disable ADX assembly variant" OFF)
+option(DISABLE_AZTEC_VM "Don't build Aztec VM (acceptable if iterating on core proving)" OFF)
 option(MULTITHREADING "Enable multi-threading" ON)
 option(OMP_MULTITHREADING "Enable OMP multi-threading" OFF)
 option(FUZZING "Build ONLY fuzzing harnesses" OFF)
@@ -144,6 +145,12 @@ include(cmake/module.cmake)
 include(cmake/msgpack.cmake)
 include(cmake/backward-cpp.cmake)
 
+if (WASM)
+    set(DISABLE_AZTEC_VM ON)
+endif()
+if(DISABLE_AZTEC_VM)
+    add_definitions(-DDISABLE_AZTEC_VM=1)
+endif()
 add_subdirectory(src)
 if (ENABLE_ASAN AND NOT(FUZZING))
     find_program(LLVM_SYMBOLIZER_PATH NAMES llvm-symbolizer-16)

barretenberg/cpp/src/CMakeLists.txt

@@ -154,7 +154,7 @@ set(BARRETENBERG_TARGET_OBJECTS
     $<TARGET_OBJECTS:translator_vm_recursion_objects>
     $<TARGET_OBJECTS:ultra_honk_objects>)
 
-if(NOT WASM)
+if(NOT DISABLE_AZTEC_VM)
     # enable AVM
     list(APPEND BARRETENBERG_TARGET_OBJECTS $<TARGET_OBJECTS:vm_objects>)
 endif()

barretenberg/cpp/src/barretenberg/bb/main.cpp

@@ -5,8 +5,10 @@
 #include "barretenberg/dsl/acir_format/acir_format.hpp"
 #include "barretenberg/honk/proof_system/types/proof.hpp"
 #include "barretenberg/plonk/proof_system/proving_key/serialize.hpp"
+#ifndef DISABLE_AZTEC_VM
 #include "barretenberg/vm/avm_trace/avm_common.hpp"
 #include "barretenberg/vm/avm_trace/avm_execution.hpp"
+#endif
 #include "config.hpp"
 #include "get_bn254_crs.hpp"
 #include "get_bytecode.hpp"
@@ -514,6 +516,7 @@ void vk_as_fields(const std::string& vk_path, const std::string& output_path)
     }
 }
 
+#ifndef DISABLE_AZTEC_VM
 /**
  * @brief Writes an avm proof and corresponding (incomplete) verification key to files.
  *
@@ -586,6 +589,7 @@ bool avm_verify(const std::filesystem::path& proof_path, const std::filesystem::
     vinfo("verified: ", verified);
     return verified;
 }
+#endif
 
 /**
  * @brief Creates a proof for an ACIR circuit
@@ -892,6 +896,7 @@ int main(int argc, char* argv[])
         } else if (command == "vk_as_fields") {
             std::string output_path = get_option(args, "-o", vk_path + "_fields.json");
             vk_as_fields(vk_path, output_path);
+#ifndef DISABLE_AZTEC_VM
         } else if (command == "avm_prove") {
             std::filesystem::path avm_bytecode_path = get_option(args, "--avm-bytecode", "./target/avm_bytecode.bin");
             std::filesystem::path avm_calldata_path = get_option(args, "--avm-calldata", "./target/avm_calldata.bin");
@@ -903,6 +908,7 @@ int main(int argc, char* argv[])
             avm_prove(avm_bytecode_path, avm_calldata_path, avm_public_inputs_path, avm_hints_path, output_path);
         } else if (command == "avm_verify") {
             return avm_verify(proof_path, vk_path) ? 0 : 1;
+#endif
         } else if (command == "prove_ultra_honk") {
             std::string output_path = get_option(args, "-o", "./proofs/proof");
             prove_honk<UltraFlavor>(bytecode_path, witness_path, output_path);

barretenberg/cpp/src/barretenberg/stdlib/primitives/biggroup/biggroup_nafs.hpp

@@ -485,7 +485,7 @@ std::vector<bool_t<C>> element<C, Fq, Fr, G>::compute_naf(const Fr& scalar, cons
     C* ctx = scalar.context;
     uint512_t scalar_multiplier_512 = uint512_t(uint256_t(scalar.get_value()) % Fr::modulus);
     uint256_t scalar_multiplier = scalar_multiplier_512.lo;
-    // NAF can't handl 0
+    // NAF can't handle 0
     if (scalar_multiplier == 0) {
         scalar_multiplier = Fr::modulus;
     }

barretenberg/cpp/src/barretenberg/vm/CMakeLists.txt

@@ -1,3 +1,3 @@
-if(NOT WASM)
-barretenberg_module(vm honk sumcheck)
+if(NOT DISABLE_AZTEC_VM)
+  barretenberg_module(vm honk sumcheck)
 endif()