From 8be9148814b88e5b0cabd5a4d2b1f4ff470a8c1c Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Tue, 26 Mar 2019 17:23:28 +0000 Subject: COMPMID-1959: Implements 2D FFT on OpenCL Change-Id: I73cf3984a5463acc854c8a59dc2bd9a5234cd99c Signed-off-by: Georgios Pinitas Reviewed-on: https://review.mlplatform.org/c/936 Comments-Addressed: Arm Jenkins Tested-by: Arm Jenkins Reviewed-by: Gian Marco Iodice --- tests/benchmark/CL/ConvolutionLayer.cpp | 18 +++- tests/benchmark/CL/FFT.cpp | 7 +- .../fixtures/FFTConvolutionLayerFixture.h | 100 +++++++++++++++++++++ tests/benchmark/fixtures/FFTFixture.h | 6 +- 4 files changed, 123 insertions(+), 8 deletions(-) create mode 100644 tests/benchmark/fixtures/FFTConvolutionLayerFixture.h (limited to 'tests/benchmark') 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 +#include +#include 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; - TEST_SUITE(CL) -using CLWinogradLayerFixture = WinogradConvolutionLayerFixture; +using CLGEMMConvolutionLayerFixture = ConvolutionLayerFixture; +using CLWinogradLayerFixture = WinogradConvolutionLayerFixture; +using CLFFTConvolutionLayerFixture = FFTConvolutionLayerFixture; + +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; +using CLFFT1DFixture = FFTFixture; +using CLFFT2DFixture = FFTFixture; 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 diff --git a/tests/benchmark/fixtures/FFTConvolutionLayerFixture.h b/tests/benchmark/fixtures/FFTConvolutionLayerFixture.h new file mode 100644 index 0000000000..2c53e3ad9b --- /dev/null +++ b/tests/benchmark/fixtures/FFTConvolutionLayerFixture.h @@ -0,0 +1,100 @@ +/* + * Copyright (c) 2019 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_FFT_CONVOLUTION_LAYER_FIXTURE +#define ARM_COMPUTE_TEST_FFT_CONVOLUTION_LAYER_FIXTURE + +#include "arm_compute/core/TensorShape.h" +#include "arm_compute/core/Types.h" +#include "tests/Globals.h" +#include "tests/Utils.h" +#include "tests/framework/Fixture.h" + +namespace arm_compute +{ +namespace test +{ +namespace benchmark +{ +/** Fixture that can be used for NEON and CL */ +template +class FFTConvolutionLayerFixture : public framework::Fixture +{ +public: + template + void setup(TensorShape src_shape, TensorShape weights_shape, TensorShape biases_shape, TensorShape dst_shape, PadStrideInfo info, Size2D dilation, ActivationLayerInfo act_info, DataType data_type, + int batches) + { + ARM_COMPUTE_UNUSED(dilation); + + // Set batched in source and destination shapes + + src_shape.set(3 /* batch */, batches); + dst_shape.set(3 /* batch */, batches); + + // Create tensors + src = create_tensor(src_shape, data_type, 1); + weights = create_tensor(weights_shape, data_type, 1); + biases = create_tensor(biases_shape, data_type, 1); + dst = create_tensor(dst_shape, data_type, 1); + + // Create and configure function + conv_layer.configure(&src, &weights, &biases, &dst, info, act_info); + + // Allocate tensors + src.allocator()->allocate(); + weights.allocator()->allocate(); + biases.allocator()->allocate(); + dst.allocator()->allocate(); + } + + void run() + { + conv_layer.run(); + } + + void sync() + { + sync_if_necessary(); + sync_tensor_if_necessary(dst); + } + + void teardown() + { + src.allocator()->free(); + weights.allocator()->free(); + biases.allocator()->free(); + dst.allocator()->free(); + } + +private: + TensorType src{}; + TensorType weights{}; + TensorType biases{}; + TensorType dst{}; + Function conv_layer{}; +}; +} // namespace benchmark +} // namespace test +} // namespace arm_compute +#endif /* ARM_COMPUTE_TEST_FFT_CONVOLUTION_LAYER_FIXTURE */ diff --git a/tests/benchmark/fixtures/FFTFixture.h b/tests/benchmark/fixtures/FFTFixture.h index c9c4e3a88e..53897b1b14 100644 --- a/tests/benchmark/fixtures/FFTFixture.h +++ b/tests/benchmark/fixtures/FFTFixture.h @@ -36,8 +36,8 @@ namespace test { namespace benchmark { -template -class FFT1DFixture : public framework::Fixture +template +class FFTFixture : public framework::Fixture { public: template @@ -48,7 +48,7 @@ public: dst = create_tensor(shape, data_type, 2); // Create and configure function - fft_func.configure(&src, &dst, FFT1DInfo()); + fft_func.configure(&src, &dst, FFTInfo()); // Allocate tensors src.allocator()->allocate(); -- cgit v1.2.1