From 0cbb927ac309e332ac6e6f1ab9170f041f0138ab Mon Sep 17 00:00:00 2001
From: Michele Di Giorgio <michele.digiorgio@arm.com>
Date: Thu, 1 Mar 2018 16:56:48 +0000
Subject: COMPMID-804: Add NHWC data format support for NEON batch
 normalisation

Change-Id: I04892e7be3f5aa58cd95917a4f90a6b4ffcf6efc
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/122897
Reviewed-by: Giorgio Arena <giorgio.arena@arm.com>
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Anthony Barbier <anthony.barbier@arm.com>
---
 .../GLES_COMPUTE/BatchNormalizationLayer.cpp       | 78 ++++++++++++----------
 1 file changed, 42 insertions(+), 36 deletions(-)

(limited to 'tests/benchmark/GLES_COMPUTE')

diff --git a/tests/benchmark/GLES_COMPUTE/BatchNormalizationLayer.cpp b/tests/benchmark/GLES_COMPUTE/BatchNormalizationLayer.cpp
index 9a2950b88d..881a6ab4dc 100644
--- a/tests/benchmark/GLES_COMPUTE/BatchNormalizationLayer.cpp
+++ b/tests/benchmark/GLES_COMPUTE/BatchNormalizationLayer.cpp
@@ -51,54 +51,60 @@ using GCBatchNormalizationLayerFixture = BatchNormalizationLayerFixture<GCTensor
 TEST_SUITE(GC)
 
 REGISTER_FIXTURE_DATA_TEST_CASE(MobileNetBatchNormalizationLayer, GCBatchNormalizationLayerFixture, framework::DatasetMode::ALL,
-                                framework::dataset::combine(framework::dataset::combine(framework::dataset::combine(framework::dataset::combine(datasets::MobileNetBatchNormalizationLayerDataset(),
-                                                                                                                    framework::dataset::combine(framework::dataset::make("UseGamma", { false, true }),
-                                                                                                                            framework::dataset::make("UseBeta", { false, true }))),
-                                                                                                                    framework::dataset::make("ActivationInfo", ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::BOUNDED_RELU, 6.f))),
-                                                                                        data_types),
-                                                            framework::dataset::make("Batches", 1)));
+                                combine(combine(combine(combine(combine(datasets::MobileNetBatchNormalizationLayerDataset(),
+                                                                        combine(framework::dataset::make("UseGamma", { false, true }),
+                                                                                framework::dataset::make("UseBeta", { false, true }))),
+                                                                framework::dataset::make("ActivationInfo", ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::BOUNDED_RELU, 6.f))),
+                                                        data_types),
+                                                framework::dataset::make("DataLayout", { DataLayout::NCHW })),
+                                        framework::dataset::make("Batches", 1)));
 
 REGISTER_FIXTURE_DATA_TEST_CASE(YOLOV2BatchNormalizationLayer, GCBatchNormalizationLayerFixture, framework::DatasetMode::ALL,
-                                framework::dataset::combine(framework::dataset::combine(framework::dataset::combine(framework::dataset::combine(datasets::YOLOV2BatchNormalizationLayerDataset(),
-                                                                                                                    framework::dataset::combine(framework::dataset::make("UseGamma", { false, true }),
-                                                                                                                            framework::dataset::make("UseBeta", { false, true }))),
-                                                                                                                    framework::dataset::make("ActivationInfo", ActivationLayerInfo())),
-                                                                                        data_types),
-                                                            framework::dataset::make("Batches", 1)));
+                                combine(combine(combine(combine(combine(datasets::YOLOV2BatchNormalizationLayerDataset(),
+                                                                        combine(framework::dataset::make("UseGamma", { false, true }),
+                                                                                framework::dataset::make("UseBeta", { false, true }))),
+                                                                framework::dataset::make("ActivationInfo", ActivationLayerInfo())),
+                                                        data_types),
+                                                framework::dataset::make("DataLayout", { DataLayout::NCHW })),
+                                        framework::dataset::make("Batches", 1)));
 
 REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetInceptionV4BatchNormalizationLayer, GCBatchNormalizationLayerFixture, framework::DatasetMode::ALL,
