From 093adbca7e9da41227412ad3c92b38fb6ab12347 Mon Sep 17 00:00:00 2001 From: Giorgio Arena Date: Wed, 10 Jan 2018 15:50:03 +0000 Subject: COMPMID-753 Add benchmarks for GEMM/GEMMLowp used in AlexNet Change-Id: Ie680065fe98c2fcdefad1fd5240f0a951df6e4cf Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/115779 Reviewed-by: Pablo Tello Tested-by: Jenkins --- src/runtime/CL/functions/CLGEMM.cpp | 4 +-- tests/benchmark/CL/GEMM.cpp | 4 ++- tests/benchmark/CL/GEMMLowp.cpp | 4 ++- tests/datasets/AlexNetGEMMDataset.h | 55 +++++++++++++++++++++++++++++++++++++ 4 files changed, 63 insertions(+), 4 deletions(-) create mode 100644 tests/datasets/AlexNetGEMMDataset.h diff --git a/src/runtime/CL/functions/CLGEMM.cpp b/src/runtime/CL/functions/CLGEMM.cpp index be2527f4ba..1657bdc0b4 100644 --- a/src/runtime/CL/functions/CLGEMM.cpp +++ b/src/runtime/CL/functions/CLGEMM.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017, 2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -55,7 +55,7 @@ void CLGEMM::configure(const ICLTensor *a, const ICLTensor *b, const ICLTensor * { ARM_COMPUTE_ERROR_ON_MISMATCHING_DATA_TYPES(a, c); ARM_COMPUTE_ERROR_ON_MSG(a->info()->dimension(1) != c->info()->dimension(1), "The C matrix must have the same number of rows as the matrix A"); - ARM_COMPUTE_ERROR_ON_MSG(b->info()->dimension(0) != c->info()->dimension(0), "The C matrix must have the same number of columns as the matrix C"); + ARM_COMPUTE_ERROR_ON_MSG(b->info()->dimension(0) != c->info()->dimension(0), "The C matrix must have the same number of columns as the matrix B"); ARM_COMPUTE_ERROR_ON_MSG(c->info()->dimension(0) != output->info()->dimension(0), "The C matrix must have the same number of rows as the output matrix"); ARM_COMPUTE_ERROR_ON_MSG(c->info()->dimension(1) != output->info()->dimension(1), "The C matrix must have the same number of columns as the output matrix"); } diff --git a/tests/benchmark/CL/GEMM.cpp b/tests/benchmark/CL/GEMM.cpp index e0c54f74a2..615b492ee0 100644 --- a/tests/benchmark/CL/GEMM.cpp +++ b/tests/benchmark/CL/GEMM.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017, 2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -27,6 +27,7 @@ #include "arm_compute/runtime/CL/functions/CLGEMM.h" #include "tests/CL/CLAccessor.h" #include "tests/benchmark/fixtures/GEMMFixture.h" +#include "tests/datasets/AlexNetGEMMDataset.h" #include "tests/datasets/GoogleNetGEMMDataset.h" #include "tests/datasets/MatrixMultiplyGEMMDataset.h" #include "tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1GEMMDataset.h" @@ -50,6 +51,7 @@ TEST_SUITE(CL) REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetInceptionV1GEMM, CLGEMMFixture, framework::DatasetMode::ALL, framework::dataset::combine(datasets::GoogLeNetInceptionV1GEMMDataset(), data_types)); REGISTER_FIXTURE_DATA_TEST_CASE(MatrixMultiplyGEMM, CLGEMMFixture, framework::DatasetMode::ALL, framework::dataset::combine(datasets::MatrixMultiplyGEMMDataset(), data_types)); REGISTER_FIXTURE_DATA_TEST_CASE(GoogleNetGEMM, CLGEMMFixture, framework::DatasetMode::NIGHTLY, framework::dataset::combine(datasets::GoogleNetGEMMDataset(), data_types)); +REGISTER_FIXTURE_DATA_TEST_CASE(AlexNetGEMM, CLGEMMFixture, framework::DatasetMode::NIGHTLY, framework::dataset::combine(datasets::AlexNetGEMMDataset(), data_types)); TEST_SUITE_END() } // namespace test diff --git a/tests/benchmark/CL/GEMMLowp.cpp b/tests/benchmark/CL/GEMMLowp.cpp index 039695b18f..1138339116 100644 --- a/tests/benchmark/CL/GEMMLowp.cpp +++ b/tests/benchmark/CL/GEMMLowp.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 ARM Limited. + * Copyright (c) 2017, 2018 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -28,6 +28,7 @@ #include "arm_compute/runtime/CL/functions/CLGEMMLowpMatrixMultiplyCore.h" #include "tests/CL/CLAccessor.h" #include "tests/benchmark/fixtures/GEMMLowpFixture.h" +#include "tests/datasets/AlexNetGEMMDataset.h" #include "tests/datasets/GoogleNetGEMMDataset.h" #include "tests/datasets/MatrixMultiplyGEMMDataset.h" #include "tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1GEMMDataset.h" @@ -46,6 +47,7 @@ TEST_SUITE(CL) REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetInceptionV1GEMMLowp, CLGEMMLowpFixture, framework::DatasetMode::ALL, datasets::GoogLeNetInceptionV1GEMMDataset()); REGISTER_FIXTURE_DATA_TEST_CASE(MatrixMultiplyGEMMLowp, CLGEMMLowpFixture, framework::DatasetMode::ALL, datasets::MatrixMultiplyGEMMDataset()); REGISTER_FIXTURE_DATA_TEST_CASE(GoogleNetGEMMLowp, CLGEMMLowpFixture, framework::DatasetMode::NIGHTLY, datasets::GoogleNetGEMMDataset()); +REGISTER_FIXTURE_DATA_TEST_CASE(AlexNetGEMMLowp, CLGEMMLowpFixture, framework::DatasetMode::NIGHTLY, datasets::AlexNetGEMMDataset()); TEST_SUITE_END() } // namespace test diff --git a/tests/datasets/AlexNetGEMMDataset.h b/tests/datasets/AlexNetGEMMDataset.h new file mode 100644 index 0000000000..ac47fb6a28 --- /dev/null +++ b/tests/datasets/AlexNetGEMMDataset.h @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2017, 2018 ARM Limited. + * + * SPDX-License-Identifier: MIT + * + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. + */ +#ifndef ARM_COMPUTE_TEST_ALEXNET_GEMM_DATASET +#define ARM_COMPUTE_TEST_ALEXNET_GEMM_DATASET + +#include "tests/datasets/GEMMDataset.h" + +#include "arm_compute/core/TensorShape.h" + +namespace arm_compute +{ +namespace test +{ +namespace datasets +{ +class AlexNetGEMMDataset final : public GEMMDataset +{ +public: + AlexNetGEMMDataset() + { + add_config(TensorShape{ 364U, 3025U }, TensorShape{ 96U, 364U }, TensorShape{ 96U, 3025U }, TensorShape{ 96U, 3025U }, 1.f, 0.f); + add_config(TensorShape{ 1201U, 729U }, TensorShape{ 128U, 1201U }, TensorShape{ 128U, 729U }, TensorShape{ 128U, 729U }, 1.f, 0.f); + add_config(TensorShape{ 2305U, 169U }, TensorShape{ 384U, 2305U }, TensorShape{ 384U, 169U }, TensorShape{ 384U, 169U }, 1.f, 0.f); + add_config(TensorShape{ 1729U, 169U }, TensorShape{ 192U, 1729U }, TensorShape{ 192U, 169U }, TensorShape{ 192U, 169U }, 1.f, 0.f); + add_config(TensorShape{ 1729U, 169U }, TensorShape{ 128U, 1729U }, TensorShape{ 128U, 169U }, TensorShape{ 128U, 169U }, 1.f, 0.f); + add_config(TensorShape{ 9216U, 1U }, TensorShape{ 4096U, 9216U }, TensorShape{ 4096U, 1U }, TensorShape{ 4096U, 1U }, 1.f, 0.f); + add_config(TensorShape{ 4096U, 1U }, TensorShape{ 4096U, 4096U }, TensorShape{ 4096U, 1U }, TensorShape{ 4096U, 1U }, 1.f, 0.f); + add_config(TensorShape{ 4096U, 1U }, TensorShape{ 1000U, 4096U }, TensorShape{ 1000U, 1U }, TensorShape{ 1000U, 1U }, 1.f, 0.f); + } +}; +} // namespace datasets +} // namespace test +} // namespace arm_compute +#endif /* ARM_COMPUTE_TEST_ALEXNET_GEMM_DATASET */ -- cgit v1.2.1