faiss 0.6.1 → 0.6.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/CHANGELOG.md +8 -0
- data/lib/faiss/version.rb +1 -1
- data/vendor/faiss/faiss/AutoTune.cpp +3 -1
- data/vendor/faiss/faiss/Clustering.cpp +9 -1
- data/vendor/faiss/faiss/IVFlib.cpp +14 -3
- data/vendor/faiss/faiss/Index.h +2 -2
- data/vendor/faiss/faiss/IndexAdditiveQuantizer.cpp +9 -10
- data/vendor/faiss/faiss/IndexAdditiveQuantizerFastScan.cpp +2 -3
- data/vendor/faiss/faiss/IndexBinaryFromFloat.cpp +1 -2
- data/vendor/faiss/faiss/IndexBinaryHNSW.cpp +10 -12
- data/vendor/faiss/faiss/IndexBinaryHash.cpp +5 -9
- data/vendor/faiss/faiss/IndexBinaryIVF.cpp +5 -7
- data/vendor/faiss/faiss/IndexEDEN.cpp +273 -0
- data/vendor/faiss/faiss/IndexEDEN.h +57 -0
- data/vendor/faiss/faiss/IndexFastScan.cpp +15 -4
- data/vendor/faiss/faiss/IndexFlat.cpp +13 -50
- data/vendor/faiss/faiss/IndexHNSW.cpp +177 -148
- data/vendor/faiss/faiss/IndexIDMap.cpp +16 -3
- data/vendor/faiss/faiss/IndexIDMap.h +2 -0
- data/vendor/faiss/faiss/IndexIVF.cpp +19 -8
- data/vendor/faiss/faiss/IndexIVFAdditiveQuantizer.cpp +3 -3
- data/vendor/faiss/faiss/IndexIVFAdditiveQuantizerFastScan.cpp +3 -4
- data/vendor/faiss/faiss/IndexIVFEDEN.cpp +302 -0
- data/vendor/faiss/faiss/IndexIVFEDEN.h +70 -0
- data/vendor/faiss/faiss/IndexIVFFastScan.cpp +5 -6
- data/vendor/faiss/faiss/IndexIVFFlat.cpp +6 -5
- data/vendor/faiss/faiss/IndexIVFFlatPanorama.cpp +3 -3
- data/vendor/faiss/faiss/IndexIVFIndependentQuantizer.cpp +1 -1
- data/vendor/faiss/faiss/IndexIVFPQ.cpp +42 -25
- data/vendor/faiss/faiss/IndexIVFPQFastScan.cpp +0 -1
- data/vendor/faiss/faiss/IndexIVFPQR.cpp +2 -3
- data/vendor/faiss/faiss/IndexIVFRaBitQ.cpp +23 -62
- data/vendor/faiss/faiss/IndexIVFRaBitQFastScan.cpp +180 -76
- data/vendor/faiss/faiss/IndexIVFRaBitQFastScan.h +5 -4
- data/vendor/faiss/faiss/IndexIVFSpectralHash.cpp +8 -6
- data/vendor/faiss/faiss/IndexLSH.cpp +2 -3
- data/vendor/faiss/faiss/IndexLattice.cpp +5 -0
- data/vendor/faiss/faiss/IndexNNDescent.cpp +10 -3
- data/vendor/faiss/faiss/IndexNSG.cpp +8 -4
- data/vendor/faiss/faiss/IndexPQ.cpp +6 -8
- data/vendor/faiss/faiss/IndexPreTransform.cpp +15 -0
- data/vendor/faiss/faiss/IndexRaBitQ.cpp +2 -2
- data/vendor/faiss/faiss/IndexRaBitQFastScan.cpp +1 -2
- data/vendor/faiss/faiss/IndexRaBitQFastScan.h +5 -1
- data/vendor/faiss/faiss/IndexRefine.cpp +30 -1
- data/vendor/faiss/faiss/IndexReplicas.cpp +1 -2
- data/vendor/faiss/faiss/IndexScalarQuantizer.cpp +68 -6
- data/vendor/faiss/faiss/IndexScalarQuantizer.h +10 -0
- data/vendor/faiss/faiss/IndexShards.cpp +2 -2
- data/vendor/faiss/faiss/IndexShardsIVF.cpp +2 -2
- data/vendor/faiss/faiss/MetaIndexes.cpp +2 -4
- data/vendor/faiss/faiss/SuperKMeans.cpp +256 -240
- data/vendor/faiss/faiss/SuperKMeans.h +30 -0
- data/vendor/faiss/faiss/VectorTransform.cpp +33 -2
- data/vendor/faiss/faiss/clone_index.cpp +5 -0
- data/vendor/faiss/faiss/cppcontrib/SaDecodeKernels.h +1 -1
- data/vendor/faiss/faiss/cppcontrib/sa_decode/Level2-neon-inl.h +902 -12
- data/vendor/faiss/faiss/cppcontrib/sa_decode/PQ-neon-inl.h +702 -10
- data/vendor/faiss/faiss/factory_tools.cpp +51 -4
- data/vendor/faiss/faiss/gpu/GpuCloner.cpp +11 -11
- data/vendor/faiss/faiss/gpu/GpuIndex.h +34 -11
- data/vendor/faiss/faiss/gpu/GpuIndexCagra.h +47 -0
- data/vendor/faiss/faiss/gpu/GpuIndexIVF.h +17 -0
- data/vendor/faiss/faiss/gpu/GpuIndexIVFScalarQuantizer.h +16 -0
- data/vendor/faiss/faiss/gpu/GpuResources.h +3 -2
- data/vendor/faiss/faiss/gpu/StandardGpuResources.cpp +11 -12
- data/vendor/faiss/faiss/gpu/StandardGpuResources.h +3 -3
- data/vendor/faiss/faiss/gpu/perf/PerfClustering.cpp +1 -1
- data/vendor/faiss/faiss/gpu/perf/PerfIVFPQAdd.cpp +2 -2
- data/vendor/faiss/faiss/gpu/test/TestGpuIndexIVFScalarQuantizer.cpp +180 -0
- data/vendor/faiss/faiss/gpu_metal/MetalDistance.h +87 -0
- data/vendor/faiss/faiss/gpu_metal/MetalIndex.h +7 -0
- data/vendor/faiss/faiss/gpu_metal/MetalIndexIVFFlat.h +177 -0
- data/vendor/faiss/faiss/gpu_metal/MetalIndexIVFPQ.h +88 -0
- data/vendor/faiss/faiss/gpu_metal/MetalKernels.h +48 -3
- data/vendor/faiss/faiss/gpu_metal/MetalPythonBridge.h +45 -0
- data/vendor/faiss/faiss/gpu_metal/impl/MetalIVFFlat.h +193 -0
- data/vendor/faiss/faiss/gpu_metal/impl/MetalIVFPQ.h +134 -0
- data/vendor/faiss/faiss/impl/ClusteringInitialization.cpp +2 -2
- data/vendor/faiss/faiss/impl/DistanceComputer.h +34 -0
- data/vendor/faiss/faiss/impl/EDENQuantizer.h +119 -0
- data/vendor/faiss/faiss/impl/HNSW.cpp +658 -344
- data/vendor/faiss/faiss/impl/HNSW.h +51 -13
- data/vendor/faiss/faiss/impl/LocalSearchQuantizer.cpp +2 -2
- data/vendor/faiss/faiss/impl/NSG.cpp +18 -12
- data/vendor/faiss/faiss/impl/Panorama.h +20 -7
- data/vendor/faiss/faiss/impl/PolysemousTraining.cpp +152 -84
- data/vendor/faiss/faiss/impl/ProductQuantizer.cpp +59 -24
- data/vendor/faiss/faiss/impl/RaBitQUtils.cpp +45 -37
- data/vendor/faiss/faiss/impl/RaBitQUtils.h +35 -0
- data/vendor/faiss/faiss/impl/RaBitQuantizer.cpp +175 -68
- data/vendor/faiss/faiss/impl/RaBitQuantizer.h +19 -0
- data/vendor/faiss/faiss/impl/RaBitQuantizerMultiBit.cpp +2 -11
- data/vendor/faiss/faiss/impl/ResultHandler.h +26 -31
- data/vendor/faiss/faiss/impl/ScalarQuantizer.cpp +522 -58
- data/vendor/faiss/faiss/impl/ScalarQuantizer.h +70 -0
- data/vendor/faiss/faiss/impl/ThreadedIndex-inl.h +2 -2
- data/vendor/faiss/faiss/impl/VisitedTable.cpp +33 -13
- data/vendor/faiss/faiss/impl/VisitedTable.h +88 -33
- data/vendor/faiss/faiss/impl/binary_hamming/IndexBinaryIVF_impl.h +1 -1
- data/vendor/faiss/faiss/impl/binary_hamming/avx2.cpp +4 -4
- data/vendor/faiss/faiss/impl/fast_scan/dispatching.h +38 -3
- data/vendor/faiss/faiss/impl/hnsw/LockVector.cpp +1 -1
- data/vendor/faiss/faiss/impl/hnsw/MinimaxHeap.cpp +35 -43
- data/vendor/faiss/faiss/impl/hnsw/MinimaxHeap.h +64 -15
- data/vendor/faiss/faiss/impl/hnsw/avx2.cpp +86 -40
- data/vendor/faiss/faiss/impl/hnsw/avx512.cpp +81 -50
- data/vendor/faiss/faiss/impl/index_read.cpp +476 -75
- data/vendor/faiss/faiss/impl/index_write.cpp +56 -4
- data/vendor/faiss/faiss/impl/io_macros.h +25 -0
- data/vendor/faiss/faiss/impl/lattice_Zn.cpp +8 -9
- data/vendor/faiss/faiss/impl/platform_macros.h +15 -9
- data/vendor/faiss/faiss/impl/polysemous_training/avx512.cpp +284 -0
- data/vendor/faiss/faiss/impl/polysemous_training/dispatch.h +115 -0
- data/vendor/faiss/faiss/impl/pq_code_distance/IVFPQ_QueryTables.cpp +0 -1
- data/vendor/faiss/faiss/impl/pq_code_distance/PQDistanceComputer_impl.h +26 -15
- data/vendor/faiss/faiss/impl/pq_code_distance/avx2.cpp +6 -4
- data/vendor/faiss/faiss/impl/pq_code_distance/avx512.cpp +2 -0
- data/vendor/faiss/faiss/impl/pq_code_distance/neon.cpp +2 -0
- data/vendor/faiss/faiss/impl/pq_code_distance/pq_code_distance-generic.cpp +20 -0
- data/vendor/faiss/faiss/impl/pq_code_distance/pq_code_distance-inl.h +36 -0
- data/vendor/faiss/faiss/impl/pq_code_distance/pq_code_distance-sve.cpp +5 -0
- data/vendor/faiss/faiss/impl/pq_code_distance/pq_scan_impl.h +105 -0
- data/vendor/faiss/faiss/impl/pq_code_distance/rvv.cpp +2 -0
- data/vendor/faiss/faiss/impl/result_handler/ResultHandler.cpp +195 -0
- data/vendor/faiss/faiss/impl/result_handler/avx2.cpp +133 -0
- data/vendor/faiss/faiss/impl/result_handler/avx512.cpp +281 -0
- data/vendor/faiss/faiss/impl/scalar_quantizer/EDENQuantizer-avx2.cpp +72 -0
- data/vendor/faiss/faiss/impl/scalar_quantizer/EDENQuantizer-avx512.cpp +228 -0
- data/vendor/faiss/faiss/impl/scalar_quantizer/EDENQuantizer.cpp +882 -0
- data/vendor/faiss/faiss/impl/scalar_quantizer/distance_computers.h +6 -0
- data/vendor/faiss/faiss/impl/scalar_quantizer/quantizers.h +336 -26
- data/vendor/faiss/faiss/impl/scalar_quantizer/sq-avx2.cpp +331 -32
- data/vendor/faiss/faiss/impl/scalar_quantizer/sq-avx512-impl.h +553 -0
- data/vendor/faiss/faiss/impl/scalar_quantizer/sq-avx512-spr.cpp +558 -0
- data/vendor/faiss/faiss/impl/scalar_quantizer/sq-avx512.cpp +284 -45
- data/vendor/faiss/faiss/impl/scalar_quantizer/sq-dispatch.h +502 -3
- data/vendor/faiss/faiss/impl/scalar_quantizer/sq-neon.cpp +157 -32
- data/vendor/faiss/faiss/impl/scalar_quantizer/sq-rvv.cpp +26 -0
- data/vendor/faiss/faiss/impl/simd_dispatch.h +86 -8
- data/vendor/faiss/faiss/index_factory.cpp +37 -7
- data/vendor/faiss/faiss/index_io.h +16 -0
- data/vendor/faiss/faiss/invlists/DirectMap.cpp +5 -2
- data/vendor/faiss/faiss/invlists/InvertedLists.cpp +15 -15
- data/vendor/faiss/faiss/invlists/InvertedLists.h +2 -2
- data/vendor/faiss/faiss/invlists/OnDiskInvertedLists.cpp +19 -4
- data/vendor/faiss/faiss/python/python_callbacks.cpp +3 -1
- data/vendor/faiss/faiss/svs/IndexSVSFaissUtils.h +60 -0
- data/vendor/faiss/faiss/svs/IndexSVSFlat.cpp +26 -1
- data/vendor/faiss/faiss/svs/IndexSVSFlat.h +13 -0
- data/vendor/faiss/faiss/svs/IndexSVSIVF.cpp +1 -1
- data/vendor/faiss/faiss/svs/IndexSVSIVFLeanVec.cpp +1 -1
- data/vendor/faiss/faiss/svs/IndexSVSVamana.cpp +150 -23
- data/vendor/faiss/faiss/svs/IndexSVSVamana.h +30 -7
- data/vendor/faiss/faiss/svs/IndexSVSVamanaLVQ.cpp +3 -2
- data/vendor/faiss/faiss/svs/IndexSVSVamanaLVQ.h +2 -1
- data/vendor/faiss/faiss/svs/IndexSVSVamanaLeanVec.cpp +65 -25
- data/vendor/faiss/faiss/svs/IndexSVSVamanaLeanVec.h +3 -2
- data/vendor/faiss/faiss/utils/approx_topk_hamming/approx_topk_hamming.h +1 -1
- data/vendor/faiss/faiss/utils/bf16.h +34 -0
- data/vendor/faiss/faiss/utils/distances.cpp +14 -2
- data/vendor/faiss/faiss/utils/distances_simd.cpp +4 -4
- data/vendor/faiss/faiss/utils/extra_distances.cpp +4 -14
- data/vendor/faiss/faiss/utils/extra_distances.h +1 -2
- data/vendor/faiss/faiss/utils/hamming.cpp +9 -9
- data/vendor/faiss/faiss/utils/hamming_distance/hamming_avx2.cpp +2 -1
- data/vendor/faiss/faiss/utils/hamming_distance/hamming_avx512_spr.cpp +15 -0
- data/vendor/faiss/faiss/utils/hamming_distance/hamming_computer-avx512.h +6 -30
- data/vendor/faiss/faiss/utils/hamming_distance/hamming_computer-avx512_spr.h +171 -0
- data/vendor/faiss/faiss/utils/partitioning.cpp +0 -2
- data/vendor/faiss/faiss/utils/quantize_lut.cpp +29 -8
- data/vendor/faiss/faiss/utils/rabitq_simd.h +202 -0
- data/vendor/faiss/faiss/utils/simd_impl/distances_avx2.cpp +0 -1
- data/vendor/faiss/faiss/utils/simd_impl/distances_avx512.cpp +263 -15
- data/vendor/faiss/faiss/utils/simd_impl/distances_rvv.cpp +160 -18
- data/vendor/faiss/faiss/utils/simd_impl/partitioning_simdlib256.h +14 -68
- data/vendor/faiss/faiss/utils/simd_impl/rabitq_avx2.cpp +245 -0
- data/vendor/faiss/faiss/utils/simd_impl/rabitq_avx512.cpp +273 -0
- data/vendor/faiss/faiss/utils/simd_impl/rabitq_avx512_spr.cpp +435 -0
- data/vendor/faiss/faiss/utils/simd_impl/rabitq_neon.cpp +11 -0
- data/vendor/faiss/faiss/utils/simd_impl/rabitq_rvv.cpp +143 -6
- data/vendor/faiss/faiss/utils/simd_levels.cpp +56 -2
- data/vendor/faiss/faiss/utils/simd_levels.h +14 -0
- data/vendor/faiss/faiss/utils/utils.cpp +9 -27
- metadata +27 -2
|
@@ -9,6 +9,7 @@
|
|
|
9
9
|
|
|
10
10
|
#include <faiss/utils/rabitq_simd.h>
|
|
11
11
|
#include <immintrin.h>
|
|
12
|
+
#include <limits>
|
|
12
13
|
|
|
13
14
|
namespace faiss::rabitq {
|
|
14
15
|
|
|
@@ -167,8 +168,164 @@ inline uint64_t reduce_add_128(__m128i v) {
|
|
|
167
168
|
return lanes[0] + lanes[1];
|
|
168
169
|
}
|
|
169
170
|
|
|
171
|
+
inline __m512i round_nonnegative_ps_to_i32(__m512 x) {
|
|
172
|
+
return _mm512_cvttps_epi32(_mm512_add_ps(x, _mm512_set1_ps(0.5f)));
|
|
173
|
+
}
|
|
174
|
+
|
|
175
|
+
inline void store_i32_as_u8_16(__m512i values, uint8_t* out) {
|
|
176
|
+
const __m128i packed = _mm512_cvtusepi32_epi8(values);
|
|
177
|
+
_mm_storeu_si128(reinterpret_cast<__m128i*>(out), packed);
|
|
178
|
+
}
|
|
179
|
+
|
|
170
180
|
} // namespace
|
|
171
181
|
|
|
182
|
+
template <>
|
|
183
|
+
void lut_minmax_16<SIMDLevel::AVX512>(const float* tab, float& mn, float& mx) {
|
|
184
|
+
const __m512 v = _mm512_loadu_ps(tab);
|
|
185
|
+
mn = _mm512_reduce_min_ps(v);
|
|
186
|
+
mx = _mm512_reduce_max_ps(v);
|
|
187
|
+
}
|
|
188
|
+
|
|
189
|
+
template <>
|
|
190
|
+
void minmax_values<SIMDLevel::AVX512>(
|
|
191
|
+
const float* values,
|
|
192
|
+
size_t n,
|
|
193
|
+
float& mn,
|
|
194
|
+
float& mx) {
|
|
195
|
+
if (n == 0) {
|
|
196
|
+
return;
|
|
197
|
+
}
|
|
198
|
+
|
|
199
|
+
size_t i = 0;
|
|
200
|
+
__m512 mn_vec = _mm512_set1_ps(std::numeric_limits<float>::max());
|
|
201
|
+
__m512 mx_vec = _mm512_set1_ps(std::numeric_limits<float>::lowest());
|
|
202
|
+
for (; i + 16 <= n; i += 16) {
|
|
203
|
+
const __m512 v = _mm512_loadu_ps(values + i);
|
|
204
|
+
mn_vec = _mm512_min_ps(mn_vec, v);
|
|
205
|
+
mx_vec = _mm512_max_ps(mx_vec, v);
|
|
206
|
+
}
|
|
207
|
+
|
|
208
|
+
if (i < n) {
|
|
209
|
+
const __mmask16 mask =
|
|
210
|
+
static_cast<__mmask16>((uint32_t(1) << (n - i)) - 1);
|
|
211
|
+
const __m512 v = _mm512_maskz_loadu_ps(mask, values + i);
|
|
212
|
+
mn_vec = _mm512_mask_min_ps(mn_vec, mask, mn_vec, v);
|
|
213
|
+
mx_vec = _mm512_mask_max_ps(mx_vec, mask, mx_vec, v);
|
|
214
|
+
}
|
|
215
|
+
|
|
216
|
+
mn = _mm512_reduce_min_ps(mn_vec);
|
|
217
|
+
mx = _mm512_reduce_max_ps(mx_vec);
|
|
218
|
+
}
|
|
219
|
+
|
|
220
|
+
template <>
|
|
221
|
+
void lut_quantize_16_to_uint8<SIMDLevel::AVX512>(
|
|
222
|
+
const float* tab,
|
|
223
|
+
float mn,
|
|
224
|
+
float a,
|
|
225
|
+
uint8_t* out) {
|
|
226
|
+
const __m512 values = _mm512_loadu_ps(tab);
|
|
227
|
+
const __m512 a_vec = _mm512_set1_ps(a);
|
|
228
|
+
const __m512 scaled =
|
|
229
|
+
_mm512_fmsub_ps(values, a_vec, _mm512_set1_ps(mn * a));
|
|
230
|
+
__m512i rounded = round_nonnegative_ps_to_i32(scaled);
|
|
231
|
+
rounded = _mm512_max_epi32(rounded, _mm512_setzero_si512());
|
|
232
|
+
store_i32_as_u8_16(rounded, out);
|
|
233
|
+
}
|
|
234
|
+
|
|
235
|
+
template <>
|
|
236
|
+
void quantize_query_values<SIMDLevel::AVX512>(
|
|
237
|
+
const float* rq,
|
|
238
|
+
size_t d,
|
|
239
|
+
float v_min,
|
|
240
|
+
float inv_delta,
|
|
241
|
+
uint8_t max_code,
|
|
242
|
+
bool centered,
|
|
243
|
+
uint8_t* rqq,
|
|
244
|
+
size_t& sum_qq,
|
|
245
|
+
int64_t& sum2_signed_odd_int) {
|
|
246
|
+
const __m512 inv_delta_vec = _mm512_set1_ps(inv_delta);
|
|
247
|
+
const __m512 v_min_times_inv_delta_vec = _mm512_set1_ps(v_min * inv_delta);
|
|
248
|
+
const __m512 zero = _mm512_setzero_ps();
|
|
249
|
+
const __m512 max_code_ps = _mm512_set1_ps(static_cast<float>(max_code));
|
|
250
|
+
const __m512i max_code_i32 = _mm512_set1_epi32(max_code);
|
|
251
|
+
const __m512i two = _mm512_set1_epi32(2);
|
|
252
|
+
|
|
253
|
+
size_t i = 0;
|
|
254
|
+
if (centered) {
|
|
255
|
+
__m512i sum_acc_lo = _mm512_setzero_si512();
|
|
256
|
+
__m512i sum_acc_hi = _mm512_setzero_si512();
|
|
257
|
+
__m512i sq_acc_lo = _mm512_setzero_si512();
|
|
258
|
+
__m512i sq_acc_hi = _mm512_setzero_si512();
|
|
259
|
+
for (; i + 16 <= d; i += 16) {
|
|
260
|
+
const __m512 values = _mm512_loadu_ps(rq + i);
|
|
261
|
+
__m512 scaled = _mm512_fmsub_ps(
|
|
262
|
+
values, inv_delta_vec, v_min_times_inv_delta_vec);
|
|
263
|
+
scaled = _mm512_min_ps(_mm512_max_ps(scaled, zero), max_code_ps);
|
|
264
|
+
__m512i rounded = round_nonnegative_ps_to_i32(scaled);
|
|
265
|
+
|
|
266
|
+
sum_acc_lo = _mm512_add_epi64(
|
|
267
|
+
sum_acc_lo,
|
|
268
|
+
_mm512_cvtepi32_epi64(_mm512_castsi512_si256(rounded)));
|
|
269
|
+
sum_acc_hi = _mm512_add_epi64(
|
|
270
|
+
sum_acc_hi,
|
|
271
|
+
_mm512_cvtepi32_epi64(
|
|
272
|
+
_mm512_extracti64x4_epi64(rounded, 1)));
|
|
273
|
+
const __m512i signed_odd = _mm512_sub_epi32(
|
|
274
|
+
_mm512_mullo_epi32(rounded, two), max_code_i32);
|
|
275
|
+
const __m512i signed_odd_sqr =
|
|
276
|
+
_mm512_mullo_epi32(signed_odd, signed_odd);
|
|
277
|
+
sq_acc_lo = _mm512_add_epi64(
|
|
278
|
+
sq_acc_lo,
|
|
279
|
+
_mm512_cvtepi32_epi64(
|
|
280
|
+
_mm512_castsi512_si256(signed_odd_sqr)));
|
|
281
|
+
sq_acc_hi = _mm512_add_epi64(
|
|
282
|
+
sq_acc_hi,
|
|
283
|
+
_mm512_cvtepi32_epi64(
|
|
284
|
+
_mm512_extracti64x4_epi64(signed_odd_sqr, 1)));
|
|
285
|
+
store_i32_as_u8_16(rounded, rqq + i);
|
|
286
|
+
}
|
|
287
|
+
sum_qq += static_cast<uint64_t>(
|
|
288
|
+
_mm512_reduce_add_epi64(sum_acc_lo) +
|
|
289
|
+
_mm512_reduce_add_epi64(sum_acc_hi));
|
|
290
|
+
sum2_signed_odd_int += _mm512_reduce_add_epi64(sq_acc_lo);
|
|
291
|
+
sum2_signed_odd_int += _mm512_reduce_add_epi64(sq_acc_hi);
|
|
292
|
+
} else {
|
|
293
|
+
__m512i sum_acc_lo = _mm512_setzero_si512();
|
|
294
|
+
__m512i sum_acc_hi = _mm512_setzero_si512();
|
|
295
|
+
for (; i + 16 <= d; i += 16) {
|
|
296
|
+
const __m512 values = _mm512_loadu_ps(rq + i);
|
|
297
|
+
__m512 scaled = _mm512_fmsub_ps(
|
|
298
|
+
values, inv_delta_vec, v_min_times_inv_delta_vec);
|
|
299
|
+
scaled = _mm512_min_ps(_mm512_max_ps(scaled, zero), max_code_ps);
|
|
300
|
+
__m512i rounded = round_nonnegative_ps_to_i32(scaled);
|
|
301
|
+
|
|
302
|
+
sum_acc_lo = _mm512_add_epi64(
|
|
303
|
+
sum_acc_lo,
|
|
304
|
+
_mm512_cvtepi32_epi64(_mm512_castsi512_si256(rounded)));
|
|
305
|
+
sum_acc_hi = _mm512_add_epi64(
|
|
306
|
+
sum_acc_hi,
|
|
307
|
+
_mm512_cvtepi32_epi64(
|
|
308
|
+
_mm512_extracti64x4_epi64(rounded, 1)));
|
|
309
|
+
store_i32_as_u8_16(rounded, rqq + i);
|
|
310
|
+
}
|
|
311
|
+
sum_qq += static_cast<uint64_t>(
|
|
312
|
+
_mm512_reduce_add_epi64(sum_acc_lo) +
|
|
313
|
+
_mm512_reduce_add_epi64(sum_acc_hi));
|
|
314
|
+
}
|
|
315
|
+
|
|
316
|
+
for (; i < d; i++) {
|
|
317
|
+
const uint8_t v_qq = round_clamped_byte_scalar(
|
|
318
|
+
(rq[i] - v_min) * inv_delta, max_code);
|
|
319
|
+
rqq[i] = v_qq;
|
|
320
|
+
sum_qq += v_qq;
|
|
321
|
+
|
|
322
|
+
if (centered) {
|
|
323
|
+
const int64_t signed_odd_int = int64_t(v_qq) * 2 - max_code;
|
|
324
|
+
sum2_signed_odd_int += signed_odd_int * signed_odd_int;
|
|
325
|
+
}
|
|
326
|
+
}
|
|
327
|
+
}
|
|
328
|
+
|
|
172
329
|
template <>
|
|
173
330
|
uint64_t bitwise_and_dot_product<SIMDLevel::AVX512>(
|
|
174
331
|
const uint8_t* query,
|
|
@@ -237,6 +394,87 @@ uint64_t bitwise_and_dot_product<SIMDLevel::AVX512>(
|
|
|
237
394
|
return sum;
|
|
238
395
|
}
|
|
239
396
|
|
|
397
|
+
template <>
|
|
398
|
+
BitwiseAndDotProductResult bitwise_and_dot_product_with_popcount<
|
|
399
|
+
SIMDLevel::AVX512>(
|
|
400
|
+
const uint8_t* query,
|
|
401
|
+
const uint8_t* data,
|
|
402
|
+
size_t size,
|
|
403
|
+
size_t qb) {
|
|
404
|
+
uint64_t dot_product = 0;
|
|
405
|
+
uint64_t popcount_sum = 0;
|
|
406
|
+
size_t offset = 0;
|
|
407
|
+
if (size_t step = 512 / 8; offset + step <= size) {
|
|
408
|
+
__m512i dot_512 = _mm512_setzero_si512();
|
|
409
|
+
__m512i pop_512 = _mm512_setzero_si512();
|
|
410
|
+
for (; offset + step <= size; offset += step) {
|
|
411
|
+
__m512i v_x = _mm512_loadu_si512((const __m512i*)(data + offset));
|
|
412
|
+
pop_512 = _mm512_add_epi64(pop_512, popcount_512(v_x));
|
|
413
|
+
for (int j = 0; j < qb; j++) {
|
|
414
|
+
__m512i v_q = _mm512_loadu_si512(
|
|
415
|
+
(const __m512i*)(query + j * size + offset));
|
|
416
|
+
__m512i v_and = _mm512_and_si512(v_q, v_x);
|
|
417
|
+
__m512i v_popcnt = popcount_512(v_and);
|
|
418
|
+
__m512i v_shifted = _mm512_slli_epi64(v_popcnt, j);
|
|
419
|
+
dot_512 = _mm512_add_epi64(dot_512, v_shifted);
|
|
420
|
+
}
|
|
421
|
+
}
|
|
422
|
+
dot_product += _mm512_reduce_add_epi64(dot_512);
|
|
423
|
+
popcount_sum += _mm512_reduce_add_epi64(pop_512);
|
|
424
|
+
}
|
|
425
|
+
if (size_t step = 256 / 8; offset + step <= size) {
|
|
426
|
+
__m256i dot_256 = _mm256_setzero_si256();
|
|
427
|
+
__m256i pop_256 = _mm256_setzero_si256();
|
|
428
|
+
for (; offset + step <= size; offset += step) {
|
|
429
|
+
__m256i v_x = _mm256_loadu_si256((const __m256i*)(data + offset));
|
|
430
|
+
pop_256 = _mm256_add_epi64(pop_256, popcount_256(v_x));
|
|
431
|
+
for (int j = 0; j < qb; j++) {
|
|
432
|
+
__m256i v_q = _mm256_loadu_si256(
|
|
433
|
+
(const __m256i*)(query + j * size + offset));
|
|
434
|
+
__m256i v_and = _mm256_and_si256(v_q, v_x);
|
|
435
|
+
__m256i v_popcnt = popcount_256(v_and);
|
|
436
|
+
__m256i v_shifted = _mm256_slli_epi64(v_popcnt, j);
|
|
437
|
+
dot_256 = _mm256_add_epi64(dot_256, v_shifted);
|
|
438
|
+
}
|
|
439
|
+
}
|
|
440
|
+
dot_product += reduce_add_256(dot_256);
|
|
441
|
+
popcount_sum += reduce_add_256(pop_256);
|
|
442
|
+
}
|
|
443
|
+
__m128i dot_128 = _mm_setzero_si128();
|
|
444
|
+
__m128i pop_128 = _mm_setzero_si128();
|
|
445
|
+
for (size_t step = 128 / 8; offset + step <= size; offset += step) {
|
|
446
|
+
__m128i v_x = _mm_loadu_si128((const __m128i*)(data + offset));
|
|
447
|
+
pop_128 = _mm_add_epi64(pop_128, popcount_128(v_x));
|
|
448
|
+
for (int j = 0; j < qb; j++) {
|
|
449
|
+
__m128i v_q = _mm_loadu_si128(
|
|
450
|
+
(const __m128i*)(query + j * size + offset));
|
|
451
|
+
__m128i v_and = _mm_and_si128(v_q, v_x);
|
|
452
|
+
__m128i v_popcnt = popcount_128(v_and);
|
|
453
|
+
__m128i v_shifted = _mm_slli_epi64(v_popcnt, j);
|
|
454
|
+
dot_128 = _mm_add_epi64(dot_128, v_shifted);
|
|
455
|
+
}
|
|
456
|
+
}
|
|
457
|
+
dot_product += reduce_add_128(dot_128);
|
|
458
|
+
popcount_sum += reduce_add_128(pop_128);
|
|
459
|
+
for (size_t step = 64 / 8; offset + step <= size; offset += step) {
|
|
460
|
+
const auto yv = *(const uint64_t*)(data + offset);
|
|
461
|
+
popcount_sum += popcount64(yv);
|
|
462
|
+
for (int j = 0; j < qb; j++) {
|
|
463
|
+
const auto qv = *(const uint64_t*)(query + j * size + offset);
|
|
464
|
+
dot_product += popcount64(qv & yv) << j;
|
|
465
|
+
}
|
|
466
|
+
}
|
|
467
|
+
for (; offset < size; ++offset) {
|
|
468
|
+
const auto yv = *(data + offset);
|
|
469
|
+
popcount_sum += popcount32(yv);
|
|
470
|
+
for (int j = 0; j < qb; j++) {
|
|
471
|
+
const auto qv = *(query + j * size + offset);
|
|
472
|
+
dot_product += popcount32(qv & yv) << j;
|
|
473
|
+
}
|
|
474
|
+
}
|
|
475
|
+
return {dot_product, popcount_sum};
|
|
476
|
+
}
|
|
477
|
+
|
|
240
478
|
template <>
|
|
241
479
|
uint64_t bitwise_xor_dot_product<SIMDLevel::AVX512>(
|
|
242
480
|
const uint8_t* query,
|
|
@@ -344,6 +582,41 @@ uint64_t popcount<SIMDLevel::AVX512>(const uint8_t* data, size_t size) {
|
|
|
344
582
|
return sum;
|
|
345
583
|
}
|
|
346
584
|
|
|
585
|
+
template <>
|
|
586
|
+
void rearrange_bit_planes<SIMDLevel::AVX512>(
|
|
587
|
+
const uint8_t* rotated_qq,
|
|
588
|
+
size_t d,
|
|
589
|
+
size_t qb,
|
|
590
|
+
uint8_t* out) {
|
|
591
|
+
const size_t offset = (d + 7) / 8;
|
|
592
|
+
memset(out, 0, offset * qb);
|
|
593
|
+
size_t idim = 0;
|
|
594
|
+
for (; idim + 64 <= d; idim += 64) {
|
|
595
|
+
__m512i vals = _mm512_loadu_si512((const __m512i*)(rotated_qq + idim));
|
|
596
|
+
for (size_t iv = 0; iv < qb; iv++) {
|
|
597
|
+
__m512i mask = _mm512_set1_epi8(static_cast<char>(1 << iv));
|
|
598
|
+
__mmask64 bits = _mm512_test_epi8_mask(vals, mask);
|
|
599
|
+
memcpy(&out[iv * offset + idim / 8], &bits, 8);
|
|
600
|
+
}
|
|
601
|
+
}
|
|
602
|
+
for (; idim + 32 <= d; idim += 32) {
|
|
603
|
+
__m256i vals = _mm256_loadu_si256((const __m256i*)(rotated_qq + idim));
|
|
604
|
+
for (size_t iv = 0; iv < qb; iv++) {
|
|
605
|
+
__m256i mask = _mm256_set1_epi8(static_cast<char>(1 << iv));
|
|
606
|
+
__m256i bits =
|
|
607
|
+
_mm256_cmpeq_epi8(_mm256_and_si256(vals, mask), mask);
|
|
608
|
+
uint32_t packed = static_cast<uint32_t>(_mm256_movemask_epi8(bits));
|
|
609
|
+
memcpy(&out[iv * offset + idim / 8], &packed, 4);
|
|
610
|
+
}
|
|
611
|
+
}
|
|
612
|
+
for (; idim < d; idim++) {
|
|
613
|
+
for (size_t iv = 0; iv < qb; iv++) {
|
|
614
|
+
const bool bit = ((rotated_qq[idim] & (1 << iv)) != 0);
|
|
615
|
+
out[iv * offset + idim / 8] |= bit ? (1 << (idim % 8)) : 0;
|
|
616
|
+
}
|
|
617
|
+
}
|
|
618
|
+
}
|
|
619
|
+
|
|
347
620
|
} // namespace faiss::rabitq
|
|
348
621
|
|
|
349
622
|
namespace faiss::rabitq::multibit {
|