From c4df7925d10e708bd21ece93038b7fe72e46e049 Mon Sep 17 00:00:00 2001 From: Andrey Piskunov Date: Tue, 5 Jul 2022 16:22:14 +0300 Subject: [PATCH] use vect update for everything except TEXT --- primitives/linux-port/column.cpp | 6 +++--- tests/simd_processors.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/primitives/linux-port/column.cpp b/primitives/linux-port/column.cpp index a777722e0..4f5f88641 100644 --- a/primitives/linux-port/column.cpp +++ b/primitives/linux-port/column.cpp @@ -1278,7 +1278,7 @@ inline SIMD_WRAPPER_TYPE simdSwapedOrderDataLoad(const ColRequestHeaderDataType template void vectorizedUpdateMinMax(const bool validMinMax, const MT nonNullOrEmptyMask, VT& simdProcessor, - SimdType dataVec, SimdType simdMin, SimdType simdMax) + SimdType& dataVec, SimdType& simdMin, SimdType& simdMax) { if (validMinMax && nonNullOrEmptyMask) { @@ -1503,7 +1503,7 @@ void vectorizedFiltering(NewColRequestHeader* in, ColResultHeader* out, const T* simdProcessor, valuesWritten, validMinMax, ridOffset, dataVecTPtr, ridDstArray, writeMask, min, max, in, out, nonNullOrEmptyMask, ridArray); - if constexpr (HAS_INPUT_RIDS && KIND != KIND_TEXT) + if constexpr (KIND != KIND_TEXT) { vectorizedUpdateMinMax(validMinMax, nonNullOrEmptyMask, simdProcessor, dataVec, simdMin, simdMax); } @@ -1522,7 +1522,7 @@ void vectorizedFiltering(NewColRequestHeader* in, ColResultHeader* out, const T* srcArray += VECTOR_SIZE; ridArray += VECTOR_SIZE; } - if constexpr(HAS_INPUT_RIDS && KIND != KIND_TEXT) + if constexpr(KIND != KIND_TEXT) { extractMinMax(simdProcessor, simdMin, simdMax, min, max); } diff --git a/tests/simd_processors.cpp b/tests/simd_processors.cpp index eb5327a66..8e24a8fcd 100644 --- a/tests/simd_processors.cpp +++ b/tests/simd_processors.cpp @@ -48,7 +48,7 @@ public: simd::vi128_wr>>; using Proc = typename simd::SimdFilterProcessor; #else - using Proc = typename simd::SimdFilterProcessor::WrapperType, TypeParam>; + using Proc = typename simd::SimdFilterProcessor::WrapperType, T>; #endif void SetUp() override {