Add tests and fix bug in move_nans_to_end_of_array

Author: r-devulap

src/avx512-common-qsort.h

@@ -131,16 +131,18 @@ int64_t move_nans_to_end_of_array(T* arr, int64_t arrsize)
 {
     int64_t jj = arrsize - 1;
     int64_t ii = 0;
-    while (ii < jj) {
+    int64_t count = 0;
+    while (ii <= jj) {
         if (is_a_nan(arr[ii])) {
             std::swap(arr[ii], arr[jj]);
             jj -= 1;
+            count++;
         }
         else {
             ii += 1;
         }
     }
-    return ii;
+    return arrsize-count-1;
 }
 
 template <typename vtype, typename T = typename vtype::type_t>

tests/test-qsort-fp.hpp

@@ -0,0 +1,47 @@
+/*******************************************
+ * * Copyright (C) 2022 Intel Corporation
+ * * SPDX-License-Identifier: BSD-3-Clause
+ * *******************************************/
+
+#include "test-qsort-common.h"
+
+template <typename T>
+class avx512_sort_fp : public ::testing::Test {
+};
+TYPED_TEST_SUITE_P(avx512_sort_fp);
+
+TYPED_TEST_P(avx512_sort_fp, test_random_nan)
+{
+    const int num_nans = 3;
+    if (!cpu_has_avx512bw()) {
+        GTEST_SKIP() << "Skipping this test, it requires avx512bw";
+    }
+    std::vector<int64_t> arrsizes;
+    for (int64_t ii = num_nans; ii < 1024; ++ii) {
+        arrsizes.push_back((TypeParam)ii);
+    }
+    std::vector<TypeParam> arr;
+    std::vector<TypeParam> sortedarr;
+    for (auto &size : arrsizes) {
+        /* Random array */
+        arr = get_uniform_rand_array<TypeParam>(size);
+        for (auto ii = 1; ii <= num_nans; ++ii) {
+            arr[size-ii] = std::numeric_limits<TypeParam>::quiet_NaN();
+        }
+        sortedarr = arr;
+        std::sort(sortedarr.begin(), sortedarr.end()-3);
+        std::random_shuffle(arr.begin(), arr.end());
+        avx512_qsort<TypeParam>(arr.data(), arr.size());
+        for (auto ii = 1; ii <= num_nans; ++ii) {
+            if (!std::isnan(arr[size-ii])) {
+                ASSERT_TRUE(false) << "NAN's aren't sorted to the end. Arr size = " << size;
+            }
+        }
+        if (!std::is_sorted(arr.begin(), arr.end() - num_nans)) {
+            ASSERT_TRUE(true) << "Array isn't sorted";
+        }
+        arr.clear();
+        sortedarr.clear();
+    }
+}
+REGISTER_TYPED_TEST_SUITE_P(avx512_sort_fp, test_random_nan);

tests/test-qsort.cpp

@@ -1,5 +1,6 @@
 #include "test-partial-qsort.hpp"
 #include "test-qselect.hpp"
+#include "test-qsort-fp.hpp"
 #include "test-qsort.hpp"
 
 using QSortTestTypes = testing::Types<uint16_t,
@@ -10,6 +11,10 @@ using QSortTestTypes = testing::Types<uint16_t,
                                       int32_t,
                                       uint64_t,
                                       int64_t>;
+
+using QSortTestFPTypes = testing::Types<float, double>;
+
 INSTANTIATE_TYPED_TEST_SUITE_P(T, avx512_sort, QSortTestTypes);
+INSTANTIATE_TYPED_TEST_SUITE_P(T, avx512_sort_fp, QSortTestFPTypes);
 INSTANTIATE_TYPED_TEST_SUITE_P(T, avx512_select, QSortTestTypes);
 INSTANTIATE_TYPED_TEST_SUITE_P(T, avx512_partial_sort, QSortTestTypes);