Skip to content

Commit 7388ed7

Browse files
committed
Some fixes needed when rebasing
1 parent 55b6077 commit 7388ed7

File tree

2 files changed

+7
-26
lines changed

2 files changed

+7
-26
lines changed

src/xss-common-argsort.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ X86_SIMD_SORT_INLINE type_t get_pivot_64bit(type_t *arr,
456456
arr[arg[left + 7 * size]],
457457
arr[arg[left + 8 * size]]);
458458
// pivot will never be a nan, since there are no nan's!
459-
reg_t sort = sort_zmm_64bit<vtype>(rand_vec);
459+
reg_t sort = vtype::sort_vec(rand_vec);
460460
return ((type_t *)&sort)[4];
461461
}
462462
else {

src/xss-network-keyvaluesort.hpp

Lines changed: 6 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,13 @@
11
#ifndef XSS_KEYVALUE_NETWORKS
22
#define XSS_KEYVALUE_NETWORKS
33

4-
<<<<<<< HEAD
5-
#include "avx512-32bit-qsort.hpp"
6-
#include "avx512-64bit-qsort.hpp"
7-
#include "avx2-64bit-qsort.hpp"
8-
=======
94
#include "xss-common-includes.h"
105

11-
template <int num_lanes>
12-
struct index_64bit_vector_type;
13-
template <>
14-
struct index_64bit_vector_type<8> {
15-
using type = zmm_vector<uint64_t>;
16-
};
17-
template <>
18-
struct index_64bit_vector_type<4> {
19-
using type = avx2_vector<uint64_t>;
20-
};
6+
#define NETWORK_32BIT_1 14, 15, 12, 13, 10, 11, 8, 9, 6, 7, 4, 5, 2, 3, 0, 1
7+
#define NETWORK_32BIT_3 8, 9, 10, 11, 12, 13, 14, 15, 0, 1, 2, 3, 4, 5, 6, 7
8+
#define NETWORK_32BIT_5 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15
9+
#define NETWORK_32BIT_6 11, 10, 9, 8, 15, 14, 13, 12, 3, 2, 1, 0, 7, 6, 5, 4
10+
#define NETWORK_32BIT_7 7, 6, 5, 4, 3, 2, 1, 0, 15, 14, 13, 12, 11, 10, 9, 8
2111

2212
template <typename keyType, typename valueType>
2313
typename valueType::opmask_t extend_mask(typename keyType::opmask_t mask)
@@ -44,10 +34,9 @@ typename valueType::opmask_t extend_mask(typename keyType::opmask_t mask)
4434
}
4535
else {
4636
static_assert(keyType::vec_type == simd_type::AVX512,
47-
"Should not reach here");
37+
"should not reach here");
4838
}
4939
}
50-
>>>>>>> d1e90bb (Support for AVX2 argsort/argselect)
5140

5241
template <typename vtype1,
5342
typename vtype2,
@@ -354,17 +343,13 @@ bitonic_merge_dispatch(typename keyType::reg_t &key,
354343
{
355344
constexpr int numlanes = keyType::numlanes;
356345
if constexpr (numlanes == 8) {
357-
<<<<<<< HEAD
358346
key = bitonic_merge_reg_8lanes<keyType, valueType>(key, value);
359347
}
360348
else if constexpr (numlanes == 16) {
361349
key = bitonic_merge_reg_16lanes<keyType, valueType>(key, value);
362-
=======
363-
key = bitonic_merge_zmm_64bit<keyType, valueType>(key, value);
364350
}
365351
else if constexpr (numlanes == 4) {
366352
key = bitonic_merge_ymm_64bit<keyType, valueType>(key, value);
367-
>>>>>>> d1e90bb (Support for AVX2 argsort/argselect)
368353
}
369354
else {
370355
static_assert(numlanes == -1, "No implementation");
@@ -379,17 +364,13 @@ X86_SIMD_SORT_INLINE void sort_vec_dispatch(typename keyType::reg_t &key,
379364
{
380365
constexpr int numlanes = keyType::numlanes;
381366
if constexpr (numlanes == 8) {
382-
<<<<<<< HEAD
383367
key = sort_reg_8lanes<keyType, valueType>(key, value);
384368
}
385369
else if constexpr (numlanes == 16) {
386370
key = sort_reg_16lanes<keyType, valueType>(key, value);
387-
=======
388-
key = sort_zmm_64bit<keyType, valueType>(key, value);
389371
}
390372
else if constexpr (numlanes == 4) {
391373
key = sort_ymm_64bit<keyType, valueType>(key, value);
392-
>>>>>>> d1e90bb (Support for AVX2 argsort/argselect)
393374
}
394375
else {
395376
static_assert(numlanes == -1, "No implementation");

0 commit comments

Comments
 (0)