diff options
| author | Georgios Pinitas <georgios.pinitas@arm.com> | 2019-03-26 17:23:28 +0000 |
|---|---|---|
| committer | Gian Marco Iodice <gianmarco.iodice@arm.com> | 2019-04-11 09:34:26 +0000 |
| commit | 8be9148814b88e5b0cabd5a4d2b1f4ff470a8c1c (patch) | |
| tree | 760658b8c7b8917379467bd3fc119a5502faa850 /tests/benchmark/CL | |
| parent | a50e702289af66944e860eafc7f3b32f6c5f30be (diff) | |
| download | ComputeLibrary-8be9148814b88e5b0cabd5a4d2b1f4ff470a8c1c.tar.gz | |
COMPMID-1959: Implements 2D FFT on OpenCL
Change-Id: I73cf3984a5463acc854c8a59dc2bd9a5234cd99c
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Reviewed-on: https://review.mlplatform.org/c/936
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Gian Marco Iodice <gianmarco.iodice@arm.com>
Diffstat (limited to 'tests/benchmark/CL')
| -rw-r--r-- | tests/benchmark/CL/ConvolutionLayer.cpp | 18 | ||||
| -rw-r--r-- | tests/benchmark/CL/FFT.cpp | 7 |
2 files changed, 20 insertions, 5 deletions
diff --git a/tests/benchmark/CL/ConvolutionLayer.cpp b/tests/benchmark/CL/ConvolutionLayer.cpp index 5eb33658ff..20828b7717 100644 --- a/tests/benchmark/CL/ConvolutionLayer.cpp +++ b/tests/benchmark/CL/ConvolutionLayer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017-2018 ARM Limited. + * Copyright (c) 2017-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -29,6 +29,7 @@ #include "arm_compute/runtime/CL/functions/CLWinogradConvolutionLayer.h" #include "tests/CL/CLAccessor.h" #include "tests/benchmark/fixtures/ConvolutionLayerFixture.h" +#include "tests/benchmark/fixtures/FFTConvolutionLayerFixture.h" #include "tests/benchmark/fixtures/WinogradConvolutionLayerFixture.h" #include "tests/datasets/system_tests/alexnet/AlexNetConvolutionLayerDataset.h" #include "tests/datasets/system_tests/googlenet/inceptionv1/GoogLeNetInceptionV1ConvolutionLayerDataset.h" @@ -41,6 +42,9 @@ #include "tests/framework/Macros.h" #include "tests/framework/datasets/Datasets.h" #include "utils/TypePrinter.h" +#include <arm_compute/runtime/CL/functions/CLFFTConvolutionLayer.h> +#include <tests/datasets/SmallConvolutionLayerDataset.h> +#include <tests/datasets/system_tests/resnet12/ResNet12ConvolutionLayerDataset.h> namespace arm_compute { @@ -53,11 +57,17 @@ namespace const auto data_types = framework::dataset::make("DataType", { DataType::F16, DataType::F32, DataType::QASYMM8 }); } // namespace -using CLGEMMConvolutionLayerFixture = ConvolutionLayerFixture<CLTensor, CLGEMMConvolutionLayer, CLAccessor>; - TEST_SUITE(CL) -using CLWinogradLayerFixture = WinogradConvolutionLayerFixture<CLTensor, CLWinogradConvolutionLayer, CLAccessor>; +using CLGEMMConvolutionLayerFixture = ConvolutionLayerFixture<CLTensor, CLGEMMConvolutionLayer, CLAccessor>; +using CLWinogradLayerFixture = WinogradConvolutionLayerFixture<CLTensor, CLWinogradConvolutionLayer, CLAccessor>; +using CLFFTConvolutionLayerFixture = FFTConvolutionLayerFixture<CLTensor, CLFFTConvolutionLayer, CLAccessor>; + +REGISTER_FIXTURE_DATA_TEST_CASE(ResNet12FFTLayer, CLFFTConvolutionLayerFixture, framework::DatasetMode::ALL, + framework::dataset::combine(framework::dataset::combine(framework::dataset::combine(datasets::ResNet12FFTConvolutionLayerDataset(), + framework::dataset::make("ActivationInfo", ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::RELU))), + framework::dataset::make("DataType", { DataType::F32 })), + framework::dataset::make("Batches", 1))); REGISTER_FIXTURE_DATA_TEST_CASE(AlexNetWinogradLayer, CLWinogradLayerFixture, framework::DatasetMode::ALL, framework::dataset::combine(framework::dataset::combine(framework::dataset::combine(datasets::AlexNetWinogradLayerDataset(), diff --git a/tests/benchmark/CL/FFT.cpp b/tests/benchmark/CL/FFT.cpp index b345d58eaf..7f1ae63708 100644 --- a/tests/benchmark/CL/FFT.cpp +++ b/tests/benchmark/CL/FFT.cpp @@ -24,6 +24,7 @@ #include "arm_compute/core/Types.h" #include "arm_compute/runtime/CL/CLTensor.h" #include "arm_compute/runtime/CL/functions/CLFFT1D.h" +#include "arm_compute/runtime/CL/functions/CLFFT2D.h" #include "tests/CL/CLAccessor.h" #include "tests/benchmark/fixtures/FFTFixture.h" #include "tests/framework/Macros.h" @@ -42,13 +43,17 @@ const auto data_types = framework::dataset::make("DataType", { DataType::F32 }); const auto shapes = framework::dataset::make("Shapes", { TensorShape(192U, 128U, 64U), TensorShape(224U, 224U) }); } // namespace -using CLFFT1DFixture = FFT1DFixture<CLTensor, CLFFT1D, CLAccessor>; +using CLFFT1DFixture = FFTFixture<CLTensor, CLFFT1D, FFT1DInfo, CLAccessor>; +using CLFFT2DFixture = FFTFixture<CLTensor, CLFFT2D, FFT2DInfo, CLAccessor>; TEST_SUITE(CL) REGISTER_FIXTURE_DATA_TEST_CASE(FFT1D, CLFFT1DFixture, framework::DatasetMode::ALL, framework::dataset::combine(shapes, data_types)); +REGISTER_FIXTURE_DATA_TEST_CASE(FFT2D, CLFFT2DFixture, framework::DatasetMode::ALL, + framework::dataset::combine(shapes, data_types)); + TEST_SUITE_END() // CL } // namespace benchmark } // namespace test |