diff options
Diffstat (limited to 'tests/benchmark/fixtures')
| -rw-r--r-- | tests/benchmark/fixtures/ConvolutionFixture.h | 12 | ||||
| -rw-r--r-- | tests/benchmark/fixtures/DepthwiseConvolutionLayerFixture.h | 2 | ||||
| -rw-r--r-- | tests/benchmark/fixtures/ElementWiseUnaryFixture.h | 14 |
3 files changed, 15 insertions, 13 deletions
diff --git a/tests/benchmark/fixtures/ConvolutionFixture.h b/tests/benchmark/fixtures/ConvolutionFixture.h index 3f9c2a4f27..f355168ec1 100644 --- a/tests/benchmark/fixtures/ConvolutionFixture.h +++ b/tests/benchmark/fixtures/ConvolutionFixture.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 ARM Limited. + * Copyright (c) 2018-2019 ARM Limited. * * SPDX-License-Identifier: MIT * @@ -73,7 +73,7 @@ public: dst = create_tensor<TensorType>(src_shape, output_data_type); // Configure function - configure_target(convolution_func, src, dst, conv.data(), scale, border_mode, constant_border_value); + configure_target(src, dst, conv.data(), scale, border_mode, constant_border_value); // Allocate tensors src.allocator()->allocate(); @@ -96,7 +96,7 @@ public: } protected: - virtual void configure_target(Function &func, TensorType &src, TensorType &dst, const int16_t *conv, uint32_t scale, + virtual void configure_target(TensorType &src, TensorType &dst, const int16_t *conv, uint32_t scale, BorderMode border_mode, uint8_t border_value) = 0; protected: @@ -122,7 +122,7 @@ public: } protected: - void configure_target(Function &func, TensorType &src, TensorType &dst, const int16_t *conv, uint32_t scale, + void configure_target(TensorType &src, TensorType &dst, const int16_t *conv, uint32_t scale, BorderMode border_mode, uint8_t constant_border_value) { this->convolution_func.configure(&src, &dst, conv, scale, border_mode, constant_border_value); @@ -141,7 +141,7 @@ public: } protected: - void configure_target(Function &func, TensorType &src, TensorType &dst, const int16_t *conv, uint32_t scale, + void configure_target(TensorType &src, TensorType &dst, const int16_t *conv, uint32_t scale, BorderMode border_mode, uint8_t constant_border_value) { this->convolution_func.configure(&src, &dst, conv, this->_width, this->_height, scale, border_mode, constant_border_value); @@ -160,7 +160,7 @@ public: } protected: - void configure_target(Function &func, TensorType &src, TensorType &dst, const int16_t *conv, uint32_t scale, + void configure_target(TensorType &src, TensorType &dst, const int16_t *conv, uint32_t scale, BorderMode border_mode, uint8_t constant_border_value) { this->convolution_func.configure(&src, &dst, conv, scale, border_mode, constant_border_value); diff --git a/tests/benchmark/fixtures/DepthwiseConvolutionLayerFixture.h b/tests/benchmark/fixtures/DepthwiseConvolutionLayerFixture.h index 33753bcd07..09da816fd4 100644 --- a/tests/benchmark/fixtures/DepthwiseConvolutionLayerFixture.h +++ b/tests/benchmark/fixtures/DepthwiseConvolutionLayerFixture.h @@ -47,6 +47,8 @@ public: template <typename...> void setup(TensorShape src_shape, Size2D kernel_size, PadStrideInfo info, Size2D Dilation, DataType data_type, int batches) { + ARM_COMPUTE_UNUSED(Dilation); + // Get shapes TensorShape weights_shape(kernel_size.width, kernel_size.height); diff --git a/tests/benchmark/fixtures/ElementWiseUnaryFixture.h b/tests/benchmark/fixtures/ElementWiseUnaryFixture.h index e4f76a441f..a26f7c84c0 100644 --- a/tests/benchmark/fixtures/ElementWiseUnaryFixture.h +++ b/tests/benchmark/fixtures/ElementWiseUnaryFixture.h @@ -44,7 +44,7 @@ class ElementWiseUnaryBenchmarkFixture : public framework::Fixture { public: template <typename...> - void setup(TensorShape input_shape, DataType input_data_type, ElementWiseUnary op) + void setup(TensorShape input_shape, DataType input_data_type) { src = create_tensor<TensorType>(input_shape, input_data_type); dst = create_tensor<TensorType>(input_shape, input_data_type); @@ -80,7 +80,7 @@ public: template <typename...> void setup(const TensorShape &shape, DataType data_type) { - ElementWiseUnaryBenchmarkFixture<TensorType, AccessorType, FunctionType, T>::setup(shape, data_type, ElementWiseUnary::RSQRT); + ElementWiseUnaryBenchmarkFixture<TensorType, AccessorType, FunctionType, T>::setup(shape, data_type); } }; @@ -91,7 +91,7 @@ public: template <typename...> void setup(const TensorShape &shape, DataType data_type) { - ElementWiseUnaryBenchmarkFixture<TensorType, AccessorType, FunctionType, T>::setup(shape, data_type, ElementWiseUnary::EXP); + ElementWiseUnaryBenchmarkFixture<TensorType, AccessorType, FunctionType, T>::setup(shape, data_type); } }; @@ -102,7 +102,7 @@ public: template <typename...> void setup(const TensorShape &shape, DataType data_type) { - ElementWiseUnaryBenchmarkFixture<TensorType, AccessorType, FunctionType, T>::setup(shape, data_type, ElementWiseUnary::NEG); + ElementWiseUnaryBenchmarkFixture<TensorType, AccessorType, FunctionType, T>::setup(shape, data_type); } }; @@ -113,7 +113,7 @@ public: template <typename...> void setup(const TensorShape &shape, DataType data_type) { - ElementWiseUnaryBenchmarkFixture<TensorType, AccessorType, FunctionType, T>::setup(shape, data_type, ElementWiseUnary::LOG); + ElementWiseUnaryBenchmarkFixture<TensorType, AccessorType, FunctionType, T>::setup(shape, data_type); } }; @@ -124,7 +124,7 @@ public: template <typename...> void setup(const TensorShape &shape, DataType data_type) { - ElementWiseUnaryBenchmarkFixture<TensorType, AccessorType, FunctionType, T>::setup(shape, data_type, ElementWiseUnary::ABS); + ElementWiseUnaryBenchmarkFixture<TensorType, AccessorType, FunctionType, T>::setup(shape, data_type); } }; @@ -135,7 +135,7 @@ public: template <typename...> void setup(const TensorShape &shape, DataType data_type) { - ElementWiseUnaryBenchmarkFixture<TensorType, AccessorType, FunctionType, T>::setup(shape, data_type, ElementWiseUnary::SIN); + ElementWiseUnaryBenchmarkFixture<TensorType, AccessorType, FunctionType, T>::setup(shape, data_type); } }; } // namespace validation |