diff options
| author | Teresa Charlin <teresa.charlinreyes@arm.com> | 2023-01-10 10:32:51 +0000 |
|---|---|---|
| committer | TeresaARM <teresa.charlinreyes@arm.com> | 2023-05-08 13:16:25 +0000 |
| commit | 97a3aefff63ae081ae62aa5bac17d6e9c401937e (patch) | |
| tree | 4cda3515b8718215be14ae95283a51a49b372e68 /src/backends/cl/test | |
| parent | 1fe6c8170ae2fe90b53fb71b7570aec9dfe75c45 (diff) | |
| download | armnn-97a3aefff63ae081ae62aa5bac17d6e9c401937e.tar.gz | |
IVGCVSW-7308 Add GpuAcc Batch MatMul workload
* Call dedicated MatMul kernel in ACL
* Add int8 tests
* Add int8 to documentation
* Force tensors to be dynamic (nonConst) as per request of ACL
Signed-off-by: Teresa Charlin <teresa.charlinreyes@arm.com>
Change-Id: I7b7ac20deec8637dc46ca990d339d92c4587cbe4
Diffstat (limited to 'src/backends/cl/test')
| -rw-r--r-- | src/backends/cl/test/ClEndToEndTests.cpp | 12 | ||||
| -rw-r--r-- | src/backends/cl/test/ClLayerTests.cpp | 28 |
2 files changed, 38 insertions, 2 deletions
diff --git a/src/backends/cl/test/ClEndToEndTests.cpp b/src/backends/cl/test/ClEndToEndTests.cpp index 4ff2b79d08..a6ddd97ecf 100644 --- a/src/backends/cl/test/ClEndToEndTests.cpp +++ b/src/backends/cl/test/ClEndToEndTests.cpp @@ -8,6 +8,7 @@ #include <backendsCommon/test/ActivationEndToEndTestImpl.hpp> #include <backendsCommon/test/AdditionEndToEndTestImpl.hpp> #include <backendsCommon/test/ArgMinMaxEndToEndTestImpl.hpp> +#include <backendsCommon/test/BatchMatMulEndToEndTestImpl.hpp> #include <backendsCommon/test/ComparisonEndToEndTestImpl.hpp> #include <backendsCommon/test/ConcatEndToEndTestImpl.hpp> #include <backendsCommon/test/DepthToSpaceEndToEndTestImpl.hpp> @@ -56,6 +57,17 @@ TEST_CASE("ClAdditionEndToEndUint8Test") AdditionEndToEnd<armnn::DataType::QAsymmU8>(clDefaultBackends); } +// Batch Mat Mul +TEST_CASE("ClBatchMatMulEndToEndFloat32Test") +{ + BatchMatMulEndToEnd<armnn::DataType::Float32>(clDefaultBackends); +} + +TEST_CASE("ClBatchMatMulEndToEndInt8Test") +{ + BatchMatMulEndToEnd<armnn::DataType::QAsymmS8>(clDefaultBackends); +} + // Constant TEST_CASE("ConstantUsage_Cl_Float32") { diff --git a/src/backends/cl/test/ClLayerTests.cpp b/src/backends/cl/test/ClLayerTests.cpp index 1ad1de8e04..a84ecc9f9f 100644 --- a/src/backends/cl/test/ClLayerTests.cpp +++ b/src/backends/cl/test/ClLayerTests.cpp @@ -77,27 +77,51 @@ ARMNN_AUTO_TEST_FIXTURE_WITH_THF(Elu, ClContextControlFixture, EluTest) ARMNN_AUTO_TEST_FIXTURE_WITH_THF(BatchMatMul2DSimpleFloat32, ClContextControlFixture, BatchMatMul2DSimpleTest<DataType::Float32>); +ARMNN_AUTO_TEST_FIXTURE_WITH_THF(BatchMatMul2DSimpleInt8, + ClContextControlFixture, + BatchMatMul2DSimpleTest<DataType::QAsymmS8>); ARMNN_AUTO_TEST_FIXTURE_WITH_THF(BatchMatMul3DSimpleFloat32, ClContextControlFixture, BatchMatMul3DSimpleTest<DataType::Float32>); +ARMNN_AUTO_TEST_FIXTURE_WITH_THF(BatchMatMul3DSimpleInt8, + ClContextControlFixture, + BatchMatMul3DSimpleTest<DataType::QAsymmS8>); ARMNN_AUTO_TEST_FIXTURE_WITH_THF(BatchMatMulNCHWSimpleFloat32, ClContextControlFixture, BatchMatMulNCHWSimpleTest<DataType::Float32>); +ARMNN_AUTO_TEST_FIXTURE_WITH_THF(BatchMatMulNCHWSimpleFloat32, + ClContextControlFixture, + BatchMatMulNCHWSimpleTest<DataType::QAsymmS8>); ARMNN_AUTO_TEST_FIXTURE_WITH_THF(BatchMatMul3DBatchFloat32, ClContextControlFixture, BatchMatMul3DBatchTest<DataType::Float32>); -ARMNN_AUTO_TEST_FIXTURE_WITH_THF(BatchMatMul3DBroadcastFloat32, +ARMNN_AUTO_TEST_FIXTURE_WITH_THF(BatchMatMul3DBatchInt8, + ClContextControlFixture, + BatchMatMul3DBatchTest<DataType::QAsymmS8>); +ARMNN_AUTO_TEST_FIXTURE_WITH_THF(UNSUPPORTED_BatchMatMul3DBroadcastFloat32, ClContextControlFixture, BatchMatMul3DBroadcastTest<DataType::Float32>); -ARMNN_AUTO_TEST_FIXTURE_WITH_THF(BatchMatMul3D2DBroadcastFloat32, +ARMNN_AUTO_TEST_FIXTURE_WITH_THF(UNSUPPORTED_BatchMatMul3DBroadcastInt8, + ClContextControlFixture, + BatchMatMul3DBroadcastTest<DataType::QAsymmS8>); +ARMNN_AUTO_TEST_FIXTURE_WITH_THF(UNSUPPORTED_BatchMatMul3D2DBroadcastFloat32, ClContextControlFixture, BatchMatMul3D2DBroadcastTest<DataType::Float32>); +ARMNN_AUTO_TEST_FIXTURE_WITH_THF(UNSUPPORTED_BatchMatMul3D2DBroadcastInt8, + ClContextControlFixture, + BatchMatMul3D2DBroadcastTest<DataType::QAsymmS8>); ARMNN_AUTO_TEST_FIXTURE_WITH_THF(BatchMatMul2DTinyFloat32, ClContextControlFixture, BatchMatMul2DTinyTest<DataType::Float32>); +ARMNN_AUTO_TEST_FIXTURE_WITH_THF(BatchMatMul2DTinyInt8, + ClContextControlFixture, + BatchMatMul2DTinyTest<DataType::QAsymmS8>); ARMNN_AUTO_TEST_FIXTURE_WITH_THF(BatchMatMul2DTranspSimpleFloat32, ClContextControlFixture, BatchMatMul2DTranspSimpleTest<DataType::Float32>); +ARMNN_AUTO_TEST_FIXTURE_WITH_THF(BatchMatMul2DTranspSimpleInt8, + ClContextControlFixture, + BatchMatMul2DTranspSimpleTest<DataType::QAsymmS8>); // Batch To Space ARMNN_AUTO_TEST_FIXTURE_WITH_THF(BatchToSpaceNdNhwcFloat321, |