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

Upgrade to xxhash 0.8.2 as conan dependency, enable SIMD hashing #4893

Merged
merged 6 commits into from
Mar 13, 2024
Merged

Upgrade to xxhash 0.8.2 as conan dependency, enable SIMD hashing #4893

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
23464fb
Switch to xxhash/0.8.2, as conan dependency
Bronek Jan 19, 2024
1cb418e
Upgrade to SIMD implementation of xxhash
Bronek Jan 19, 2024
ede2376
Merge branch 'develop' into xxhash_upgrade
Bronek Jan 23, 2024
46427ad
Merge branch 'develop' into xxhash_upgrade
Bronek Feb 7, 2024
f47986c
Check out-of-memory state in XXH3_createState
Bronek Mar 8, 2024
6843b1e
Merge branch 'develop' into xxhash_upgrade
Bronek Mar 13, 2024
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
7 changes: 2 additions & 5 deletions Builds/CMake/RippledCore.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ target_sources (xrpl_core PRIVATE
src/ripple/beast/clock/basic_seconds_clock.cpp
src/ripple/beast/core/CurrentThreadName.cpp
src/ripple/beast/core/SemanticVersion.cpp
src/ripple/beast/hash/impl/xxhash.cpp
src/ripple/beast/insight/impl/Collector.cpp
src/ripple/beast/insight/impl/Groups.cpp
src/ripple/beast/insight/impl/Hook.cpp
Expand Down Expand Up @@ -152,7 +151,8 @@ target_link_libraries (xrpl_core
secp256k1::secp256k1
ed25519::ed25519
date::date
Ripple::opts)
Ripple::opts
xxHash::xxhash)
#[=================================[
main/core headers installation
#]=================================]
Expand Down Expand Up @@ -358,9 +358,6 @@ install (
src/ripple/beast/hash/uhash.h
src/ripple/beast/hash/xxhasher.h
DESTINATION include/ripple/beast/hash)
install (
FILES src/ripple/beast/hash/impl/xxhash.h
DESTINATION include/ripple/beast/hash/impl)
install (
FILES
src/ripple/beast/net/IPAddress.h
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 @@ -94,6 +94,7 @@ endif()

find_package(nudb REQUIRED)
find_package(date REQUIRED)
find_package(xxHash REQUIRED)

target_link_libraries(ripple_libs INTERFACE
ed25519::ed25519
Expand Down
3 changes: 3 additions & 0 deletions conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ class Xrpl(ConanFile):
'soci/4.0.3',
'sqlite3/3.42.0',
'zlib/1.2.13',
'xxhash/0.8.2',
]

default_options = {
Expand Down Expand Up @@ -86,6 +87,7 @@ class Xrpl(ConanFile):
'soci:shared': False,
'soci:with_sqlite3': True,
'soci:with_boost': True,
'xxhash:shared': False,
}

def set_version(self):
Expand Down Expand Up @@ -159,4 +161,5 @@ def package_info(self):
'openssl::crypto',
'date::date',
'grpc::grpc++',
'xxHash::xxhash',
]
Loading
Loading