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

unordered_map,unordered_set: Increase excess size #435

Merged
merged 1 commit into from
Oct 22, 2024
Merged

unordered_map,unordered_set: Increase excess size #435

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
4 changes: 2 additions & 2 deletions src/stdgpu/impl/unordered_base_detail.cuh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1203,9 +1203,9 @@ unordered_base<Key, Value, KeyFromValue, Hash, KeyEqual, Allocator>::createDevic
bit_ceil(static_cast<std::size_t>(std::ceil(static_cast<float>(capacity) / default_max_load_factor()))));

// excess count is estimated by the expected collision count:
// - Conservatively lower the amount since entries falling into regular buckets are already included here
// - Keep the amount although it also counts bucket elements as this is based on assuming a uniform distribution
// - Increase amount by 1 since insertion expects a non-empty excess list also in case of no collision
index_t excess_count = expected_collisions(bucket_count, capacity) * 2 / 3 + 1;
index_t excess_count = expected_collisions(bucket_count, capacity) + 1;

index_t total_count = bucket_count + excess_count;

Expand Down
6 changes: 3 additions & 3 deletions tests/stdgpu/unordered_datastructure.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1430,7 +1430,7 @@ TEST_F(STDGPU_UNORDERED_DATASTRUCTURE_TEST_CLASS, insert_multiple_while_full)

TEST_F(STDGPU_UNORDERED_DATASTRUCTURE_TEST_CLASS, insert_while_excess_empty)
{
test_unordered_datastructure tiny_hash_datastructure = test_unordered_datastructure::createDeviceObject(2);
test_unordered_datastructure tiny_hash_datastructure = test_unordered_datastructure::createDeviceObject(1);

// Fill tiny hash table
const test_unordered_datastructure::key_type position_1(1, 2, 3);
Expand Down Expand Up @@ -1592,7 +1592,7 @@ TEST_F(STDGPU_UNORDERED_DATASTRUCTURE_TEST_CLASS, insert_parallel_while_one_free

TEST_F(STDGPU_UNORDERED_DATASTRUCTURE_TEST_CLASS, insert_parallel_while_excess_empty)
{
test_unordered_datastructure tiny_hash_datastructure = test_unordered_datastructure::createDeviceObject(2);
test_unordered_datastructure tiny_hash_datastructure = test_unordered_datastructure::createDeviceObject(1);

// Fill tiny hash table
const test_unordered_datastructure::key_type position_1(1, 2, 3);
Expand Down Expand Up @@ -1688,7 +1688,7 @@ TEST_F(STDGPU_UNORDERED_DATASTRUCTURE_TEST_CLASS, emplace_parallel_while_one_fre

TEST_F(STDGPU_UNORDERED_DATASTRUCTURE_TEST_CLASS, emplace_parallel_while_excess_empty)
{
test_unordered_datastructure tiny_hash_datastructure = test_unordered_datastructure::createDeviceObject(2);
test_unordered_datastructure tiny_hash_datastructure = test_unordered_datastructure::createDeviceObject(1);

// Fill tiny hash table
const test_unordered_datastructure::key_type position_1(1, 2, 3);
Expand Down