diff options
Diffstat (limited to 'tests/benchmark_new')
| -rw-r--r-- | tests/benchmark_new/CL/NormalizationLayer.cpp | 12 | ||||
| -rw-r--r-- | tests/benchmark_new/CL/SYSTEM/AlexNet.cpp | 1 | ||||
| -rw-r--r-- | tests/benchmark_new/NEON/NormalizationLayer.cpp | 15 | ||||
| -rw-r--r-- | tests/benchmark_new/NEON/SYSTEM/AlexNet.cpp | 12 |
4 files changed, 31 insertions, 9 deletions
diff --git a/tests/benchmark_new/CL/NormalizationLayer.cpp b/tests/benchmark_new/CL/NormalizationLayer.cpp index 6d5142c7d7..7ba78a5e99 100644 --- a/tests/benchmark_new/CL/NormalizationLayer.cpp +++ b/tests/benchmark_new/CL/NormalizationLayer.cpp @@ -30,25 +30,31 @@ #include "framework/datasets/Datasets.h" #include "tests/CL/CLAccessor.h" #include "tests/TypePrinter.h" -#include "tests/datasets_new/NormalizationLayerDataset.h" +#include "tests/datasets_new/AlexNetNormalizationLayerDataset.h" +#include "tests/datasets_new/GoogLeNetNormalizationLayerDataset.h" #include "tests/fixtures_new/NormalizationLayerFixture.h" namespace arm_compute { namespace test { +namespace +{ +const auto normalization_layer_data_types = framework::dataset::make("DataType", { DataType::F16, DataType::F32 }); +} // namespace + using CLNormalizationLayerFixture = NormalizationLayerFixture<CLTensor, CLNormalizationLayer, CLAccessor>; TEST_SUITE(CL) REGISTER_FIXTURE_DATA_TEST_CASE(AlexNetNormalizationLayer, CLNormalizationLayerFixture, framework::DatasetMode::ALL, framework::dataset::combine(framework::dataset::combine(datasets::AlexNetNormalizationLayerDataset(), - framework::dataset::make("DataType", { DataType::F32 })), + normalization_layer_data_types), framework::dataset::make("Batches", { 1, 4, 8 }))); REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetNormalizationLayer, CLNormalizationLayerFixture, framework::DatasetMode::ALL, framework::dataset::combine(framework::dataset::combine(datasets::GoogLeNetNormalizationLayerDataset(), - framework::dataset::make("DataType", DataType::F32)), + normalization_layer_data_types), framework::dataset::make("Batches", { 1, 4, 8 }))); TEST_SUITE_END() diff --git a/tests/benchmark_new/CL/SYSTEM/AlexNet.cpp b/tests/benchmark_new/CL/SYSTEM/AlexNet.cpp index 85cd701648..e6d91d9706 100644 --- a/tests/benchmark_new/CL/SYSTEM/AlexNet.cpp +++ b/tests/benchmark_new/CL/SYSTEM/AlexNet.cpp @@ -36,7 +36,6 @@ #include "framework/datasets/Datasets.h" #include "tests/CL/CLAccessor.h" #include "tests/TypePrinter.h" -#include "tests/datasets_new/ActivationLayerDataset.h" #include "tests/fixtures_new/AlexNetFixture.h" namespace arm_compute diff --git a/tests/benchmark_new/NEON/NormalizationLayer.cpp b/tests/benchmark_new/NEON/NormalizationLayer.cpp index c3d4969a10..71dd9c354c 100644 --- a/tests/benchmark_new/NEON/NormalizationLayer.cpp +++ b/tests/benchmark_new/NEON/NormalizationLayer.cpp @@ -30,25 +30,34 @@ #include "framework/datasets/Datasets.h" #include "tests/NEON/Accessor.h" #include "tests/TypePrinter.h" -#include "tests/datasets_new/NormalizationLayerDataset.h" +#include "tests/datasets_new/AlexNetNormalizationLayerDataset.h" +#include "tests/datasets_new/GoogLeNetNormalizationLayerDataset.h" #include "tests/fixtures_new/NormalizationLayerFixture.h" namespace arm_compute { namespace test { +namespace +{ +#ifdef ARM_COMPUTE_ENABLE_FP16 +const auto normalization_layer_data_types = framework::dataset::make("DataType", { DataType::F16, DataType::F32, DataType::QS8 }); +#else /* ARM_COMPUTE_ENABLE_FP16 */ +const auto normalization_layer_data_types = framework::dataset::make("DataType", { DataType::F32, DataType::QS8 }); +#endif /* ARM_COMPUTE_ENABLE_FP16 */ +} // namespace using NENormalizationLayerFixture = NormalizationLayerFixture<Tensor, NENormalizationLayer, Accessor>; TEST_SUITE(NEON) REGISTER_FIXTURE_DATA_TEST_CASE(AlexNetNormalizationLayer, NENormalizationLayerFixture, framework::DatasetMode::ALL, framework::dataset::combine(framework::dataset::combine(datasets::AlexNetNormalizationLayerDataset(), - framework::dataset::make("DataType", { DataType::F32, DataType::QS8 })), + normalization_layer_data_types), framework::dataset::make("Batches", { 1, 4, 8 }))); REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetNormalizationLayer, NENormalizationLayerFixture, framework::DatasetMode::ALL, framework::dataset::combine(framework::dataset::combine(datasets::GoogLeNetNormalizationLayerDataset(), - framework::dataset::make("DataType", DataType::F32)), + normalization_layer_data_types), framework::dataset::make("Batches", { 1, 4, 8 }))); TEST_SUITE_END() diff --git a/tests/benchmark_new/NEON/SYSTEM/AlexNet.cpp b/tests/benchmark_new/NEON/SYSTEM/AlexNet.cpp index e97919a21f..282d3e67bd 100644 --- a/tests/benchmark_new/NEON/SYSTEM/AlexNet.cpp +++ b/tests/benchmark_new/NEON/SYSTEM/AlexNet.cpp @@ -36,13 +36,21 @@ #include "framework/datasets/Datasets.h" #include "tests/NEON/Accessor.h" #include "tests/TypePrinter.h" -#include "tests/datasets_new/ActivationLayerDataset.h" #include "tests/fixtures_new/AlexNetFixture.h" namespace arm_compute { namespace test { +namespace +{ +#ifdef ARM_COMPUTE_ENABLE_FP16 +const auto alex_net_data_types = framework::dataset::make("DataType", { DataType::F16, DataType::F32, DataType::QS8 }); +#else /* ARM_COMPUTE_ENABLE_FP16 */ +const auto alex_net_data_types = framework::dataset::make("DataType", { DataType::F32, DataType::QS8 }); +#endif /* ARM_COMPUTE_ENABLE_FP16 */ +} // namespace + using NEAlexNetFixture = AlexNetFixture<ITensor, Tensor, SubTensor, @@ -58,7 +66,7 @@ TEST_SUITE(NEON) TEST_SUITE(SYSTEM_TEST) REGISTER_FIXTURE_DATA_TEST_CASE(AlexNet, NEAlexNetFixture, framework::DatasetMode::ALL, - framework::dataset::combine(framework::dataset::make("DataType", { DataType::F32, DataType::QS8 }), + framework::dataset::combine(alex_net_data_types, framework::dataset::make("Batches", { 1, 4, 8 }))); TEST_SUITE_END() |