Update tests to use x86simdsort library

Author: Raghuveer Devulapalli

benchmarks/bench-argsort.hpp

@@ -22,7 +22,6 @@ static void scalarargsort(benchmark::State &state, Args &&...args)
     std::string arrtype = std::get<1>(args_tuple);
     // set up array
     std::vector<T> arr = get_array<T>(arrtype, arrsize);
-    std::vector<T> arr_bkp = arr;
     std::vector<int64_t> inx;
     // benchmark
     for (auto _ : state) {
@@ -39,7 +38,6 @@ static void simdargsort(benchmark::State &state, Args &&...args)
     std::string arrtype = std::get<1>(args_tuple);
     // set up array
     std::vector<T> arr = get_array<T>(arrtype, arrsize);
-    std::vector<T> arr_bkp = arr;
     std::vector<int64_t> inx;
     // benchmark
     for (auto _ : state) {

meson.build

@@ -32,9 +32,10 @@ libsimdsort = shared_library('x86simdsort',
                             )
 
 testexe = executable('testexe',
-                     include_directories : [src, utils],
+                     include_directories : [lib, utils],
                      dependencies : gtest_dep,
-                     link_whole : [libtests]
+                     link_whole : [libtests],
+                     link_with : libsimdsort,
                     )
 
 benchexe = executable('benchexe',

tests/meson.build

@@ -1,31 +1,17 @@
 libtests = []
 
-if cpp.has_argument('-march=skylake-avx512')
-  libtests += static_library('tests_kv',
-    files(
-      'test-keyvalue.cpp',
-      'test-argsort.cpp',
-    ),
-    dependencies: gtest_dep,
-    include_directories : [src, utils],
-    cpp_args : ['-O3', '-march=skylake-avx512'],
-    )
-endif
+libtests += static_library('tests_qsort',
+  files('test-qsort.cpp', ),
+  dependencies: gtest_dep,
+  include_directories : [lib, utils],
+  cpp_args : ['-O3'],
+  )
 
-if cpp.has_argument('-march=icelake-client')
-  libtests += static_library('tests_qsort',
-    files('test-qsort.cpp', ),
-    dependencies: gtest_dep,
-    include_directories : [src, utils],
-    cpp_args : ['-O3', '-march=icelake-client'],
-    )
-endif
-
-if cancompilefp16
-  libtests += static_library('tests_qsortfp16',
-    files('test-qsortfp16.cpp', ),
-    dependencies: gtest_dep,
-    include_directories : [src, utils],
-    cpp_args : ['-O3', '-march=sapphirerapids'],
-    )
-endif
+#if cancompilefp16
+#  libtests += static_library('tests_qsortfp16',
+#    files('test-qsortfp16.cpp', ),
+#    dependencies: gtest_dep,
+#    include_directories : [src, utils],
+#    cpp_args : ['-O3', '-march=sapphirerapids'],
+#    )
+#endif