diff options
author | David Monahan <david.monahan@arm.com> | 2020-11-20 15:30:49 +0000 |
---|---|---|
committer | Francis Murtagh <francis.murtagh@arm.com> | 2020-11-20 16:58:26 +0000 |
commit | 63e75dce4d685521f53b26b987d20d11829a4126 (patch) | |
tree | 05d8fa0bf8f6fc679292eddb0232dcb72edf7fc0 /delegate/src/test/QuantizationTest.cpp | |
parent | eb61612b0103e44ae3b98e3305b75d01f997662d (diff) | |
download | armnn-63e75dce4d685521f53b26b987d20d11829a4126.tar.gz |
IVGCVSW-5549 Failing Transpose Conv2d Uint8 test
* Changing Uint8 tests to Int8 for Delegate Transpose Conv2d
* Refactor of Quantization tests to be per backend
Signed-off-by: David Monahan <david.monahan@arm.com>
Change-Id: Ic1528e1dc339030c7f1eed9f3884e99b14f389e4
Diffstat (limited to 'delegate/src/test/QuantizationTest.cpp')
-rw-r--r-- | delegate/src/test/QuantizationTest.cpp | 176 |
1 files changed, 104 insertions, 72 deletions
diff --git a/delegate/src/test/QuantizationTest.cpp b/delegate/src/test/QuantizationTest.cpp index f743f240ec..fbc2903d38 100644 --- a/delegate/src/test/QuantizationTest.cpp +++ b/delegate/src/test/QuantizationTest.cpp @@ -279,142 +279,174 @@ void QuantizeUint8Int8Test(std::vector<armnn::BackendId>& backends) expectedOutputValues); } -TEST_SUITE("QuantizationTests") +TEST_SUITE("CpuRef_QuantizationTests") { -// Dequantize Operator Tests -TEST_CASE ("DEQUANTIZE_UINT8_GpuAcc_Test") +TEST_CASE ("DEQUANTIZE_UINT8_CpuRef_Test") { - std::vector<armnn::BackendId> backends = { armnn::Compute::GpuAcc, - armnn::Compute::CpuRef }; + std::vector<armnn::BackendId> backends = { armnn::Compute::CpuRef }; DequantizeUint8Test(backends); } -TEST_CASE ("DEQUANTIZE_UINT8_CpuAcc_Test") -{ - std::vector<armnn::BackendId> backends = { armnn::Compute::CpuAcc, - armnn::Compute::CpuRef }; - DequantizeUint8Test(backends); -} -TEST_CASE ("DEQUANTIZE_INT8_GpuAcc_Test") +TEST_CASE ("DEQUANTIZE_INT8_CpuRef_Test") { - std::vector<armnn::BackendId> backends = { armnn::Compute::GpuAcc, - armnn::Compute::CpuRef }; + std::vector<armnn::BackendId> backends = { armnn::Compute::CpuRef }; DequantizeInt8Test(backends); } -TEST_CASE ("DEQUANTIZE_INT8_CpuAcc_Test") -{ - std::vector<armnn::BackendId> backends = { armnn::Compute::CpuAcc, - armnn::Compute::CpuRef }; - DequantizeInt8Test(backends); -} -TEST_CASE ("DEQUANTIZE_INT16_GpuAcc_Test") +TEST_CASE ("DEQUANTIZE_INT16_CpuRef_Test") { - std::vector<armnn::BackendId> backends = { armnn::Compute::GpuAcc, - armnn::Compute::CpuRef }; + std::vector<armnn::BackendId> backends = { armnn::Compute::CpuRef }; DequantizeInt16Test(backends); } -TEST_CASE ("DEQUANTIZE_INT16_CpuAcc_Test") -{ - std::vector<armnn::BackendId> backends = { armnn::Compute::CpuAcc, - armnn::Compute::CpuRef }; - DequantizeInt16Test(backends); -} -// Quantize Operator Tests -TEST_CASE ("QUANTIZE_FLOAT32_UINT8_GpuAcc_Test") +TEST_CASE ("QUANTIZE_FLOAT32_UINT8_CpuRef_Test") { - std::vector<armnn::BackendId> backends = { armnn::Compute::GpuAcc, - armnn::Compute::CpuRef }; + std::vector<armnn::BackendId> backends = { armnn::Compute::CpuRef }; QuantizeFloat32Uint8Test(backends); } -TEST_CASE ("QUANTIZE_FLOAT32_UINT8_CpuAcc_Test") -{ - std::vector<armnn::BackendId> backends = { armnn::Compute::CpuAcc, - armnn::Compute::CpuRef }; - QuantizeFloat32Uint8Test(backends); -} -TEST_CASE ("QUANTIZE_FLOAT32_INT8_GpuAcc_Test") +TEST_CASE ("QUANTIZE_FLOAT32_INT8_CpuRef_Test") { - std::vector<armnn::BackendId> backends = { armnn::Compute::GpuAcc, - armnn::Compute::CpuRef }; + std::vector<armnn::BackendId> backends = { armnn::Compute::CpuRef }; QuantizeFloat32Int8Test(backends); } -TEST_CASE ("QUANTIZE_FLOAT32_INT8_CpuAcc_Test") -{ - std::vector<armnn::BackendId> backends = { armnn::Compute::CpuAcc, - armnn::Compute::CpuRef }; - QuantizeFloat32Int8Test(backends); -} -TEST_CASE ("QUANTIZE_FLOAT32_INT16_GpuAcc_Test") +TEST_CASE ("QUANTIZE_FLOAT32_INT16_CpuRef_Test") { std::vector<armnn::BackendId> backends = { armnn::Compute::CpuRef }; QuantizeFloat32Int16Test(backends); } -TEST_CASE ("QUANTIZE_FLOAT32_INT16_CpuAcc_Test") + +TEST_CASE ("QUANTIZE_INT16_INT16_CpuRef_Test") { std::vector<armnn::BackendId> backends = { armnn::Compute::CpuRef }; - QuantizeFloat32Int16Test(backends); + QuantizeInt16Int16Test(backends); } -TEST_CASE ("QUANTIZE_INT16_INT16_GpuAcc_Test") + +TEST_CASE ("QUANTIZE_INT16_INT8_CpuRef_Test") { std::vector<armnn::BackendId> backends = { armnn::Compute::CpuRef }; - QuantizeInt16Int16Test(backends); + QuantizeInt16Int8Test(backends); } -TEST_CASE ("QUANTIZE_INT16_INT16_CpuAcc_Test") + + +TEST_CASE ("QUANTIZE_INT8_UINT8_CpuRef_Test") { std::vector<armnn::BackendId> backends = { armnn::Compute::CpuRef }; - QuantizeInt16Int16Test(backends); + QuantizeInt8Uint8Test(backends); } -TEST_CASE ("QUANTIZE_INT16_INT8_GpuAcc_Test") + +TEST_CASE ("QUANTIZE_UINT8_INT8_CpuRef_Test") { std::vector<armnn::BackendId> backends = { armnn::Compute::CpuRef }; - QuantizeInt16Int8Test(backends); + QuantizeUint8Int8Test(backends); +} + } -TEST_CASE ("QUANTIZE_INT16_INT8_CpuAcc_Test") +TEST_SUITE("CpuAcc_QuantizationTests") { - std::vector<armnn::BackendId> backends = { armnn::Compute::CpuRef }; - QuantizeInt16Int8Test(backends); + +// Dequantize Operator Tests +TEST_CASE ("DEQUANTIZE_UINT8_CpuAcc_Test") +{ + std::vector<armnn::BackendId> backends = { armnn::Compute::CpuAcc }; + DequantizeUint8Test(backends); } -TEST_CASE ("QUANTIZE_INT8_UINT8_GpuAcc_Test") +TEST_CASE ("DEQUANTIZE_INT8_CpuAcc_Test") { - std::vector<armnn::BackendId> backends = { armnn::Compute::GpuAcc, - armnn::Compute::CpuRef }; - QuantizeInt8Uint8Test(backends); + std::vector<armnn::BackendId> backends = { armnn::Compute::CpuAcc }; + DequantizeInt8Test(backends); +} + +TEST_CASE ("DEQUANTIZE_INT16_CpuAcc_Test") +{ + std::vector<armnn::BackendId> backends = { armnn::Compute::CpuAcc }; + DequantizeInt16Test(backends); +} + +// Quantize Operator Tests +TEST_CASE ("QUANTIZE_FLOAT32_UINT8_CpuAcc_Test") +{ + std::vector<armnn::BackendId> backends = { armnn::Compute::CpuAcc }; + QuantizeFloat32Uint8Test(backends); +} + +TEST_CASE ("QUANTIZE_FLOAT32_INT8_CpuAcc_Test") +{ + std::vector<armnn::BackendId> backends = { armnn::Compute::CpuAcc }; + QuantizeFloat32Int8Test(backends); } TEST_CASE ("QUANTIZE_INT8_UINT8_CpuAcc_Test") { - std::vector<armnn::BackendId> backends = { armnn::Compute::CpuAcc, - armnn::Compute::CpuRef }; + std::vector<armnn::BackendId> backends = { armnn::Compute::CpuAcc }; QuantizeInt8Uint8Test(backends); } -TEST_CASE ("QUANTIZE_UINT8_INT8_GpuAcc_Test") +TEST_CASE ("QUANTIZE_UINT8_INT8_CpuAcc_Test") { - std::vector<armnn::BackendId> backends = { armnn::Compute::GpuAcc, - armnn::Compute::CpuRef }; + std::vector<armnn::BackendId> backends = { armnn::Compute::CpuAcc }; QuantizeUint8Int8Test(backends); } -TEST_CASE ("QUANTIZE_UINT8_INT8_CpuAcc_Test") +} + +TEST_SUITE("GpuAcc_QuantizationTests") +{ + +// Dequantize Operator Tests +TEST_CASE ("DEQUANTIZE_UINT8_GpuAcc_Test") +{ + std::vector<armnn::BackendId> backends = { armnn::Compute::GpuAcc }; + DequantizeUint8Test(backends); +} + +TEST_CASE ("DEQUANTIZE_INT8_GpuAcc_Test") +{ + std::vector<armnn::BackendId> backends = { armnn::Compute::GpuAcc }; + DequantizeInt8Test(backends); +} + +TEST_CASE ("DEQUANTIZE_INT16_GpuAcc_Test") +{ + std::vector<armnn::BackendId> backends = { armnn::Compute::GpuAcc }; + DequantizeInt16Test(backends); +} + +// Quantize Operator Tests +TEST_CASE ("QUANTIZE_FLOAT32_UINT8_GpuAcc_Test") +{ + std::vector<armnn::BackendId> backends = { armnn::Compute::GpuAcc }; + QuantizeFloat32Uint8Test(backends); +} + +TEST_CASE ("QUANTIZE_FLOAT32_INT8_GpuAcc_Test") +{ + std::vector<armnn::BackendId> backends = { armnn::Compute::GpuAcc }; + QuantizeFloat32Int8Test(backends); +} + +TEST_CASE ("QUANTIZE_INT8_UINT8_GpuAcc_Test") +{ + std::vector<armnn::BackendId> backends = { armnn::Compute::GpuAcc }; + QuantizeInt8Uint8Test(backends); +} + +TEST_CASE ("QUANTIZE_UINT8_INT8_GpuAcc_Test") { - std::vector<armnn::BackendId> backends = { armnn::Compute::CpuAcc, - armnn::Compute::CpuRef }; + std::vector<armnn::BackendId> backends = { armnn::Compute::GpuAcc }; QuantizeUint8Int8Test(backends); } |