-                                framework::dataset::combine(framework::dataset::combine(framework::dataset::combine(framework::dataset::combine(datasets::GoogLeNetInceptionV4BatchNormalizationLayerDataset(),
-                                                                                                                    framework::dataset::combine(framework::dataset::make("UseGamma", { false, true }),
-                                                                                                                            framework::dataset::make("UseBeta", { false, true }))),
-                                                                                                                    framework::dataset::make("ActivationInfo", ActivationLayerInfo())),
-                                                                                        data_types),
-                                                            framework::dataset::make("Batches", 1)));
+                                combine(combine(combine(combine(combine(datasets::GoogLeNetInceptionV4BatchNormalizationLayerDataset(),
+                                                                        combine(framework::dataset::make("UseGamma", { false, true }),
+                                                                                framework::dataset::make("UseBeta", { false, true }))),
+                                                                framework::dataset::make("ActivationInfo", ActivationLayerInfo())),
+                                                        data_types),
+                                                framework::dataset::make("DataLayout", { DataLayout::NCHW })),
+                                        framework::dataset::make("Batches", 1)));
 
 TEST_SUITE(NIGHTLY)
 
 REGISTER_FIXTURE_DATA_TEST_CASE(MobileNetBatchNormalizationLayer, GCBatchNormalizationLayerFixture, framework::DatasetMode::NIGHTLY,
-                                framework::dataset::combine(framework::dataset::combine(framework::dataset::combine(framework::dataset::combine(datasets::MobileNetBatchNormalizationLayerDataset(),
-                                                                                                                    framework::dataset::combine(framework::dataset::make("UseGamma", { false, true }),
-                                                                                                                            framework::dataset::make("UseBeta", { false, true }))),
-                                                                                                                    framework::dataset::make("ActivationInfo", ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::BOUNDED_RELU, 6.f))),
-                                                                                        data_types),
-                                                            framework::dataset::make("Batches", { 4, 8 })));
+                                combine(combine(combine(combine(combine(datasets::MobileNetBatchNormalizationLayerDataset(),
+                                                                        combine(framework::dataset::make("UseGamma", { false, true }),
+                                                                                framework::dataset::make("UseBeta", { false, true }))),
+                                                                framework::dataset::make("ActivationInfo", ActivationLayerInfo(ActivationLayerInfo::ActivationFunction::BOUNDED_RELU, 6.f))),
+                                                        data_types),
+                                                framework::dataset::make("DataLayout", { DataLayout::NCHW })),
+                                        framework::dataset::make("Batches", { 4, 8 })));
 
 REGISTER_FIXTURE_DATA_TEST_CASE(YOLOV2BatchNormalizationLayer, GCBatchNormalizationLayerFixture, framework::DatasetMode::NIGHTLY,
-                                framework::dataset::combine(framework::dataset::combine(framework::dataset::combine(framework::dataset::combine(datasets::YOLOV2BatchNormalizationLayerDataset(),
-                                                                                                                    framework::dataset::combine(framework::dataset::make("UseGamma", { false, true }),
-                                                                                                                            framework::dataset::make("UseBeta", { false, true }))),
-                                                                                                                    framework::dataset::make("ActivationInfo", ActivationLayerInfo())),
-                                                                                        data_types),
-                                                            framework::dataset::make("Batches", { 4, 8 })));
+                                combine(combine(combine(combine(combine(datasets::YOLOV2BatchNormalizationLayerDataset(),
+                                                                        combine(framework::dataset::make("UseGamma", { false, true }),
+                                                                                framework::dataset::make("UseBeta", { false, true }))),
+                                                                framework::dataset::make("ActivationInfo", ActivationLayerInfo())),
+                                                        data_types),
+                                                framework::dataset::make("DataLayout", { DataLayout::NCHW })),
+                                        framework::dataset::make("Batches", { 4, 8 })));
 
 REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetInceptionV4BatchNormalizationLayer, GCBatchNormalizationLayerFixture, framework::DatasetMode::NIGHTLY,
-                                framework::dataset::combine(framework::dataset::combine(framework::dataset::combine(framework::dataset::combine(datasets::GoogLeNetInceptionV4BatchNormalizationLayerDataset(),
-                                                                                                                    framework::dataset::combine(framework::dataset::make("UseGamma", { false, true }),
-                                                                                                                            framework::dataset::make("UseBeta", { false, true }))),
-                                                                                                                    framework::dataset::make("ActivationInfo", ActivationLayerInfo())),
-                                                                                        data_types),
-                                                            framework::dataset::make("Batches", { 4, 8 })));
+                                combine(combine(combine(combine(combine(datasets::GoogLeNetInceptionV4BatchNormalizationLayerDataset(),
+                                                                        combine(framework::dataset::make("UseGamma", { false, true }),
+                                                                                framework::dataset::make("UseBeta", { false, true }))),
+                                                                framework::dataset::make("ActivationInfo", ActivationLayerInfo())),
+                                                        data_types),
+                                                framework::dataset::make("DataLayout", { DataLayout::NCHW })),
+                                        framework::dataset::make("Batches", { 4, 8 })));
 TEST_SUITE_END()
 TEST_SUITE_END()
 } // namespace benchmark
-- 
cgit v1.2.1