diff options
| author | Gian Marco <gianmarco.iodice@arm.com> | 2017-11-30 14:31:13 +0000 |
|---|---|---|
| committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-11-02 16:42:17 +0000 |
| commit | c7f9b893b8edc5660542821e2d0508460bc40225 (patch) | |
| tree | 594456a7da9335bebda56498cfbb39be3a9609a2 /tests/benchmark/NEON/GEMMLowp.cpp | |
| parent | 23ac91b6ba235e67847802d4b49e494fa5bedbb6 (diff) | |
| download | ComputeLibrary-c7f9b893b8edc5660542821e2d0508460bc40225.tar.gz | |
COMPMID-722 - Support for vector-matrix in GEMMLowp (NEON)
This patch includes COMPMID-716 as well
- Added vector-matrix case in NEGEMMLowpMatrixMultiplyKernel
- Added benchmarks for NEON and OpenCL
Change-Id: I715cd25e8668a4d6c8127e9a298a865e7713267f
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/111468
Tested-by: BSG Visual Compute Jenkins server to access repositories on http://mpd-gerrit.cambridge.arm.com <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
Diffstat (limited to 'tests/benchmark/NEON/GEMMLowp.cpp')
| -rw-r--r-- | tests/benchmark/NEON/GEMMLowp.cpp | 28 |
1 files changed, 8 insertions, 20 deletions
diff --git a/tests/benchmark/NEON/GEMMLowp.cpp b/tests/benchmark/NEON/GEMMLowp.cpp index a0e5e694bd..e3ad1d43d2 100644 --- a/tests/benchmark/NEON/GEMMLowp.cpp +++ b/tests/benchmark/NEON/GEMMLowp.cpp @@ -23,42 +23,30 @@ */ #include "arm_compute/core/TensorShape.h" #include "arm_compute/core/Types.h" +#include "arm_compute/runtime/NEON/functions/NEGEMMLowpMatrixMultiplyCore.h" #include "arm_compute/runtime/Tensor.h" #include "arm_compute/runtime/TensorAllocator.h" #include "tests/NEON/Accessor.h" #include "tests/benchmark/fixtures/GEMMLowpFixture.h" +#include "tests/datasets/GoogleNetGEMMDataset.h" +#include "tests/datasets/MatrixMultiplyGEMMDataset.h" +#include "tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1GEMMDataset.h" #include "tests/framework/Macros.h" #include "tests/framework/datasets/Datasets.h" #include "utils/TypePrinter.h" -#include "arm_compute/core/NEON/kernels/NEGEMMInterleaveBlockedKernel.h" -#include "tests/NEON/Helper.h" - namespace arm_compute { namespace test { -const auto data_int_blk = framework::dataset::make("M", 800) * framework::dataset::make("N", 800) * framework::dataset::make("by", 8, 13) * framework::dataset::make("block", 4, 9); +using NEGEMMLowpFixture = GEMMLowpMatrixMultiplyCoreFixture<Tensor, NEGEMMLowpMatrixMultiplyCore, Accessor>; TEST_SUITE(NEON) -TEST_SUITE(INTERLEAVE_BLOCKED) -using NEInterleaveBlocked = NESynthetizeFunction<NEGEMMInterleaveBlockedKernel>; -using NEGEMMInterleaveBlockedFixture = GEMMInterleaveBlockedFixture<Tensor, NEInterleaveBlocked, Accessor>; -REGISTER_FIXTURE_DATA_TEST_CASE(InterleaveBlocked, NEGEMMInterleaveBlockedFixture, framework::DatasetMode::ALL, data_int_blk); -TEST_SUITE_END() - -#if 0 //FIXME: enable when we update NEGEMMLowp interface to work without offsets -TEST_SUITE(U32) -using NEGEMMLowpFixture = GEMMLowpFixture<Tensor, NEGEMMLowp, Accessor>; -REGISTER_FIXTURE_DATA_TEST_CASE(GEMMLowp, NEGEMMLowpFixture, framework::DatasetMode::ALL, framework::dataset::make("M", 100, 120) * framework::dataset::make("N", 100, - 110) - * framework::dataset::make("K", 16, 20)); +REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetInceptionV1GEMMLowp, NEGEMMLowpFixture, framework::DatasetMode::ALL, datasets::GoogLeNetInceptionV1GEMMDataset()); +REGISTER_FIXTURE_DATA_TEST_CASE(MatrixMultiplyGEMMLowp, NEGEMMLowpFixture, framework::DatasetMode::ALL, datasets::MatrixMultiplyGEMMDataset()); +REGISTER_FIXTURE_DATA_TEST_CASE(GoogleNetGEMMLowp, NEGEMMLowpFixture, framework::DatasetMode::NIGHTLY, datasets::GoogleNetGEMMDataset()); TEST_SUITE_END() -#endif // defined(__aarch64__) - -TEST_SUITE_END() - } // namespace test } // namespace arm_compute |