Skip to content

Commit f07f39d

Browse files
author
Raghuveer Devulapalli
committed
Use distint names for partition functions
1 parent 82f875a commit f07f39d

File tree

2 files changed

+33
-33
lines changed

2 files changed

+33
-33
lines changed

‎src/avx512-64bit-keyvaluesort.hpp‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -57,13 +57,13 @@ template <typename vtype1,
5757
typename type_t2 = typename vtype2::type_t,
5858
typename reg_t1 = typename vtype1::reg_t,
5959
typename reg_t2 = typename vtype2::reg_t>
60-
X86_SIMD_SORT_INLINE arrsize_t partition_avx512(type_t1 *keys,
61-
type_t2 *indexes,
62-
arrsize_t left,
63-
arrsize_t right,
64-
type_t1 pivot,
65-
type_t1 *smallest,
66-
type_t1 *biggest)
60+
X86_SIMD_SORT_INLINE arrsize_t kvpartition_avx512(type_t1 *keys,
61+
type_t2 *indexes,
62+
arrsize_t left,
63+
arrsize_t right,
64+
type_t1 pivot,
65+
type_t1 *smallest,
66+
type_t1 *biggest)
6767
{
6868
/* make array length divisible by vtype1::numlanes , shortening the array */
6969
for (int32_t i = (right - left) % vtype1::numlanes; i > 0; --i) {
@@ -189,16 +189,16 @@ template <typename vtype1,
189189
typename type_t2 = typename vtype2::type_t,
190190
typename reg_t1 = typename vtype1::reg_t,
191191
typename reg_t2 = typename vtype2::reg_t>
192-
X86_SIMD_SORT_INLINE arrsize_t partition_avx512_unrolled(type_t1 *keys,
193-
type_t2 *indexes,
194-
arrsize_t left,
195-
arrsize_t right,
196-
type_t1 pivot,
197-
type_t1 *smallest,
198-
type_t1 *biggest)
192+
X86_SIMD_SORT_INLINE arrsize_t kvpartition_avx512_unrolled(type_t1 *keys,
193+
type_t2 *indexes,
194+
arrsize_t left,
195+
arrsize_t right,
196+
type_t1 pivot,
197+
type_t1 *smallest,
198+
type_t1 *biggest)
199199
{
200200
if (right - left <= 8 * num_unroll * vtype1::numlanes) {
201-
return partition_avx512<vtype1, vtype2>(
201+
return kvpartition_avx512<vtype1, vtype2>(
202202
keys, indexes, left, right, pivot, smallest, biggest);
203203
}
204204
/* make array length divisible by vtype1::numlanes , shortening the array */
@@ -391,7 +391,7 @@ X86_SIMD_SORT_INLINE void qsort_64bit_(type1_t *keys,
391391
type1_t pivot = get_pivot_blocks<vtype1>(keys, left, right);
392392
type1_t smallest = vtype1::type_max();
393393
type1_t biggest = vtype1::type_min();
394-
arrsize_t pivot_index = partition_avx512_unrolled<vtype1, vtype2, 4>(
394+
arrsize_t pivot_index = kvpartition_avx512_unrolled<vtype1, vtype2, 4>(
395395
keys, indexes, left, right + 1, pivot, &smallest, &biggest);
396396
if (pivot != smallest) {
397397
qsort_64bit_<vtype1, vtype2>(

‎src/xss-common-argsort.h‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -173,13 +173,13 @@ X86_SIMD_SORT_INLINE int32_t partition_vec(type_t *arg,
173173
* last element that is less than equal to the pivot.
174174
*/
175175
template <typename vtype, typename argtype, typename type_t>
176-
X86_SIMD_SORT_INLINE arrsize_t partition_avx512(type_t *arr,
177-
arrsize_t *arg,
178-
arrsize_t left,
179-
arrsize_t right,
180-
type_t pivot,
181-
type_t *smallest,
182-
type_t *biggest)
176+
X86_SIMD_SORT_INLINE arrsize_t argpartition_avx512(type_t *arr,
177+
arrsize_t *arg,
178+
arrsize_t left,
179+
arrsize_t right,
180+
type_t pivot,
181+
type_t *smallest,
182+
type_t *biggest)
183183
{
184184
/* make array length divisible by vtype::numlanes , shortening the array */
185185
for (int32_t i = (right - left) % vtype::numlanes; i > 0; --i) {
@@ -292,16 +292,16 @@ template <typename vtype,
292292
typename argtype,
293293
int num_unroll,
294294
typename type_t = typename vtype::type_t>
295-
X86_SIMD_SORT_INLINE arrsize_t partition_avx512_unrolled(type_t *arr,
296-
arrsize_t *arg,
297-
arrsize_t left,
298-
arrsize_t right,
299-
type_t pivot,
300-
type_t *smallest,
301-
type_t *biggest)
295+
X86_SIMD_SORT_INLINE arrsize_t argpartition_avx512_unrolled(type_t *arr,
296+
arrsize_t *arg,
297+
arrsize_t left,
298+
arrsize_t right,
299+
type_t pivot,
300+
type_t *smallest,
301+
type_t *biggest)
302302
{
303303
if (right - left <= 8 * num_unroll * vtype::numlanes) {
304-
return partition_avx512<vtype, argtype>(
304+
return argpartition_avx512<vtype, argtype>(
305305
arr, arg, left, right, pivot, smallest, biggest);
306306
}
307307
/* make array length divisible by vtype::numlanes , shortening the array */
@@ -493,7 +493,7 @@ X86_SIMD_SORT_INLINE void argsort_64bit_(type_t *arr,
493493
type_t pivot = get_pivot_64bit<vtype>(arr, arg, left, right);
494494
type_t smallest = vtype::type_max();
495495
type_t biggest = vtype::type_min();
496-
arrsize_t pivot_index = partition_avx512_unrolled<vtype, argtype, 4>(
496+
arrsize_t pivot_index = argpartition_avx512_unrolled<vtype, argtype, 4>(
497497
arr, arg, left, right + 1, pivot, &smallest, &biggest);
498498
if (pivot != smallest)
499499
argsort_64bit_<vtype, argtype>(
@@ -529,7 +529,7 @@ X86_SIMD_SORT_INLINE void argselect_64bit_(type_t *arr,
529529
type_t pivot = get_pivot_64bit<vtype>(arr, arg, left, right);
530530
type_t smallest = vtype::type_max();
531531
type_t biggest = vtype::type_min();
532-
arrsize_t pivot_index = partition_avx512_unrolled<vtype, argtype, 4>(
532+
arrsize_t pivot_index = argpartition_avx512_unrolled<vtype, argtype, 4>(
533533
arr, arg, left, right + 1, pivot, &smallest, &biggest);
534534
if ((pivot != smallest) && (pos < pivot_index))
535535
argselect_64bit_<vtype, argtype>(

0 commit comments

Comments
 (0)