diff options
Diffstat (limited to 'tests/validation')
| -rw-r--r-- | tests/validation/NEON/Comparisons.cpp | 15 | ||||
| -rw-r--r-- | tests/validation/reference/Comparisons.cpp | 25 |
2 files changed, 38 insertions, 2 deletions
diff --git a/tests/validation/NEON/Comparisons.cpp b/tests/validation/NEON/Comparisons.cpp index c3b1c69523..38e440e649 100644 --- a/tests/validation/NEON/Comparisons.cpp +++ b/tests/validation/NEON/Comparisons.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 ARM Limited. + * Copyright (c) 2019-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -45,6 +45,7 @@ namespace { const auto configure_dataset = combine(datasets::SmallShapes(), framework::dataset::make("DataType", { DataType::QASYMM8, + DataType::QASYMM8_SIGNED, #ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC DataType::F16, #endif /* __ARM_FEATURE_FP16_VECTOR_ARITHMETIC */ @@ -167,6 +168,18 @@ FIXTURE_DATA_TEST_CASE(RunSmall, validate(Accessor(_target), _reference); } TEST_SUITE_END() +TEST_SUITE(QASYMM8_SIGNED) +FIXTURE_DATA_TEST_CASE(RunSmall, + NEComparisonQuantizedFixture<int8_t>, + framework::DatasetMode::PRECOMMIT, + combine(combine(combine(run_small_dataset, framework::dataset::make("DataType", DataType::QASYMM8_SIGNED)), + framework::dataset::make("QuantizationInfo", { QuantizationInfo() })), + framework::dataset::make("QuantizationInfo", { QuantizationInfo(0.3f, 2) }))) +{ + // Validate output + validate(Accessor(_target), _reference); +} +TEST_SUITE_END() TEST_SUITE_END() TEST_SUITE_END() // Comparison diff --git a/tests/validation/reference/Comparisons.cpp b/tests/validation/reference/Comparisons.cpp index 6d08daf89d..c0c86b1933 100644 --- a/tests/validation/reference/Comparisons.cpp +++ b/tests/validation/reference/Comparisons.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018-2019 ARM Limited. + * Copyright (c) 2018-2020 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -139,6 +139,29 @@ SimpleTensor<uint8_t> compare(ComparisonOperation op, const SimpleTensor<uint8_t return dst; } +template <> +SimpleTensor<uint8_t> compare(ComparisonOperation op, const SimpleTensor<int8_t> &src1, const SimpleTensor<int8_t> &src2) +{ + SimpleTensor<uint8_t> dst(TensorShape::broadcast_shape(src1.shape(), src2.shape()), DataType::U8); + + Coordinates id_src1{}; + Coordinates id_src2{}; + Coordinates id_dst{}; + + if(src1.data_type() == DataType::QASYMM8_SIGNED) + { + SimpleTensor<float> src1_tmp = convert_from_asymmetric(src1); + SimpleTensor<float> src2_tmp = convert_from_asymmetric(src2); + BroadcastUnroll<Coordinates::num_max_dimensions>::unroll(op, src1_tmp, src2_tmp, dst, id_src1, id_src2, id_dst); + } + else + { + // DataType::U8 + BroadcastUnroll<Coordinates::num_max_dimensions>::unroll(op, src1, src2, dst, id_src1, id_src2, id_dst); + } + return dst; +} + template SimpleTensor<uint8_t> compare(ComparisonOperation op, const SimpleTensor<half> &src1, const SimpleTensor<half> &src2); template SimpleTensor<uint8_t> compare(ComparisonOperation op, const SimpleTensor<float> &src1, const SimpleTensor<float> &src2); |