Use move and use custom-float in src files

intel · Apr 5, 2024 · 97cb7ec · 97cb7ec
1 parent 3a69a68
commit 97cb7ec
Show file tree

Hide file tree

Showing 10 changed files with 38 additions and 34 deletions.
diff --git a/meson.build b/meson.build
@@ -36,7 +36,7 @@ cancompilefp16 = cpp.compiles(fp16code, args:'-march=sapphirerapids')
 subdir('lib')
 libsimdsort = shared_library('x86simdsortcpp',
                              'lib/x86simdsort.cpp',
-                             include_directories : [utils, lib],
+                             include_directories : [src, utils, lib],
                              link_with : [libtargets],
                              gnu_symbol_visibility : 'inlineshidden',
                              install : true,

diff --git a/src/avx512-16bit-qsort.hpp b/src/avx512-16bit-qsort.hpp
@@ -560,10 +560,11 @@ X86_SIMD_SORT_INLINE_ONLY bool is_a_nan<uint16_t>(uint16_t elem)
     return ((elem & 0x7c00u) == 0x7c00u) && ((elem & 0x03ffu) != 0);
 }
 
-X86_SIMD_SORT_INLINE void avx512_qsort_fp16(uint16_t *arr,
-                                            arrsize_t arrsize,
-                                            bool hasnan = false,
-                                            bool descending = false)
+[[maybe_unused]] X86_SIMD_SORT_INLINE void
+avx512_qsort_fp16(uint16_t *arr,
+                  arrsize_t arrsize,
+                  bool hasnan = false,
+                  bool descending = false)
 {
     using vtype = zmm_vector<float16>;
 
@@ -585,11 +586,12 @@ X86_SIMD_SORT_INLINE void avx512_qsort_fp16(uint16_t *arr,
     }
 }
 
-X86_SIMD_SORT_INLINE void avx512_qselect_fp16(uint16_t *arr,
-                                              arrsize_t k,
-                                              arrsize_t arrsize,
-                                              bool hasnan = false,
-                                              bool descending = false)
+[[maybe_unused]] X86_SIMD_SORT_INLINE void
+avx512_qselect_fp16(uint16_t *arr,
+                    arrsize_t k,
+                    arrsize_t arrsize,
+                    bool hasnan = false,
+                    bool descending = false)
 {
     using vtype = zmm_vector<float16>;
 
@@ -617,11 +619,12 @@ X86_SIMD_SORT_INLINE void avx512_qselect_fp16(uint16_t *arr,
     }
 }
 
