From 9593bde92b99fb4473611a2a2bb47a8040bfb500 Mon Sep 17 00:00:00 2001
From: Georgios Pinitas <georgios.pinitas@arm.com>
Date: Thu, 25 Oct 2018 19:17:35 +0100
Subject: COMPMID-1674: (3RDPARTY_UPDATE) Add FullyConnectedLayer Dragonbench

Change-Id: I3c3e96a743614af4c2c2391780d5de2db6191b0f
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/155318
Tested-by: bsgcomp <bsgcomp@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
Reviewed-by: Pablo Tello <pablo.tello@arm.com>
---
 tests/benchmark/NEON/DragonBench.cpp | 45 +++++++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 16 deletions(-)

(limited to 'tests/benchmark/NEON')

diff --git a/tests/benchmark/NEON/DragonBench.cpp b/tests/benchmark/NEON/DragonBench.cpp
index 33e6939b24..37638584da 100644
--- a/tests/benchmark/NEON/DragonBench.cpp
+++ b/tests/benchmark/NEON/DragonBench.cpp
@@ -26,9 +26,12 @@
 #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"
@@ -36,8 +39,6 @@
 #include "tests/framework/datasets/Datasets.h"
 #include "utils/TypePrinter.h"
 
-#include "tests/benchmark/DragonBenchConfigs.h"
-
 namespace arm_compute
 {
 namespace test
@@ -52,52 +53,64 @@ const auto data_types = framework::dataset::make("DataType", { DataType::QASYMM8
 const auto data_types = framework::dataset::make("DataType", { DataType::QASYMM8, DataType::F32 });
 #endif /* __ARM_FEATURE_FP16_VECTOR_ARITHMETIC */
 
-// Common DragonBench parameters
-auto CommonParamsNoBias = combine(combine(data_types, framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })),
-                                  framework::dataset::make("HasBias", { false }));
-auto CommonParamsBias = combine(combine(data_types, framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })),
-                                framework::dataset::make("HasBias", { true }));
-} // namespace
+// 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 }));
 
-using NEDragonBenchConv2DFixture = DragonBenchConv2DFixture<Tensor, NEConvolutionLayer, Accessor, Conv2D>;
+// 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), CommonParamsNoBias));
+                                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), CommonParamsNoBias));
+                                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), CommonParamsNoBias));
+                                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), CommonParamsBias));
+                                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), CommonParamsBias));
+                                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), CommonParamsBias));
+                                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
-- 
cgit v1.2.1