Added taskwait, fixed task threshold and extended tests

intel · Oct 1, 2024 · 13ea0fd · 13ea0fd
1 parent c61ce8f
commit 13ea0fd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/src/xss-common-keyvaluesort.hpp b/src/xss-common-keyvaluesort.hpp
@@ -559,9 +559,14 @@ X86_SIMD_SORT_INLINE void xss_qsort_kv(
                     keys, indexes, 0, arrsize - 1, maxiters, task_threshold);
         }
         else {
-            kvsort_<keytype, valtype>(
-                    keys, indexes, 0, arrsize - 1, maxiters, 0);
+            kvsort_<keytype, valtype>(keys,
+                                      indexes,
+                                      0,
+                                      arrsize - 1,
+                                      maxiters,
+                                      std::numeric_limits<arrsize_t>::max());
         }
+#pragma omp taskwait
 #else
         kvsort_<keytype, valtype>(keys, indexes, 0, arrsize - 1, maxiters, 0);
 #endif

diff --git a/tests/test-keyvalue.cpp b/tests/test-keyvalue.cpp
@@ -15,6 +15,10 @@ class simdkvsort : public ::testing::Test {
     simdkvsort()
     {
         std::iota(arrsize.begin(), arrsize.end(), 1);
+        arrsize.push_back(10'000);
+        arrsize.push_back(100'000);
+        arrsize.push_back(1'000'000);
+
         arrtype = {"random",
                    "constant",
                    "sorted",