Merge branch 'next' into gd/acir-serialization-changes

Author: guipublic

.test_patterns.yml

@@ -45,23 +45,19 @@ tests:
     error_regex: "field_t::range_constraint"
     owners:
       - *luke
-  - regex: "barretenberg/acir_tests/scripts/run_test_browser.sh"
+  - regex: "barretenberg/acir_tests/scripts/browser_prove.sh"
     error_regex: "Failed to fetch"
     owners:
       - *adam
-  - regex: "barretenberg/acir_tests/scripts/run_test_browser.sh"
-    error_regex: "Failed to fetch"
-    owners:
-      - *adam
-  - regex: "barretenberg/acir_tests/scripts/run_test_browser.sh"
+  - regex: "barretenberg/acir_tests/scripts/browser_prove.sh"
     error_regex: "RuntimeError: Out of bounds memory access"
     owners:
       - *adam
-  - regex: "barretenberg/acir_tests/scripts/run_test_browser.sh"
+  - regex: "barretenberg/acir_tests/scripts/browser_prove.sh"
     error_regex: "call_indirect to a null table entry"
     owners:
       - *adam
-  - regex: "barretenberg/acir_tests/scripts/run_test_browser.sh"
+  - regex: "barretenberg/acir_tests/scripts/browser_prove.sh"
     error_regex: "Input is not large enough"
     owners:
       - *adam

barretenberg/README.md

@@ -326,7 +326,7 @@ If you are in a scenario where you have a failing call to check_circuit and wish
 
 Usage instructions:
 
-- On ubuntu (or our mainframe accounts) use `sudo apt-get install libdw-dev libelf-dev libbackward-cpp-dev` to support trace printing
+- On ubuntu (or our mainframe accounts) use `sudo apt-get install libdw-dev libelf-dev` to support trace printing
 - Use `cmake --preset debug-fast-circuit-check-traces` and `cmake --build --preset debug-fast-circuit-check-traces` to enable the backward-cpp dependency through the CHECK_CIRCUIT_STACKTRACES CMake variable.
 - Run any case where you have a failing check_circuit call, you will now have a stack trace illuminating where this constraint was added in code.
 

barretenberg/cpp/CMakeLists.txt

@@ -30,6 +30,7 @@ option(ENABLE_ASAN "Address sanitizer for debugging tricky memory corruption" OF
 option(ENABLE_HEAVY_TESTS "Enable heavy tests when collecting coverage" OFF)
 # Note: Must do 'sudo apt-get install libdw-dev' or equivalent
 option(CHECK_CIRCUIT_STACKTRACES "Enable (slow) stack traces for check circuit" OFF)
+option(ENABLE_STACKTRACES "Enable stack traces on assertion" OFF)
 option(ENABLE_TRACY "Enable low-medium overhead profiling for memory and performance with tracy" OFF)
 option(ENABLE_PIC "Builds with position independent code" OFF)
 option(SYNTAX_ONLY "only check syntax (-fsyntax-only)" OFF)
@@ -44,7 +45,9 @@ if(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64" OR CMAKE_SYSTEM_PROCESSOR MATCHES "a
 endif()
 
 if(CHECK_CIRCUIT_STACKTRACES)
-    add_compile_options(-DCHECK_CIRCUIT_STACKTRACES)
+    add_compile_options(-DCHECK_CIRCUIT_STACKTRACES -DSTACKTRACES)
+elseif(ENABLE_STACKTRACES)
+    add_compile_options(-DSTACKTRACES)
 endif()
 
 if(ENABLE_TRACY OR ENABLE_TRACY_TIME_INSTRUMENTED)

barretenberg/cpp/CMakePresets.json

@@ -119,14 +119,15 @@
       "inherits": "clang20",
       "binaryDir": "build-debug",
       "environment": {
-        "CMAKE_BUILD_TYPE": "Debug",
         "CFLAGS": "-gdwarf-4",
         "CXXFLAGS": "-gdwarf-4",
         "LDFLAGS": "-gdwarf-4"
       },
       "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug",
         "ENABLE_ASAN": "OFF",
-        "DISABLE_ASM": "ON"
+        "DISABLE_ASM": "ON",
+        "ENABLE_STACKTRACES": "ON"
       }
     },
     {
@@ -163,12 +164,12 @@
       "binaryDir": "build-tracy-time-sampled",
       "inherits": "clang20",
       "environment": {
-        "CMAKE_BUILD_TYPE": "RelWithDebInfo",
         "CFLAGS": "-g -fno-omit-frame-pointer",
         "CXXFLAGS": "-g -fno-omit-frame-pointer",
         "LDFLAGS": "-g -fno-omit-frame-pointer -rdynamic"
       },
       "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "RelWithDebInfo",
         "ENABLE_TRACY": "ON"
       }
     },
