From 40b292799f16f8a471887ab2363ec75ba8eb01ca Mon Sep 17 00:00:00 2001 From: Pablo Tello Date: Wed, 19 Jul 2017 16:56:05 +0100 Subject: COMPMID-421: Enabled FP16 in the neon ConvolutionLayer benchmark tests. Change-Id: Ifc3dae91eaae0d9b0ca4e25ab4b1924afc9effb0 Reviewed-on: http://mpd-gerrit.cambridge.arm.com/81057 Tested-by: Kaizen Reviewed-by: Moritz Pflanzer --- tests/benchmark_new/NEON/ConvolutionLayer.cpp | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/benchmark_new/NEON/ConvolutionLayer.cpp b/tests/benchmark_new/NEON/ConvolutionLayer.cpp index 633ad6de5b..0825b4b6bb 100644 --- a/tests/benchmark_new/NEON/ConvolutionLayer.cpp +++ b/tests/benchmark_new/NEON/ConvolutionLayer.cpp @@ -39,23 +39,31 @@ namespace arm_compute { namespace test { +namespace +{ +#ifdef ARM_COMPUTE_ENABLE_FP16 +const auto alexnet_data_types = framework::dataset::make("DataType", { DataType::QS8, DataType::F16, DataType::F32 }); +const auto lenet_data_types = framework::dataset::make("DataType", { DataType::F16, DataType::F32 }); +#else /* ARM_COMPUTE_ENABLE_FP16 */ +const auto alexnet_data_types = framework::dataset::make("DataType", { DataType::QS8, DataType::F32 }); +const auto lenet_data_types = framework::dataset::make("DataType", { DataType::F32 }); +#endif /* ARM_COMPUTE_ENABLE_FP16 */ +} // namespace + using NEConvolutionLayerFixture = ConvolutionLayerFixture; TEST_SUITE(NEON) REGISTER_FIXTURE_DATA_TEST_CASE(AlexNetConvolutionLayer, NEConvolutionLayerFixture, framework::DatasetMode::ALL, - framework::dataset::combine(framework::dataset::combine(datasets::AlexNetConvolutionLayerDataset(), - framework::dataset::make("DataType", { DataType::F32, DataType::QS8 })), + framework::dataset::combine(framework::dataset::combine(datasets::AlexNetConvolutionLayerDataset(), alexnet_data_types), framework::dataset::make("Batches", { 1, 4, 8 }))); REGISTER_FIXTURE_DATA_TEST_CASE(LeNet5ConvolutionLayer, NEConvolutionLayerFixture, framework::DatasetMode::ALL, - framework::dataset::combine(framework::dataset::combine(datasets::LeNet5ConvolutionLayerDataset(), - framework::dataset::make("DataType", DataType::F32)), + framework::dataset::combine(framework::dataset::combine(datasets::LeNet5ConvolutionLayerDataset(), lenet_data_types), framework::dataset::make("Batches", { 1, 4, 8 }))); REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetConvolutionLayer, NEConvolutionLayerFixture, framework::DatasetMode::ALL, - framework::dataset::combine(framework::dataset::combine(datasets::GoogLeNetConvolutionLayerDataset(), - framework::dataset::make("DataType", DataType::F32)), + framework::dataset::combine(framework::dataset::combine(datasets::GoogLeNetConvolutionLayerDataset(), lenet_data_types), framework::dataset::make("Batches", { 1, 4, 8 }))); TEST_SUITE_END() -- cgit v1.2.1