aboutsummaryrefslogtreecommitdiff
path: root/tests/benchmark_new
diff options
context:
space:
mode:
Diffstat (limited to 'tests/benchmark_new')
-rw-r--r--tests/benchmark_new/CL/ActivationLayer.cpp5
-rw-r--r--tests/benchmark_new/CL/ConvolutionLayer.cpp6
-rw-r--r--tests/benchmark_new/CL/PoolingLayer.cpp6
-rw-r--r--tests/benchmark_new/NEON/ActivationLayer.cpp14
-rw-r--r--tests/benchmark_new/NEON/ConvolutionLayer.cpp15
-rw-r--r--tests/benchmark_new/NEON/PoolingLayer.cpp14
6 files changed, 48 insertions, 12 deletions
diff --git a/tests/benchmark_new/CL/ActivationLayer.cpp b/tests/benchmark_new/CL/ActivationLayer.cpp
index 6f8a00727e..bf7b36a9e1 100644
--- a/tests/benchmark_new/CL/ActivationLayer.cpp
+++ b/tests/benchmark_new/CL/ActivationLayer.cpp
@@ -56,6 +56,11 @@ REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetActivationLayer, CLActivationLayerFixtu
framework::dataset::make("DataType", DataType::F32)),
framework::dataset::make("Batches", { 1, 4, 8 })));
+REGISTER_FIXTURE_DATA_TEST_CASE(SqueezeNetActivationLayer, CLActivationLayerFixture, framework::DatasetMode::ALL,
+ framework::dataset::combine(framework::dataset::combine(datasets::SqueezeNetActivationLayerDataset(),
+ framework::dataset::make("DataType", DataType::F32)),
+ framework::dataset::make("Batches", { 1, 4, 8 })));
+
TEST_SUITE_END()
} // namespace test
} // namespace arm_compute
diff --git a/tests/benchmark_new/CL/ConvolutionLayer.cpp b/tests/benchmark_new/CL/ConvolutionLayer.cpp
index 6e0d6ffc2a..cae0640bc1 100644
--- a/tests/benchmark_new/CL/ConvolutionLayer.cpp
+++ b/tests/benchmark_new/CL/ConvolutionLayer.cpp
@@ -33,6 +33,7 @@
#include "tests/datasets_new/AlexNetConvolutionLayerDataset.h"
#include "tests/datasets_new/GoogLeNetConvolutionLayerDataset.h"
#include "tests/datasets_new/LeNet5ConvolutionLayerDataset.h"
+#include "tests/datasets_new/SqueezeNetConvolutionLayerDataset.h"
#include "tests/fixtures_new/ConvolutionLayerFixture.h"
namespace arm_compute
@@ -58,6 +59,11 @@ REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetConvolutionLayer, CLConvolutionLayerFix
framework::dataset::make("DataType", DataType::F32)),
framework::dataset::make("Batches", { 1, 4, 8 })));
+REGISTER_FIXTURE_DATA_TEST_CASE(SqueezeNetConvolutionLayer, CLConvolutionLayerFixture, framework::DatasetMode::ALL,
+ framework::dataset::combine(framework::dataset::combine(datasets::SqueezeNetConvolutionLayerDataset(),
+ framework::dataset::make("DataType", DataType::F32)),
+ framework::dataset::make("Batches", { 1, 4, 8 })));
+
TEST_SUITE_END()
} // namespace test
} // namespace arm_compute
diff --git a/tests/benchmark_new/CL/PoolingLayer.cpp b/tests/benchmark_new/CL/PoolingLayer.cpp
index 125907bff5..de2299286b 100644
--- a/tests/benchmark_new/CL/PoolingLayer.cpp
+++ b/tests/benchmark_new/CL/PoolingLayer.cpp
@@ -33,6 +33,7 @@
#include "tests/datasets_new/AlexNetPoolingLayerDataset.h"
#include "tests/datasets_new/GoogLeNetPoolingLayerDataset.h"
#include "tests/datasets_new/LeNet5PoolingLayerDataset.h"
+#include "tests/datasets_new/SqueezeNetPoolingLayerDataset.h"
#include "tests/fixtures_new/PoolingLayerFixture.h"
namespace arm_compute
@@ -58,6 +59,11 @@ REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetPoolingLayer, CLPoolingLayerFixture, fr
framework::dataset::make("DataType", DataType::F32)),
framework::dataset::make("Batches", { 1, 4, 8 })));
+REGISTER_FIXTURE_DATA_TEST_CASE(SqueezeNetPoolingLayer, CLPoolingLayerFixture, framework::DatasetMode::ALL,
+ framework::dataset::combine(framework::dataset::combine(datasets::SqueezeNetPoolingLayerDataset(),
+ framework::dataset::make("DataType", DataType::F32)),
+ framework::dataset::make("Batches", { 1, 4, 8 })));
+
TEST_SUITE_END()
} // namespace test
} // namespace arm_compute
diff --git a/tests/benchmark_new/NEON/ActivationLayer.cpp b/tests/benchmark_new/NEON/ActivationLayer.cpp
index 53b401a1ce..beb98b487a 100644
--- a/tests/benchmark_new/NEON/ActivationLayer.cpp
+++ b/tests/benchmark_new/NEON/ActivationLayer.cpp
@@ -40,11 +40,13 @@ 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 });
+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 });
+const auto squeezenet_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 });
+const auto alexnet_data_types = framework::dataset::make("DataType", { DataType::QS8, DataType::F32 });
+const auto lenet_data_types = framework::dataset::make("DataType", { DataType::F32 });
+const auto squeezenet_data_types = framework::dataset::make("DataType", { DataType::F32 });
#endif /* ARM_COMPUTE_ENABLE_FP16 */
} // namespace
@@ -64,6 +66,10 @@ REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetActivationLayer, NEActivationLayerFixtu
framework::dataset::combine(framework::dataset::combine(datasets::GoogLeNetActivationLayerDataset(), lenet_data_types),
framework::dataset::make("Batches", { 1, 4, 8 })));
+REGISTER_FIXTURE_DATA_TEST_CASE(SqueezeNetActivationLayer, NEActivationLayerFixture, framework::DatasetMode::ALL,
+ framework::dataset::combine(framework::dataset::combine(datasets::SqueezeNetActivationLayerDataset(), squeezenet_data_types),
+ framework::dataset::make("Batches", { 1, 4, 8 })));
+
TEST_SUITE_END()
} // namespace test
} // namespace arm_compute
diff --git a/tests/benchmark_new/NEON/ConvolutionLayer.cpp b/tests/benchmark_new/NEON/ConvolutionLayer.cpp
index 6dd4df89a4..7406180e95 100644
--- a/tests/benchmark_new/NEON/ConvolutionLayer.cpp
+++ b/tests/benchmark_new/NEON/ConvolutionLayer.cpp
@@ -33,6 +33,7 @@
#include "tests/datasets_new/AlexNetConvolutionLayerDataset.h"
#include "tests/datasets_new/GoogLeNetConvolutionLayerDataset.h"
#include "tests/datasets_new/LeNet5ConvolutionLayerDataset.h"
+#include "tests/datasets_new/SqueezeNetConvolutionLayerDataset.h"
#include "tests/fixtures_new/ConvolutionLayerFixture.h"
namespace arm_compute
@@ -42,11 +43,13 @@ 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 });
+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 });
+const auto squeezenet_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 });
+const auto alexnet_data_types = framework::dataset::make("DataType", { DataType::QS8, DataType::F32 });
+const auto lenet_data_types = framework::dataset::make("DataType", { DataType::F32 });
+const auto squeezenet_data_types = framework::dataset::make("DataType", { DataType::F32 });
#endif /* ARM_COMPUTE_ENABLE_FP16 */
} // namespace
@@ -66,6 +69,10 @@ REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetConvolutionLayer, NEConvolutionLayerFix
framework::dataset::combine(framework::dataset::combine(datasets::GoogLeNetConvolutionLayerDataset(), lenet_data_types),
framework::dataset::make("Batches", { 1, 4, 8 })));
+REGISTER_FIXTURE_DATA_TEST_CASE(SqueezeNetConvolutionLayer, NEConvolutionLayerFixture, framework::DatasetMode::ALL,
+ framework::dataset::combine(framework::dataset::combine(datasets::SqueezeNetConvolutionLayerDataset(), squeezenet_data_types),
+ framework::dataset::make("Batches", { 1, 4, 8 })));
+
TEST_SUITE_END()
} // namespace test
} // namespace arm_compute
diff --git a/tests/benchmark_new/NEON/PoolingLayer.cpp b/tests/benchmark_new/NEON/PoolingLayer.cpp
index c9d598d4a9..099102441a 100644
--- a/tests/benchmark_new/NEON/PoolingLayer.cpp
+++ b/tests/benchmark_new/NEON/PoolingLayer.cpp
@@ -33,6 +33,7 @@
#include "tests/datasets_new/AlexNetPoolingLayerDataset.h"
#include "tests/datasets_new/GoogLeNetPoolingLayerDataset.h"
#include "tests/datasets_new/LeNet5PoolingLayerDataset.h"
+#include "tests/datasets_new/SqueezeNetPoolingLayerDataset.h"
#include "tests/fixtures_new/PoolingLayerFixture.h"
namespace arm_compute
@@ -42,11 +43,13 @@ 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 });
+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 });
+const auto squeezenet_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 });
+const auto alexnet_data_types = framework::dataset::make("DataType", { DataType::QS8, DataType::F32 });
+const auto lenet_data_types = framework::dataset::make("DataType", { DataType::F32 });
+const auto squeezenet_data_types = framework::dataset::make("DataType", { DataType::F32 });
#endif /* ARM_COMPUTE_ENABLE_FP16 */
} // namespace
@@ -63,6 +66,9 @@ REGISTER_FIXTURE_DATA_TEST_CASE(LeNet5PoolingLayer, NEPoolingLayerFixture, frame
REGISTER_FIXTURE_DATA_TEST_CASE(GoogLeNetPoolingLayer, NEPoolingLayerFixture, framework::DatasetMode::ALL,
framework::dataset::combine(framework::dataset::combine(datasets::GoogLeNetPoolingLayerDataset(), lenet_data_types), framework::dataset::make("Batches", { 1, 4, 8 })));
+REGISTER_FIXTURE_DATA_TEST_CASE(SqueezeNetPoolingLayer, NEPoolingLayerFixture, framework::DatasetMode::ALL,
+ framework::dataset::combine(framework::dataset::combine(datasets::GoogLeNetPoolingLayerDataset(), squeezenet_data_types), framework::dataset::make("Batches", { 1, 4, 8 })));
+
TEST_SUITE_END()
} // namespace test
} // namespace arm_compute
generated by cgit v1.2.1 (git 2.23.0) at 2024-08-11 07:05:06 +0000