From 84b7aeda5108249d15a3f53be84f27d42819e3bf Mon Sep 17 00:00:00 2001 From: Raghuveer Devulapalli Date: Fri, 9 Oct 2026 08:53:59 +0000 Subject: [PATCH 1/2] benchmarks: fix deprecated benchmark::internal::Benchmark usage --- benchmarks/bench.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/benchmarks/bench.h b/benchmarks/bench.h index 63fb2f82..ff2b1a4c 100644 --- a/benchmarks/bench.h +++ b/benchmarks/bench.h @@ -5,7 +5,7 @@ #define MY_BENCHMARK_CAPTURE(func, T, test_case_name, ...) \ BENCHMARK_PRIVATE_DECLARE(func) \ = (::benchmark::internal::RegisterBenchmarkInternal( \ - std::unique_ptr( \ + std::unique_ptr<::benchmark::Benchmark>( \ new ::benchmark::internal::FunctionBenchmark( \ #func "/" #test_case_name "/" #T, \ [](::benchmark::State &st) { \ From 57348c9a3150ad614042e9b52c3f2df61b6b27f7 Mon Sep 17 00:00:00 2001 From: Raghuveer Devulapalli Date: Fri, 9 Oct 2026 09:07:23 +0000 Subject: [PATCH 2/2] lint fix --- lib/x86simdsort-avx2.cpp | 3 +-- lib/x86simdsort-scalar.h | 7 ++----- lib/x86simdsort-skx.cpp | 3 +-- lib/x86simdsort.cpp | 11 ++++++----- src/x86simdsort-static-incl.h | 31 +++++++++++-------------------- src/xss-common-argsort.h | 23 +++++++++++------------ src/xss-common-qsort.h | 3 +-- 7 files changed, 33 insertions(+), 48 deletions(-) diff --git a/lib/x86simdsort-avx2.cpp b/lib/x86simdsort-avx2.cpp index afac33c7..8eff4621 100644 --- a/lib/x86simdsort-avx2.cpp +++ b/lib/x86simdsort-avx2.cpp @@ -11,8 +11,7 @@ bool descending, \ bool nans_last) \ { \ - x86simdsortStatic::qsort( \ - arr, arrsize, hasnan, descending, nans_last); \ + x86simdsortStatic::qsort(arr, arrsize, hasnan, descending, nans_last); \ } \ template <> \ void qselect(type *arr, \ diff --git a/lib/x86simdsort-scalar.h b/lib/x86simdsort-scalar.h index 7faf4446..a4807592 100644 --- a/lib/x86simdsort-scalar.h +++ b/lib/x86simdsort-scalar.h @@ -56,11 +56,8 @@ namespace utils { namespace scalar { template - void qsort(T *arr, - size_t arrsize, - bool hasnan, - bool reversed, - bool nans_last) + void + qsort(T *arr, size_t arrsize, bool hasnan, bool reversed, bool nans_last) { std::sort(arr, arr + arrsize, diff --git a/lib/x86simdsort-skx.cpp b/lib/x86simdsort-skx.cpp index b38653e7..7a123d5c 100644 --- a/lib/x86simdsort-skx.cpp +++ b/lib/x86simdsort-skx.cpp @@ -11,8 +11,7 @@ bool descending, \ bool nans_last) \ { \ - x86simdsortStatic::qsort( \ - arr, arrsize, hasnan, descending, nans_last); \ + x86simdsortStatic::qsort(arr, arrsize, hasnan, descending, nans_last); \ } \ template <> \ void qselect(type *arr, \ diff --git a/lib/x86simdsort.cpp b/lib/x86simdsort.cpp index 44ddb0da..4ba78452 100644 --- a/lib/x86simdsort.cpp +++ b/lib/x86simdsort.cpp @@ -111,8 +111,7 @@ namespace x86simdsort { bool nans_last) \ { \ if (internal_qsort##TYPE == NULL) { CAT(resolve_qsort, TYPE)(); } \ - (*internal_qsort##TYPE)( \ - arr, arrsize, hasnan, descending, nans_last); \ + (*internal_qsort##TYPE)(arr, arrsize, hasnan, descending, nans_last); \ } #define DECLARE_INTERNAL_qselect(TYPE) \ @@ -202,8 +201,7 @@ namespace x86simdsort { bool descending, \ bool nans_last) \ { \ - (*internal_qsort##TYPE)( \ - arr, arrsize, hasnan, descending, nans_last); \ + (*internal_qsort##TYPE)(arr, arrsize, hasnan, descending, nans_last); \ } #define DECLARE_INTERNAL_qselect(TYPE) \ @@ -520,7 +518,10 @@ void keyvalue_qsort_uint32_uint64(uint32_t *key, uint64_t *val, size_t size) x86simdsort::keyvalue_qsort(key, val, size, true); } XSS_EXPORT_SYMBOL -void keyvalue_partialsort_float_int32(float *key, int32_t *val, size_t size, size_t k) +void keyvalue_partialsort_float_int32(float *key, + int32_t *val, + size_t size, + size_t k) { x86simdsort::keyvalue_partial_sort(key, val, size, k); } diff --git a/src/x86simdsort-static-incl.h b/src/x86simdsort-static-incl.h index bdc91baf..de1d3650 100644 --- a/src/x86simdsort-static-incl.h +++ b/src/x86simdsort-static-incl.h @@ -90,11 +90,8 @@ X86_SIMD_SORT_FINLINE void keyvalue_partial_sort(T1 *key, #define XSS_METHODS(ISA) \ template \ - X86_SIMD_SORT_FINLINE void x86simdsortStatic::qsort(T *arr, \ - size_t size, \ - bool hasnan, \ - bool descending, \ - bool nans_last) \ + X86_SIMD_SORT_FINLINE void x86simdsortStatic::qsort( \ + T *arr, size_t size, bool hasnan, bool descending, bool nans_last) \ { \ ISA##_qsort(arr, size, hasnan, descending, nans_last); \ } \ @@ -144,14 +141,13 @@ X86_SIMD_SORT_FINLINE void keyvalue_partial_sort(T1 *key, return indices; \ } \ template \ - X86_SIMD_SORT_FINLINE void x86simdsortStatic::argselect( \ - const T *arr, \ - size_t *arg, \ - size_t k, \ - size_t size, \ - bool hasnan, \ - bool descending, \ - bool nans_last) \ + X86_SIMD_SORT_FINLINE void x86simdsortStatic::argselect(const T *arr, \ + size_t *arg, \ + size_t k, \ + size_t size, \ + bool hasnan, \ + bool descending, \ + bool nans_last) \ { \ ISA##_argselect(arr, arg, k, size, hasnan, descending, nans_last); \ } \ @@ -166,13 +162,8 @@ X86_SIMD_SORT_FINLINE void keyvalue_partial_sort(T1 *key, { \ std::vector indices(size); \ std::iota(indices.begin(), indices.end(), 0); \ - x86simdsortStatic::argselect(arr, \ - indices.data(), \ - k, \ - size, \ - hasnan, \ - descending, \ - nans_last); \ + x86simdsortStatic::argselect( \ + arr, indices.data(), k, size, hasnan, descending, nans_last); \ return indices; \ } \ template \ diff --git a/src/xss-common-argsort.h b/src/xss-common-argsort.h index b4fd433a..0b1b632f 100644 --- a/src/xss-common-argsort.h +++ b/src/xss-common-argsort.h @@ -43,18 +43,17 @@ X86_SIMD_SORT_INLINE void std_argsort_withnan(const T *arr, bool nans_last = true, bool descending = false) { - std::sort( - arg + left, - arg + right, - [arr, nans_last, descending](arrsize_t a, arrsize_t b) -> bool { - bool a_nan = std::isnan(arr[a]); - bool b_nan = std::isnan(arr[b]); - if (!a_nan && !b_nan) { - return descending ? arr[a] > arr[b] : arr[a] < arr[b]; - } - if (a_nan && b_nan) { return false; } - return nans_last ? !a_nan : a_nan; - }); + std::sort(arg + left, + arg + right, + [arr, nans_last, descending](arrsize_t a, arrsize_t b) -> bool { + bool a_nan = std::isnan(arr[a]); + bool b_nan = std::isnan(arr[b]); + if (!a_nan && !b_nan) { + return descending ? arr[a] > arr[b] : arr[a] < arr[b]; + } + if (a_nan && b_nan) { return false; } + return nans_last ? !a_nan : a_nan; + }); } /* argsort using std::sort */ diff --git a/src/xss-common-qsort.h b/src/xss-common-qsort.h index 70aa3465..f6687c5f 100644 --- a/src/xss-common-qsort.h +++ b/src/xss-common-qsort.h @@ -720,8 +720,7 @@ X86_SIMD_SORT_INLINE void xss_partial_qsort(T *arr, bool nans_last = true) { if (k == 0) return; - xss_qselect( - arr, k - 1, arrsize, hasnan, nans_last); + xss_qselect(arr, k - 1, arrsize, hasnan, nans_last); xss_qsort(arr, k - 1, hasnan, nans_last); }