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

Add inlining hints to concurrent hash map #2394

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+18 −14
Open

Add inlining hints to concurrent hash map #2394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4851356
Fix tests by using results
krenzland Jan 21, 2025
832f726
Add more inlining hints to hashmap
krenzland Jan 21, 2025
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
11 changes: 7 additions & 4 deletions folly/concurrency/ConcurrentHashMap.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -288,10 +288,12 @@ class ConcurrentHashMap {
return true;
}

ConstIterator find(const KeyType& k) const { return findImpl(k); }
FOLLY_ALWAYS_INLINE ConstIterator find(const KeyType& k) const {
return findImpl(k);
}

template <typename K, EnableHeterogeneousFind<K, int> = 0>
ConstIterator find(const K& k) const {
FOLLY_ALWAYS_INLINE ConstIterator find(const K& k) const {
return findImpl(k);
}

Expand Down Expand Up @@ -604,7 +606,8 @@ class ConcurrentHashMap {
segment_(std::exchange(o.segment_, uint64_t(NumShards))),
parent_(std::exchange(o.parent_, nullptr)) {}

ConstIterator(const ConcurrentHashMap* parent, uint64_t segment)
FOLLY_ALWAYS_INLINE ConstIterator(
const ConcurrentHashMap* parent, uint64_t segment)
: segment_(segment), parent_(parent) {}

private:
Expand Down Expand Up @@ -656,7 +659,7 @@ class ConcurrentHashMap {

private:
template <typename K>
ConstIterator findImpl(const K& k) const {
FOLLY_ALWAYS_INLINE ConstIterator findImpl(const K& k) const {
auto h = HashFn{}(k);
auto segment = pickSegment(h);
ConstIterator res(this, segment);
Expand Down
6 changes: 3 additions & 3 deletions folly/concurrency/detail/ConcurrentHashMap-detail.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ class alignas(64) BucketTable {
bucket_count_.load(std::memory_order_relaxed) * load_factor_;
}

Iterator cbegin() {
FOLLY_ALWAYS_INLINE Iterator cbegin() {
Iterator res;
size_t bcount;
Buckets* buckets;
Expand Down Expand Up @@ -605,7 +605,7 @@ class alignas(64) BucketTable {

Iterator& operator=(const Iterator& o) = delete;

Iterator& operator=(Iterator&& o) noexcept {
FOLLY_ALWAYS_INLINE Iterator& operator=(Iterator&& o) noexcept {
if (this != &o) {
hazptrs_ = std::move(o.hazptrs_);
node_ = std::exchange(o.node_, nullptr);
Expand Down Expand Up @@ -1899,7 +1899,7 @@ class alignas(64) ConcurrentHashMapSegment {

void max_load_factor(float factor) { impl_.max_load_factor(factor); }

Iterator cbegin() { return impl_.cbegin(); }
FOLLY_ALWAYS_INLINE Iterator cbegin() { return impl_.cbegin(); }

Iterator cend() { return impl_.cend(); }

Expand Down
15 changes: 8 additions & 7 deletions folly/concurrency/test/ConcurrentHashMapBench.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
#include <thread>

#include <folly/synchronization/test/Barrier.h>
#include <folly/BenchmarkUtil.h>

DEFINE_int32(reps, 10, "number of reps");
DEFINE_int32(ops, 1000 * 1000, "number of operations per rep");
Expand Down Expand Up @@ -92,7 +93,7 @@ uint64_t bench_ctor_dtor(
for (int i = 0; i < ops; ++i) {
folly::ConcurrentHashMap<int, int> m;
for (int j = 0; j < size; ++j) {
m.insert(j, j);
folly::doNotOptimizeAway(m.insert(j, j));
}
}
};
Expand All @@ -114,11 +115,11 @@ uint64_t bench_find(
auto fn = [&](int) {
if (sameItem) {
for (int i = 0; i < ops; ++i) {
m.find(key);
folly::doNotOptimizeAway(m.find(key));
}
} else {
for (int i = 0; i < ops; ++i) {
m.find(i);
folly::doNotOptimizeAway(m.find(i));
}
}
};
Expand All @@ -138,7 +139,7 @@ uint64_t bench_iter(const int nthr, int size, const std::string& name) {
auto repFn = [&] {
auto fn = [&](int) {
for (int i = 0; i < reps; ++i) {
for (auto it = m.begin(); it != m.end(); ++it) {
for (auto it = m.begin(); it != m.end(); doNotOptimizeAway(++it)) {
}
}
};
Expand All @@ -157,7 +158,7 @@ uint64_t bench_begin(const int nthr, int size, const std::string& name) {
auto repFn = [&] {
auto fn = [&](int) {
for (int i = 0; i < ops; ++i) {
auto it = m.begin();
folly::doNotOptimizeAway(m.begin());
}
};
auto endfn = [&] {};
Expand All @@ -175,7 +176,7 @@ uint64_t bench_empty(const int nthr, int size, const std::string& name) {
auto repFn = [&] {
auto fn = [&](int) {
for (int i = 0; i < ops; ++i) {
m.empty();
folly::doNotOptimizeAway(m.empty());
}
};
auto endfn = [&] {};
Expand All @@ -193,7 +194,7 @@ uint64_t bench_size(const int nthr, int size, const std::string& name) {
auto repFn = [&] {
auto fn = [&](int) {
for (int i = 0; i < ops; ++i) {
m.size();
folly::doNotOptimizeAway(m.size());
}
};
auto endfn = [&] {};
Expand Down
Loading