commit cc65bbe73dc4e376108fedb82ce06df983536595
author SiCong Li <sicong.li@arm.com> Fri Aug 18 11:58:21 2017 +0100
committer Anthony Barbier <anthony.barbier@arm.com> Fri Nov 02 16:35:24 2018 +0000
tree 79b3d048ff23d39b48807dff615adf9a68cc5099
parent 1246b63ca04cb067f26ae860688647224d6ba24e

COMPMID-483 Add VGG16 benchmarks

* Add VGG16 benchmarks
* Remove batch size 4 from all precommit benchmarks for FullyConnectedLayer
* Move all batch sizes > 1 to nightly

Change-Id: I80c890f488fa68d672fe66cb5ce7180992a4ec41
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/84477
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>

tests/benchmark_new/NEON/ActivationLayer.cpp

diff --git a/tests/benchmark_new/NEON/ActivationLayer.cpp b/tests/benchmark_new/NEON/ActivationLayer.cpp
index 3020b95..9083ce9 100644
--- a/tests/benchmark_new/NEON/ActivationLayer.cpp
+++ b/tests/benchmark_new/NEON/ActivationLayer.cpp
@@ -35,6 +35,7 @@
 #include "tests/datasets_new/system_tests/googlenet/inceptionv4/GoogLeNetInceptionV4ActivationLayerDataset.h"
 #include "tests/datasets_new/system_tests/lenet5/LeNet5ActivationLayerDataset.h"
 #include "tests/datasets_new/system_tests/squeezenet/SqueezeNetActivationLayerDataset.h"
+#include "tests/datasets_new/system_tests/vgg/vgg16/VGG16ActivationLayerDataset.h"
 #include "tests/datasets_new/system_tests/yolo/v2/YOLOV2ActivationLayerDataset.h"
 #include "tests/fixtures_new/ActivationLayerFixture.h"
 
@@ -75,6 +76,10 @@
                                 framework::dataset::combine(framework::dataset::combine(datasets::SqueezeNetActivationLayerDataset(), data_types),
                                                             framework::dataset::make("Batches", 1)));
 
+REGISTER_FIXTURE_DATA_TEST_CASE(VGG16ActivationLayer, NEActivationLayerFixture, framework::DatasetMode::ALL,
+                                framework::dataset::combine(framework::dataset::combine(datasets::VGG16ActivationLayerDataset(), data_types),
+                                                            framework::dataset::make("Batches", 1)));
+
 REGISTER_FIXTURE_DATA_TEST_CASE(YOLOV2ActivationLayer, NEActivationLayerFixture, framework::DatasetMode::ALL,
                                 framework::dataset::combine(framework::dataset::combine(datasets::YOLOV2ActivationLayerDataset(), data_types),
                                                             framework::dataset::make("Batches", 1)));
@@ -100,6 +105,10 @@
                                 framework::dataset::combine(framework::dataset::combine(datasets::SqueezeNetActivationLayerDataset(), data_types),
                                                             framework::dataset::make("Batches", { 4, 8 })));
 
+REGISTER_FIXTURE_DATA_TEST_CASE(VGG16ActivationLayer, NEActivationLayerFixture, framework::DatasetMode::NIGHTLY,
+                                framework::dataset::combine(framework::dataset::combine(datasets::VGG16ActivationLayerDataset(), data_types),
+                                                            framework::dataset::make("Batches", { 4, 8 })));
+
 REGISTER_FIXTURE_DATA_TEST_CASE(YOLOV2ActivationLayer, NEActivationLayerFixture, framework::DatasetMode::NIGHTLY,
                                 framework::dataset::combine(framework::dataset::combine(datasets::YOLOV2ActivationLayerDataset(), data_types),
                                                             framework::dataset::make("Batches", { 4, 8 })));