diff options
Diffstat (limited to 'src/backends/backendsCommon')
| -rw-r--r-- | src/backends/backendsCommon/WorkloadData.cpp | 3 | ||||
| -rw-r--r-- | src/backends/backendsCommon/test/LayerTests.cpp | 50 | ||||
| -rw-r--r-- | src/backends/backendsCommon/test/LayerTests.hpp | 20 | ||||
| -rw-r--r-- | src/backends/backendsCommon/test/SpaceToDepthTestImpl.hpp | 4 |
4 files changed, 66 insertions, 11 deletions
diff --git a/src/backends/backendsCommon/WorkloadData.cpp b/src/backends/backendsCommon/WorkloadData.cpp index 3766f5f7ca..324c1debc0 100644 --- a/src/backends/backendsCommon/WorkloadData.cpp +++ b/src/backends/backendsCommon/WorkloadData.cpp @@ -1206,7 +1206,8 @@ void SpaceToDepthQueueDescriptor::Validate(const WorkloadInfo& workloadInfo) con { DataType::Float32, DataType::Float16, - DataType::QuantisedAsymm8 + DataType::QuantisedAsymm8, + DataType::QuantisedSymm16 }; ValidateDataTypes(workloadInfo.m_InputTensorInfos[0], diff --git a/src/backends/backendsCommon/test/LayerTests.cpp b/src/backends/backendsCommon/test/LayerTests.cpp index 56c0ab6b12..5c41d3aac3 100644 --- a/src/backends/backendsCommon/test/LayerTests.cpp +++ b/src/backends/backendsCommon/test/LayerTests.cpp @@ -9421,7 +9421,7 @@ LayerTestResult<uint8_t, 4> SpaceToDepthNHWCAsymmQ8Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - return SpaceToDepthSimpleTest<armnn::DataType::QuantisedAsymm8>( + return SpaceToDepthSimpleTest1<armnn::DataType::QuantisedAsymm8>( workloadFactory, memoryManager); } @@ -9430,26 +9430,64 @@ LayerTestResult<uint8_t, 4> SpaceToDepthNCHWAsymmQ8Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - return SpaceToDepthSimpleTest<armnn::DataType::QuantisedAsymm8>( + return SpaceToDepthSimpleTest1<armnn::DataType::QuantisedAsymm8>( workloadFactory, memoryManager, armnn::DataLayout::NCHW); } -LayerTestResult<float, 4> SpaceToDepthNHWCFloat32Test( +LayerTestResult<float, 4> SpaceToDepthNHWCFloat32Test1( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - return SpaceToDepthFloatTest<armnn::DataType::Float32>( + return SpaceToDepthSimpleTest1<armnn::DataType::Float32>( workloadFactory, memoryManager); } -LayerTestResult<float, 4> SpaceToDepthNCHWFloat32Test( +LayerTestResult<float, 4> SpaceToDepthNCHWFloat32Test1( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) { - return SpaceToDepthFloatTest<armnn::DataType::Float32>( + return SpaceToDepthSimpleTest1<armnn::DataType::Float32>( + workloadFactory, + memoryManager, + armnn::DataLayout::NCHW); +} + +LayerTestResult<float, 4> SpaceToDepthNHWCFloat32Test2( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) +{ + return SpaceToDepthSimpleTest2<armnn::DataType::Float32>( + workloadFactory, + memoryManager); +} + +LayerTestResult<float, 4> SpaceToDepthNCHWFloat32Test2( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) +{ + return SpaceToDepthSimpleTest2<armnn::DataType::Float32>( + workloadFactory, + memoryManager, + armnn::DataLayout::NCHW); +} + +LayerTestResult<int16_t, 4> SpaceToDepthNHWCQSymm16Test( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) +{ + return SpaceToDepthSimpleTest2<armnn::DataType::QuantisedSymm16>( + workloadFactory, + memoryManager); +} + +LayerTestResult<int16_t, 4> SpaceToDepthNCHWQSymm16Test( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager) +{ + return SpaceToDepthSimpleTest2<armnn::DataType::QuantisedSymm16>( workloadFactory, memoryManager, armnn::DataLayout::NCHW); diff --git a/src/backends/backendsCommon/test/LayerTests.hpp b/src/backends/backendsCommon/test/LayerTests.hpp index 259ad01c62..c3ea619eaa 100644 --- a/src/backends/backendsCommon/test/LayerTests.hpp +++ b/src/backends/backendsCommon/test/LayerTests.hpp @@ -2004,11 +2004,27 @@ LayerTestResult<uint8_t, 4> SpaceToDepthNHWCAsymmQ8Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); -LayerTestResult<float, 4> SpaceToDepthNHWCFloat32Test( +LayerTestResult<float, 4> SpaceToDepthNHWCFloat32Test1( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); -LayerTestResult<float, 4> SpaceToDepthNCHWFloat32Test( +LayerTestResult<float, 4> SpaceToDepthNCHWFloat32Test1( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + +LayerTestResult<float, 4> SpaceToDepthNHWCFloat32Test2( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + +LayerTestResult<float, 4> SpaceToDepthNCHWFloat32Test2( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + +LayerTestResult<int16_t, 4> SpaceToDepthNHWCQSymm16Test( + armnn::IWorkloadFactory& workloadFactory, + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); + +LayerTestResult<int16_t, 4> SpaceToDepthNCHWQSymm16Test( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager); diff --git a/src/backends/backendsCommon/test/SpaceToDepthTestImpl.hpp b/src/backends/backendsCommon/test/SpaceToDepthTestImpl.hpp index 99926cd026..af3f5d2618 100644 --- a/src/backends/backendsCommon/test/SpaceToDepthTestImpl.hpp +++ b/src/backends/backendsCommon/test/SpaceToDepthTestImpl.hpp @@ -81,7 +81,7 @@ LayerTestResult<T, 4> SpaceToDepthTestImpl( } template<armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> -LayerTestResult<T, 4> SpaceToDepthSimpleTest( +LayerTestResult<T, 4> SpaceToDepthSimpleTest1( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, armnn::DataLayout dataLayout = armnn::DataLayout::NHWC) @@ -114,7 +114,7 @@ LayerTestResult<T, 4> SpaceToDepthSimpleTest( } template<armnn::DataType ArmnnType, typename T = armnn::ResolveType<ArmnnType>> -LayerTestResult<T, 4> SpaceToDepthFloatTest( +LayerTestResult<T, 4> SpaceToDepthSimpleTest2( armnn::IWorkloadFactory& workloadFactory, const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, armnn::DataLayout dataLayout = armnn::DataLayout::NHWC) |