Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Make target architecture configurable, target westmere in GA. #2660

Merged
merged 1 commit into from
Oct 4, 2023
Merged

fix: Make target architecture configurable, target westmere in GA. #2660

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/publish-bb.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ jobs:
run: |
cd barretenberg/cpp

cmake --preset default -DCMAKE_BUILD_TYPE=RelWithAssert
cmake --preset default -DCMAKE_BUILD_TYPE=RelWithAssert -DTARGET_ARCH=westmere
cmake --build --preset default --target bb

- name: Tar and GZip bb Binary (Ubuntu)
Expand Down
26 changes: 15 additions & 11 deletions barretenberg/cpp/CMakePresets.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
"CC": "clang",
"CXX": "clang++",
"CMAKE_EXPORT_COMPILE_COMMANDS": "ON"
},
"cacheVariables": {
"TARGET_ARCH": "skylake"
}
},
{
Expand Down Expand Up @@ -51,20 +54,20 @@
"DISABLE_ASM": "ON"
}
},
{"name":"asan",
"displayName": "Debugging build with address sanitizer on Clang-16",
"description": "Build with address sanitizer on clang16 with debugging information",
"inherits":"clang16-dbg",
{
"name": "asan",
"displayName": "Debugging build with address sanitizer on Clang-16",
"description": "Build with address sanitizer on clang16 with debugging information",
"inherits": "clang16-dbg",
"binaryDir": "build-asan",
"environment": {
"environment": {
"CMAKE_BUILD_TYPE": "Debug"
},
"cacheVariables": {
"ENABLE_ASAN": "ON",
"DISABLE_ASM": "ON"
"DISABLE_ASM": "ON"
}

},
},
{
"name": "gcc",
"displayName": "Build with GCC",
Expand Down Expand Up @@ -193,7 +196,8 @@
"name": "clang16-dbg",
"inherits": "default",
"configurePreset": "clang16-dbg"
},{
},
{
"name": "asan",
"inherits": "default",
"configurePreset": "asan"
Expand All @@ -218,7 +222,7 @@
"inherits": "clang16",
"configurePreset": "fuzzing"
},
{
{
"name": "smt-verification",
"inherits": "clang16",
"configurePreset": "smt-verification"
Expand Down Expand Up @@ -278,7 +282,7 @@
"inherits": "default",
"configurePreset": "clang16-dbg"
},
{
{
"name": "asan",
"inherits": "default",
"configurePreset": "asan"
Expand Down
3 changes: 2 additions & 1 deletion barretenberg/cpp/cmake/arch.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,6 @@ if(WASM)
endif()

if(NOT WASM AND NOT APPLE AND NOT ARM)
add_compile_options(-march=skylake)
message(STATUS "Target architecture: ${TARGET_ARCH}")
add_compile_options(-march=${TARGET_ARCH})
endif()