Skip to content

Commit cea0a72

Browse files
committed
Small cleanup to pivot selection code
1 parent 70733ff commit cea0a72

File tree

1 file changed

+3
-12
lines changed

1 file changed

+3
-12
lines changed

src/avx512-common-qsort.h

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -706,15 +706,6 @@ X86_SIMD_SORT_INLINE type_t get_pivot_scalar(type_t *arr,
706706
return ((type_t *)&vec)[numSamples / 2];
707707
}
708708

709-
template <typename vtype, typename reg_t>
710-
X86_SIMD_SORT_INLINE reg_t sort_zmm_16bit(reg_t zmm);
711-
712-
template <typename vtype, typename reg_t>
713-
X86_SIMD_SORT_INLINE reg_t sort_zmm_32bit(reg_t zmm);
714-
715-
template <typename vtype, typename reg_t>
716-
X86_SIMD_SORT_INLINE reg_t sort_zmm_64bit(reg_t zmm);
717-
718709
template <typename vtype, typename type_t>
719710
X86_SIMD_SORT_INLINE type_t get_pivot_16bit(type_t *arr,
720711
const int64_t left,
@@ -755,7 +746,7 @@ X86_SIMD_SORT_INLINE type_t get_pivot_16bit(type_t *arr,
755746
arr[left + 30 * size],
756747
arr[left + 31 * size]};
757748
typename vtype::reg_t rand_vec = vtype::loadu(vec_arr);
758-
typename vtype::reg_t sort = sort_zmm_16bit<vtype>(rand_vec);
749+
typename vtype::reg_t sort = vtype::sort_vec(rand_vec);
759750
return ((type_t *)&sort)[16];
760751
}
761752

@@ -789,7 +780,7 @@ X86_SIMD_SORT_INLINE type_t get_pivot_32bit(type_t *arr,
789780
ymm_t rand_vec2
790781
= vtype::template i64gather<sizeof(type_t)>(rand_index2, arr);
791782
zmm_t rand_vec = vtype::merge(rand_vec1, rand_vec2);
792-
zmm_t sort = sort_zmm_32bit<vtype>(rand_vec);
783+
zmm_t sort = vtype::sort_vec(rand_vec);
793784
// pivot will never be a nan, since there are no nan's!
794785
return ((type_t *)&sort)[8];
795786
}
@@ -812,7 +803,7 @@ X86_SIMD_SORT_INLINE type_t get_pivot_64bit(type_t *arr,
812803
left + 8 * size);
813804
zmm_t rand_vec = vtype::template i64gather<sizeof(type_t)>(rand_index, arr);
814805
// pivot will never be a nan, since there are no nan's!
815-
zmm_t sort = sort_zmm_64bit<vtype>(rand_vec);
806+
zmm_t sort = vtype::sort_vec(rand_vec);
816807
return ((type_t *)&sort)[4];
817808
}
818809

0 commit comments

Comments
 (0)