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

rpcdaemon: add CMake option to enable mimalloc usage #919

Merged
merged 4 commits into from
Mar 17, 2023
Merged

rpcdaemon: add CMake option to enable mimalloc usage #919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
de38fa9
Add CMake option to enable mimalloc usage in RpcDaemon
canepat Mar 17, 2023
bc932c6
Add mimalloc installation in CI
canepat Mar 17, 2023
43be2af
Remove mimalloc dependency from silkrpc library
canepat Mar 17, 2023
4a7aac5
Add mimalloc installation in CI default build
canepat Mar 17, 2023
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
20 changes: 20 additions & 0 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,16 @@ commands:
command: |
sudo apt-get update
sudo apt-get install -y m4 texinfo bison
- run:
name: "Install mimalloc"
command: |
git clone https://github.com/microsoft/mimalloc
cd mimalloc
mkdir -p out/release
cd out/release
cmake ../..
make
sudo make install
- restore_cache:
name: "Restore Hunter cache"
key: &hunter-cache-key hunter-{{ .Environment.CIRCLE_JOB }}-{{checksum "cmake/Hunter/config.cmake"}}-{{checksum "cmake/toolchain/base.cmake"}}-{{checksum "cmake/toolchain/cxx20.cmake"}}-{{checksum "cmake/toolchain/clang_libcxx.cmake"}}-{{checksum "cmake/toolchain/wasi.cmake"}}
Expand Down Expand Up @@ -278,6 +288,16 @@ jobs:
command: |
sudo apt-get update
sudo apt-get install -y m4 texinfo bison
- run:
name: "Install mimalloc"
command: |
git clone https://github.com/microsoft/mimalloc
cd mimalloc
mkdir -p out/release
cd out/release
cmake ../..
make
sudo make install
- restore_cache:
name: "Restore Hunter cache"
key: &cache-key hunter-{{ .Environment.CIRCLE_JOB }}-{{checksum "cmake/Hunter/config.cmake"}}-{{checksum "cmake/toolchain/base.cmake"}}-{{checksum "cmake/toolchain/cxx20.cmake"}}
Expand Down
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ option(SILKWORM_WASM_API "Build WebAssembly API" OFF)
option(SILKWORM_CORE_ONLY "Only build Silkworm Core" OFF)
option(SILKWORM_CLANG_COVERAGE "Clang instrumentation for code coverage reports" OFF)
option(SILKWORM_SANITIZE "Build instrumentation for sanitizers" OFF)
option(SILKWORM_USE_MIMALLOC "Enable using mimalloc for dynamic memory management" ON)

get_filename_component(SILKWORM_MAIN_DIR . ABSOLUTE)
set(SILKWORM_MAIN_SRC_DIR "${SILKWORM_MAIN_DIR}/silkworm")
Expand Down
4 changes: 2 additions & 2 deletions cmd/rpcdaemon/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ find_package(absl REQUIRED)
find_package(CLI11 REQUIRED)
find_package(gRPC REQUIRED)
find_package(Protobuf REQUIRED)
if(SILKRPC_USE_MIMALLOC)
if(SILKWORM_USE_MIMALLOC)
find_package(mimalloc 2.0 REQUIRED)
endif()

Expand Down Expand Up @@ -62,7 +62,7 @@ set(SILKRPC_DAEMON_LIBRARIES
silkrpc
absl::flags_parse
CLI11::CLI11)
if(SILKRPC_USE_MIMALLOC)
if(SILKWORM_USE_MIMALLOC)
list(APPEND SILKRPC_DAEMON_LIBRARIES mimalloc)
endif()

Expand Down
1 change: 1 addition & 0 deletions conanfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ cli11/2.2.0
grpc/1.46.3
gtest/1.12.1
jwt-cpp/0.6.0
mimalloc/2.0.9
ms-gsl/4.0.0
nlohmann_json/3.11.2
openssl/1.1.1s # grpc dependency
Expand Down
6 changes: 0 additions & 6 deletions silkworm/silkrpc/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,6 @@ else()
endif()
find_package(intx REQUIRED)
find_package(jwt-cpp REQUIRED)
if(SILKRPC_USE_MIMALLOC)
find_package(mimalloc 2.0 REQUIRED)
endif()
find_package(nlohmann_json REQUIRED)

set(SILKWORM_INTERFACE_SRC
Expand Down Expand Up @@ -71,9 +68,6 @@ set(SILKRPC_LIBRARIES
protobuf::libprotobuf
silkworm_core
silkworm_node)
if(SILKRPC_USE_MIMALLOC)
list(APPEND SILKRPC_LIBRARIES mimalloc)
endif()

add_library(silkrpc ${SILKRPC_SRC} ${SILKWORM_INTERFACE_SRC})

Expand Down