diff options
author | Georgios Pinitas <georgios.pinitas@arm.com> | 2018-11-28 15:07:29 +0000 |
---|---|---|
committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2018-11-29 18:38:31 +0000 |
commit | eb6aad7e1eee0c0659ea71444ed4093c52267af3 (patch) | |
tree | 6734b1a7ffa2ef1ae13c4b2daeeb557fc8774fbc | |
parent | 00e6e1e7de746a76bbe3f4eb7b5d63034c5029fb (diff) | |
download | ComputeLibrary-eb6aad7e1eee0c0659ea71444ed4093c52267af3.tar.gz |
COMPMID-1811 (3RDPARTY_UPDATE): Rework benchmarks
Change-Id: I02a4ea0270e1776daf8ac1084f28dd054257be4a
Reviewed-on: https://review.mlplatform.org/309
Reviewed-by: Pablo Marquez <pablo.tello@arm.com>
Tested-by: Arm Jenkins <bsgcomp@arm.com>
m--------- | 3rdparty | 0 | ||||
-rw-r--r-- | tests/SConscript | 9 | ||||
-rw-r--r-- | tests/benchmark/CL/DragonBench.cpp | 117 | ||||
-rw-r--r-- | tests/benchmark/DragonBenchConfigs.cpp | 48 | ||||
-rw-r--r-- | tests/benchmark/DragonBenchConfigs.h | 98 | ||||
-rw-r--r-- | tests/benchmark/NEON/DragonBench.cpp | 119 | ||||
-rw-r--r-- | tests/benchmark/fixtures/DragonBenchFixture.h | 180 | ||||
-rw-r--r-- | tests/datasets/DragonBenchDataset.h | 88 |
8 files changed, 9 insertions, 650 deletions
diff --git a/3rdparty b/3rdparty -Subproject 1d9c5d994bc052e72d3cb0eb8f40f189071ca51 +Subproject b0188aaf180460bbe037e0e8010430e175606c2 diff --git a/tests/SConscript b/tests/SConscript index 24714efa74..41731c2343 100644 --- a/tests/SConscript +++ b/tests/SConscript @@ -85,6 +85,9 @@ common_files = Glob('*.cpp') common_objects = [test_env.StaticObject(f) for f in common_files] files_benchmark = Glob('benchmark/*.cpp') +#FIXME Delete before release +if env['internal_only']: + files_benchmark += Glob('../3rdparty/tests/benchmark/*.cpp') # Add unit tests files_validation = Glob('validation/UNIT/*/*.cpp') @@ -101,6 +104,9 @@ if env['opencl']: files_benchmark += Glob('benchmark/CL/*/' + filter_pattern) files_benchmark += Glob('benchmark/CL/' + filter_pattern) + #FIXME Delete before release + if env['internal_only']: + files_benchmark += Glob('../3rdparty/tests/benchmark/CL/' + filter_pattern) files_validation += Glob('validation/CL/*/' + filter_pattern) files_validation += Glob('validation/CL/' + filter_pattern) @@ -109,6 +115,9 @@ if env['neon']: filter_pattern = test_env['test_filter'] files_benchmark += Glob('benchmark/NEON/*/' + filter_pattern) files_benchmark += Glob('benchmark/NEON/' + filter_pattern) + #FIXME Delete before release + if env['internal_only']: + files_benchmark += Glob('../3rdparty/tests/benchmark/NEON/' + filter_pattern) files_validation += Glob('validation/NEON/*/' + filter_pattern) files_validation += Glob('validation/NEON/' + filter_pattern) diff --git a/tests/benchmark/CL/DragonBench.cpp b/tests/benchmark/CL/DragonBench.cpp deleted file mode 100644 index 250b25aeee..0000000000 --- a/tests/benchmark/CL/DragonBench.cpp +++ /dev/null @@ -1,117 +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. - */ -#ifdef INTERNAL_ONLY - -#include "arm_compute/core/TensorShape.h" -#include "arm_compute/core/Types.h" -#include "arm_compute/runtime/CL/CLTensor.h" -#include "arm_compute/runtime/CL/CLTensorAllocator.h" -#include "arm_compute/runtime/CL/functions/CLConvolutionLayer.h" -#include "arm_compute/runtime/CL/functions/CLFullyConnectedLayer.h" - -#include "tests/benchmark/DragonBenchConfigs.h" - -#include "tests/CL/CLAccessor.h" -#include "tests/benchmark/fixtures/DragonBenchFixture.h" -#include "tests/datasets/DragonBenchDataset.h" -#include "tests/framework/Macros.h" -#include "tests/framework/datasets/Datasets.h" -#include "utils/TypePrinter.h" - -namespace arm_compute -{ -namespace test -{ -namespace benchmark -{ -namespace -{ -// Common parameters -const auto data_types = framework::dataset::make("DataType", { DataType::QASYMM8, DataType::F16, DataType::F32 }); - -// Common DragonBench parameters -auto CommonConv2DParamsNoBias = combine(combine(data_types, framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })), - framework::dataset::make("HasBias", { false })); -auto CommonConv2DParamsBias = combine(combine(data_types, framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })), - framework::dataset::make("HasBias", { true })); - -// Common DragonBench FC parameters -auto CommonFCParams = combine(data_types, framework::dataset::make("HasBias", { false })); -} // namespace - -TEST_SUITE(CL) -TEST_SUITE(DragonBench) - -TEST_SUITE(Conv2D) -using CLDragonBenchConv2DFixture = DragonBenchConv2DFixture<CLTensor, CLConvolutionLayer, CLAccessor, Conv2D>; - -REGISTER_FIXTURE_DATA_TEST_CASE(SilverWing, - CLDragonBenchConv2DFixture, - framework::DatasetMode::ALL, - combine(datasets::DragonBenchDataset<Conv2D_Configs, Conv2D>(silverwing_cfgs), CommonConv2DParamsNoBias)); - -REGISTER_FIXTURE_DATA_TEST_CASE(SunFyre, - CLDragonBenchConv2DFixture, - framework::DatasetMode::ALL, - combine(datasets::DragonBenchDataset<Conv2D_Configs, Conv2D>(sunfyre_cfgs), CommonConv2DParamsNoBias)); - -REGISTER_FIXTURE_DATA_TEST_CASE(Syrax, - CLDragonBenchConv2DFixture, - framework::DatasetMode::ALL, - combine(datasets::DragonBenchDataset<Conv2D_Configs, Conv2D>(syrax_cfgs), CommonConv2DParamsNoBias)); - -TEST_SUITE(Nightly) -REGISTER_FIXTURE_DATA_TEST_CASE(SilverWing, - CLDragonBenchConv2DFixture, - framework::DatasetMode::NIGHTLY, - combine(datasets::DragonBenchDataset<Conv2D_Configs, Conv2D>(silverwing_cfgs), CommonConv2DParamsBias)); - -REGISTER_FIXTURE_DATA_TEST_CASE(SunFyre, - CLDragonBenchConv2DFixture, - framework::DatasetMode::NIGHTLY, - combine(datasets::DragonBenchDataset<Conv2D_Configs, Conv2D>(sunfyre_cfgs), CommonConv2DParamsBias)); - -REGISTER_FIXTURE_DATA_TEST_CASE(Syrax, - CLDragonBenchConv2DFixture, - framework::DatasetMode::NIGHTLY, - combine(datasets::DragonBenchDataset<Conv2D_Configs, Conv2D>(syrax_cfgs), CommonConv2DParamsBias)); -TEST_SUITE_END() // Nightly -TEST_SUITE_END() // Conv2D - -TEST_SUITE(FullyConnected) -using CLDragonBenchFCFixture = DragonBenchFCFixture<CLTensor, CLFullyConnectedLayer, CLAccessor, Fully_Connected>; - -REGISTER_FIXTURE_DATA_TEST_CASE(DreamFyre, - CLDragonBenchFCFixture, - framework::DatasetMode::ALL, - combine(datasets::DragonBenchDataset<Fully_Connected_Configs, Fully_Connected>(dreamfyre_cfgs), CommonFCParams)); -TEST_SUITE_END() // FullyConnected - -TEST_SUITE_END() // DragonBench -TEST_SUITE_END() // CL -} // namespace benchmark -} // namespace test -} // namespace arm_compute - -#endif // INTERNAL_ONLY diff --git a/tests/benchmark/DragonBenchConfigs.cpp b/tests/benchmark/DragonBenchConfigs.cpp deleted file mode 100644 index 2f0a62caab..0000000000 --- a/tests/benchmark/DragonBenchConfigs.cpp +++ /dev/null @@ -1,48 +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. - */ -#ifdef INTERNAL_ONLY - -#include <string> -#include <vector> - -namespace arm_compute -{ -namespace test -{ -namespace benchmark -{ -#include "dragonbench/conv2d/conv2d.hpp" -#include "dragonbench/fully_connected/fully_connected.hpp" - -// Conv2D -#include "dragonbench/conv2d/silverwing/silverwing_configs.hpp" -#include "dragonbench/conv2d/sunfyre/sunfyre_configs.hpp" -#include "dragonbench/conv2d/syrax/syrax_configs.hpp" - -// Fully Connected -#include "dragonbench/fully_connected/dreamfyre/dreamfyre_configs.hpp" -} // namespace benchmark -} // namespace test -} // namespace arm_compute -#endif // INTERNAL_ONLY
\ No newline at end of file diff --git a/tests/benchmark/DragonBenchConfigs.h b/tests/benchmark/DragonBenchConfigs.h deleted file mode 100644 index 4fe6c79ae8..0000000000 --- a/tests/benchmark/DragonBenchConfigs.h +++ /dev/null @@ -1,98 +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_DRAGONBENCH_CONFIGS_H__ -#define __ARM_COMPUTE_DRAGONBENCH_CONFIGS_H__ - -#include <string> -#include <vector> - -#include "dragonbench/conv2d/conv2d.hpp" -#include "dragonbench/fully_connected/fully_connected.hpp" - -namespace arm_compute -{ -// Stream operators -inline ::std::ostream &operator<<(::std::ostream &os, const Conv2D &conv2d_config) -{ - os << "network_name=" << conv2d_config.network_name << ":"; - os << "layer_name=" << conv2d_config.layer_name << ":"; - os << "id=" << conv2d_config.id << ":"; - os << "Input_NCHW=" - << conv2d_config.ibatch << ',' - << conv2d_config.ch_in << ',' - << conv2d_config.dim_in_h << ',' - << conv2d_config.dim_in_w << ":"; - os << "Output_NCHW=" - << conv2d_config.ibatch << ',' - << conv2d_config.ch_out << ',' - << conv2d_config.dim_out_h << ',' - << conv2d_config.dim_out_w << ":"; - os << "Weights_HW=" - << conv2d_config.kern_h << ',' - << conv2d_config.kern_w << ":"; - os << "Stride_HW=" - << conv2d_config.stride_h << ',' - << conv2d_config.stride_w << ":"; - os << "Padding=" << conv2d_config.padding << ":"; - return os; -} -inline std::string to_string(const Conv2D &conv2d_config) -{ - std::stringstream str; - str << conv2d_config; - return str.str(); -} -inline ::std::ostream &operator<<(::std::ostream &os, const Fully_Connected &fc_config) -{ - os << "network_name=" << fc_config.network_name << ":"; - os << "layer_name=" << fc_config.layer_name << ":"; - os << "id=" << fc_config.id << ":"; - os << "M=" << fc_config.m << ":"; - os << "N=" << fc_config.n << ":"; - os << "K=" << fc_config.k << ":"; - return os; -} -inline std::string to_string(const Fully_Connected &fc_config) -{ - std::stringstream str; - str << fc_config; - return str.str(); -} - -namespace test -{ -namespace benchmark -{ -// Conv 2D benchmarks -extern conv2d_configs silverwing_cfgs; -extern conv2d_configs sunfyre_cfgs; -extern conv2d_configs syrax_cfgs; - -// Fully Connected benchmarks -extern fully_connected_configs dreamfyre_cfgs; -} // namespace benchmark -} // namespace test -} // namespace arm_compute -#endif /* __ARM_COMPUTE_DRAGONBENCH_CONFIGS_H__ */ diff --git a/tests/benchmark/NEON/DragonBench.cpp b/tests/benchmark/NEON/DragonBench.cpp deleted file mode 100644 index 37638584da..0000000000 --- a/tests/benchmark/NEON/DragonBench.cpp +++ /dev/null @@ -1,119 +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. - */ -#ifdef INTERNAL_ONLY - -#include "arm_compute/core/TensorShape.h" -#include "arm_compute/core/Types.h" -#include "arm_compute/runtime/NEON/functions/NEConvolutionLayer.h" -#include "arm_compute/runtime/NEON/functions/NEFullyConnectedLayer.h" -#include "arm_compute/runtime/Tensor.h" -#include "arm_compute/runtime/TensorAllocator.h" - -#include "tests/benchmark/DragonBenchConfigs.h" - -#include "tests/NEON/Accessor.h" -#include "tests/benchmark/fixtures/DragonBenchFixture.h" -#include "tests/datasets/DragonBenchDataset.h" -#include "tests/framework/Macros.h" -#include "tests/framework/datasets/Datasets.h" -#include "utils/TypePrinter.h" - -namespace arm_compute -{ -namespace test -{ -namespace benchmark -{ -namespace -{ -#ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC -const auto data_types = framework::dataset::make("DataType", { DataType::QASYMM8, DataType::F16, DataType::F32 }); -#else /* __ARM_FEATURE_FP16_VECTOR_ARITHMETIC */ -const auto data_types = framework::dataset::make("DataType", { DataType::QASYMM8, DataType::F32 }); -#endif /* __ARM_FEATURE_FP16_VECTOR_ARITHMETIC */ - -// Common DragonBench Conv2D parameters -auto CommonConv2DParamsNoBias = combine(combine(data_types, framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })), - framework::dataset::make("HasBias", { false })); -auto CommonConv2DParamsBias = combine(combine(data_types, framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })), - framework::dataset::make("HasBias", { true })); - -// Common DragonBench FC parameters -auto CommonFCParams = combine(data_types, framework::dataset::make("HasBias", { false })); -} // namespace - -TEST_SUITE(NEON) -TEST_SUITE(DragonBench) - -TEST_SUITE(Conv2D) -using NEDragonBenchConv2DFixture = DragonBenchConv2DFixture<Tensor, NEConvolutionLayer, Accessor, Conv2D>; - -REGISTER_FIXTURE_DATA_TEST_CASE(SilverWing, - NEDragonBenchConv2DFixture, - framework::DatasetMode::ALL, - combine(datasets::DragonBenchDataset<Conv2D_Configs, Conv2D>(silverwing_cfgs), CommonConv2DParamsNoBias)); - -REGISTER_FIXTURE_DATA_TEST_CASE(SunFyre, - NEDragonBenchConv2DFixture, - framework::DatasetMode::ALL, - combine(datasets::DragonBenchDataset<Conv2D_Configs, Conv2D>(sunfyre_cfgs), CommonConv2DParamsNoBias)); - -REGISTER_FIXTURE_DATA_TEST_CASE(Syrax, - NEDragonBenchConv2DFixture, - framework::DatasetMode::ALL, - combine(datasets::DragonBenchDataset<Conv2D_Configs, Conv2D>(syrax_cfgs), CommonConv2DParamsNoBias)); - -TEST_SUITE(Nightly) -REGISTER_FIXTURE_DATA_TEST_CASE(SilverWing, - NEDragonBenchConv2DFixture, - framework::DatasetMode::NIGHTLY, - combine(datasets::DragonBenchDataset<Conv2D_Configs, Conv2D>(silverwing_cfgs), CommonConv2DParamsBias)); - -REGISTER_FIXTURE_DATA_TEST_CASE(SunFyre, - NEDragonBenchConv2DFixture, - framework::DatasetMode::NIGHTLY, - combine(datasets::DragonBenchDataset<Conv2D_Configs, Conv2D>(sunfyre_cfgs), CommonConv2DParamsBias)); - -REGISTER_FIXTURE_DATA_TEST_CASE(Syrax, - NEDragonBenchConv2DFixture, - framework::DatasetMode::NIGHTLY, - combine(datasets::DragonBenchDataset<Conv2D_Configs, Conv2D>(syrax_cfgs), CommonConv2DParamsBias)); -TEST_SUITE_END() // Nightly -TEST_SUITE_END() // Conv2D - -TEST_SUITE(FullyConnected) -using NEDragonBenchFCFixture = DragonBenchFCFixture<Tensor, NEFullyConnectedLayer, Accessor, Fully_Connected>; - -REGISTER_FIXTURE_DATA_TEST_CASE(DreamFyre, - NEDragonBenchFCFixture, - framework::DatasetMode::ALL, - combine(datasets::DragonBenchDataset<Fully_Connected_Configs, Fully_Connected>(dreamfyre_cfgs), CommonFCParams)); -TEST_SUITE_END() // FullyConnected - -TEST_SUITE_END() // DragonBench -TEST_SUITE_END() // NEON -} // namespace benchmark -} // namespace test -} // namespace arm_compute -#endif // INTERNAL_ONLY 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 <typename TensorType, typename Function, typename Accessor, typename Conv2DConfig> -class DragonBenchConv2DFixture : public framework::Fixture -{ -public: - template <typename...> - 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<TensorType>(src_shape, data_type, 1, q_info, data_layout); - weights = create_tensor<TensorType>(weights_shape, data_type, 1, q_info, data_layout); - biases = create_tensor<TensorType>(biases_shape, bias_data_type, 1, q_info, data_layout); - dst = create_tensor<TensorType>(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<TensorType>(); - sync_tensor_if_necessary<TensorType>(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 <typename TensorType, typename Function, typename Accessor, typename FullyConnectedConfig> -class DragonBenchFCFixture : public framework::Fixture -{ -public: - template <typename...> - 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<TensorType>(src_shape, data_type, 1, q_info); - weights = create_tensor<TensorType>(weights_shape, data_type, 1, q_info); - biases = create_tensor<TensorType>(biases_shape, bias_data_type, 1, q_info); - dst = create_tensor<TensorType>(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<TensorType>(); - sync_tensor_if_necessary<TensorType>(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 */ diff --git a/tests/datasets/DragonBenchDataset.h b/tests/datasets/DragonBenchDataset.h deleted file mode 100644 index 799083e4c1..0000000000 --- a/tests/datasets/DragonBenchDataset.h +++ /dev/null @@ -1,88 +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_DRAGONBENCH_DATASET -#define ARM_COMPUTE_DRAGONBENCH_DATASET - -namespace arm_compute -{ -namespace test -{ -namespace datasets -{ -template <typename ConfigsType, typename ConfigType> -class DragonBenchDataset -{ -public: - using type = std::tuple<ConfigType>; - - DragonBenchDataset(ConfigsType configs) - : _configs(configs) - { - } - - struct iterator - { - iterator(typename std::vector<ConfigType>::const_iterator configs_it) - : _configs_it{ std::move(configs_it) } - { - } - - std::string description() const - { - return to_string(*_configs_it); - } - - DragonBenchDataset::type operator*() const - { - return std::make_tuple(*_configs_it); - } - - iterator &operator++() - { - ++_configs_it; - return *this; - } - - private: - typename std::vector<ConfigType>::const_iterator _configs_it; - }; - - iterator begin() const - { - return iterator(_configs.configs.begin()); - } - - int size() const - { - return _configs.num_configs; - } - -private: - ConfigsType _configs; -}; -} // namespace datasets -} // namespace test -} // namespace arm_compute -#endif /* ARM_COMPUTE_DRAGONBENCH_DATASET */ |