-X86_SIMD_SORT_INLINE void avx512_partial_qsort_fp16(uint16_t *arr,
-                                                    arrsize_t k,
-                                                    arrsize_t arrsize,
-                                                    bool hasnan = false,
-                                                    bool descending = false)
+[[maybe_unused]] X86_SIMD_SORT_INLINE void
+avx512_partial_qsort_fp16(uint16_t *arr,
+                          arrsize_t k,
+                          arrsize_t arrsize,
+                          bool hasnan = false,
+                          bool descending = false)
 {
     avx512_qselect_fp16(arr, k - 1, arrsize, hasnan, descending);
     avx512_qsort_fp16(arr, k - 1, descending);

diff --git a/src/avx512-64bit-keyvaluesort.hpp b/src/avx512-64bit-keyvaluesort.hpp
@@ -418,7 +418,7 @@ avx512_qsort_kv(T1 *keys, T2 *indexes, arrsize_t arrsize, bool hasnan = false)
                                       zmm_vector<T2>>::type;
 
     if (arrsize > 1) {
-        if constexpr (std::is_floating_point_v<T1>) {
+        if constexpr (xss::fp::is_floating_point_v<T1>) {
             arrsize_t nan_count = 0;
             if (UNLIKELY(hasnan)) {
                 nan_count = replace_nan_with_inf<zmm_vector<T1>>(keys, arrsize);

diff --git a/src/xss-common-argsort.h b/src/xss-common-argsort.h
@@ -554,7 +554,7 @@ avx512_argsort(T *arr, arrsize_t *arg, arrsize_t arrsize, bool hasnan = false)
                                       zmm_vector<arrsize_t>>::type;
 
     if (arrsize > 1) {
-        if constexpr (std::is_floating_point_v<T>) {
+        if constexpr (xss::fp::is_floating_point_v<T>) {
             if ((hasnan) && (array_has_nan<vectype>(arr, arrsize))) {
                 std_argsort_withnan(arr, arg, 0, arrsize);
                 return;
@@ -580,7 +580,7 @@ avx2_argsort(T *arr, arrsize_t *arg, arrsize_t arrsize, bool hasnan = false)
                                       avx2_half_vector<arrsize_t>,
                                       avx2_vector<arrsize_t>>::type;
     if (arrsize > 1) {
-        if constexpr (std::is_floating_point_v<T>) {
+        if constexpr (xss::fp::is_floating_point_v<T>) {
             if ((hasnan) && (array_has_nan<vectype>(arr, arrsize))) {
                 std_argsort_withnan(arr, arg, 0, arrsize);
                 return;
@@ -611,7 +611,7 @@ X86_SIMD_SORT_INLINE void avx512_argselect(T *arr,
                                       zmm_vector<arrsize_t>>::type;
 
     if (arrsize > 1) {
-        if constexpr (std::is_floating_point_v<T>) {
+        if constexpr (xss::fp::is_floating_point_v<T>) {
             if ((hasnan) && (array_has_nan<vectype>(arr, arrsize))) {
                 std_argselect_withnan(arr, arg, k, 0, arrsize);
                 return;
@@ -641,7 +641,7 @@ X86_SIMD_SORT_INLINE void avx2_argselect(T *arr,
                                       avx2_vector<arrsize_t>>::type;
 
     if (arrsize > 1) {
-        if constexpr (std::is_floating_point_v<T>) {
+        if constexpr (xss::fp::is_floating_point_v<T>) {
             if ((hasnan) && (array_has_nan<vectype>(arr, arrsize))) {
                 std_argselect_withnan(arr, arg, k, 0, arrsize);
                 return;

diff --git a/src/xss-common-includes.h b/src/xss-common-includes.h
@@ -7,6 +7,7 @@
 #include <immintrin.h>
 #include <limits>
 #include <vector>
+#include "xss-custom-float.h"
 
 #define X86_SIMD_SORT_INFINITY std::numeric_limits<double>::infinity()
 #define X86_SIMD_SORT_INFINITYF std::numeric_limits<float>::infinity()

diff --git a/src/xss-common-qsort.h b/src/xss-common-qsort.h
@@ -105,8 +105,8 @@ X86_SIMD_SORT_INLINE void replace_inf_with_nan(type_t *arr,
 {
     if (descending) {
         for (arrsize_t ii = 0; nan_count > 0; ++ii) {
-            if constexpr (std::is_floating_point_v<type_t>) {
-                arr[ii] = std::numeric_limits<type_t>::quiet_NaN();
+            if constexpr (xss::fp::is_floating_point_v<type_t>) {
+                arr[ii] = xss::fp::quiet_NaN<type_t>();
             }
             else {
                 arr[ii] = 0xFFFF;
@@ -116,8 +116,8 @@ X86_SIMD_SORT_INLINE void replace_inf_with_nan(type_t *arr,
     }
     else {
         for (arrsize_t ii = size - 1; nan_count > 0; --ii) {
-            if constexpr (std::is_floating_point_v<type_t>) {
-                arr[ii] = std::numeric_limits<type_t>::quiet_NaN();
+            if constexpr (xss::fp::is_floating_point_v<type_t>) {
+                arr[ii] = xss::fp::quiet_NaN<type_t>();
             }
             else {
                 arr[ii] = 0xFFFF;
@@ -619,7 +619,7 @@ X86_SIMD_SORT_INLINE void xss_qsort(T *arr, arrsize_t arrsize, bool hasnan)
 
     if (arrsize > 1) {
         arrsize_t nan_count = 0;
-        if constexpr (std::is_floating_point_v<T>) {
+        if constexpr (xss::fp::is_floating_point_v<T>) {
             if (UNLIKELY(hasnan)) {
                 nan_count = replace_nan_with_inf<vtype>(arr, arrsize);
             }
@@ -646,7 +646,7 @@ xss_qselect(T *arr, arrsize_t k, arrsize_t arrsize, bool hasnan)
     arrsize_t index_first_elem = 0;
     arrsize_t index_last_elem = arrsize - 1;
 
-    if constexpr (std::is_floating_point_v<T>) {
+    if constexpr (xss::fp::is_floating_point_v<T>) {
         if (UNLIKELY(hasnan)) {
             if constexpr (descending) {
                 index_first_elem = move_nans_to_start_of_array(arr, arrsize);

diff --git a/utils/custom-float.h → src/xss-custom-float.h b/utils/custom-float.h → src/xss-custom-float.h
@@ -1,5 +1,5 @@
-#ifndef UTILS_FLOAT
-#define UTILS_FLOAT
+#ifndef XSS_CUSTOM_FLOAT
+#define XSS_CUSTOM_FLOAT
 #include <cstdint>
 namespace xss {
 namespace fp {
@@ -87,4 +87,4 @@ namespace fp {
 
 } // namespace fp
 } // namespace xss
-#endif
+#endif // XSS_CUSTOM_FLOAT
diff --git a/tests/meson.build b/tests/meson.build
@@ -3,17 +3,17 @@ libtests = []
 libtests += static_library('tests_qsort',
   files('test-qsort.cpp', ),
   dependencies: gtest_dep,
-  include_directories : [lib, utils],
+  include_directories : [src, lib, utils],
   )
 
 libtests += static_library('tests_kvsort',
   files('test-keyvalue.cpp', ),
   dependencies: gtest_dep,
-  include_directories : [lib, utils],
+  include_directories : [src, lib, utils],
   )
 
 libtests += static_library('tests_objsort',
   files('test-objqsort.cpp', ),
   dependencies: gtest_dep,
-  include_directories : [lib, utils],
+  include_directories : [src, lib, utils],
   )
diff --git a/utils/custom-compare.h b/utils/custom-compare.h
@@ -1,6 +1,6 @@
 #include <limits>
 #include <cmath>
-#include "custom-float.h"
+#include "xss-custom-float.h"
 
 /*
  * Custom comparator class to handle NAN's: treats NAN  > INF

diff --git a/utils/rand_array.h b/utils/rand_array.h
@@ -10,7 +10,7 @@
 #include <type_traits>
 #include <vector>
 #include <algorithm>
-#include "custom-float.h"
+#include "xss-custom-float.h"
 
 template <typename T>
 static std::vector<T> get_uniform_rand_array(int64_t arrsize,