diff options
author | Michele Di Giorgio <michele.digiorgio@arm.com> | 2017-07-26 17:09:17 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-09-17 14:16:42 +0100 |
commit | d5e65c71261fd42d3e69478507fbfcc8cf36befc (patch) | |
tree | 4892d179782b61f4198b45741d84b7d7fb30a011 /tests | |
parent | baa656d41a9ef9027fca866c890a07b15747feda (diff) | |
download | ComputeLibrary-d5e65c71261fd42d3e69478507fbfcc8cf36befc.tar.gz |
COMPMID-456: Add support for QS16 NEON Normalization Layer.
Change-Id: I1e542808cfd7774c67cc4e9a58e42449e4fb29aa
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/81735
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/benchmark_new/NEON/NormalizationLayer.cpp | 4 | ||||
-rw-r--r-- | tests/validation_new/CPP/NormalizationLayer.cpp | 1 | ||||
-rw-r--r-- | tests/validation_new/NEON/NormalizationLayer.cpp | 21 |
3 files changed, 23 insertions, 3 deletions
diff --git a/tests/benchmark_new/NEON/NormalizationLayer.cpp b/tests/benchmark_new/NEON/NormalizationLayer.cpp index 71dd9c354c..de7183d2ec 100644 --- a/tests/benchmark_new/NEON/NormalizationLayer.cpp +++ b/tests/benchmark_new/NEON/NormalizationLayer.cpp @@ -41,9 +41,9 @@ namespace test namespace { #ifdef ARM_COMPUTE_ENABLE_FP16 -const auto normalization_layer_data_types = framework::dataset::make("DataType", { DataType::F16, DataType::F32, DataType::QS8 }); +const auto normalization_layer_data_types = framework::dataset::make("DataType", { DataType::QS8, DataType::QS16, DataType::F16, DataType::F32 }); #else /* ARM_COMPUTE_ENABLE_FP16 */ -const auto normalization_layer_data_types = framework::dataset::make("DataType", { DataType::F32, DataType::QS8 }); +const auto normalization_layer_data_types = framework::dataset::make("DataType", { DataType::QS8, DataType::QS16, DataType::F32 }); #endif /* ARM_COMPUTE_ENABLE_FP16 */ } // namespace using NENormalizationLayerFixture = NormalizationLayerFixture<Tensor, NENormalizationLayer, Accessor>; diff --git a/tests/validation_new/CPP/NormalizationLayer.cpp b/tests/validation_new/CPP/NormalizationLayer.cpp index 72f49007cc..a8818d8b5c 100644 --- a/tests/validation_new/CPP/NormalizationLayer.cpp +++ b/tests/validation_new/CPP/NormalizationLayer.cpp @@ -268,6 +268,7 @@ SimpleTensor<T> normalization_layer(const SimpleTensor<T> &src, NormalizationLay template SimpleTensor<float> normalization_layer(const SimpleTensor<float> &src, NormalizationLayerInfo info); template SimpleTensor<half_float::half> normalization_layer(const SimpleTensor<half_float::half> &src, NormalizationLayerInfo info); template SimpleTensor<qint8_t> normalization_layer(const SimpleTensor<qint8_t> &src, NormalizationLayerInfo info); +template SimpleTensor<qint16_t> normalization_layer(const SimpleTensor<qint16_t> &src, NormalizationLayerInfo info); } // namespace reference } // namespace validation } // namespace test diff --git a/tests/validation_new/NEON/NormalizationLayer.cpp b/tests/validation_new/NEON/NormalizationLayer.cpp index f364975332..dfe793131a 100644 --- a/tests/validation_new/NEON/NormalizationLayer.cpp +++ b/tests/validation_new/NEON/NormalizationLayer.cpp @@ -50,7 +50,8 @@ constexpr float tolerance_f16 = 0.001f; #endif /* ARM_COMPUTE_ENABLE_FP16 */ constexpr float tolerance_f32 = 0.00001f; /** Tolerance for fixed point operations */ -constexpr int8_t tolerance_qs8 = 2; +constexpr int8_t tolerance_qs8 = 2; +constexpr int16_t tolerance_qs16 = 3; /** Input data set. */ const auto NormalizationDataset = combine(combine(combine(datasets::SmallShapes(), datasets::NormalizationTypes()), framework::dataset::make("NormalizationSize", 3, 9, 2)), @@ -116,6 +117,24 @@ FIXTURE_DATA_TEST_CASE(RunLarge, NENormalizationLayerFixedPointFixture<int8_t>, validate(Accessor(_target), _reference, tolerance_qs8); } TEST_SUITE_END() + +TEST_SUITE(QS16) +// Testing for fixed point position [1,14) as reciprocal limits the maximum fixed point position to 14 +FIXTURE_DATA_TEST_CASE(RunSmall, NENormalizationLayerFixedPointFixture<int16_t>, framework::DatasetMode::PRECOMMIT, combine(combine(NormalizationDataset, framework::dataset::make("DataType", + DataType::QS16)), + framework::dataset::make("FractionalBits", 1, 14))) +{ + // Validate output + validate(Accessor(_target), _reference, tolerance_qs16); +} +FIXTURE_DATA_TEST_CASE(RunLarge, NENormalizationLayerFixedPointFixture<int16_t>, framework::DatasetMode::NIGHTLY, combine(combine(NormalizationDataset, framework::dataset::make("DataType", + DataType::QS16)), + framework::dataset::make("FractionalBits", 1, 14))) +{ + // Validate output + validate(Accessor(_target), _reference, tolerance_qs16); +} +TEST_SUITE_END() TEST_SUITE_END() TEST_SUITE_END() |