From eb6aad7e1eee0c0659ea71444ed4093c52267af3 Mon Sep 17 00:00:00 2001 From: Georgios Pinitas Date: Wed, 28 Nov 2018 15:07:29 +0000 Subject: COMPMID-1811 (3RDPARTY_UPDATE): Rework benchmarks Change-Id: I02a4ea0270e1776daf8ac1084f28dd054257be4a Reviewed-on: https://review.mlplatform.org/309 Reviewed-by: Pablo Marquez Tested-by: Arm Jenkins --- tests/benchmark/fixtures/DragonBenchFixture.h | 180 -------------------------- 1 file changed, 180 deletions(-) delete mode 100644 tests/benchmark/fixtures/DragonBenchFixture.h (limited to 'tests/benchmark/fixtures') diff --git a/tests/benchmark/fixtures/DragonBenchFixture.h b/tests/benchmark/fixtures/DragonBenchFixture.h deleted file mode 100644 index bb93a46cf5..0000000000 --- a/tests/benchmark/fixtures/DragonBenchFixture.h +++ /dev/null @@ -1,180 +0,0 @@ -/* - * Copyright (c) 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. - */ -//FIXME / INTERNAL_ONLY: This file should not be released! -#ifndef ARM_COMPUTE_TEST_DRAGONBENCH_FIXTURE -#define ARM_COMPUTE_TEST_DRAGONBENCH_FIXTURE - -#include "arm_compute/core/Error.h" -#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 DragonBenchConv2DFixture : public framework::Fixture -{ -public: - template - void setup(Conv2DConfig config, DataType data_type, DataLayout data_layout, bool has_bias) - { - // Set tensor shapes in NCHW layout - TensorShape src_shape(config.dim_in_w, config.dim_in_h, config.ch_in, config.ibatch); - TensorShape weights_shape(config.kern_w, config.kern_h, config.ch_in, config.ch_out); - TensorShape biases_shape(config.ch_out); - TensorShape dst_shape(config.dim_out_w, config.dim_out_h, config.ch_out, config.ibatch); - - // Set convolution layer info - PadStrideInfo info(config.stride_w, config.stride_h, 0, 0); - if(config.padding) - { - info = calculate_same_pad(src_shape, weights_shape, info); - } - - // Permute shapes in case of NHWC - if(data_layout == DataLayout::NHWC) - { - permute(src_shape, PermutationVector(2U, 0U, 1U)); - permute(weights_shape, PermutationVector(2U, 0U, 1U)); - permute(dst_shape, PermutationVector(2U, 0U, 1U)); - } - - // Determine bias data type - DataType bias_data_type = is_data_type_quantized_asymmetric(data_type) ? DataType::S32 : data_type; - const QuantizationInfo q_info(2.f, 10); - - // Create tensors - src = create_tensor(src_shape, data_type, 1, q_info, data_layout); - weights = create_tensor(weights_shape, data_type, 1, q_info, data_layout); - biases = create_tensor(biases_shape, bias_data_type, 1, q_info, data_layout); - dst = create_tensor(dst_shape, data_type, 1, q_info, data_layout); - - // Create and configure function - conv_layer.configure(&src, &weights, has_bias ? &biases : nullptr, &dst, 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{}; -}; - -/** Fixture that can be used for NEON and CL */ -template -class DragonBenchFCFixture : public framework::Fixture -{ -public: - template - void setup(FullyConnectedConfig config, DataType data_type, bool has_bias) - { - // Set tensor shapes in NCHW layout - TensorShape src_shape(config.k, config.m); - TensorShape weights_shape(config.k, config.n); - TensorShape biases_shape(config.n); - TensorShape dst_shape(config.n, config.m); - - // Determine bias data type - DataType bias_data_type = is_data_type_quantized_asymmetric(data_type) ? DataType::S32 : data_type; - const QuantizationInfo q_info(2.f, 10); - - // Create tensors - src = create_tensor(src_shape, data_type, 1, q_info); - weights = create_tensor(weights_shape, data_type, 1, q_info); - biases = create_tensor(biases_shape, bias_data_type, 1, q_info); - dst = create_tensor(dst_shape, data_type, 1, q_info); - - // Create and configure function - fc_layer.configure(&src, &weights, has_bias ? &biases : nullptr, &dst); - - // Allocate tensors - src.allocator()->allocate(); - weights.allocator()->allocate(); - biases.allocator()->allocate(); - dst.allocator()->allocate(); - } - - void run() - { - fc_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 fc_layer{}; -}; -} // namespace benchmark -} // namespace test -} // namespace arm_compute -#endif /* ARM_COMPUTE_TEST_DRAGONBENCH_FIXTURE */ -- cgit v1.2.1