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>
diff --git a/tests/benchmark/CL/BatchNormalizationLayer.cpp b/tests/benchmark/CL/BatchNormalizationLayer.cpp
index 3312319..3d11aea 100644
--- a/tests/benchmark/CL/BatchNormalizationLayer.cpp
+++ b/tests/benchmark/CL/BatchNormalizationLayer.cpp
@@ -51,54 +51,60 @@
TEST_SUITE(CL)
REGISTER_FIXTURE_DATA_TEST_CASE(MobileNetBatchNormalizationLayer, CLBatchNormalizationLayerFixture, 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, CLBatchNormalizationLayerFixture, 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, CLBatchNormalizationLayerFixture, 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, CLBatchNormalizationLayerFixture, 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, CLBatchNormalizationLayerFixture, 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, CLBatchNormalizationLayerFixture, 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