From 19e79420fa9f136352cce56b5650b47aa2e96de3 Mon Sep 17 00:00:00 2001 From: Ryan OShea Date: Wed, 4 May 2022 00:38:03 +0100 Subject: IVGCVSW-6175 Add Pooling3d to Neon * Add IsSupported for Pooling3d * Add CreateWorkload case for Pooling3d * Create new NeonPooling3dWorkload header and source files * Add Pooling3d workload to NeonWorkloads.hpp * Add float32 tests for Pooling3d workload * Add Uint8 tests for Cl and NE pooling3d Signed-off-by: Ryan OShea Change-Id: Ic992e1233d1eb8db52df2c8446183df1c907bc4d --- src/backends/cl/test/ClLayerTests.cpp | 61 ++++++++++++++++++++++++++++++++--- 1 file changed, 57 insertions(+), 4 deletions(-) (limited to 'src/backends/cl/test') diff --git a/src/backends/cl/test/ClLayerTests.cpp b/src/backends/cl/test/ClLayerTests.cpp index 68635ac6fc..855697c9be 100644 --- a/src/backends/cl/test/ClLayerTests.cpp +++ b/src/backends/cl/test/ClLayerTests.cpp @@ -517,6 +517,7 @@ ARMNN_AUTO_TEST_FIXTURE_WITH_THF(IgnorePaddingSimpleL2Pooling2d, ARMNN_AUTO_TEST_FIXTURE_WITH_THF(UNSUPPORTED_IgnorePaddingSimpleL2Pooling2dUint8, ClContextControlFixture, IgnorePaddingSimpleL2Pooling2dUint8Test) + ARMNN_AUTO_TEST_FIXTURE_WITH_THF(IgnorePaddingL2Pooling2dSize3, ClContextControlFixture, IgnorePaddingL2Pooling2dSize3Test) @@ -617,26 +618,51 @@ ARMNN_AUTO_TEST_FIXTURE_WITH_THF(SimpleMaxPooling3dSize2x2x2Stride1x1x1, SimpleMaxPooling3dSize2x2x2Stride1x1x1Test, DataLayout::NDHWC) +ARMNN_AUTO_TEST_FIXTURE_WITH_THF(SimpleMaxPooling3dSize2x2x2Stride1x1x1Uint8, + ClContextControlFixture, + SimpleMaxPooling3dSize2x2x2Stride1x1x1Uint8Test, + DataLayout::NDHWC) + ARMNN_AUTO_TEST_FIXTURE_WITH_THF(SimpleMaxPooling3d, ClContextControlFixture, SimpleMaxPooling3dTest, DataLayout::NDHWC) +ARMNN_AUTO_TEST_FIXTURE_WITH_THF(SimpleMaxPooling3dUint8, + ClContextControlFixture, + SimpleMaxPooling3dUint8Test, + DataLayout::NDHWC) + ARMNN_AUTO_TEST_FIXTURE_WITH_THF(IgnorePaddingSimpleMaxPooling3d, ClContextControlFixture, IgnorePaddingSimpleMaxPooling3dTest, DataLayout::NDHWC) +ARMNN_AUTO_TEST_FIXTURE_WITH_THF(IgnorePaddingSimpleMaxPooling3dUint8, + ClContextControlFixture, + IgnorePaddingSimpleMaxPooling3dUint8Test, + DataLayout::NDHWC) + ARMNN_AUTO_TEST_FIXTURE_WITH_THF(SimpleAveragePooling3d, ClContextControlFixture, SimpleAveragePooling3dTest, DataLayout::NDHWC) +ARMNN_AUTO_TEST_FIXTURE_WITH_THF(SimpleAveragePooling3dUint8, + ClContextControlFixture, + SimpleAveragePooling3dUint8Test, + DataLayout::NDHWC) + ARMNN_AUTO_TEST_FIXTURE_WITH_THF(LargeTensorsAveragePooling3d, ClContextControlFixture, LargeTensorsAveragePooling3dTest, DataLayout::NDHWC) +ARMNN_AUTO_TEST_FIXTURE_WITH_THF(LargeTensorsAveragePooling3dUint8, + ClContextControlFixture, + LargeTensorsAveragePooling3dUint8Test, + DataLayout::NDHWC) + ARMNN_AUTO_TEST_FIXTURE_WITH_THF(IgnorePaddingSimpleAveragePooling3d, ClContextControlFixture, IgnorePaddingSimpleAveragePooling3dTest, @@ -657,11 +683,21 @@ ARMNN_AUTO_TEST_FIXTURE_WITH_THF(AsymmetricNonSquareMaxPooling3d, AsymmetricNonSquareMaxPooling3dTest, DataLayout::NDHWC) +ARMNN_AUTO_TEST_FIXTURE_WITH_THF(AsymmetricNonSquareMaxPooling3dUint8, + ClContextControlFixture, + AsymmetricNonSquareMaxPooling3dUint8Test, + DataLayout::NDHWC) + ARMNN_AUTO_TEST_FIXTURE_WITH_THF(AsymmetricNonSquareAveragePooling3d, ClContextControlFixture, AsymmetricNonSquareAveragePooling3dTest, DataLayout::NDHWC) +ARMNN_AUTO_TEST_FIXTURE_WITH_THF(AsymmetricNonSquareAveragePooling3dUint8, + ClContextControlFixture, + AsymmetricNonSquareAveragePooling3dUint8Test, + DataLayout::NDHWC) + ARMNN_AUTO_TEST_FIXTURE_WITH_THF(AsymmetricNonSquareL2Pooling3d, ClContextControlFixture, AsymmetricNonSquareL2Pooling3dTest, @@ -672,9 +708,19 @@ ARMNN_AUTO_TEST_FIXTURE_WITH_THF(UNSUPPORTED_AsymmetricNonSquareMaxPooling3dWith AsymmetricNonSquareMaxPooling3dWithPaddingOnlyPoolTest, DataLayout::NDHWC) -ARMNN_AUTO_TEST_FIXTURE_WITH_THF(UNSUPPORTED_AsymmetricNonSquareAveragePooling3dWithPaddingOnlyPool, +ARMNN_AUTO_TEST_FIXTURE_WITH_THF(UNSUPPORTED_AsymmetricNonSquareMaxPooling3dWithPaddingOnlyPoolUint8, ClContextControlFixture, - AsymmetricNonSquareAveragePooling3dWithPaddingOnlyPoolTest, + AsymmetricNonSquareMaxPooling3dWithPaddingOnlyPoolUint8Test, + DataLayout::NDHWC) + +ARMNN_AUTO_TEST_FIXTURE_WITH_THF(UNSUPPORTED_AsymmetricNonSquareAveragePooling3dWithPaddingOnlyPoolUint8, + ClContextControlFixture, + AsymmetricNonSquareAveragePooling3dWithPaddingOnlyPoolUint8Test, + DataLayout::NDHWC) + +ARMNN_AUTO_TEST_FIXTURE_WITH_THF(UNSUPPORTED_AsymmetricNonSquareAveragePooling3dWithPaddingOnlyPoolUint8, + ClContextControlFixture, + AsymmetricNonSquareAveragePooling3dWithPaddingOnlyPoolUint8Test, DataLayout::NDHWC) ARMNN_AUTO_TEST_FIXTURE_WITH_THF(UNSUPPORTEDAsymmetricNonSquareL2Pooling3dWithPaddingOnlyPool, @@ -682,13 +728,20 @@ ARMNN_AUTO_TEST_FIXTURE_WITH_THF(UNSUPPORTEDAsymmetricNonSquareL2Pooling3dWithPa AsymmetricNonSquareL2Pooling3dWithPaddingOnlyPoolTest, DataLayout::NDHWC) +ARMNN_AUTO_TEST_FIXTURE_WITH_THF(UNSUPPORTEDAsymmetricNonSquareL2Pooling3dWithPaddingOnlyPoolUint8, + ClContextControlFixture, + AsymmetricNonSquareL2Pooling3dWithPaddingOnlyPoolUint8Test, + DataLayout::NDHWC) + ARMNN_AUTO_TEST_FIXTURE_WITH_THF(SimpleAveragePooling3d, ClContextControlFixture, SimpleAveragePooling3dTest, DataLayout::NDHWC) - - +ARMNN_AUTO_TEST_FIXTURE_WITH_THF(SimpleAveragePooling3dUint8, + ClContextControlFixture, + SimpleAveragePooling3dUint8Test, + DataLayout::NDHWC) // Add ARMNN_AUTO_TEST_FIXTURE_WITH_THF(SimpleAdd, ClContextControlFixture, AdditionTest) -- cgit v1.2.1