diff options
Diffstat (limited to 'src/backends/neon/test')
-rw-r--r-- | src/backends/neon/test/NeonLayerSupportTests.cpp | 2 | ||||
-rw-r--r-- | src/backends/neon/test/NeonLayerTests.cpp | 2 | ||||
-rw-r--r-- | src/backends/neon/test/NeonMemCopyTests.cpp | 40 | ||||
-rw-r--r-- | src/backends/neon/test/NeonTimerTest.cpp | 2 |
4 files changed, 33 insertions, 13 deletions
diff --git a/src/backends/neon/test/NeonLayerSupportTests.cpp b/src/backends/neon/test/NeonLayerSupportTests.cpp index e5bdfb9251..d1f188d283 100644 --- a/src/backends/neon/test/NeonLayerSupportTests.cpp +++ b/src/backends/neon/test/NeonLayerSupportTests.cpp @@ -7,7 +7,7 @@ #include <layers/ConvertFp16ToFp32Layer.hpp> #include <layers/ConvertFp32ToFp16Layer.hpp> -#include <TensorHelpers.hpp> +#include <armnnTestUtils/TensorHelpers.hpp> #include <armnn/backends/TensorHandle.hpp> #include <neon/NeonWorkloadFactory.hpp> diff --git a/src/backends/neon/test/NeonLayerTests.cpp b/src/backends/neon/test/NeonLayerTests.cpp index 3b63a88457..9648c1626a 100644 --- a/src/backends/neon/test/NeonLayerTests.cpp +++ b/src/backends/neon/test/NeonLayerTests.cpp @@ -5,7 +5,7 @@ #include "NeonWorkloadFactoryHelper.hpp" -#include <TensorHelpers.hpp> +#include <armnnTestUtils/TensorHelpers.hpp> #include <UnitTests.hpp> #include <neon/NeonLayerSupport.hpp> diff --git a/src/backends/neon/test/NeonMemCopyTests.cpp b/src/backends/neon/test/NeonMemCopyTests.cpp index 048509224b..de4195d771 100644 --- a/src/backends/neon/test/NeonMemCopyTests.cpp +++ b/src/backends/neon/test/NeonMemCopyTests.cpp @@ -3,23 +3,43 @@ // SPDX-License-Identifier: MIT // -#include "NeonWorkloadFactoryHelper.hpp" +#include "../NeonWorkloadFactory.hpp" +#include <neon/NeonBackend.hpp> +#include <armnnTestUtils/LayerTestResult.hpp> +#include <armnnTestUtils/MemCopyTestImpl.hpp> +#include <armnnTestUtils/MockBackend.hpp> +#include <doctest/doctest.h> -#include <aclCommon/test/MemCopyTestImpl.hpp> +namespace +{ -#include <neon/NeonWorkloadFactory.hpp> +template <> +struct MemCopyTestHelper<armnn::NeonWorkloadFactory> +{ + static armnn::IBackendInternal::IMemoryManagerSharedPtr GetMemoryManager() + { + armnn::NeonBackend backend; + return backend.CreateMemoryManager(); + } -#include <reference/RefWorkloadFactory.hpp> -#include <reference/test/RefWorkloadFactoryHelper.hpp> + static armnn::NeonWorkloadFactory GetFactory( + const armnn::IBackendInternal::IMemoryManagerSharedPtr& memoryManager, + const armnn::ModelOptions& modelOptions = {}) + { + armnn::NeonBackend backend; + return armnn::NeonWorkloadFactory(armnn::PolymorphicPointerDowncast<armnn::NeonMemoryManager>(memoryManager), + backend.CreateBackendSpecificModelContext(modelOptions)); + } +}; +} // namespace -#include <doctest/doctest.h> TEST_SUITE("NeonMemCopy") { TEST_CASE("CopyBetweenCpuAndNeon") { LayerTestResult<float, 4> result = - MemCopyTest<armnn::RefWorkloadFactory, armnn::NeonWorkloadFactory, armnn::DataType::Float32>(false); + MemCopyTest<armnn::MockWorkloadFactory, armnn::NeonWorkloadFactory, armnn::DataType::Float32>(false); auto predResult = CompareTensors(result.m_ActualData, result.m_ExpectedData, result.m_ActualShape, result.m_ExpectedShape); CHECK_MESSAGE(predResult.m_Result, predResult.m_Message.str()); @@ -28,7 +48,7 @@ TEST_CASE("CopyBetweenCpuAndNeon") TEST_CASE("CopyBetweenNeonAndCpu") { LayerTestResult<float, 4> result = - MemCopyTest<armnn::NeonWorkloadFactory, armnn::RefWorkloadFactory, armnn::DataType::Float32>(false); + MemCopyTest<armnn::NeonWorkloadFactory, armnn::MockWorkloadFactory, armnn::DataType::Float32>(false); auto predResult = CompareTensors(result.m_ActualData, result.m_ExpectedData, result.m_ActualShape, result.m_ExpectedShape); CHECK_MESSAGE(predResult.m_Result, predResult.m_Message.str()); @@ -37,7 +57,7 @@ TEST_CASE("CopyBetweenNeonAndCpu") TEST_CASE("CopyBetweenCpuAndNeonWithSubtensors") { LayerTestResult<float, 4> result = - MemCopyTest<armnn::RefWorkloadFactory, armnn::NeonWorkloadFactory, armnn::DataType::Float32>(true); + MemCopyTest<armnn::MockWorkloadFactory, armnn::NeonWorkloadFactory, armnn::DataType::Float32>(true); auto predResult = CompareTensors(result.m_ActualData, result.m_ExpectedData, result.m_ActualShape, result.m_ExpectedShape); CHECK_MESSAGE(predResult.m_Result, predResult.m_Message.str()); @@ -46,7 +66,7 @@ TEST_CASE("CopyBetweenCpuAndNeonWithSubtensors") TEST_CASE("CopyBetweenNeonAndCpuWithSubtensors") { LayerTestResult<float, 4> result = - MemCopyTest<armnn::NeonWorkloadFactory, armnn::RefWorkloadFactory, armnn::DataType::Float32>(true); + MemCopyTest<armnn::NeonWorkloadFactory, armnn::MockWorkloadFactory, armnn::DataType::Float32>(true); auto predResult = CompareTensors(result.m_ActualData, result.m_ExpectedData, result.m_ActualShape, result.m_ExpectedShape); CHECK_MESSAGE(predResult.m_Result, predResult.m_Message.str()); diff --git a/src/backends/neon/test/NeonTimerTest.cpp b/src/backends/neon/test/NeonTimerTest.cpp index 7d73df83bd..e029d2721c 100644 --- a/src/backends/neon/test/NeonTimerTest.cpp +++ b/src/backends/neon/test/NeonTimerTest.cpp @@ -6,7 +6,7 @@ #include "NeonWorkloadFactoryHelper.hpp" -#include <TensorHelpers.hpp> +#include <armnnTestUtils/TensorHelpers.hpp> #include <armnn/backends/TensorHandle.hpp> #include <armnn/backends/WorkloadFactory.hpp> |