From 30eef142b33749b3579b014d071d99270008eb02 Mon Sep 17 00:00:00 2001 From: Alexey Arno Date: Tue, 19 May 2015 16:23:13 +0300 Subject: [PATCH 1/3] Merge --- dbms/include/DB/Functions/FunctionsRound.h | 277 ++++++++++++--------- 1 file changed, 156 insertions(+), 121 deletions(-) diff --git a/dbms/include/DB/Functions/FunctionsRound.h b/dbms/include/DB/Functions/FunctionsRound.h index 567379ef5f7..93e328ed94b 100644 --- a/dbms/include/DB/Functions/FunctionsRound.h +++ b/dbms/include/DB/Functions/FunctionsRound.h @@ -92,28 +92,152 @@ namespace DB } }; - template class Op, typename PowersTable> - struct FunctionApproximatingImpl + /// Реализация функций округления на низком уровне. + + template + struct RoundingComputation { - template - static inline U apply(U val, UInt8 precision, - typename std::enable_if::value>::type * = nullptr) + }; + + template + struct RoundingComputation + { + using Data = std::array; + using Scale = __m128; + + static inline void prepareScale(size_t scale, Scale & mm_scale) + { + Float32 fscale = static_cast(scale); + mm_scale = _mm_load1_ps(&fscale); + } + + static inline void compute(const Data & in, const Scale & mm_scale, Data & out) + { + Float32 input[4] __attribute__((aligned(16))) = {in[0], in[1], in[2], in[3]}; + __m128 mm_value = _mm_load_ps(input); + + mm_value = _mm_mul_ps(mm_value, mm_scale); + mm_value = _mm_round_ps(mm_value, rounding_mode); + mm_value = _mm_div_ps(mm_value, mm_scale); + + Float32 res[4] __attribute__((aligned(16))); + _mm_store_ps(res, mm_value); + out = {res[0], res[1], res[2], res[3]}; + } + }; + + template + struct RoundingComputation + { + using Data = std::array; + using Scale = __m128d; + + static inline void prepareScale(size_t scale, Scale & mm_scale) + { + Float64 fscale = static_cast(scale); + mm_scale = _mm_load1_pd(&fscale); + } + + static inline void compute(const Data & in, const Scale & mm_scale, Data & out) + { + Float64 input[2] __attribute__((aligned(16))) = { in[0], in[1] }; + __m128d mm_value = _mm_load_pd(input); + + mm_value = _mm_mul_pd(mm_value, mm_scale); + mm_value = _mm_round_pd(mm_value, rounding_mode); + mm_value = _mm_div_pd(mm_value, mm_scale); + + Float64 res[2] __attribute__((aligned(16))); + _mm_store_pd(res, mm_value); + out = {res[0], res[1]}; + } + }; + + /// Реализация функций округления на высоком уровне. + + template + struct FunctionRoundingImpl + { + }; + + /// В случае целочисленных значений не выполяется округления. + template + struct FunctionRoundingImpl::value>::type> + { + static inline void apply(const PODArray & in, size_t scale, typename ColumnVector::Container_t & out) + { + size_t size = in.size(); + for (size_t i = 0; i < size; ++i) + out[i] = in[i]; + } + + static inline T apply(T val, size_t scale) + { + return val; + } + }; + + template + struct FunctionRoundingImpl::value>::type> + { + private: + using Op = RoundingComputation; + using Data = typename Op::Data; + using Scale = typename Op::Scale; + + public: + static inline void apply(const PODArray & in, size_t scale, typename ColumnVector::Container_t & out) + { + Scale mm_scale; + Op::prepareScale(scale, mm_scale); + + const size_t size = in.size(); + const size_t data_size = std::tuple_size(); + + size_t i; + for (i = 0; i < (size - data_size + 1); i += data_size) + { + Data tmp; + for (size_t j = 0; j < data_size; ++j) + tmp[j] = in[i + j]; + + Data res; + Op::compute(tmp, mm_scale, res); + + for (size_t j = 0; j < data_size; ++j) + out[i + j] = res[j]; + } + + if (i < size) + { + Data tmp{0}; + for (size_t j = 0; (j < data_size) && (i + j) < size; ++j) + tmp[j] = in[i + j]; + + Data res; + Op::compute(tmp, mm_scale, res); + + for (size_t j = 0; (j < data_size) && (i + j) < size; ++j) + out[i + j] = in[i + j]; + } + } + + static inline T apply(T val, size_t scale) { if (val == 0) return val; else { - size_t power = PowersTable::values[precision]; - return Op::apply(val * power) / power; - } - } + Scale mm_scale; + Op::prepareScale(scale, mm_scale); - /// Для целых чисел ничего не надо делать. - template - static inline U apply(U val, UInt8 precision, - typename std::enable_if::value>::type * = nullptr) - { - return val; + Data tmp{0}; + tmp[0] = val; + + Data res; + Op::compute(tmp, mm_scale, res); + return res[0]; + } } }; @@ -164,7 +288,7 @@ namespace { /// Отдельные степени числа 10. - template + template struct PowerOf10 { static const size_t value = 10 * PowerOf10::value; @@ -179,49 +303,49 @@ namespace /// Объявление и определение контейнера содержащего таблицу степеней числа 10. - template + template struct TableContainer { static const std::array values; }; - template + template const std::array TableContainer::values = { TArgs... }; /// Генератор первых N степеней. - template + template struct FillArrayImpl { using result = typename FillArrayImpl::value, TArgs...>::result; }; - template + template struct FillArrayImpl<0, TArgs...> { using result = TableContainer::value, TArgs...>; }; - template + template struct FillArray { - using result = typename FillArrayImpl::result; + using result = typename FillArrayImpl::result; }; - /** Шаблон для функцией, которые вычисляют приближенное значение входного параметра + /** Шаблон для функций, которые вычисляют приближенное значение входного параметра * типа (U)Int8/16/32/64 или Float32/64 и принимают дополнительный необязятельный * параметр указывающий сколько знаков после запятой оставить (по умолчанию - 0). * Op - функция (round/floor/ceil) */ - template class Op, typename Name> - class FunctionApproximating : public IFunction + template + class FunctionRounding : public IFunction { public: static constexpr auto name = Name::name; - static IFunction * create(const Context & context) { return new FunctionApproximating; } + static IFunction * create(const Context & context) { return new FunctionRounding; } private: - using PowersOf10 = FillArray::digits10 + 1>::result; + using PowersOf10 = FillArray::digits10 + 1>::result; private: template @@ -245,10 +369,7 @@ namespace typename ColumnVector::Container_t & vec_res = col_res->getData(); vec_res.resize(col->getData().size()); - const PODArray & a = col->getData(); - size_t size = a.size(); - for (size_t i = 0; i < size; ++i) - vec_res[i] = FunctionApproximatingImpl::apply(a[i], precision); + FunctionRoundingImpl::apply(col->getData(), PowersOf10::values[precision], vec_res); return true; } @@ -258,7 +379,7 @@ namespace if (arguments.size() == 2) precision = getPrecision(block.getByPosition(arguments[1]).column); - T res = FunctionApproximatingImpl::apply(col->getData(), precision); + T res = FunctionRoundingImpl::apply(col->getData(), PowersOf10::values[precision]); ColumnConst * col_res = new ColumnConst(col->size(), res); block.getByPosition(result).column = col_res; @@ -355,92 +476,6 @@ namespace } }; -namespace -{ - /// Определение функцией для использования в шаблоне FunctionApproximating. - - template - struct RoundImpl - { - static inline T apply(T val) - { - return val; - } - }; - - template<> - struct RoundImpl - { - static inline Float32 apply(Float32 val) - { - return roundf(val); - } - }; - - template<> - struct RoundImpl - { - static inline Float64 apply(Float64 val) - { - return round(val); - } - }; - - template - struct CeilImpl - { - static inline T apply(T val) - { - return val; - } - }; - - template<> - struct CeilImpl - { - static inline Float32 apply(Float32 val) - { - return ceilf(val); - } - }; - - template<> - struct CeilImpl - { - static inline Float64 apply(Float64 val) - { - return ceil(val); - } - }; - - template - struct FloorImpl - { - static inline T apply(T val) - { - return val; - } - }; - - template<> - struct FloorImpl - { - static inline Float32 apply(Float32 val) - { - return floorf(val); - } - }; - - template<> - struct FloorImpl - { - static inline Float64 apply(Float64 val) - { - return floor(val); - } - }; -} - struct NameRoundToExp2 { static constexpr auto name = "roundToExp2"; }; struct NameRoundDuration { static constexpr auto name = "roundDuration"; }; struct NameRoundAge { static constexpr auto name = "roundAge"; }; @@ -451,7 +486,7 @@ namespace typedef FunctionUnaryArithmetic FunctionRoundToExp2; typedef FunctionUnaryArithmetic FunctionRoundDuration; typedef FunctionUnaryArithmetic FunctionRoundAge; - typedef FunctionApproximating FunctionRound; - typedef FunctionApproximating FunctionCeil; - typedef FunctionApproximating FunctionFloor; + typedef FunctionRounding FunctionRound; + typedef FunctionRounding FunctionCeil; + typedef FunctionRounding FunctionFloor; } From 8a36ba31c8f0f56ef5d8564e7c27051729e056b0 Mon Sep 17 00:00:00 2001 From: Alexey Arno Date: Tue, 19 May 2015 16:26:23 +0300 Subject: [PATCH 2/3] dbms: Server: small cosmetic change. [#METR-15210] --- dbms/include/DB/Functions/FunctionsRound.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/dbms/include/DB/Functions/FunctionsRound.h b/dbms/include/DB/Functions/FunctionsRound.h index 93e328ed94b..4b96bf5b9d9 100644 --- a/dbms/include/DB/Functions/FunctionsRound.h +++ b/dbms/include/DB/Functions/FunctionsRound.h @@ -288,7 +288,7 @@ namespace { /// Отдельные степени числа 10. - template + template struct PowerOf10 { static const size_t value = 10 * PowerOf10::value; @@ -303,33 +303,33 @@ namespace /// Объявление и определение контейнера содержащего таблицу степеней числа 10. - template + template struct TableContainer { static const std::array values; }; - template + template const std::array TableContainer::values = { TArgs... }; /// Генератор первых N степеней. - template + template struct FillArrayImpl { using result = typename FillArrayImpl::value, TArgs...>::result; }; - template + template struct FillArrayImpl<0, TArgs...> { using result = TableContainer::value, TArgs...>; }; - template + template struct FillArray { - using result = typename FillArrayImpl::result; + using result = typename FillArrayImpl::result; }; /** Шаблон для функций, которые вычисляют приближенное значение входного параметра From 2421d530334e510f3b697220845e84e920cd8756 Mon Sep 17 00:00:00 2001 From: Alexey Arno Date: Tue, 19 May 2015 16:31:14 +0300 Subject: [PATCH 3/3] dbms: Server: small cosmetic change. [#METR-15210] --- dbms/include/DB/Functions/FunctionsRound.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/dbms/include/DB/Functions/FunctionsRound.h b/dbms/include/DB/Functions/FunctionsRound.h index 4b96bf5b9d9..5c795cbd54f 100644 --- a/dbms/include/DB/Functions/FunctionsRound.h +++ b/dbms/include/DB/Functions/FunctionsRound.h @@ -211,13 +211,13 @@ namespace DB if (i < size) { Data tmp{0}; - for (size_t j = 0; (j < data_size) && (i + j) < size; ++j) + for (size_t j = 0; (j < data_size) && ((i + j) < size); ++j) tmp[j] = in[i + j]; Data res; Op::compute(tmp, mm_scale, res); - for (size_t j = 0; (j < data_size) && (i + j) < size; ++j) + for (size_t j = 0; (j < data_size) && ((i + j) < size); ++j) out[i + j] = in[i + j]; } } @@ -357,6 +357,8 @@ namespace template bool executeForType(Block & block, const ColumnNumbers & arguments, size_t result) { + using Op = FunctionRoundingImpl; + if (ColumnVector * col = typeid_cast *>(&*block.getByPosition(arguments[0]).column)) { UInt8 precision = 0; @@ -369,7 +371,7 @@ namespace typename ColumnVector::Container_t & vec_res = col_res->getData(); vec_res.resize(col->getData().size()); - FunctionRoundingImpl::apply(col->getData(), PowersOf10::values[precision], vec_res); + Op::apply(col->getData(), PowersOf10::values[precision], vec_res); return true; } @@ -379,7 +381,7 @@ namespace if (arguments.size() == 2) precision = getPrecision(block.getByPosition(arguments[1]).column); - T res = FunctionRoundingImpl::apply(col->getData(), PowersOf10::values[precision]); + T res = Op::apply(col->getData(), PowersOf10::values[precision]); ColumnConst * col_res = new ColumnConst(col->size(), res); block.getByPosition(result).column = col_res;