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>

1 files changed, 31 insertions, 17 deletions

diff --git a/tests/benchmark/CL/DragonBench.cpp b/tests/benchmark/CL/DragonBench.cpp
index 958639894f..250b25aeee 100644
--- a/tests/benchmark/CL/DragonBench.cpp
+++ b/tests/benchmark/CL/DragonBench.cpp
@@ -28,6 +28,9 @@
 #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"
@@ -36,8 +39,6 @@
 #include "tests/framework/datasets/Datasets.h"
 #include "utils/TypePrinter.h"
 
-#include "tests/benchmark/DragonBenchConfigs.h"
-
 namespace arm_compute
 {
 namespace test
@@ -46,54 +47,67 @@ namespace benchmark
 {
 namespace
 {
+// Common parameters
+const auto data_types = framework::dataset::make("DataType", { DataType::QASYMM8, DataType::F16, DataType::F32 });
+
 // Common DragonBench parameters
-auto CommonParamsNoBias = combine(combine(framework::dataset::make("DataType", { DataType::QASYMM8, DataType::F16, DataType::F32 }),
-                                          framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })),
-                                  framework::dataset::make("HasBias", { false }));
-auto CommonParamsBias = combine(combine(framework::dataset::make("DataType", { DataType::QASYMM8, DataType::F16, DataType::F32 }),
-                                        framework::dataset::make("DataLayout", { DataLayout::NCHW, DataLayout::NHWC })),
-                                framework::dataset::make("HasBias", { true }));
-} // namespace
+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 CLDragonBenchConv2DFixture = DragonBenchConv2DFixture<CLTensor, CLConvolutionLayer, CLAccessor, Conv2D>;
+// 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), CommonParamsNoBias));
+                                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), CommonParamsNoBias));
+                                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), CommonParamsNoBias));
+                                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), CommonParamsBias));
+                                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), CommonParamsBias));
+                                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), CommonParamsBias));
+                                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