diff options
author | Moritz Pflanzer <moritz.pflanzer@arm.com> | 2017-07-19 12:03:33 +0100 |
---|---|---|
committer | Anthony Barbier <anthony.barbier@arm.com> | 2018-09-17 14:16:42 +0100 |
commit | ec69f93dc63408933d322ec27d0b7049b9a6e07c (patch) | |
tree | 1018456b367e2c1b95755f4934dc6536c4407995 /tests/benchmark_new | |
parent | 04b741277fb6f775a44aa1d06b574c94d8559050 (diff) | |
download | ComputeLibrary-ec69f93dc63408933d322ec27d0b7049b9a6e07c.tar.gz |
COMPMID-415: Add MatrixMultiply benchmark
Change-Id: I62145acae304cc110a33b02717fae393ddab045a
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/81008
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Diffstat (limited to 'tests/benchmark_new')
-rw-r--r-- | tests/benchmark_new/CL/GEMM.cpp | 12 | ||||
-rw-r--r-- | tests/benchmark_new/NEON/GEMM.cpp | 6 |
2 files changed, 8 insertions, 10 deletions
diff --git a/tests/benchmark_new/CL/GEMM.cpp b/tests/benchmark_new/CL/GEMM.cpp index 2fd928d131..7f7f719e86 100644 --- a/tests/benchmark_new/CL/GEMM.cpp +++ b/tests/benchmark_new/CL/GEMM.cpp @@ -29,6 +29,7 @@ #include "framework/datasets/Datasets.h" #include "tests/TypePrinter.h" #include "tests/datasets_new/GoogLeNetGEMMDataset.h" +#include "tests/datasets_new/MatrixMultiplyGEMMDataset.h" #include "tests/fixtures_new/GEMMFixture.h" namespace arm_compute @@ -37,20 +38,15 @@ namespace test { namespace { -auto data_types = framework::dataset::make("DataType", -{ -#if ARM_COMPUTE_ENABLE_FP16 - DataType::FP16, -#endif /* ARM_COMPUTE_ENABLE_FP16 */ - DataType::F32 -}); +const auto data_types = framework::dataset::make("DataType", { DataType::F16, DataType::F32 }); } // namespace using CLGEMMFixture = GEMMFixture<CLTensor, CLGEMM>; TEST_SUITE(CL) -REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetGEMM, CLGEMMFixture, framework::DatasetMode::ALL, framework::dataset::combine(datasets::GoogLeNetGEMMDataset(), std::move(data_types))); +REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetGEMM, CLGEMMFixture, framework::DatasetMode::ALL, framework::dataset::combine(datasets::GoogLeNetGEMMDataset(), data_types)); +REGISTER_FIXTURE_DATA_TEST_CASE(MatrixMultiplyGEMM, CLGEMMFixture, framework::DatasetMode::ALL, framework::dataset::combine(datasets::MatrixMultiplyGEMMDataset(), data_types)); TEST_SUITE_END() } // namespace test diff --git a/tests/benchmark_new/NEON/GEMM.cpp b/tests/benchmark_new/NEON/GEMM.cpp index 640ec1c032..58d5864ba6 100644 --- a/tests/benchmark_new/NEON/GEMM.cpp +++ b/tests/benchmark_new/NEON/GEMM.cpp @@ -30,6 +30,7 @@ #include "framework/datasets/Datasets.h" #include "tests/TypePrinter.h" #include "tests/datasets_new/GoogLeNetGEMMDataset.h" +#include "tests/datasets_new/MatrixMultiplyGEMMDataset.h" #include "tests/fixtures_new/GEMMFixture.h" namespace arm_compute @@ -38,7 +39,7 @@ namespace test { namespace { -auto data_types = framework::dataset::make("DataType", +const auto data_types = framework::dataset::make("DataType", { #if ARM_COMPUTE_ENABLE_FP16 DataType::F16, @@ -52,7 +53,8 @@ using NEGEMMFixture = GEMMFixture<Tensor, NEGEMM>; TEST_SUITE(NEON) -REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetGEMM, NEGEMMFixture, framework::DatasetMode::ALL, framework::dataset::combine(datasets::GoogLeNetGEMMDataset(), std::move(data_types))); +REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetGEMM, NEGEMMFixture, framework::DatasetMode::ALL, framework::dataset::combine(datasets::GoogLeNetGEMMDataset(), data_types)); +REGISTER_FIXTURE_DATA_TEST_CASE(MatrixMultiplyGEMM, NEGEMMFixture, framework::DatasetMode::ALL, framework::dataset::combine(datasets::MatrixMultiplyGEMMDataset(), data_types)); TEST_SUITE_END() } // namespace test |