Skip to content

Commit 640f775

Browse files
sleeepyjacksleeepyjack
committed
Update tests
1 parent c78c8b2 commit 640f775

41 files changed

Lines changed: 397 additions & 479 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎tests/CMakeLists.txt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,6 @@ ConfigureTest(STATIC_SET_TEST
6464
static_set/heterogeneous_lookup_test.cu
6565
static_set/insert_and_find_test.cu
6666
static_set/large_input_test.cu
67-
static_set/large_key_type_test.cu
6867
static_set/retrieve_test.cu
6968
static_set/retrieve_all_test.cu
7069
static_set/retrieve_if_test.cu
@@ -89,7 +88,6 @@ ConfigureTest(STATIC_MAP_TEST
8988
static_map/insert_or_assign_test.cu
9089
static_map/insert_or_apply_test.cu
9190
static_map/key_sentinel_test.cu
92-
static_map/large_type_test.cu
9391
static_map/shared_memory_test.cu
9492
static_map/stream_test.cu
9593
static_map/rehash_test.cu

‎tests/static_map/contains_test.cu‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
#include <test_utils.hpp>
1818

19+
#include <cuco/detail/__config>
1920
#include <cuco/static_map.cuh>
2021

2122
#include <cuda/functional>
@@ -130,7 +131,15 @@ TEMPLATE_TEST_CASE_SIG(
130131
(int32_t, int32_t, cuco::test::probe_sequence::linear_probing, 1),
131132
(int32_t, int32_t, cuco::test::probe_sequence::linear_probing, 2),
132133
(int64_t, int64_t, cuco::test::probe_sequence::linear_probing, 1),
133-
(int64_t, int64_t, cuco::test::probe_sequence::linear_probing, 2))
134+
(int64_t, int64_t, cuco::test::probe_sequence::linear_probing, 2)
135+
#if defined(CUCO_HAS_128BIT_ATOMICS)
136+
,
137+
(__int128_t, __int128_t, cuco::test::probe_sequence::double_hashing, 1),
138+
(__int128_t, __int128_t, cuco::test::probe_sequence::double_hashing, 2),
139+
(__int128_t, __int128_t, cuco::test::probe_sequence::linear_probing, 1),
140+
(__int128_t, __int128_t, cuco::test::probe_sequence::linear_probing, 2)
141+
#endif
142+
)
134143
{
135144
constexpr size_type num_keys{400};
136145

‎tests/static_map/duplicate_keys_test.cu‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
#include <test_utils.hpp>
1818

19+
#include <cuco/detail/__config>
1920
#include <cuco/static_map.cuh>
2021

2122
#include <cuda/functional>
@@ -52,7 +53,15 @@ TEMPLATE_TEST_CASE_SIG(
5253
(int64_t, int32_t, cuco::test::probe_sequence::linear_probing, 1),
5354
(int64_t, int64_t, cuco::test::probe_sequence::linear_probing, 1),
5455
(int64_t, int32_t, cuco::test::probe_sequence::linear_probing, 2),
55-
(int64_t, int64_t, cuco::test::probe_sequence::linear_probing, 2))
56+
(int64_t, int64_t, cuco::test::probe_sequence::linear_probing, 2)
57+
#if defined(CUCO_HAS_128BIT_ATOMICS)
58+
,
59+
(__int128_t, __int128_t, cuco::test::probe_sequence::double_hashing, 1),
60+
(__int128_t, __int128_t, cuco::test::probe_sequence::double_hashing, 2),
61+
(__int128_t, __int128_t, cuco::test::probe_sequence::linear_probing, 1),
62+
(__int128_t, __int128_t, cuco::test::probe_sequence::linear_probing, 2)
63+
#endif
64+
)
5665
{
5766
constexpr size_type num_keys{500'000};
5867

‎tests/static_map/erase_test.cu‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
#include <test_utils.hpp>
1818

19+
#include <cuco/detail/__config>
1920
#include <cuco/static_map.cuh>
2021

2122
#include <cuda/functional>
@@ -101,7 +102,15 @@ TEMPLATE_TEST_CASE_SIG(
101102
(int64_t, int32_t, cuco::test::probe_sequence::linear_probing, 1),
102103
(int64_t, int64_t, cuco::test::probe_sequence::linear_probing, 1),
103104
(int64_t, int32_t, cuco::test::probe_sequence::linear_probing, 2),
104-
(int64_t, int64_t, cuco::test::probe_sequence::linear_probing, 2))
105+
(int64_t, int64_t, cuco::test::probe_sequence::linear_probing, 2)
106+
#if defined(CUCO_HAS_128BIT_ATOMICS)
107+
,
108+
(__int128_t, __int128_t, cuco::test::probe_sequence::double_hashing, 1),
109+
(__int128_t, __int128_t, cuco::test::probe_sequence::double_hashing, 2),
110+
(__int128_t, __int128_t, cuco::test::probe_sequence::linear_probing, 1),
111+
(__int128_t, __int128_t, cuco::test::probe_sequence::linear_probing, 2)
112+
#endif
113+
)
105114
{
106115
constexpr size_type num_keys{1'000'000};
107116

‎tests/static_map/find_test.cu‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
#include <test_utils.hpp>
1818

19+
#include <cuco/detail/__config>
1920
#include <cuco/static_map.cuh>
2021

2122
#include <cuda/functional>
@@ -152,7 +153,15 @@ TEMPLATE_TEST_CASE_SIG(
152153
(int64_t, int32_t, cuco::test::probe_sequence::linear_probing, 1),
153154
(int64_t, int64_t, cuco::test::probe_sequence::linear_probing, 1),
154155
(int64_t, int32_t, cuco::test::probe_sequence::linear_probing, 2),
155-
(int64_t, int64_t, cuco::test::probe_sequence::linear_probing, 2))
156+
(int64_t, int64_t, cuco::test::probe_sequence::linear_probing, 2)
157+
#if defined(CUCO_HAS_128BIT_ATOMICS)
158+
,
159+
(__int128_t, __int128_t, cuco::test::probe_sequence::double_hashing, 1),
160+
(__int128_t, __int128_t, cuco::test::probe_sequence::double_hashing, 2),
161+
(__int128_t, __int128_t, cuco::test::probe_sequence::linear_probing, 1),
162+
(__int128_t, __int128_t, cuco::test::probe_sequence::linear_probing, 2)
163+
#endif
164+
)
156165
{
157166
constexpr size_type num_keys{301};
158167

‎tests/static_map/for_each_test.cu‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
#include <test_utils.hpp>
1818

19+
#include <cuco/detail/__config>
1920
#include <cuco/static_map.cuh>
2021

2122
#include <cuda/atomic>
@@ -99,7 +100,15 @@ TEMPLATE_TEST_CASE_SIG(
99100
(int64_t, int32_t, cuco::test::probe_sequence::linear_probing, 1),
100101
(int64_t, int64_t, cuco::test::probe_sequence::linear_probing, 1),
101102
(int64_t, int32_t, cuco::test::probe_sequence::linear_probing, 2),
102-
(int64_t, int64_t, cuco::test::probe_sequence::linear_probing, 2))
103+
(int64_t, int64_t, cuco::test::probe_sequence::linear_probing, 2)
104+
#if defined(CUCO_HAS_128BIT_ATOMICS)
105+
,
106+
(__int128_t, __int128_t, cuco::test::probe_sequence::double_hashing, 1),
107+
(__int128_t, __int128_t, cuco::test::probe_sequence::double_hashing, 2),
108+
(__int128_t, __int128_t, cuco::test::probe_sequence::linear_probing, 1),
109+
(__int128_t, __int128_t, cuco::test::probe_sequence::linear_probing, 2)
110+
#endif
111+
)
103112
{
104113
constexpr size_type num_keys{100};
105114
using probe = std::conditional_t<

‎tests/static_map/hash_test.cu‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
#include <test_utils.hpp>
1818

19+
#include <cuco/detail/__config>
1920
#include <cuco/hash_functions.cuh>
2021
#include <cuco/static_map.cuh>
2122

@@ -62,7 +63,16 @@ void test_hash_function()
6263
REQUIRE(cuco::test::all_of(d_keys_exist.begin(), d_keys_exist.end(), cuda::std::identity{}));
6364
}
6465

65-
TEMPLATE_TEST_CASE_SIG("static_map hash tests", "", ((typename Key)), (int32_t), (int64_t))
66+
TEMPLATE_TEST_CASE_SIG("static_map hash tests",
67+
"",
68+
((typename Key)),
69+
(int32_t),
70+
(int64_t)
71+
#if defined(CUCO_HAS_128BIT_ATOMICS)
72+
,
73+
(__int128_t)
74+
#endif
75+
)
6676
{
6777
test_hash_function<Key, cuco::murmurhash3_32<Key>>();
6878
test_hash_function<Key, cuco::murmurhash3_x64_128<Key>>();

‎tests/static_map/insert_and_find_test.cu‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
#include <test_utils.hpp>
1919

20+
#include <cuco/detail/__config>
2021
#include <cuco/static_map.cuh>
2122

2223
#include <cuda/functional>
@@ -51,7 +52,15 @@ TEMPLATE_TEST_CASE_SIG(
5152
(int64_t, int32_t, cuco::test::probe_sequence::linear_probing, 1),
5253
(int64_t, int64_t, cuco::test::probe_sequence::linear_probing, 1),
5354
(int64_t, int32_t, cuco::test::probe_sequence::linear_probing, 2),
54-
(int64_t, int64_t, cuco::test::probe_sequence::linear_probing, 2))
55+
(int64_t, int64_t, cuco::test::probe_sequence::linear_probing, 2)
56+
#if defined(CUCO_HAS_128BIT_ATOMICS)
57+
,
58+
(__int128_t, __int128_t, cuco::test::probe_sequence::double_hashing, 1),
59+
(__int128_t, __int128_t, cuco::test::probe_sequence::double_hashing, 2),
60+
(__int128_t, __int128_t, cuco::test::probe_sequence::linear_probing, 1),
61+
(__int128_t, __int128_t, cuco::test::probe_sequence::linear_probing, 2)
62+
#endif
63+
)
5564
{
5665
#if !defined(CUCO_HAS_INDEPENDENT_THREADS)
5766
if constexpr (cuco::detail::is_packable<cuco::pair<Key, Value>>())

‎tests/static_map/insert_or_apply_test.cu‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
#include <test_utils.hpp>
1818

19+
#include <cuco/detail/__config>
1920
#include <cuco/static_map.cuh>
2021
#include <cuco/utility/reduction_functors.cuh>
2122

@@ -160,7 +161,15 @@ TEMPLATE_TEST_CASE_SIG(
160161
(int64_t, int32_t, cuco::test::probe_sequence::linear_probing, 1),
161162
(int64_t, int64_t, cuco::test::probe_sequence::linear_probing, 1),
162163
(int64_t, int32_t, cuco::test::probe_sequence::linear_probing, 2),
163-
(int64_t, int64_t, cuco::test::probe_sequence::linear_probing, 2))
164+
(int64_t, int64_t, cuco::test::probe_sequence::linear_probing, 2)
165+
#if defined(CUCO_HAS_128BIT_ATOMICS)
166+
,
167+
(__int128_t, __int128_t, cuco::test::probe_sequence::double_hashing, 1),
168+
(__int128_t, __int128_t, cuco::test::probe_sequence::double_hashing, 2),
169+
(__int128_t, __int128_t, cuco::test::probe_sequence::linear_probing, 1),
170+
(__int128_t, __int128_t, cuco::test::probe_sequence::linear_probing, 2)
171+
#endif
172+
)
164173
{
165174
constexpr size_type num_keys{10'000};
166175
constexpr size_type num_unique_keys{100};
@@ -201,8 +210,16 @@ TEMPLATE_TEST_CASE_SIG(
201210
}
202211
}
203212
204-
TEMPLATE_TEST_CASE_SIG(
205-
"static_map insert_or_apply all unique keys tests", "", ((typename Key)), (int32_t), (int64_t))
213+
TEMPLATE_TEST_CASE_SIG("static_map insert_or_apply all unique keys tests",
214+
"",
215+
((typename Key)),
216+
(int32_t),
217+
(int64_t)
218+
#if defined(CUCO_HAS_128BIT_ATOMICS)
219+
,
220+
(__int128_t)
221+
#endif
222+
)
206223
{
207224
using Value = Key;
208225

‎tests/static_map/insert_or_assign_test.cu‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616

1717
#include <test_utils.hpp>
1818

19+
#include <cuco/detail/__config>
1920
#include <cuco/static_map.cuh>
2021

2122
#include <cuda/functional>
@@ -92,7 +93,15 @@ TEMPLATE_TEST_CASE_SIG(
9293
(int64_t, int32_t, cuco::test::probe_sequence::linear_probing, 1),
9394
(int64_t, int64_t, cuco::test::probe_sequence::linear_probing, 1),
9495
(int64_t, int32_t, cuco::test::probe_sequence::linear_probing, 2),
95-
(int64_t, int64_t, cuco::test::probe_sequence::linear_probing, 2))
96+
(int64_t, int64_t, cuco::test::probe_sequence::linear_probing, 2)
97+
#if defined(CUCO_HAS_128BIT_ATOMICS)
98+
,
99+
(__int128_t, __int128_t, cuco::test::probe_sequence::double_hashing, 1),
100+
(__int128_t, __int128_t, cuco::test::probe_sequence::double_hashing, 2),
101+
(__int128_t, __int128_t, cuco::test::probe_sequence::linear_probing, 1),
102+
(__int128_t, __int128_t, cuco::test::probe_sequence::linear_probing, 2)
103+
#endif
104+
)
96105
{
97106
constexpr size_type num_keys{400};
98107

0 commit comments

Comments
 (0)