@@ -190,10 +191,12 @@
       "inherits": "debug",
       "binaryDir": "build-debug-fast",
       "environment": {
-        "CMAKE_BUILD_TYPE": "Debug",
         "CFLAGS": "-O2 -gdwarf",
         "CXXFLAGS": "-O2 -gdwarf-4",
         "LDFLAGS": "-O2 -gdwarf-4"
+      },
+      "cacheVariables": {
+        "ENABLE_STACKTRACES": "ON"
       }
     },
     {
@@ -207,13 +210,25 @@
       }
     },
     {
-      "name": "debug-no-avm",
+      "name": "debug-fast-no-avm",
       "displayName": "Optimized debug build with Clang-20 (no AVM)",
       "description": "Build with globally installed Clang-20 in debug mode excluding the Aztec VM",
+      "inherits": "debug-fast",
+      "binaryDir": "build-debug-fast-no-avm",
+      "cacheVariables": {
+        "DISABLE_AZTEC_VM": "ON",
+        "ENABLE_STACKTRACES": "ON"
+      }
+    },
+    {
+      "name": "debug-no-avm",
+      "displayName": "Debug build with Clang-20 (no AVM)",
+      "description": "Build with globally installed Clang-20 in debug mode excluding the Aztec VM",
       "inherits": "debug",
       "binaryDir": "build-debug-no-avm",
       "cacheVariables": {
-        "DISABLE_AZTEC_VM": "ON"
+        "DISABLE_AZTEC_VM": "ON",
+        "ENABLE_STACKTRACES": "ON"
       }
     },
     {
@@ -235,7 +250,8 @@
       "cacheVariables": {
         "ENABLE_ASAN": "ON",
         "DISABLE_AZTEC_VM": "ON",
-        "DISABLE_ASM": "ON"
+        "DISABLE_ASM": "ON",
+        "ENABLE_STACKTRACES": "OFF"
       }
     },
     {
@@ -244,12 +260,10 @@
       "description": "Build with address sanitizer on clang20 with debugging information",
       "inherits": "debug",
       "binaryDir": "build-asan",
-      "environment": {
-        "CMAKE_BUILD_TYPE": "Debug"
-      },
       "cacheVariables": {
         "ENABLE_ASAN": "ON",
-        "DISABLE_ASM": "ON"
+        "DISABLE_ASM": "ON",
+        "ENABLE_STACKTRACES": "OFF"
       }
     },
     {
@@ -279,9 +293,7 @@
       "binaryDir": "build-fuzzing",
       "cacheVariables": {
         "FUZZING": "ON",
-        "DISABLE_AZTEC_VM": "ON"
-      },
-      "environment": {
+        "DISABLE_AZTEC_VM": "ON",
         "CMAKE_BUILD_TYPE": "RelWithAssert"
       }
     },
@@ -294,9 +306,7 @@
       "cacheVariables": {
         "FUZZING": "ON",
         "DISABLE_AZTEC_VM": "ON",
-        "DISABLE_ASM": "ON"
-      },
-      "environment": {
+        "DISABLE_ASM": "ON",
         "CMAKE_BUILD_TYPE": "RelWithAssert"
       }
     },
