Skip to content

Commit 13ea0fd

Browse files
committed
Added taskwait, fixed task threshold and extended tests
1 parent c61ce8f commit 13ea0fd

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

src/xss-common-keyvaluesort.hpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -559,9 +559,14 @@ X86_SIMD_SORT_INLINE void xss_qsort_kv(
559559
keys, indexes, 0, arrsize - 1, maxiters, task_threshold);
560560
}
561561
else {
562-
kvsort_<keytype, valtype>(
563-
keys, indexes, 0, arrsize - 1, maxiters, 0);
562+
kvsort_<keytype, valtype>(keys,
563+
indexes,
564+
0,
565+
arrsize - 1,
566+
maxiters,
567+
std::numeric_limits<arrsize_t>::max());
564568
}
569+
#pragma omp taskwait
565570
#else
566571
kvsort_<keytype, valtype>(keys, indexes, 0, arrsize - 1, maxiters, 0);
567572
#endif

tests/test-keyvalue.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ class simdkvsort : public ::testing::Test {
1515
simdkvsort()
1616
{
1717
std::iota(arrsize.begin(), arrsize.end(), 1);
18+
arrsize.push_back(10'000);
19+
arrsize.push_back(100'000);
20+
arrsize.push_back(1'000'000);
21+
1822
arrtype = {"random",
1923
"constant",
2024
"sorted",

0 commit comments

Comments
 (0)