From 29db3d293302254b80e82651895d997ca145142a Mon Sep 17 00:00:00 2001 From: Viet-Hoa Do Date: Wed, 10 Aug 2022 11:56:49 +0100 Subject: Add LUT for quantized sigmoid function * Move LUT implementation to a seperate file. It will be used for both QASYMM8 and QASYMM8_SIGNED. * Fix wrong constant value related to QASYMM8_SIGNED leaky ReLU in 32-bit build. Resolves: COMPMID-5464 Signed-off-by: Viet-Hoa Do Change-Id: I2b24d52409a38f1b66fd532f431eff8a9e4547b6 Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/8066 Comments-Addressed: Arm Jenkins Reviewed-by: Gunes Bayir Tested-by: Arm Jenkins Benchmark: Arm Jenkins --- arm_compute/core/Types.h | 43 ++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 40 insertions(+), 3 deletions(-) (limited to 'arm_compute/core/Types.h') diff --git a/arm_compute/core/Types.h b/arm_compute/core/Types.h index 952c174194..1fad815a50 100644 --- a/arm_compute/core/Types.h +++ b/arm_compute/core/Types.h @@ -1686,7 +1686,7 @@ public: return _lut; } - void init_lut(const UniformQuantizationInfo &qi_in, const UniformQuantizationInfo &qi_out) + void init_lut(DataType data_type, const UniformQuantizationInfo &qi_in, const UniformQuantizationInfo &qi_out) { if(_act == ActivationFunction::HARD_SWISH) { @@ -1696,14 +1696,35 @@ public: { qasymm8_leaky_relu_populate_table(_lut, qi_in, qi_out, _a); } + else if(_act == ActivationFunction::LOGISTIC) + { + if(data_type == DataType::QASYMM8) + { + qasymm8_logistic_populate_table(_lut, qi_in, qi_out); + } + else + { + qasymm8_signed_logistic_populate_table(_lut, qi_in, qi_out); + } + } } #endif // __aarch64__ static inline bool is_lut_supported(ActivationFunction act_func, DataType data_type) { #ifdef __aarch64__ - auto supported = (data_type == DataType::QASYMM8 && (act_func == ActivationFunction::HARD_SWISH || act_func == ActivationFunction::LEAKY_RELU)); - return supported; + switch(act_func) + { + case ActivationFunction::HARD_SWISH: + case ActivationFunction::LEAKY_RELU: + return data_type == DataType::QASYMM8; + + case ActivationFunction::LOGISTIC: + return (data_type == DataType::QASYMM8) || (data_type == DataType::QASYMM8_SIGNED); + + default: + return false; + } #else // __aarch64__ ARM_COMPUTE_UNUSED(act_func); ARM_COMPUTE_UNUSED(data_type); @@ -1735,6 +1756,22 @@ private: lut[i] = qasymm8_leaky_relu(i, qi_in, qi_out, alpha); } } + + static inline void qasymm8_logistic_populate_table(LookupTable256 &lut, const UniformQuantizationInfo &qi_in, const UniformQuantizationInfo &qi_out) + { + for(size_t i = 0; i < lut.size(); ++i) + { + lut[i] = qasymm8_logistic(i, qi_in, qi_out); + } + } + + static inline void qasymm8_signed_logistic_populate_table(LookupTable256 &lut, const UniformQuantizationInfo &qi_in, const UniformQuantizationInfo &qi_out) + { + for(size_t i = 0; i < lut.size(); ++i) + { + lut[i] = qasymm8_signed_logistic(static_cast(i), qi_in, qi_out); + } + } #endif // __aarch64__ }; -- cgit v1.2.1