From 1a531faf71c7563cf7b1d2e36cc4261e6a4a9906 Mon Sep 17 00:00:00 2001 From: Sang-Hoon Park Date: Thu, 26 Mar 2020 13:57:57 +0000 Subject: COMPMID-3238 modify reference kernel of layer normalization for QSYMM16 Specialize the reference kernel for enhanced QLSTM use-case. - More specific function name is used to reduce confusion. - Logic inside has been changed to match with the expected behavior of actual kernel Change-Id: I1bed5fce1709a658c5a8f85f178dc41a265255ed Signed-off-by: Sang-Hoon Park Reviewed-on: https://review.mlplatform.org/c/ml/ComputeLibrary/+/2933 Tested-by: Arm Jenkins Reviewed-by: Michele Di Giorgio Comments-Addressed: Arm Jenkins --- .../reference/LayerNormalizationLayer.cpp | 60 -------------- .../validation/reference/LayerNormalizationLayer.h | 44 ----------- .../reference/QLSTMLayerNormalization.cpp | 91 ++++++++++++++++++++++ .../validation/reference/QLSTMLayerNormalization.h | 44 +++++++++++ 4 files changed, 135 insertions(+), 104 deletions(-) delete mode 100644 tests/validation/reference/LayerNormalizationLayer.cpp delete mode 100644 tests/validation/reference/LayerNormalizationLayer.h create mode 100644 tests/validation/reference/QLSTMLayerNormalization.cpp create mode 100644 tests/validation/reference/QLSTMLayerNormalization.h diff --git a/tests/validation/reference/LayerNormalizationLayer.cpp b/tests/validation/reference/LayerNormalizationLayer.cpp deleted file mode 100644 index e597ccd997..0000000000 --- a/tests/validation/reference/LayerNormalizationLayer.cpp +++ /dev/null @@ -1,60 +0,0 @@ -/* - * Copyright (c) 2020 ARM Limited. - * - * SPDX-License-Identifier: MIT - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ - -#include "LayerNormalizationLayer.h" -#include "ArithmeticOperations.h" -#include "MeanStdDevNormalizationLayer.h" -#include "PixelWiseMultiplication.h" - -namespace arm_compute -{ -namespace test -{ -namespace validation -{ -namespace reference -{ -SimpleTensor layer_normalization_layer_float(SimpleTensor src, SimpleTensor weight, SimpleTensor bias) -{ - src = mean_std_normalization_layer(src); - src = pixel_wise_multiplication(src, weight, 1, ConvertPolicy::SATURATE, RoundingPolicy::TO_ZERO); - return arithmetic_operation(ArithmeticOperation::ADD, src, bias, DataType::F32, ConvertPolicy::SATURATE); -} - -SimpleTensor layer_normalization_layer(const SimpleTensor &src, const SimpleTensor &weight, const SimpleTensor &bias) -{ - ARM_COMPUTE_ERROR_ON(src.shape().num_dimensions() > 2); - - SimpleTensor converted_src = convert_from_symmetric(src); - SimpleTensor converted_weight = convert_from_symmetric(weight); - SimpleTensor converted_bias = convert_from_symmetric(bias); - - SimpleTensor output = layer_normalization_layer_float(converted_src, converted_weight, converted_bias); - - return convert_to_symmetric(output, src.quantization_info()); -} -} // namespace reference -} // namespace validation -} // namespace test -} // namespace arm_compute diff --git a/tests/validation/reference/LayerNormalizationLayer.h b/tests/validation/reference/LayerNormalizationLayer.h deleted file mode 100644 index 5b1d08cc9c..0000000000 --- a/tests/validation/reference/LayerNormalizationLayer.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Copyright (c) 2020 ARM Limited. - * - * SPDX-License-Identifier: MIT - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to - * deal in the Software without restriction, including without limitation the - * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or - * sell copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. - */ -#ifndef ARM_COMPUTE_TEST_LAYER_NORMALIZATION_LAYER_H -#define ARM_COMPUTE_TEST_LAYER_NORMALIZATION_LAYER_H - -#include "tests/SimpleTensor.h" -#include "tests/validation/Helpers.h" - -namespace arm_compute -{ -namespace test -{ -namespace validation -{ -namespace reference -{ -SimpleTensor layer_normalization_layer(const SimpleTensor &src, const SimpleTensor &weight, const SimpleTensor &bias); -} // namespace reference -} // namespace validation -} // namespace test -} // namespace arm_compute - -#endif /* ARM_COMPUTE_TEST_LAYER_NORMALIZATION_LAYER_H */ diff --git a/tests/validation/reference/QLSTMLayerNormalization.cpp b/tests/validation/reference/QLSTMLayerNormalization.cpp new file mode 100644 index 0000000000..6764a81617 --- /dev/null +++ b/tests/validation/reference/QLSTMLayerNormalization.cpp @@ -0,0 +1,91 @@ +/* + * Copyright (c) 2020 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ + +#include "QLSTMLayerNormalization.h" +#include "ArithmeticOperations.h" +#include "MeanStdDevNormalizationLayer.h" +#include "PixelWiseMultiplication.h" +#include "src/core/utils/quantization/AsymmHelpers.cpp" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace reference +{ +SimpleTensor qlstm_layer_normalization_float_compute(SimpleTensor src, SimpleTensor weight, SimpleTensor bias) +{ + SimpleTensor output = mean_std_normalization_layer(src); + output = pixel_wise_multiplication(output, weight, 1, ConvertPolicy::SATURATE, RoundingPolicy::TO_ZERO); + return arithmetic_operation(ArithmeticOperation::ADD, output, bias, DataType::F32, ConvertPolicy::SATURATE); +} + +SimpleTensor qlstm_layer_normalization(const SimpleTensor &src, const SimpleTensor &weight, const SimpleTensor &bias) +{ + ARM_COMPUTE_ERROR_ON(src.shape().num_dimensions() > 2); + + SimpleTensor converted_src{ src.shape(), DataType::F32 }; + SimpleTensor converted_weight{ weight.shape(), DataType::F32 }; + SimpleTensor converted_bias{ bias.shape(), DataType::F32 }; + + const auto iq_info = src.quantization_info().uniform(); + int output_multiplier{}; + int output_shift{}; + quantization::calculate_quantized_multiplier(iq_info.scale, &output_multiplier, &output_shift); + + const float layer_norm_scale = output_multiplier * std::pow(2, static_cast(output_shift - 31)); + const float bias_scale = std::pow(2., -10) * layer_norm_scale; + + for(int i = 0; i < src.num_elements(); i++) + { + converted_src[i] = static_cast(src[i]); + } + + for(int i = 0; i < bias.num_elements(); i++) + { + converted_bias[i] = static_cast(bias[i]) * bias_scale; + } + + for(int i = 0; i < weight.num_elements(); i++) + { + converted_weight[i] = weight[i] * layer_norm_scale; + } + + SimpleTensor output_float = qlstm_layer_normalization_float_compute(converted_src, converted_weight, converted_bias); + SimpleTensor output{ output_float.shape(), DataType::QSYMM16 }; + + for(int i = 0; i < output.num_elements(); i++) + { + const auto output_val_s32 = static_cast(std::round(output_float[i] * std::pow(2, 12))); + output[i] = utility::clamp(output_val_s32, std::numeric_limits::min()); + } + + return output; +} +} // namespace reference +} // namespace validation +} // namespace test +} // namespace arm_compute diff --git a/tests/validation/reference/QLSTMLayerNormalization.h b/tests/validation/reference/QLSTMLayerNormalization.h new file mode 100644 index 0000000000..c35aa2a867 --- /dev/null +++ b/tests/validation/reference/QLSTMLayerNormalization.h @@ -0,0 +1,44 @@ +/* + * Copyright (c) 2020 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#ifndef ARM_COMPUTE_TEST_QLSTM_LAYER_NORMALIZATION_H +#define ARM_COMPUTE_TEST_QLSTM_LAYER_NORMALIZATION_H + +#include "tests/SimpleTensor.h" +#include "tests/validation/Helpers.h" + +namespace arm_compute +{ +namespace test +{ +namespace validation +{ +namespace reference +{ +SimpleTensor qlstm_layer_normalization(const SimpleTensor &src, const SimpleTensor &weight, const SimpleTensor &bias); +} // namespace reference +} // namespace validation +} // namespace test +} // namespace arm_compute + +#endif /* ARM_COMPUTE_TEST_QLSTM_LAYER_NORMALIZATION_H */ -- cgit v1.2.1