From f0a7718def63907396cc84488fe2a2ed3de77522 Mon Sep 17 00:00:00 2001 From: codygunton <codygunton@gmail.com> Date: Wed, 6 Mar 2024 19:23:51 +0000 Subject: [PATCH 1/2] Add RelWithAssert build --- barretenberg/cpp/CMakePresets.json | 29 ++++++++++++++++++++++++----- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/barretenberg/cpp/CMakePresets.json b/barretenberg/cpp/CMakePresets.json index 85e8c0c9490..d4d08f2efe6 100644 --- a/barretenberg/cpp/CMakePresets.json +++ b/barretenberg/cpp/CMakePresets.json @@ -70,6 +70,15 @@ "LDFLAGS": "-O2 -gdwarf-4" } }, + { + "name": "clang16-with-asserts", + "displayName": "Build with Clang-16 using RelWithAssert", + "description": "Build with globally installed Clang-16 in release with ASSERTs mode", + "inherits": "default", + "environment": { + "CMAKE_BUILD_TYPE": "RelWithAssert" + } + }, { "name": "asan", "displayName": "Debugging build with address sanitizer on Clang-16", @@ -114,7 +123,8 @@ "CC": "gcc-13", "CXX": "g++-13" } - }, { + }, + { "name": "bench", "displayName": "Build benchmarks", "description": "Build default preset but with a special benchmark directory", @@ -359,6 +369,11 @@ "inherits": "default", "configurePreset": "clang16-dbg-fast" }, + { + "name": "clang16-with-asserts", + "inherits": "default", + "configurePreset": "clang16-with-asserts" + }, { "name": "asan", "inherits": "default", @@ -389,7 +404,7 @@ "inherits": "clang16", "configurePreset": "fuzzing" }, -{ + { "name": "fuzzing-asan", "inherits": "clang16-dbg", "configurePreset": "fuzzing-asan" @@ -442,14 +457,18 @@ "configurePreset": "wasm-dbg", "inheritConfigureEnvironment": true, "jobs": 0, - "targets": ["barretenberg.wasm"] + "targets": [ + "barretenberg.wasm" + ] }, { "name": "wasm-threads", "configurePreset": "wasm-threads", "inheritConfigureEnvironment": true, "jobs": 0, - "targets": ["barretenberg.wasm"] + "targets": [ + "barretenberg.wasm" + ] }, { "name": "xray", @@ -518,7 +537,7 @@ "inherits": "default", "configurePreset": "fuzzing" }, -{ + { "name": "fuzzing-asan", "inherits": "clang16-dbg", "configurePreset": "fuzzing-asan" From c26b4741ce30de76a4117c308ca9543d51b0ee15 Mon Sep 17 00:00:00 2001 From: codygunton <codygunton@gmail.com> Date: Thu, 14 Mar 2024 17:22:33 +0000 Subject: [PATCH 2/2] Rename --- barretenberg/cpp/CMakePresets.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/barretenberg/cpp/CMakePresets.json b/barretenberg/cpp/CMakePresets.json index d4d08f2efe6..cf1744b5c6f 100644 --- a/barretenberg/cpp/CMakePresets.json +++ b/barretenberg/cpp/CMakePresets.json @@ -71,7 +71,7 @@ } }, { - "name": "clang16-with-asserts", + "name": "clang16-assert", "displayName": "Build with Clang-16 using RelWithAssert", "description": "Build with globally installed Clang-16 in release with ASSERTs mode", "inherits": "default", @@ -370,9 +370,9 @@ "configurePreset": "clang16-dbg-fast" }, { - "name": "clang16-with-asserts", + "name": "clang16-assert", "inherits": "default", - "configurePreset": "clang16-with-asserts" + "configurePreset": "clang16-assert" }, { "name": "asan",