@@ -311,9 +321,7 @@
         "FUZZING_SHOW_INFORMATION": "ON",
         "DISABLE_AZTEC_VM": "ON",
         "ENABLE_ASAN": "ON",
-        "DISABLE_ASM": "ON"
-      },
-      "environment": {
+        "DISABLE_ASM": "ON",
         "CMAKE_BUILD_TYPE": "RelWithAssert"
       }
     },
@@ -326,11 +334,11 @@
       "cacheVariables": {
         "FUZZING": "ON",
         "DISABLE_ASM": "ON",
-        "DISABLE_AZTEC_VM": "ON"
+        "DISABLE_AZTEC_VM": "ON",
+        "CMAKE_BUILD_TYPE": "RelWithAssert"
       },
       "environment": {
-        "CXXFLAGS": "-fprofile-instr-generate -fcoverage-mapping",
-        "CMAKE_BUILD_TYPE": "RelWithAssert"
+        "CXXFLAGS": "-fprofile-instr-generate -fcoverage-mapping"
       }
     },
     {
@@ -446,10 +454,8 @@
       "description": "Build for pthread enabled WASM",
       "inherits": "wasm",
       "binaryDir": "build-wasm-threads",
-      "environment": {
-        "CMAKE_BUILD_TYPE": "Release"
-      },
       "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release",
         "MULTITHREADING": "ON"
       }
     },
@@ -459,10 +465,8 @@
       "binaryDir": "build-wasm-threads-dbg",
       "description": "Build with wasi-sdk to create debug wasm",
       "inherits": "wasm",
-      "environment": {
-        "CMAKE_BUILD_TYPE": "Debug"
-      },
       "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug",
         "MULTITHREADING": "ON"
       }
     },
@@ -517,6 +521,11 @@
       "inherits": "default",
       "configurePreset": "clang20-no-avm"
     },
+    {
+      "name": "debug-fast-no-avm",
+      "inherits": "default",
+      "configurePreset": "debug-fast-no-avm"
+    },
     {
       "name": "debug-no-avm",
       "inherits": "default",

barretenberg/cpp/cmake/backward-cpp.cmake

@@ -1,4 +1,4 @@
-if(CHECK_CIRCUIT_STACKTRACES)
+if(CHECK_CIRCUIT_STACKTRACES OR ENABLE_STACKTRACES)
     include(FetchContent)
 
     # Also requires one of: libbfd (gnu binutils), libdwarf, libdw (elfutils)
@@ -8,4 +8,4 @@ if(CHECK_CIRCUIT_STACKTRACES)
         SYSTEM          # optional, the Backward include directory will be treated as system directory
     )
     FetchContent_MakeAvailable(backward)
-endif()
+endif()

barretenberg/cpp/cmake/module.cmake

@@ -57,7 +57,7 @@ function(barretenberg_module MODULE_NAME)
             ${TBB_IMPORTED_TARGETS}
         )
 
-        if(CHECK_CIRCUIT_STACKTRACES)
+        if(CHECK_CIRCUIT_STACKTRACES OR ENABLE_STACKTRACES)
             target_link_libraries(
                 ${MODULE_NAME}_objects
                 PUBLIC
@@ -108,7 +108,7 @@ function(barretenberg_module MODULE_NAME)
         )
         list(APPEND exe_targets ${MODULE_NAME}_tests)
 
-        if(CHECK_CIRCUIT_STACKTRACES)
+        if(CHECK_CIRCUIT_STACKTRACES OR ENABLE_STACKTRACES)
             target_link_libraries(
                 ${MODULE_NAME}_test_objects
                 PUBLIC
@@ -236,7 +236,7 @@ function(barretenberg_module MODULE_NAME)
                 ${TRACY_LIBS}
                 ${TBB_IMPORTED_TARGETS}
             )
-            if(CHECK_CIRCUIT_STACKTRACES)
+            if(CHECK_CIRCUIT_STACKTRACES OR ENABLE_STACKTRACES)
                 target_link_libraries(
                     ${BENCHMARK_NAME}_bench_objects
                     PUBLIC