|
4 | 4 |
|
5 | 5 | #include "base.hpp"
|
6 | 6 | #include "numa_helpers.h"
|
| 7 | +#include "test_helpers.h" |
7 | 8 |
|
8 | 9 | #include <numa.h>
|
9 | 10 | #include <numaif.h>
|
10 | 11 | #include <sched.h>
|
11 | 12 |
|
12 |
| -#include "test_helpers.h" |
13 | 13 | #include <umf/providers/provider_os_memory.h>
|
14 | 14 |
|
15 | 15 | static umf_os_memory_provider_params_t UMF_OS_MEMORY_PROVIDER_PARAMS_TEST =
|
@@ -138,7 +138,6 @@ TEST_P(testNumaOnEachNode, checkNumaNodesAllocations) {
|
138 | 138 | UMF_OS_MEMORY_PROVIDER_PARAMS_TEST;
|
139 | 139 |
|
140 | 140 | os_memory_provider_params.numa_list = &numa_node_number;
|
141 |
| - numa_bitmask_setbit(nodemask, numa_node_number); |
142 | 141 | os_memory_provider_params.numa_list_len = 1;
|
143 | 142 | os_memory_provider_params.numa_mode = UMF_NUMA_MODE_BIND;
|
144 | 143 | initOsProvider(os_memory_provider_params);
|
@@ -216,7 +215,6 @@ TEST_P(testNumaOnEachNode, checkModeInterleaveSingleNode) {
|
216 | 215 | UMF_OS_MEMORY_PROVIDER_PARAMS_TEST;
|
217 | 216 |
|
218 | 217 | os_memory_provider_params.numa_list = &numa_node_number;
|
219 |
| - numa_bitmask_setbit(nodemask, numa_node_number); |
220 | 218 | os_memory_provider_params.numa_list_len = 1;
|
221 | 219 | os_memory_provider_params.numa_mode = UMF_NUMA_MODE_INTERLEAVE;
|
222 | 220 | initOsProvider(os_memory_provider_params);
|
@@ -335,7 +333,7 @@ TEST_F(testNuma, checkModeDefault) {
|
335 | 333 | }
|
336 | 334 |
|
337 | 335 | // Test for allocations on numa nodes with interleave mode enabled.
|
338 |
| -// The page allocations are interleaved across the set of nodes specified in nodemask. |
| 336 | +// The page allocations are interleaved across the set of all available nodes. |
339 | 337 | TEST_F(testNuma, checkModeInterleave) {
|
340 | 338 | constexpr int pages_num = 1024;
|
341 | 339 | size_t page_size = sysconf(_SC_PAGE_SIZE);
|
|
0 commit comments