COMPMID-959 Add benchmark namespace in benchmark tests
Change-Id: Ieef1c5380bff1c019af0203fb7e4734f48a2fb63
Reviewed-on: https://eu-gerrit-1.euhpc.arm.com/113499
Tested-by: Jenkins <bsgcomp@arm.com>
Reviewed-by: Georgios Pinitas <georgios.pinitas@arm.com>
diff --git a/tests/benchmark/NEON/ActivationLayer.cpp b/tests/benchmark/NEON/ActivationLayer.cpp
index 58aa42a..e1664d3 100644
--- a/tests/benchmark/NEON/ActivationLayer.cpp
+++ b/tests/benchmark/NEON/ActivationLayer.cpp
@@ -44,6 +44,8 @@
{
namespace test
{
+namespace benchmark
+{
namespace
{
#ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC
@@ -125,5 +127,6 @@
framework::dataset::make("Batches", { 4, 8 })));
TEST_SUITE_END()
TEST_SUITE_END()
+} // namespace benchmark
} // namespace test
} // namespace arm_compute
diff --git a/tests/benchmark/NEON/BatchNormalizationLayer.cpp b/tests/benchmark/NEON/BatchNormalizationLayer.cpp
index 2520037..6d28318 100644
--- a/tests/benchmark/NEON/BatchNormalizationLayer.cpp
+++ b/tests/benchmark/NEON/BatchNormalizationLayer.cpp
@@ -40,6 +40,8 @@
{
namespace test
{
+namespace benchmark
+{
namespace
{
#ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC
@@ -89,5 +91,6 @@
framework::dataset::make("Batches", { 4, 8 })));
TEST_SUITE_END()
TEST_SUITE_END()
+} // namespace benchmark
} // namespace test
} // namespace arm_compute
diff --git a/tests/benchmark/NEON/ConvolutionLayer.cpp b/tests/benchmark/NEON/ConvolutionLayer.cpp
index af0db6d..9914d08 100644
--- a/tests/benchmark/NEON/ConvolutionLayer.cpp
+++ b/tests/benchmark/NEON/ConvolutionLayer.cpp
@@ -45,6 +45,8 @@
{
namespace test
{
+namespace benchmark
+{
namespace
{
#ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC
@@ -152,5 +154,6 @@
TEST_SUITE_END()
TEST_SUITE_END()
+} // namespace benchmark
} // namespace test
} // namespace arm_compute
diff --git a/tests/benchmark/NEON/DirectConvolutionLayer.cpp b/tests/benchmark/NEON/DirectConvolutionLayer.cpp
index 7854f61..67b9485 100644
--- a/tests/benchmark/NEON/DirectConvolutionLayer.cpp
+++ b/tests/benchmark/NEON/DirectConvolutionLayer.cpp
@@ -43,6 +43,8 @@
{
namespace test
{
+namespace benchmark
+{
namespace
{
// Special data types for networks that need 5x5 direct convolution, which does not support Fixed Point
@@ -100,5 +102,6 @@
TEST_SUITE_END()
TEST_SUITE_END()
+} // namespace benchmark
} // namespace test
} // namespace arm_compute
diff --git a/tests/benchmark/NEON/Floor.cpp b/tests/benchmark/NEON/Floor.cpp
index 824aee9..f87e70c 100644
--- a/tests/benchmark/NEON/Floor.cpp
+++ b/tests/benchmark/NEON/Floor.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017 ARM Limited.
+ * Copyright (c) 2017-2018 ARM Limited.
*
* SPDX-License-Identifier: MIT
*
@@ -37,6 +37,8 @@
{
namespace test
{
+namespace benchmark
+{
namespace
{
const auto data_types = framework::dataset::make("DataType", { DataType::F32 });
@@ -50,5 +52,6 @@
framework::dataset::combine(datasets::SmallShapes(), data_types));
TEST_SUITE_END()
+} // namespace benchmark
} // namespace test
} // namespace arm_compute
diff --git a/tests/benchmark/NEON/FullyConnectedLayer.cpp b/tests/benchmark/NEON/FullyConnectedLayer.cpp
index edd4406..d0fb04f 100644
--- a/tests/benchmark/NEON/FullyConnectedLayer.cpp
+++ b/tests/benchmark/NEON/FullyConnectedLayer.cpp
@@ -41,6 +41,8 @@
{
namespace test
{
+namespace benchmark
+{
namespace
{
#ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC
@@ -106,5 +108,6 @@
framework::dataset::make("Batches", { 4, 8 })));
TEST_SUITE_END()
TEST_SUITE_END()
+} // namespace benchmark
} // namespace test
} // namespace arm_compute
diff --git a/tests/benchmark/NEON/GEMM.cpp b/tests/benchmark/NEON/GEMM.cpp
index 473d642..2a57ace 100644
--- a/tests/benchmark/NEON/GEMM.cpp
+++ b/tests/benchmark/NEON/GEMM.cpp
@@ -39,6 +39,8 @@
{
namespace test
{
+namespace benchmark
+{
namespace
{
const auto data_types = framework::dataset::make("DataType",
@@ -67,5 +69,6 @@
reshape_b_only_once));
TEST_SUITE_END()
+} // namespace benchmark
} // namespace test
} // namespace arm_compute
diff --git a/tests/benchmark/NEON/GEMMLowp.cpp b/tests/benchmark/NEON/GEMMLowp.cpp
index e3ad1d4..4b13f31 100644
--- a/tests/benchmark/NEON/GEMMLowp.cpp
+++ b/tests/benchmark/NEON/GEMMLowp.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017 ARM Limited.
+ * Copyright (c) 2017-2018 ARM Limited.
*
* SPDX-License-Identifier: MIT
*
@@ -39,6 +39,8 @@
{
namespace test
{
+namespace benchmark
+{
using NEGEMMLowpFixture = GEMMLowpMatrixMultiplyCoreFixture<Tensor, NEGEMMLowpMatrixMultiplyCore, Accessor>;
TEST_SUITE(NEON)
@@ -48,5 +50,6 @@
REGISTER_FIXTURE_DATA_TEST_CASE(GoogleNetGEMMLowp, NEGEMMLowpFixture, framework::DatasetMode::NIGHTLY, datasets::GoogleNetGEMMDataset());
TEST_SUITE_END()
+} // namespace benchmark
} // namespace test
} // namespace arm_compute
diff --git a/tests/benchmark/NEON/NormalizationLayer.cpp b/tests/benchmark/NEON/NormalizationLayer.cpp
index 1f2b2a3..0c9a864 100644
--- a/tests/benchmark/NEON/NormalizationLayer.cpp
+++ b/tests/benchmark/NEON/NormalizationLayer.cpp
@@ -38,6 +38,8 @@
{
namespace test
{
+namespace benchmark
+{
namespace
{
#ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC
@@ -72,5 +74,6 @@
framework::dataset::make("Batches", { 4, 8 })));
TEST_SUITE_END()
TEST_SUITE_END()
+} // namespace benchmark
} // namespace test
} // namespace arm_compute
diff --git a/tests/benchmark/NEON/PoolingLayer.cpp b/tests/benchmark/NEON/PoolingLayer.cpp
index c1e1a01..bdb5032 100644
--- a/tests/benchmark/NEON/PoolingLayer.cpp
+++ b/tests/benchmark/NEON/PoolingLayer.cpp
@@ -43,6 +43,8 @@
{
namespace test
{
+namespace benchmark
+{
namespace
{
#ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC
@@ -100,5 +102,6 @@
framework::dataset::combine(framework::dataset::combine(datasets::YOLOV2PoolingLayerDataset(), data_types), framework::dataset::make("Batches", { 4, 8 })));
TEST_SUITE_END()
TEST_SUITE_END()
+} // namespace benchmark
} // namespace test
} // namespace arm_compute
diff --git a/tests/benchmark/NEON/ROIPoolingLayer.cpp b/tests/benchmark/NEON/ROIPoolingLayer.cpp
index 64b3570..02cf47b 100644
--- a/tests/benchmark/NEON/ROIPoolingLayer.cpp
+++ b/tests/benchmark/NEON/ROIPoolingLayer.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2017 ARM Limited.
+ * Copyright (c) 2017-2018 ARM Limited.
*
* SPDX-License-Identifier: MIT
*
@@ -39,6 +39,8 @@
{
namespace test
{
+namespace benchmark
+{
using NEROIPoolingLayerFixture = ROIPoolingLayerFixture<Tensor, NEROIPoolingLayer, Accessor, Array<ROI>, ArrayAccessor<ROI>>;
TEST_SUITE(NEON)
@@ -49,5 +51,6 @@
framework::dataset::make("Batches", { 1, 4, 8 })));
TEST_SUITE_END()
+} // namespace benchmark
} // namespace test
} // namespace arm_compute
diff --git a/tests/benchmark/NEON/SYSTEM/AlexNet.cpp b/tests/benchmark/NEON/SYSTEM/AlexNet.cpp
index e28f967..e349175 100644
--- a/tests/benchmark/NEON/SYSTEM/AlexNet.cpp
+++ b/tests/benchmark/NEON/SYSTEM/AlexNet.cpp
@@ -43,6 +43,8 @@
{
namespace test
{
+namespace benchmark
+{
namespace
{
#ifdef __ARM_FEATURE_FP16_VECTOR_ARITHMETIC
@@ -73,5 +75,6 @@
TEST_SUITE_END()
TEST_SUITE_END()
+} // namespace benchmark
} // namespace test
} // namespace arm_compute
diff --git a/tests/benchmark/NEON/SYSTEM/LeNet5.cpp b/tests/benchmark/NEON/SYSTEM/LeNet5.cpp
index d8ec575..d9d08f4 100644
--- a/tests/benchmark/NEON/SYSTEM/LeNet5.cpp
+++ b/tests/benchmark/NEON/SYSTEM/LeNet5.cpp
@@ -40,6 +40,8 @@
{
namespace test
{
+namespace benchmark
+{
using NELeNet5Fixture = LeNet5Fixture<Tensor,
Accessor,
NEActivationLayer,
@@ -56,5 +58,6 @@
TEST_SUITE_END()
TEST_SUITE_END()
+} // namespace benchmark
} // namespace test
} // namespace arm_compute
diff --git a/tests/benchmark/NEON/SoftmaxLayer.cpp b/tests/benchmark/NEON/SoftmaxLayer.cpp
index 9a6f6a4..06c990b 100644
--- a/tests/benchmark/NEON/SoftmaxLayer.cpp
+++ b/tests/benchmark/NEON/SoftmaxLayer.cpp
@@ -37,6 +37,8 @@
{
namespace test
{
+namespace benchmark
+{
namespace
{
const auto data_types = framework::dataset::make("DataType", { DataType::F32 });
@@ -53,5 +55,6 @@
framework::dataset::combine(datasets::SoftmaxLayerLargeShapes(), data_types));
TEST_SUITE_END()
+} // namespace benchmark
} // namespace test
} // namespace arm_compute