COMPMID-418 Add check and fix comments after preprocessor conditions

Change-Id: I1353fd652ee180e3931e58b4ce13d651a48c7e2c
Reviewed-on: http://mpd-gerrit.cambridge.arm.com/79567
Tested-by: Kaizen <jeremy.johnson+kaizengerrit@arm.com>
Reviewed-by: Moritz Pflanzer <moritz.pflanzer@arm.com>

121 files changed, 190 insertions, 188 deletions

diff --git a/tests/CL/CLAccessor.h b/tests/CL/CLAccessor.h
index 21db3ee23d..e6d226c89b 100644
--- a/tests/CL/CLAccessor.h
+++ b/tests/CL/CLAccessor.h
@@ -133,4 +133,4 @@ inline void *CLAccessor::operator()(const Coordinates &coord)
 } // cl
 } // namespace test
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_CL_CLACCESSOR_H__ */
diff --git a/tests/Globals.h b/tests/Globals.h
index a44d7ce83b..823b5d6df5 100644
--- a/tests/Globals.h
+++ b/tests/Globals.h
@@ -35,4 +35,4 @@ namespace test
 extern std::unique_ptr<TensorLibrary> library;
 } // namespace test
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_GLOBALS_H__ */
diff --git a/tests/IAccessor.h b/tests/IAccessor.h
index 3c06dc36be..b4f2d213da 100644
--- a/tests/IAccessor.h
+++ b/tests/IAccessor.h
@@ -86,4 +86,4 @@ inline IAccessor::~IAccessor()
 }
 } // namespace test
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_IACCESSOR_H__ */
diff --git a/tests/NEON/Helper.h b/tests/NEON/Helper.h
index 0651c9c709..f9774c774c 100644
--- a/tests/NEON/Helper.h
+++ b/tests/NEON/Helper.h
@@ -49,4 +49,4 @@ Array<T> create_array(const std::vector<T> &v)
 } // namespace neon
 } // namespace test
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_NEON_HELPER_H__ */
diff --git a/tests/NEON/NEAccessor.h b/tests/NEON/NEAccessor.h
index be28c27d98..9afc300d99 100644
--- a/tests/NEON/NEAccessor.h
+++ b/tests/NEON/NEAccessor.h
@@ -121,4 +121,4 @@ inline void *NEAccessor::operator()(const Coordinates &coord)
 } // namespace neon
 } // namespace test
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_NEON_NEACCESSOR_H__ */
diff --git a/tests/PaddingCalculator.h b/tests/PaddingCalculator.h
index 6906353a66..957abf5aaf 100644
--- a/tests/PaddingCalculator.h
+++ b/tests/PaddingCalculator.h
@@ -164,4 +164,4 @@ inline PaddingSize PaddingCalculator::required_padding(Option option) const
 }
 } // namespace test
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_PADDING_CALCULATOR_H__ */
diff --git a/tests/ProgramOptions.h b/tests/ProgramOptions.h
index b61ae01b30..0b28355aa6 100644
--- a/tests/ProgramOptions.h
+++ b/tests/ProgramOptions.h
@@ -98,4 +98,4 @@ bool ProgramOptions::get(const std::string &name, T &value) const
 }
 } // namespace test
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_PROGRAM_OPTIONS_H__ */
diff --git a/tests/RawTensor.h b/tests/RawTensor.h
index 87ceb438e8..2480917c38 100644
--- a/tests/RawTensor.h
+++ b/tests/RawTensor.h
@@ -156,4 +156,4 @@ private:
 };
 } // namespace test
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_RAW_TENSOR_H__ */
diff --git a/tests/TensorCache.h b/tests/TensorCache.h
index b4f7b59e15..4bb059e203 100644
--- a/tests/TensorCache.h
+++ b/tests/TensorCache.h
@@ -115,4 +115,4 @@ inline RawTensor &TensorCache::add(std::tuple<const std::string &, Format, Chann
 }
 } // namespace test
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_TENSOR_CACHE_H__ */
diff --git a/tests/TensorLibrary.cpp b/tests/TensorLibrary.cpp
index 21bb4ecd73..479c3e5f04 100644
--- a/tests/TensorLibrary.cpp
+++ b/tests/TensorLibrary.cpp
@@ -186,13 +186,15 @@ RawTensor load_ppm(const std::string &path)
 }
 } // namespace
 
-TensorLibrary::TensorLibrary(std::string path)
-    : _library_path(std::move(path)), _seed{ std::random_device()() }
+TensorLibrary::TensorLibrary(std::string path) //NOLINT
+    : _library_path(std::move(path)),
+      _seed{ std::random_device()() }
 {
 }
 
-TensorLibrary::TensorLibrary(std::string path, std::random_device::result_type seed)
-    : _library_path(std::move(path)), _seed{ seed }
+TensorLibrary::TensorLibrary(std::string path, std::random_device::result_type seed) //NOLINT
+    : _library_path(std::move(path)),
+      _seed{ seed }
 {
 }
 
@@ -342,9 +344,9 @@ RawTensor TensorLibrary::load_image(const std::string &name) const
 {
 #ifdef _WIN32
     const std::string image_path = ("\\images\\");
-#else
+#else  /* _WIN32 */
     const std::string image_path = ("/images/");
-#endif
+#endif /* _WIN32 */
 
     const std::string path      = _library_path + image_path + name;
     const std::string extension = path.substr(path.find_last_of('.') + 1);
diff --git a/tests/TensorLibrary.h b/tests/TensorLibrary.h
index 69b2381171..6c079b6872 100644
--- a/tests/TensorLibrary.h
+++ b/tests/TensorLibrary.h
@@ -45,7 +45,7 @@
 
 #if ARM_COMPUTE_ENABLE_FP16
 #include <arm_fp16.h> // needed for float16_t
-#endif
+#endif                /* ARM_COMPUTE_ENABLE_FP16 */
 
 namespace arm_compute
 {
@@ -370,7 +370,7 @@ private:
     mutable TensorCache             _cache{};
     mutable std::mutex              _format_lock{};
     mutable std::mutex              _channel_lock{};
-    std::string                     _library_path;
+    const std::string               _library_path;
     std::random_device::result_type _seed;
 };
 
@@ -600,7 +600,7 @@ void TensorLibrary::fill_tensor_uniform(T &&tensor, std::random_device::result_t
             fill(tensor, distribution_f16, seed_offset);
             break;
         }
-#endif
+#endif /* ARM_COMPUTE_ENABLE_FP16 */
         case DataType::F32:
         {
             ARM_COMPUTE_ERROR_ON(!(std::is_same<float, D>::value));
@@ -632,9 +632,9 @@ void TensorLibrary::fill_layer_data(T &&tensor, std::string name) const
 {
 #ifdef _WIN32
     const std::string path_separator("\\");
-#else
+#else  /* _WIN32 */
     const std::string path_separator("/");
-#endif
+#endif /* _WIN32 */
 
     const std::string path = _library_path + path_separator + name;
 
@@ -662,4 +662,4 @@ void TensorLibrary::fill_layer_data(T &&tensor, std::string name) const
 }
 } // namespace test
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_TENSOR_LIBRARY_H__ */
diff --git a/tests/TypePrinter.h b/tests/TypePrinter.h
index f5915c474a..4fb3b64d42 100644
--- a/tests/TypePrinter.h
+++ b/tests/TypePrinter.h
@@ -464,4 +464,4 @@ inline ::std::ostream &operator<<(::std::ostream &os, const BorderSize &border)
     return os;
 }
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_TYPE_PRINTER_H__ */
diff --git a/tests/TypeReader.h b/tests/TypeReader.h
index 82eb9e42cf..2be76ba63f 100644
--- a/tests/TypeReader.h
+++ b/tests/TypeReader.h
@@ -64,4 +64,4 @@ inline ::std::istream &operator>>(::std::istream &is, BorderMode &mode)
     return is;
 }
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_TYPE_READER_H__ */
diff --git a/tests/Types.h b/tests/Types.h
index 2cb69ff04e..cb9b0b9d5a 100644
--- a/tests/Types.h
+++ b/tests/Types.h
@@ -34,4 +34,4 @@ enum class FixedPointOp
     RECIPROCAL /**< Reciprocal */
 };
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_TYPES_H__ */
diff --git a/tests/UserConfiguration.h b/tests/UserConfiguration.h
index dad0960bdb..815da04810 100644
--- a/tests/UserConfiguration.h
+++ b/tests/UserConfiguration.h
@@ -133,4 +133,4 @@ UserConfiguration::Option<T>::operator T() const
 }
 } // namespace test
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_USER_CONFIGURATION_H__ */
diff --git a/tests/Utils.h b/tests/Utils.h
index 8d5046da34..ad45bffe6e 100644
--- a/tests/Utils.h
+++ b/tests/Utils.h
@@ -40,9 +40,9 @@
 #include <string>
 #include <type_traits>
 
-#if ARM_COMPUTE_ENABLE_FP16
+#ifdef ARM_COMPUTE_ENABLE_FP16
 #include <arm_fp16.h> // needed for float16_t
-#endif
+#endif                /* ARM_COMPUTE_ENABLE_FP16 */
 
 namespace arm_compute
 {
@@ -102,7 +102,7 @@ template <> struct promote<int32_t> { using type = int64_t; };
 template <> struct promote<float> { using type = float; };
 #ifdef ARM_COMPUTE_ENABLE_FP16
 template <> struct promote<float16_t> { using type = float16_t; };
-#endif
+#endif /* ARM_COMPUTE_ENABLE_FP16 */
 
 
 template <typename T>
@@ -417,4 +417,4 @@ inline T create_tensor(const TensorShape &shape, DataType data_type, int num_cha
 }
 } // namespace test
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_UTILS_H__ */
diff --git a/tests/benchmark/Datasets.h b/tests/benchmark/Datasets.h
index e7bfb6f10f..cb45b50589 100644
--- a/tests/benchmark/Datasets.h
+++ b/tests/benchmark/Datasets.h
@@ -76,4 +76,4 @@ void DataSetArgs(::benchmark::internal::Benchmark *b)
 }
 }
 }
-#endif
+#endif /* __ARM_COMPUTE_TEST_BENCHMARK_DATASETS_H__ */
diff --git a/tests/benchmark/Instrument.h b/tests/benchmark/Instrument.h
index 39b0088670..5034471091 100644
--- a/tests/benchmark/Instrument.h
+++ b/tests/benchmark/Instrument.h
@@ -104,4 +104,4 @@ Instrument::Measurement<T>::operator double() const
 } // namespace benchmark
 } // namespace test
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_BENCHMARK_INSTRUMENT_H__ */
diff --git a/tests/benchmark/PMUCounter.h b/tests/benchmark/PMUCounter.h
index de45f319f6..c04b0e5760 100644
--- a/tests/benchmark/PMUCounter.h
+++ b/tests/benchmark/PMUCounter.h
@@ -68,4 +68,4 @@ private:
 } // namespace benchmark
 } // namespace test
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_BENCHMARK_PMU_COUNTER_H__ */
diff --git a/tests/benchmark/PerformanceProgramOptions.h b/tests/benchmark/PerformanceProgramOptions.h
index 671e263bb2..e9c7a38b3f 100644
--- a/tests/benchmark/PerformanceProgramOptions.h
+++ b/tests/benchmark/PerformanceProgramOptions.h
@@ -42,4 +42,4 @@ public:
 } // namespace performance
 } // namespace test
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_PERFORMANCE_PROGRAM_OPTIONS_H__ */
diff --git a/tests/benchmark/PerformanceUserConfiguration.h b/tests/benchmark/PerformanceUserConfiguration.h
index a140d404c8..daf85a4332 100644
--- a/tests/benchmark/PerformanceUserConfiguration.h
+++ b/tests/benchmark/PerformanceUserConfiguration.h
@@ -54,4 +54,4 @@ struct PerformanceUserConfiguration : public UserConfiguration
 extern performance::PerformanceUserConfiguration user_config;
 } // namespace test
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_PERFORMANCE_PERFORMANCE_USER_CONFIGURATION_H__ */
diff --git a/tests/benchmark/Profiler.h b/tests/benchmark/Profiler.h
index 03922f4704..f2464949d0 100644
--- a/tests/benchmark/Profiler.h
+++ b/tests/benchmark/Profiler.h
@@ -73,4 +73,4 @@ private:
 } // namespace benchmark
 } // namespace test
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_BENCHMARK_PROFILER_H__ */
diff --git a/tests/benchmark/WallClockTimer.h b/tests/benchmark/WallClockTimer.h
index cf6828e88d..85a8b86213 100644
--- a/tests/benchmark/WallClockTimer.h
+++ b/tests/benchmark/WallClockTimer.h
@@ -50,4 +50,4 @@ private:
 } // namespace benchmark
 } // namespace test
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_BENCHMARK_WALL_CLOCK_TIMER_H__ */
diff --git a/tests/benchmark/main.cpp b/tests/benchmark/main.cpp
index 1b6bafb3a1..356490960c 100644
--- a/tests/benchmark/main.cpp
+++ b/tests/benchmark/main.cpp
@@ -34,7 +34,7 @@
 
 #ifdef OPENCL
 #include "arm_compute/runtime/CL/CLScheduler.h"
-#endif
+#endif /* OPENCL */
 #include "arm_compute/runtime/Scheduler.h"
 
 #include <iostream>
@@ -88,7 +88,7 @@ int main(int argc, char **argv)
 
 #ifdef OPENCL
     arm_compute::CLScheduler::get().default_init();
-#endif
+#endif /* OPENCL */
 
     std::cout << "Using " << user_config.threads << " CPU " << (user_config.threads == 1 ? "thread" : "threads") << "\n";
     std::cout << "Seed: " << library->seed() << "\n";
diff --git a/tests/benchmark/system_tests/common/LeNet5.h b/tests/benchmark/system_tests/common/LeNet5.h
index cca1bbf3f3..a2d0cd577c 100644
--- a/tests/benchmark/system_tests/common/LeNet5.h
+++ b/tests/benchmark/system_tests/common/LeNet5.h
@@ -79,4 +79,4 @@ public:
 } // namespace benchmark
 } // namespace test
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_BENCHMARK_LENET5_H__ */
diff --git a/tests/dataset/ActivationFunctionDataset.h b/tests/dataset/ActivationFunctionDataset.h
index 11e4baac78..bc0e011bde 100644
--- a/tests/dataset/ActivationFunctionDataset.h
+++ b/tests/dataset/ActivationFunctionDataset.h
@@ -29,7 +29,7 @@
 
 #ifdef BOOST
 #include "boost_wrapper.h"
-#endif
+#endif /* BOOST */
 
 namespace arm_compute
 {
@@ -63,4 +63,4 @@ public:
 };
 } // namespace test
 } // namespace arm_compute
-#endif //__ARM_COMPUTE_TEST_DATASET_ACTIVATION_FUNCTION_DATASET_H__
+#endif /* __ARM_COMPUTE_TEST_DATASET_ACTIVATION_FUNCTION_DATASET_H__ */
diff --git a/tests/dataset/ActivationLayerDataset.h b/tests/dataset/ActivationLayerDataset.h
index 9d7cffba14..ef6f382f97 100644
--- a/tests/dataset/ActivationLayerDataset.h
+++ b/tests/dataset/ActivationLayerDataset.h
@@ -35,7 +35,7 @@
 
 #ifdef BOOST
 #include "boost_wrapper.h"
-#endif
+#endif /* BOOST */
 
 namespace arm_compute
 {
diff --git a/tests/dataset/BatchNormalizationLayerDataset.h b/tests/dataset/BatchNormalizationLayerDataset.h
index 4323b8fe93..f1ba212b97 100644
--- a/tests/dataset/BatchNormalizationLayerDataset.h
+++ b/tests/dataset/BatchNormalizationLayerDataset.h
@@ -35,7 +35,7 @@
 
 #ifdef BOOST
 #include "boost_wrapper.h"
-#endif
+#endif /* BOOST */
 
 namespace arm_compute
 {
diff --git a/tests/dataset/BorderModeDataset.h b/tests/dataset/BorderModeDataset.h
index 37c7a5ba10..debf7bdf00 100644
--- a/tests/dataset/BorderModeDataset.h
+++ b/tests/dataset/BorderModeDataset.h
@@ -28,7 +28,7 @@
 
 #ifdef BOOST
 #include "boost_wrapper.h"
-#endif
+#endif /* BOOST */
 
 #include <array>
 
@@ -56,9 +56,9 @@ public:
     /** Number of samples in the data set. */
 #ifdef BOOST
     boost::unit_test::data::size_t size() const
-#else
+#else  /* BOOST */
     unsigned int size() const
-#endif
+#endif /* BOOST */
     {
         return _modes.size();
     }
@@ -79,4 +79,4 @@ private:
 };
 } // namespace test
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_BORDER_MODE_DATASET_H__ */
diff --git a/tests/dataset/ConvertPolicyDataset.h b/tests/dataset/ConvertPolicyDataset.h
index 697dba615b..bca033e515 100644
--- a/tests/dataset/ConvertPolicyDataset.h
+++ b/tests/dataset/ConvertPolicyDataset.h
@@ -30,7 +30,7 @@
 
 #ifdef BOOST
 #include "boost_wrapper.h"
-#endif
+#endif /* BOOST */
 
 namespace arm_compute
 {
@@ -56,9 +56,9 @@ public:
     /** Number of samples in the data set. */
 #ifdef BOOST
     boost::unit_test::data::size_t size() const
-#else
+#else  /* BOOST */
     unsigned int size() const
-#endif
+#endif /* BOOST */
     {
         return _policies.size();
     }
@@ -79,4 +79,4 @@ private:
 };
 } // namespace test
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_CONVERT_POLICY_DATASETS_H__ */
diff --git a/tests/dataset/ConvolutionLayerDataset.h b/tests/dataset/ConvolutionLayerDataset.h
index 402fae31ad..af04fa98ea 100644
--- a/tests/dataset/ConvolutionLayerDataset.h
+++ b/tests/dataset/ConvolutionLayerDataset.h
@@ -35,7 +35,7 @@
 
 #ifdef BOOST
 #include "boost_wrapper.h"
-#endif
+#endif /* BOOST */
 
 namespace arm_compute
 {
@@ -269,4 +269,4 @@ public:
 };
 } // namespace test
 } // namespace arm_compute
-#endif //__ARM_COMPUTE_TEST_DATASET_CONVOLUTION_LAYER_DATASET_H__
+#endif /* __ARM_COMPUTE_TEST_DATASET_CONVOLUTION_LAYER_DATASET_H__ */
diff --git a/tests/dataset/DataTypeDatasets.h b/tests/dataset/DataTypeDatasets.h
index 8c63857477..7198f79007 100644
--- a/tests/dataset/DataTypeDatasets.h
+++ b/tests/dataset/DataTypeDatasets.h
@@ -28,7 +28,7 @@
 
 #ifdef BOOST
 #include "boost_wrapper.h"
-#endif
+#endif /* BOOST */
 
 namespace arm_compute
 {
@@ -55,9 +55,9 @@ public:
     /** Number of samples in the data set. */
 #ifdef BOOST
     boost::unit_test::data::size_t size() const
-#else
+#else  /* BOOST */
     unsigned int size() const
-#endif
+#endif /* BOOST */
     {
         return _types.size();
     }
@@ -190,4 +190,4 @@ public:
 };
 } // namespace test
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_DATA_TYPE_DATASET_H__ */
diff --git a/tests/dataset/FullyConnectedLayerDataset.h b/tests/dataset/FullyConnectedLayerDataset.h
index 53b7d022d7..cf43a6302a 100644
--- a/tests/dataset/FullyConnectedLayerDataset.h
+++ b/tests/dataset/FullyConnectedLayerDataset.h
@@ -34,7 +34,7 @@
 
 #ifdef BOOST
 #include "boost_wrapper.h"
-#endif
+#endif /* BOOST */
 
 namespace arm_compute
 {
@@ -152,4 +152,4 @@ public:
 };
 } // namespace test
 } // namespace arm_compute
-#endif //__ARM_COMPUTE_TEST_DATASET_FULLY_CONNECTED_LAYER_DATASET_H__
+#endif /* __ARM_COMPUTE_TEST_DATASET_FULLY_CONNECTED_LAYER_DATASET_H__ */
diff --git a/tests/dataset/GEMMDataset.h b/tests/dataset/GEMMDataset.h
index ddd4a3424f..ce05557231 100644
--- a/tests/dataset/GEMMDataset.h
+++ b/tests/dataset/GEMMDataset.h
@@ -38,7 +38,7 @@
 
 #ifdef BOOST
 #include "boost_wrapper.h"
-#endif
+#endif /* BOOST */
 
 namespace arm_compute
 {
diff --git a/tests/dataset/GenericDataset.h b/tests/dataset/GenericDataset.h
index 4ca489bd82..48754fccf8 100644
--- a/tests/dataset/GenericDataset.h
+++ b/tests/dataset/GenericDataset.h
@@ -31,7 +31,7 @@
 
 #ifdef BOOST
 #include "boost_wrapper.h"
-#endif
+#endif /* BOOST */
 
 namespace arm_compute
 {
@@ -58,9 +58,9 @@ public:
     /** Number of samples in the data set. */
 #ifdef BOOST
     boost::unit_test::data::size_t size() const
-#else
+#else  /* BOOST */
     unsigned int size() const
-#endif
+#endif /* BOOST */
     {
         return _data.size();
     }
@@ -94,4 +94,4 @@ private:
 };
 } // namespace test
 } // namespace arm_compute
-#endif //__ARM_COMPUTE_TEST_DATASET_GENERIC_DATASET_H__
+#endif /* __ARM_COMPUTE_TEST_DATASET_GENERIC_DATASET_H__ */
diff --git a/tests/dataset/ImageDatasets.h b/tests/dataset/ImageDatasets.h
index 555227e83b..6aa25cf942 100644
--- a/tests/dataset/ImageDatasets.h
+++ b/tests/dataset/ImageDatasets.h
@@ -29,7 +29,7 @@
 
 #ifdef BOOST
 #include "boost_wrapper.h"
-#endif
+#endif /* BOOST */
 
 namespace arm_compute
 {
@@ -56,9 +56,9 @@ public:
     /** Number of samples in the data set. */
 #ifdef BOOST
     boost::unit_test::data::size_t size() const
-#else
+#else  /* BOOST */
     unsigned int size() const
-#endif
+#endif /* BOOST */
     {
         return _images.size();
     }
@@ -109,7 +109,7 @@ public:
 #ifdef INTERNAL_ONLY
         : ImageDataset("1280x720.ppm", "1920x1080.ppm", "4160x3120.ppm")
           // The 4k image is too large to distribute
-#else
+#else  /* INTERNAL_ONLY */
         : ImageDataset("1280x720.ppm", "1920x1080.ppm")
 #endif /* INTERNAL_ONLY */
     {
@@ -117,4 +117,4 @@ public:
 };
 } // namespace test
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_IMAGE_DATASETS_H__ */
diff --git a/tests/dataset/InterpolationPolicyDataset.h b/tests/dataset/InterpolationPolicyDataset.h
index e6062eae53..0f3184c81a 100644
--- a/tests/dataset/InterpolationPolicyDataset.h
+++ b/tests/dataset/InterpolationPolicyDataset.h
@@ -28,7 +28,7 @@
 
 #ifdef BOOST
 #include "boost_wrapper.h"
-#endif
+#endif /* BOOST */
 
 namespace arm_compute
 {
@@ -54,9 +54,9 @@ public:
     /** Number of samples in the data set. */
 #ifdef BOOST
     boost::unit_test::data::size_t size() const
-#else
+#else  /* BOOST */
     unsigned int size() const
-#endif
+#endif /* BOOST */
     {
         return _policies.size();
     }
@@ -77,4 +77,4 @@ private:
 };
 } // namespace test
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_INTERPOLATION_POLICY_DATASET_H__ */
diff --git a/tests/dataset/MatrixPatternDataset.h b/tests/dataset/MatrixPatternDataset.h
index d9f20c123b..050c4d9cfd 100644
--- a/tests/dataset/MatrixPatternDataset.h
+++ b/tests/dataset/MatrixPatternDataset.h
@@ -28,7 +28,7 @@
 
 #ifdef BOOST
 #include "boost_wrapper.h"
-#endif
+#endif /* BOOST */
 
 #include <array>
 
@@ -56,9 +56,9 @@ public:
     /** Number of samples in the data set. */
 #ifdef BOOST
     boost::unit_test::data::size_t size() const
-#else
+#else  /* BOOST */
     unsigned int size() const
-#endif
+#endif /* BOOST */
     {
         return _patterns.size();
     }
@@ -79,4 +79,4 @@ private:
 };
 } // namespace test
 } // namespace arm_compute
-#endif // __ARM_COMPUTE_TEST_MATRIX_PATTERN_DATASET_H__
+#endif /* __ARM_COMPUTE_TEST_MATRIX_PATTERN_DATASET_H__ */
diff --git a/tests/dataset/NonLinearFilterFunctionDataset.h b/tests/dataset/NonLinearFilterFunctionDataset.h
index 177887353b..a2db3239c3 100644
--- a/tests/dataset/NonLinearFilterFunctionDataset.h
+++ b/tests/dataset/NonLinearFilterFunctionDataset.h
@@ -28,7 +28,7 @@
 
 #ifdef BOOST
 #include "boost_wrapper.h"
-#endif
+#endif /* BOOST */
 
 #include <array>
 
@@ -56,9 +56,9 @@ public:
     /** Number of samples in the data set. */
 #ifdef BOOST
     boost::unit_test::data::size_t size() const
-#else
+#else  /* BOOST */
     unsigned int size() const
-#endif
+#endif /* BOOST */
     {
         return _functions.size();
     }
@@ -79,4 +79,4 @@ private:
 };
 } // namespace test
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_NON_LINEAR_FILTER_FUNCTION_DATASET_H__ */
diff --git a/tests/dataset/NormalizationLayerDataset.h b/tests/dataset/NormalizationLayerDataset.h
index 7234f41551..fc56694dc8 100644
--- a/tests/dataset/NormalizationLayerDataset.h
+++ b/tests/dataset/NormalizationLayerDataset.h
@@ -35,7 +35,7 @@
 
 #ifdef BOOST
 #include "boost_wrapper.h"
-#endif
+#endif /* BOOST */
 
 namespace arm_compute
 {
@@ -96,4 +96,4 @@ public:
 
 } // namespace test
 } // namespace arm_compute
-#endif //__ARM_COMPUTE_TEST_DATASET_NORMALIZATION_LAYER_DATASET_H__
+#endif /* __ARM_COMPUTE_TEST_DATASET_NORMALIZATION_LAYER_DATASET_H__ */
diff --git a/tests/dataset/NormalizationTypeDataset.h b/tests/dataset/NormalizationTypeDataset.h
index bb1975c6c9..9edadbf8ab 100644
--- a/tests/dataset/NormalizationTypeDataset.h
+++ b/tests/dataset/NormalizationTypeDataset.h
@@ -28,7 +28,7 @@
 
 #ifdef BOOST
 #include "boost_wrapper.h"
-#endif
+#endif /* BOOST */
 
 namespace arm_compute
 {
@@ -54,9 +54,9 @@ public:
     /** Number of samples in the data set. */
 #ifdef BOOST
     boost::unit_test::data::size_t size() const
-#else
+#else  /* BOOST */
     unsigned int size() const
-#endif
+#endif /* BOOST */
     {
         return _types.size();
     }
@@ -77,4 +77,4 @@ private:
 };
 } // namespace test
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_NORMALIZATION_TYPE_DATASET_H__ */
diff --git a/tests/dataset/PoolingLayerDataset.h b/tests/dataset/PoolingLayerDataset.h
index 0a50a763ce..5cdece4f66 100644
--- a/tests/dataset/PoolingLayerDataset.h
+++ b/tests/dataset/PoolingLayerDataset.h
@@ -34,7 +34,7 @@
 
 #ifdef BOOST
 #include "boost_wrapper.h"
-#endif
+#endif /* BOOST */
 
 namespace arm_compute
 {
diff --git a/tests/dataset/PoolingTypesDataset.h b/tests/dataset/PoolingTypesDataset.h
index c78a20b809..c8e34665f4 100644
--- a/tests/dataset/PoolingTypesDataset.h
+++ b/tests/dataset/PoolingTypesDataset.h
@@ -29,7 +29,7 @@
 
 #ifdef BOOST
 #include "boost_wrapper.h"
-#endif
+#endif /* BOOST */
 
 namespace arm_compute
 {
diff --git a/tests/dataset/RoundingPolicyDataset.h b/tests/dataset/RoundingPolicyDataset.h
index c70872020b..0e7c7ba0c5 100644
--- a/tests/dataset/RoundingPolicyDataset.h
+++ b/tests/dataset/RoundingPolicyDataset.h
@@ -30,7 +30,7 @@
 
 #ifdef BOOST
 #include "boost_wrapper.h"
-#endif
+#endif /* BOOST */
 
 namespace arm_compute
 {
@@ -56,9 +56,9 @@ public:
     /** Number of samples in the data set. */
 #ifdef BOOST
     boost::unit_test::data::size_t size() const
-#else
+#else  /* BOOST */
     unsigned int size() const
-#endif
+#endif /* BOOST */
     {
         return _policies.size();
     }
@@ -79,4 +79,4 @@ private:
 };
 } // namespace test
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_ROUNDING_POLICY_DATASETS_H__ */
diff --git a/tests/dataset/ShapeDatasets.h b/tests/dataset/ShapeDatasets.h
index 1e9e5f139a..71c786a641 100644
--- a/tests/dataset/ShapeDatasets.h
+++ b/tests/dataset/ShapeDatasets.h
@@ -30,7 +30,7 @@
 
 #ifdef BOOST
 #include "boost_wrapper.h"
-#endif
+#endif /* BOOST */
 
 namespace arm_compute
 {
@@ -57,9 +57,9 @@ public:
     /** Number of samples in the data set. */
 #ifdef BOOST
     boost::unit_test::data::size_t size() const
-#else
+#else  /* BOOST */
     unsigned int size() const
-#endif
+#endif /* BOOST */
     {
         return _shapes.size();
     }
@@ -149,4 +149,4 @@ public:
 };
 } // namespace test
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_SHAPE_DATASETS_H__ */
diff --git a/tests/dataset/ThresholdDataset.h b/tests/dataset/ThresholdDataset.h
index a2d76e3c48..e5a1e375ff 100644
--- a/tests/dataset/ThresholdDataset.h
+++ b/tests/dataset/ThresholdDataset.h
@@ -38,7 +38,7 @@
 
 #ifdef BOOST
 #include "boost_wrapper.h"
-#endif
+#endif /* BOOST */
 
 namespace arm_compute
 {
@@ -92,4 +92,4 @@ public:
 
 } // namespace test
 } // namespace arm_compute
-#endif //__ARM_COMPUTE_TEST_DATASET_THRESHOLD_DATASET_H__
+#endif /* __ARM_COMPUTE_TEST_DATASET_THRESHOLD_DATASET_H__ */
diff --git a/tests/validation/CL/ActivationLayer.cpp b/tests/validation/CL/ActivationLayer.cpp
index 5d266e60d2..7286b93485 100644
--- a/tests/validation/CL/ActivationLayer.cpp
+++ b/tests/validation/CL/ActivationLayer.cpp
@@ -227,4 +227,4 @@ BOOST_AUTO_TEST_SUITE_END()
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/CL/BitwiseAnd.cpp b/tests/validation/CL/BitwiseAnd.cpp
index c818fc5d98..12e63f84a8 100644
--- a/tests/validation/CL/BitwiseAnd.cpp
+++ b/tests/validation/CL/BitwiseAnd.cpp
@@ -215,4 +215,4 @@ BOOST_DATA_TEST_CASE(RunLarge, LargeShapes(), shape)
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/CL/Box3x3.cpp b/tests/validation/CL/Box3x3.cpp
index 96a0d09ea3..c4660a754a 100644
--- a/tests/validation/CL/Box3x3.cpp
+++ b/tests/validation/CL/Box3x3.cpp
@@ -164,4 +164,4 @@ BOOST_DATA_TEST_CASE(RunLarge, LargeShapes() * BorderModes(), shape, border_mode
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/CL/CLFixture.h b/tests/validation/CL/CLFixture.h
index 138e0566eb..8569948a98 100644
--- a/tests/validation/CL/CLFixture.h
+++ b/tests/validation/CL/CLFixture.h
@@ -45,4 +45,4 @@ struct CLFixture
 } // namespace validation
 } // namespace test
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_VALIDATION_CL_CLFIXTURE_H__ */
diff --git a/tests/validation/CL/ConvolutionLayer.cpp b/tests/validation/CL/ConvolutionLayer.cpp
index 60e8754193..fb06dd4d06 100644
--- a/tests/validation/CL/ConvolutionLayer.cpp
+++ b/tests/validation/CL/ConvolutionLayer.cpp
@@ -151,7 +151,7 @@ BOOST_DATA_TEST_CASE(SmallConvolutionLayer,
     validate(CLAccessor(dst), ref_dst, tolerance_f32);
 }
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* ARM_COMPUTE_ENABLE_FP16 */
 
 BOOST_AUTO_TEST_SUITE(Float)
 BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit"))
@@ -188,4 +188,4 @@ BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/CL/DepthConvert.cpp b/tests/validation/CL/DepthConvert.cpp
index 87fe3814f7..340ddf2562 100644
--- a/tests/validation/CL/DepthConvert.cpp
+++ b/tests/validation/CL/DepthConvert.cpp
@@ -410,4 +410,4 @@ BOOST_AUTO_TEST_SUITE_END()
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/CL/FillBorder.cpp b/tests/validation/CL/FillBorder.cpp
index f6930eed9a..028bd20e1c 100644
--- a/tests/validation/CL/FillBorder.cpp
+++ b/tests/validation/CL/FillBorder.cpp
@@ -87,4 +87,4 @@ BOOST_DATA_TEST_CASE(FillBorder, BorderModes() * boost::unit_test::data::make({
 }
 
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/CL/FixedPoint/FixedPoint_QS8.cpp b/tests/validation/CL/FixedPoint/FixedPoint_QS8.cpp
index bc35de0f22..fb6e6220d9 100644
--- a/tests/validation/CL/FixedPoint/FixedPoint_QS8.cpp
+++ b/tests/validation/CL/FixedPoint/FixedPoint_QS8.cpp
@@ -70,7 +70,7 @@ CLTensor compute_fixed_point_op(const TensorShape &shape, int fixed_point_positi
     std::string fixed_point_operation_kernel;
 #ifndef EMBEDDED_KERNELS
     fixed_point_operation_kernel += "#include \"fixed_point.h\"\n";
-#endif
+#endif /* EMBEDDED_KERNELS */
     fixed_point_operation_kernel +=
         "__kernel void fixed_point_operation_qs8(                                                                 \n"
         "   __global char* src,                                                                                   \n"
@@ -138,7 +138,7 @@ CLTensor compute_fixed_point_op(const TensorShape &shape, int fixed_point_positi
 
 #ifndef EMBEDDED_KERNELS
     build_opts += " -I" + CLKernelLibrary::get().get_kernel_path();
-#else
+#else  /* EMBEDDED_KERNELS */
     sources.push_back(CLKernelLibrary::get().get_program_source("fixed_point.h"));
 #endif /* EMBEDDED_KERNELS */
 
@@ -222,4 +222,4 @@ BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/CL/GEMM.cpp b/tests/validation/CL/GEMM.cpp
index 076364c5ab..f79d84f271 100644
--- a/tests/validation/CL/GEMM.cpp
+++ b/tests/validation/CL/GEMM.cpp
@@ -199,4 +199,4 @@ BOOST_AUTO_TEST_SUITE_END()
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/CL/Gaussian3x3.cpp b/tests/validation/CL/Gaussian3x3.cpp
index bf4684d068..1a1bf82b61 100644
--- a/tests/validation/CL/Gaussian3x3.cpp
+++ b/tests/validation/CL/Gaussian3x3.cpp
@@ -164,4 +164,4 @@ BOOST_DATA_TEST_CASE(RunLarge, LargeShapes() * BorderModes(), shape, border_mode
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/CL/Gaussian5x5.cpp b/tests/validation/CL/Gaussian5x5.cpp
index 827dadd6a6..2ed2d3eaba 100644
--- a/tests/validation/CL/Gaussian5x5.cpp
+++ b/tests/validation/CL/Gaussian5x5.cpp
@@ -164,4 +164,4 @@ BOOST_DATA_TEST_CASE(RunLarge, LargeShapes() * BorderModes(), shape, border_mode
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/CL/IntegralImage.cpp b/tests/validation/CL/IntegralImage.cpp
index e46568e164..c45c03e8ca 100644
--- a/tests/validation/CL/IntegralImage.cpp
+++ b/tests/validation/CL/IntegralImage.cpp
@@ -140,4 +140,4 @@ BOOST_DATA_TEST_CASE(RunLarge, LargeShapes(), shape)
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/CL/NonLinearFilter.cpp b/tests/validation/CL/NonLinearFilter.cpp
index 414a30812d..f89b54c049 100644
--- a/tests/validation/CL/NonLinearFilter.cpp
+++ b/tests/validation/CL/NonLinearFilter.cpp
@@ -201,4 +201,4 @@ BOOST_DATA_TEST_CASE(RunLarge, LargeShapes()
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/CL/PoolingLayer.cpp b/tests/validation/CL/PoolingLayer.cpp
index 5876e8bf23..9b7e27f7c9 100644
--- a/tests/validation/CL/PoolingLayer.cpp
+++ b/tests/validation/CL/PoolingLayer.cpp
@@ -116,4 +116,4 @@ BOOST_AUTO_TEST_SUITE_END()
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/CL/Sobel3x3.cpp b/tests/validation/CL/Sobel3x3.cpp
index 59c21e7758..a70ed803d4 100644
--- a/tests/validation/CL/Sobel3x3.cpp
+++ b/tests/validation/CL/Sobel3x3.cpp
@@ -203,4 +203,4 @@ BOOST_DATA_TEST_CASE(RunLarge, LargeShapes() * BorderModes(), shape, border_mode
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/CL/Sobel5x5.cpp b/tests/validation/CL/Sobel5x5.cpp
index 8beb795969..3e02856f41 100644
--- a/tests/validation/CL/Sobel5x5.cpp
+++ b/tests/validation/CL/Sobel5x5.cpp
@@ -202,4 +202,4 @@ BOOST_DATA_TEST_CASE(RunLarge, LargeShapes() * BorderModes(), shape, border_mode
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/CL/SoftmaxLayer.cpp b/tests/validation/CL/SoftmaxLayer.cpp
index 3f8f465504..43efc04d36 100644
--- a/tests/validation/CL/SoftmaxLayer.cpp
+++ b/tests/validation/CL/SoftmaxLayer.cpp
@@ -191,4 +191,4 @@ BOOST_AUTO_TEST_SUITE_END()
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/CL/Threshold.cpp b/tests/validation/CL/Threshold.cpp
index 4f9e420656..42254c690b 100644
--- a/tests/validation/CL/Threshold.cpp
+++ b/tests/validation/CL/Threshold.cpp
@@ -151,4 +151,4 @@ BOOST_DATA_TEST_CASE(RunLarge,
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/Datasets.h b/tests/validation/Datasets.h
index e33cc62a5e..64918fc4f5 100644
--- a/tests/validation/Datasets.h
+++ b/tests/validation/Datasets.h
@@ -268,4 +268,4 @@ struct is_dataset<arm_compute::test::MatrixPatterns> : boost::mpl::true_
 }
 }
 }
-#endif
+#endif /* __ARM_COMPUTE_TEST_VALIDATION_DATASETS_H__ */
diff --git a/tests/validation/NEON/AbsoluteDifference.cpp b/tests/validation/NEON/AbsoluteDifference.cpp
index 779baa75e6..e083b8d409 100644
--- a/tests/validation/NEON/AbsoluteDifference.cpp
+++ b/tests/validation/NEON/AbsoluteDifference.cpp
@@ -198,4 +198,4 @@ BOOST_AUTO_TEST_SUITE_END()
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/Accumulate.cpp b/tests/validation/NEON/Accumulate.cpp
index f8cc5073a8..249b08dc8e 100644
--- a/tests/validation/NEON/Accumulate.cpp
+++ b/tests/validation/NEON/Accumulate.cpp
@@ -143,4 +143,4 @@ BOOST_DATA_TEST_CASE(RunLarge, LargeShapes(),
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/AccumulateSquared.cpp b/tests/validation/NEON/AccumulateSquared.cpp
index 093ccb49af..770ed8f9c3 100644
--- a/tests/validation/NEON/AccumulateSquared.cpp
+++ b/tests/validation/NEON/AccumulateSquared.cpp
@@ -144,4 +144,4 @@ BOOST_DATA_TEST_CASE(RunLarge, LargeShapes() * boost::unit_test::data::make({ 0U
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/AccumulateWeighted.cpp b/tests/validation/NEON/AccumulateWeighted.cpp
index 8c54076f1b..2d7f12aeb3 100644
--- a/tests/validation/NEON/AccumulateWeighted.cpp
+++ b/tests/validation/NEON/AccumulateWeighted.cpp
@@ -143,4 +143,4 @@ BOOST_DATA_TEST_CASE(RunLarge, LargeShapes() * boost::unit_test::data::make({ 0.
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/ActivationLayer.cpp b/tests/validation/NEON/ActivationLayer.cpp
index 6a84a5367f..40be32278d 100644
--- a/tests/validation/NEON/ActivationLayer.cpp
+++ b/tests/validation/NEON/ActivationLayer.cpp
@@ -249,4 +249,4 @@ BOOST_AUTO_TEST_SUITE_END()
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/ArithmeticAddition.cpp b/tests/validation/NEON/ArithmeticAddition.cpp
index fe998299b8..def203b95f 100644
--- a/tests/validation/NEON/ArithmeticAddition.cpp
+++ b/tests/validation/NEON/ArithmeticAddition.cpp
@@ -225,4 +225,4 @@ BOOST_AUTO_TEST_SUITE_END()
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/ArithmeticSubtraction.cpp b/tests/validation/NEON/ArithmeticSubtraction.cpp
index 35c29638a5..37240faaf6 100644
--- a/tests/validation/NEON/ArithmeticSubtraction.cpp
+++ b/tests/validation/NEON/ArithmeticSubtraction.cpp
@@ -225,4 +225,4 @@ BOOST_AUTO_TEST_SUITE_END()
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/BatchNormalizationLayer.cpp b/tests/validation/NEON/BatchNormalizationLayer.cpp
index 3206b3965d..38e3751db4 100644
--- a/tests/validation/NEON/BatchNormalizationLayer.cpp
+++ b/tests/validation/NEON/BatchNormalizationLayer.cpp
@@ -193,4 +193,4 @@ BOOST_AUTO_TEST_SUITE_END()
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/BitwiseAnd.cpp b/tests/validation/NEON/BitwiseAnd.cpp
index 44d0bd9870..130c94bcbb 100644
--- a/tests/validation/NEON/BitwiseAnd.cpp
+++ b/tests/validation/NEON/BitwiseAnd.cpp
@@ -215,4 +215,4 @@ BOOST_DATA_TEST_CASE(RunLarge, LargeShapes(), shape)
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/BitwiseNot.cpp b/tests/validation/NEON/BitwiseNot.cpp
index d30339e785..3897101165 100644
--- a/tests/validation/NEON/BitwiseNot.cpp
+++ b/tests/validation/NEON/BitwiseNot.cpp
@@ -139,4 +139,4 @@ BOOST_DATA_TEST_CASE(RunLarge, LargeShapes(), shape)
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/BitwiseOr.cpp b/tests/validation/NEON/BitwiseOr.cpp
index 9b47f79bad..78e81dd94c 100644
--- a/tests/validation/NEON/BitwiseOr.cpp
+++ b/tests/validation/NEON/BitwiseOr.cpp
@@ -147,4 +147,4 @@ BOOST_DATA_TEST_CASE(RunLarge, LargeShapes(), shape)
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/BitwiseXor.cpp b/tests/validation/NEON/BitwiseXor.cpp
index 7ab6448e36..41825a5dcb 100644
--- a/tests/validation/NEON/BitwiseXor.cpp
+++ b/tests/validation/NEON/BitwiseXor.cpp
@@ -147,4 +147,4 @@ BOOST_DATA_TEST_CASE(RunLarge, LargeShapes(), shape)
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/Box3x3.cpp b/tests/validation/NEON/Box3x3.cpp
index 0b9c2f082f..00326c36fc 100644
--- a/tests/validation/NEON/Box3x3.cpp
+++ b/tests/validation/NEON/Box3x3.cpp
@@ -165,4 +165,4 @@ BOOST_DATA_TEST_CASE(RunLarge, LargeShapes() * BorderModes(), shape, border_mode
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/ConvolutionLayer.cpp b/tests/validation/NEON/ConvolutionLayer.cpp
index da35442530..128fb8e842 100644
--- a/tests/validation/NEON/ConvolutionLayer.cpp
+++ b/tests/validation/NEON/ConvolutionLayer.cpp
@@ -45,8 +45,8 @@ namespace
 const float tolerance_f32 = 1e-03f; /**< Tolerance value for comparing reference's output against implementation's output for DataType::F32 */
 #ifdef ARM_COMPUTE_ENABLE_FP16
 const float tolerance_f16 = 0.01f; /**< Tolerance value for comparing reference's output against implementation's output for DataType::F16 */
-#endif
-const float tolerance_qs8 = 3.0f; /**< Tolerance value for comparing reference's output against implementation's output for DataType::QS8 */
+#endif                             /* ARM_COMPUTE_ENABLE_FP16 */
+const float tolerance_qs8 = 3.0f;  /**< Tolerance value for comparing reference's output against implementation's output for DataType::QS8 */
 
 Tensor compute_convolution_layer(const TensorShape &input_shape, const TensorShape &weights_shape, const TensorShape &bias_shape, const TensorShape &output_shape, DataType dt,
                                  const PadStrideInfo &conv_info, int fixed_point_position)
@@ -151,7 +151,7 @@ BOOST_DATA_TEST_CASE(SmallConvolutionLayer,
     validate(NEAccessor(dst), ref_dst, tolerance_f16);
 }
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* ARM_COMPUTE_ENABLE_FP16 */
 
 BOOST_AUTO_TEST_SUITE(Float)
 BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit"))
@@ -220,4 +220,4 @@ BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/ConvolutionLayerDirect.cpp b/tests/validation/NEON/ConvolutionLayerDirect.cpp
index 0f5cee6d6d..aeac73c1d6 100644
--- a/tests/validation/NEON/ConvolutionLayerDirect.cpp
+++ b/tests/validation/NEON/ConvolutionLayerDirect.cpp
@@ -214,4 +214,4 @@ BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
\ No newline at end of file
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/DepthConvert.cpp b/tests/validation/NEON/DepthConvert.cpp
index 1aed9dddf5..4a37d98990 100644
--- a/tests/validation/NEON/DepthConvert.cpp
+++ b/tests/validation/NEON/DepthConvert.cpp
@@ -497,4 +497,4 @@ BOOST_AUTO_TEST_SUITE_END()
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/FillBorder.cpp b/tests/validation/NEON/FillBorder.cpp
index 54710923c1..3ce4c6ffc9 100644
--- a/tests/validation/NEON/FillBorder.cpp
+++ b/tests/validation/NEON/FillBorder.cpp
@@ -86,4 +86,4 @@ BOOST_DATA_TEST_CASE(FillBorder, BorderModes() * boost::unit_test::data::make({
 }
 
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/Fixedpoint/Exp_QS16.cpp b/tests/validation/NEON/Fixedpoint/Exp_QS16.cpp
index bb8961af73..f882508756 100644
--- a/tests/validation/NEON/Fixedpoint/Exp_QS16.cpp
+++ b/tests/validation/NEON/Fixedpoint/Exp_QS16.cpp
@@ -120,4 +120,4 @@ BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/Fixedpoint/Exp_QS8.cpp b/tests/validation/NEON/Fixedpoint/Exp_QS8.cpp
index e901f60986..8f01721bc6 100644
--- a/tests/validation/NEON/Fixedpoint/Exp_QS8.cpp
+++ b/tests/validation/NEON/Fixedpoint/Exp_QS8.cpp
@@ -120,4 +120,4 @@ BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/Fixedpoint/Invsqrt_QS16.cpp b/tests/validation/NEON/Fixedpoint/Invsqrt_QS16.cpp
index fc79db08aa..dd51421072 100644
--- a/tests/validation/NEON/Fixedpoint/Invsqrt_QS16.cpp
+++ b/tests/validation/NEON/Fixedpoint/Invsqrt_QS16.cpp
@@ -120,4 +120,4 @@ BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/Fixedpoint/Invsqrt_QS8.cpp b/tests/validation/NEON/Fixedpoint/Invsqrt_QS8.cpp
index 78719d1290..0af86debcb 100644
--- a/tests/validation/NEON/Fixedpoint/Invsqrt_QS8.cpp
+++ b/tests/validation/NEON/Fixedpoint/Invsqrt_QS8.cpp
@@ -118,4 +118,4 @@ BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/Fixedpoint/Log_QS16.cpp b/tests/validation/NEON/Fixedpoint/Log_QS16.cpp
index f7a9bc8ccc..f81f35967e 100644
--- a/tests/validation/NEON/Fixedpoint/Log_QS16.cpp
+++ b/tests/validation/NEON/Fixedpoint/Log_QS16.cpp
@@ -119,4 +119,4 @@ BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/Fixedpoint/Log_QS8.cpp b/tests/validation/NEON/Fixedpoint/Log_QS8.cpp
index 8cdbd30867..4a4738e105 100644
--- a/tests/validation/NEON/Fixedpoint/Log_QS8.cpp
+++ b/tests/validation/NEON/Fixedpoint/Log_QS8.cpp
@@ -119,4 +119,4 @@ BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/Fixedpoint/Reciprocal_QS16.cpp b/tests/validation/NEON/Fixedpoint/Reciprocal_QS16.cpp
index 1ef73e2847..15fc6eeb21 100644
--- a/tests/validation/NEON/Fixedpoint/Reciprocal_QS16.cpp
+++ b/tests/validation/NEON/Fixedpoint/Reciprocal_QS16.cpp
@@ -119,4 +119,4 @@ BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/Fixedpoint/Reciprocal_QS8.cpp b/tests/validation/NEON/Fixedpoint/Reciprocal_QS8.cpp
index 9c33a9ebcb..b42f13ae47 100644
--- a/tests/validation/NEON/Fixedpoint/Reciprocal_QS8.cpp
+++ b/tests/validation/NEON/Fixedpoint/Reciprocal_QS8.cpp
@@ -119,4 +119,4 @@ BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/FullyConnectedLayer.cpp b/tests/validation/NEON/FullyConnectedLayer.cpp
index 69ff663193..ae0d94a53c 100644
--- a/tests/validation/NEON/FullyConnectedLayer.cpp
+++ b/tests/validation/NEON/FullyConnectedLayer.cpp
@@ -219,4 +219,4 @@ BOOST_AUTO_TEST_SUITE_END()
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/GEMM.cpp b/tests/validation/NEON/GEMM.cpp
index 75ce39716c..4174de0cc8 100644
--- a/tests/validation/NEON/GEMM.cpp
+++ b/tests/validation/NEON/GEMM.cpp
@@ -217,4 +217,4 @@ BOOST_AUTO_TEST_SUITE_END()
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/Gaussian3x3.cpp b/tests/validation/NEON/Gaussian3x3.cpp
index 40ccfe070c..b303d5a6d4 100644
--- a/tests/validation/NEON/Gaussian3x3.cpp
+++ b/tests/validation/NEON/Gaussian3x3.cpp
@@ -165,4 +165,4 @@ BOOST_DATA_TEST_CASE(RunLarge, LargeShapes() * BorderModes(), shape, border_mode
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/Gaussian5x5.cpp b/tests/validation/NEON/Gaussian5x5.cpp
index f8771fb1a4..e094ee57b9 100644
--- a/tests/validation/NEON/Gaussian5x5.cpp
+++ b/tests/validation/NEON/Gaussian5x5.cpp
@@ -167,4 +167,4 @@ BOOST_DATA_TEST_CASE(RunLarge, LargeShapes() * BorderModes(), shape, border_mode
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/IntegralImage.cpp b/tests/validation/NEON/IntegralImage.cpp
index e20eba6e70..ad6ba4b618 100644
--- a/tests/validation/NEON/IntegralImage.cpp
+++ b/tests/validation/NEON/IntegralImage.cpp
@@ -142,4 +142,4 @@ BOOST_DATA_TEST_CASE(RunLarge, LargeShapes(), shape)
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/MeanStdDev.cpp b/tests/validation/NEON/MeanStdDev.cpp
index 91de5b6175..1598bd893c 100644
--- a/tests/validation/NEON/MeanStdDev.cpp
+++ b/tests/validation/NEON/MeanStdDev.cpp
@@ -141,4 +141,4 @@ BOOST_DATA_TEST_CASE(RunLarge, Large2DShapes(), shape)
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/NonLinearFilter.cpp b/tests/validation/NEON/NonLinearFilter.cpp
index 5da7812a34..eb2e80712a 100644
--- a/tests/validation/NEON/NonLinearFilter.cpp
+++ b/tests/validation/NEON/NonLinearFilter.cpp
@@ -201,4 +201,4 @@ BOOST_DATA_TEST_CASE(RunLarge, LargeShapes()
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/NormalizationLayer.cpp b/tests/validation/NEON/NormalizationLayer.cpp
index 65adaf5a3f..a8ba7dac55 100644
--- a/tests/validation/NEON/NormalizationLayer.cpp
+++ b/tests/validation/NEON/NormalizationLayer.cpp
@@ -150,4 +150,4 @@ BOOST_AUTO_TEST_SUITE_END()
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/PixelWiseMultiplication.cpp b/tests/validation/NEON/PixelWiseMultiplication.cpp
index 83525170c7..f52489fa5b 100644
--- a/tests/validation/NEON/PixelWiseMultiplication.cpp
+++ b/tests/validation/NEON/PixelWiseMultiplication.cpp
@@ -425,4 +425,4 @@ BOOST_AUTO_TEST_SUITE_END()
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/PoolingLayer.cpp b/tests/validation/NEON/PoolingLayer.cpp
index 9991437a2f..925c1ea7c1 100644
--- a/tests/validation/NEON/PoolingLayer.cpp
+++ b/tests/validation/NEON/PoolingLayer.cpp
@@ -164,4 +164,4 @@ BOOST_AUTO_TEST_SUITE_END()
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/ROIPoolingLayer.cpp b/tests/validation/NEON/ROIPoolingLayer.cpp
index 08b051e9c9..cc8c873cc9 100644
--- a/tests/validation/NEON/ROIPoolingLayer.cpp
+++ b/tests/validation/NEON/ROIPoolingLayer.cpp
@@ -106,4 +106,4 @@ BOOST_AUTO_TEST_SUITE_END()
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/Sobel3x3.cpp b/tests/validation/NEON/Sobel3x3.cpp
index 3b69b2b898..ded9e737f3 100644
--- a/tests/validation/NEON/Sobel3x3.cpp
+++ b/tests/validation/NEON/Sobel3x3.cpp
@@ -202,4 +202,4 @@ BOOST_DATA_TEST_CASE(RunLarge, LargeShapes() * BorderModes(), shape, border_mode
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/Sobel5x5.cpp b/tests/validation/NEON/Sobel5x5.cpp
index 456e675643..d0d252f214 100644
--- a/tests/validation/NEON/Sobel5x5.cpp
+++ b/tests/validation/NEON/Sobel5x5.cpp
@@ -202,4 +202,4 @@ BOOST_DATA_TEST_CASE(RunLarge, LargeShapes() * BorderModes(), shape, border_mode
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/SoftmaxLayer.cpp b/tests/validation/NEON/SoftmaxLayer.cpp
index 389d44814d..549463962a 100644
--- a/tests/validation/NEON/SoftmaxLayer.cpp
+++ b/tests/validation/NEON/SoftmaxLayer.cpp
@@ -193,4 +193,4 @@ BOOST_AUTO_TEST_SUITE_END()
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/NEON/Threshold.cpp b/tests/validation/NEON/Threshold.cpp
index 923245ed45..0ae495a4e3 100644
--- a/tests/validation/NEON/Threshold.cpp
+++ b/tests/validation/NEON/Threshold.cpp
@@ -151,4 +151,4 @@ BOOST_DATA_TEST_CASE(RunLarge,
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/Reference.h b/tests/validation/Reference.h
index ebd5fa76c4..cbdeb012ce 100644
--- a/tests/validation/Reference.h
+++ b/tests/validation/Reference.h
@@ -370,4 +370,4 @@ protected:
 } // namespace validation
 } // namespace test
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_REFERENCE_REFERENCE_H__ */
diff --git a/tests/validation/ReferenceCPP.h b/tests/validation/ReferenceCPP.h
index e7567aea95..10e5ab6bc6 100644
--- a/tests/validation/ReferenceCPP.h
+++ b/tests/validation/ReferenceCPP.h
@@ -314,4 +314,4 @@ private:
 } // namespace validation
 } // namespace test
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_REFERENCE_REFERENCE_CPP_H__ */
diff --git a/tests/validation/TensorFactory.h b/tests/validation/TensorFactory.h
index d842baddde..2f33dd283d 100644
--- a/tests/validation/TensorFactory.h
+++ b/tests/validation/TensorFactory.h
@@ -32,7 +32,7 @@
 
 #if ARM_COMPUTE_ENABLE_FP16
 #include <arm_fp16.h> // needed for float16_t
-#endif
+#endif                /* ARM_COMPUTE_ENABLE_FP16 */
 
 namespace arm_compute
 {
@@ -45,7 +45,7 @@ using TensorVariant = boost::variant < Tensor<uint8_t>, Tensor<int8_t>,
       Tensor<uint32_t>, Tensor<int32_t>,
 #ifdef ARM_COMPUTE_ENABLE_FP16
       Tensor<float16_t>,
-#endif
+#endif /* ARM_COMPUTE_ENABLE_FP16 */
       Tensor<float >>;
 
 /** Helper to create a constant type if the passed reference is constant. */
@@ -100,7 +100,7 @@ public:
                 using value_type_f16 = typename match_const<R, float16_t>::type;
                 v                    = Tensor<float16_t>(shape, dt, fixed_point_position, reinterpret_cast<value_type_f16 *>(data));
                 break;
-#endif
+#endif /* ARM_COMPUTE_ENABLE_FP16 */
             case DataType::F32:
                 using value_type_f32 = typename match_const<R, float>::type;
                 v                    = Tensor<float>(shape, dt, fixed_point_position, reinterpret_cast<value_type_f32 *>(data));
diff --git a/tests/validation/TensorOperations.h b/tests/validation/TensorOperations.h
index fbc69bc4d5..488ffa90d9 100644
--- a/tests/validation/TensorOperations.h
+++ b/tests/validation/TensorOperations.h
@@ -57,9 +57,9 @@ template <class T>
 struct is_floating_point
     : std::integral_constant < bool,
       std::is_same<float, typename std::remove_cv<T>::type>::value ||
-#if ARM_COMPUTE_ENABLE_FP16
+#ifdef ARM_COMPUTE_ENABLE_FP16
       std::is_same<float16_t, typename std::remove_cv<T>::type>::value ||
-#endif
+#endif /* ARM_COMPUTE_ENABLE_FP16 */
       std::is_same<double, typename std::remove_cv<T>::type>::value || std::is_same<long double, typename std::remove_cv<T>::type>::value >
 {
 };
diff --git a/tests/validation/UNIT/FixedPoint.cpp b/tests/validation/UNIT/FixedPoint.cpp
index 0cac9bda9d..00cab9eb29 100644
--- a/tests/validation/UNIT/FixedPoint.cpp
+++ b/tests/validation/UNIT/FixedPoint.cpp
@@ -161,4 +161,4 @@ BOOST_DATA_TEST_CASE(FixedPointQS8Outputs, (boost::unit_test::data::make(func_na
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/UNIT/TensorInfo.cpp b/tests/validation/UNIT/TensorInfo.cpp
index 11ed9f6dcc..c74cfebfe4 100644
--- a/tests/validation/UNIT/TensorInfo.cpp
+++ b/tests/validation/UNIT/TensorInfo.cpp
@@ -88,4 +88,4 @@ shape, auto_padding, strides, offset)
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/UNIT/TensorShape.cpp b/tests/validation/UNIT/TensorShape.cpp
index 2d78cd549a..4c1ef680b5 100644
--- a/tests/validation/UNIT/TensorShape.cpp
+++ b/tests/validation/UNIT/TensorShape.cpp
@@ -67,4 +67,4 @@ BOOST_DATA_TEST_CASE(SetEmpty, boost::unit_test::data::make({ 0, 1, 2, 3, 4, 5 }
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/UNIT/Utils.cpp b/tests/validation/UNIT/Utils.cpp
index 69523a5620..e28ca19620 100644
--- a/tests/validation/UNIT/Utils.cpp
+++ b/tests/validation/UNIT/Utils.cpp
@@ -68,7 +68,7 @@ BOOST_DATA_TEST_CASE(Index2CoordFail, boost::unit_test::data::make({ TensorShape
 {
     BOOST_CHECK_THROW(index2coord(shape, index), std::runtime_error);
 }
-#endif
+#endif /* 0 */
 
 BOOST_TEST_DECORATOR(*boost::unit_test::label("precommit") * boost::unit_test::label("nightly"))
 BOOST_DATA_TEST_CASE(Coord2Index, boost::unit_test::data::make({ TensorShape{ 1U }, TensorShape{ 2U }, TensorShape{ 2U, 3U } }) ^ boost::unit_test::data::make({ Coordinates{ 0 }, Coordinates{ 1 }, Coordinates{ 0, 1 } })
@@ -87,8 +87,8 @@ BOOST_DATA_TEST_CASE(Coord2IndexFail, boost::unit_test::data::make({ TensorShape
 {
     BOOST_CHECK_THROW(coord2index(shape, coordinate), std::runtime_error);
 }
-#endif
+#endif /* 0 */
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
diff --git a/tests/validation/Validation.cpp b/tests/validation/Validation.cpp
index 0092e4dfed..f65f22935f 100644
--- a/tests/validation/Validation.cpp
+++ b/tests/validation/Validation.cpp
@@ -40,9 +40,9 @@
 #include <cstdint>
 #include <iomanip>
 
-#if ARM_COMPUTE_ENABLE_FP16
+#ifdef ARM_COMPUTE_ENABLE_FP16
 #include <arm_fp16.h> // needed for float16_t
-#endif
+#endif                /* ARM_COMPUTE_ENABLE_FP16 */
 
 namespace arm_compute
 {
@@ -88,10 +88,10 @@ double get_double_data(const void *ptr, DataType data_type)
             return *reinterpret_cast<const uint64_t *>(ptr);
         case DataType::S64:
             return *reinterpret_cast<const int64_t *>(ptr);
-#if ARM_COMPUTE_ENABLE_FP16
+#ifdef ARM_COMPUTE_ENABLE_FP16
         case DataType::F16:
             return *reinterpret_cast<const float16_t *>(ptr);
-#endif
+#endif /* ARM_COMPUTE_ENABLE_FP16 */
         case DataType::F32:
             return *reinterpret_cast<const float *>(ptr);
         case DataType::F64:
diff --git a/tests/validation/Validation.h b/tests/validation/Validation.h
index 2eb79dda8f..e833ae4322 100644
--- a/tests/validation/Validation.h
+++ b/tests/validation/Validation.h
@@ -131,4 +131,4 @@ void validate(float target, float ref, float tolerance_abs_error = std::numeric_
 } // namespace validation
 } // namespace test
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_REFERENCE_VALIDATION_H__ */
diff --git a/tests/validation/ValidationProgramOptions.h b/tests/validation/ValidationProgramOptions.h
index bf30db960d..6b29b807de 100644
--- a/tests/validation/ValidationProgramOptions.h
+++ b/tests/validation/ValidationProgramOptions.h
@@ -42,4 +42,4 @@ public:
 } // namespace validation
 } // namespace test
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_VALIDATION_PROGRAM_OPTIONS_H__ */
diff --git a/tests/validation/ValidationUserConfiguration.h b/tests/validation/ValidationUserConfiguration.h
index 28b58e8375..a9b8b4fe40 100644
--- a/tests/validation/ValidationUserConfiguration.h
+++ b/tests/validation/ValidationUserConfiguration.h
@@ -39,4 +39,4 @@ using ValidationUserConfiguration = UserConfiguration;
 extern validation::ValidationUserConfiguration user_config;
 } // namespace test
 } // namespace arm_compute
-#endif
+#endif /* __ARM_COMPUTE_TEST_REFERENCE_VALIDATION_USER_CONFIGURATION_H__ */
diff --git a/tests/validation/system_tests/CL/AlexNet.cpp b/tests/validation/system_tests/CL/AlexNet.cpp
index bbbe4cde6e..a7c6ea4640 100644
--- a/tests/validation/system_tests/CL/AlexNet.cpp
+++ b/tests/validation/system_tests/CL/AlexNet.cpp
@@ -106,5 +106,5 @@ BOOST_AUTO_TEST_CASE(AlexNet)
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
 #endif /* INTERNAL_ONLY */
diff --git a/tests/validation/system_tests/CL/LeNet5.cpp b/tests/validation/system_tests/CL/LeNet5.cpp
index c05690d62a..42c5bd5a7b 100644
--- a/tests/validation/system_tests/CL/LeNet5.cpp
+++ b/tests/validation/system_tests/CL/LeNet5.cpp
@@ -89,5 +89,5 @@ BOOST_AUTO_TEST_CASE(LeNet5)
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
 #endif /* INTERNAL_ONLY */
diff --git a/tests/validation/system_tests/NEON/AlexNet.cpp b/tests/validation/system_tests/NEON/AlexNet.cpp
index 1bb17d4c9b..365689242b 100644
--- a/tests/validation/system_tests/NEON/AlexNet.cpp
+++ b/tests/validation/system_tests/NEON/AlexNet.cpp
@@ -107,5 +107,5 @@ BOOST_AUTO_TEST_CASE(AlexNet)
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
 #endif /* INTERNAL_ONLY */
diff --git a/tests/validation/system_tests/NEON/LeNet5.cpp b/tests/validation/system_tests/NEON/LeNet5.cpp
index 5a311ef6dd..fedc119cb3 100644
--- a/tests/validation/system_tests/NEON/LeNet5.cpp
+++ b/tests/validation/system_tests/NEON/LeNet5.cpp
@@ -89,5 +89,5 @@ BOOST_AUTO_TEST_CASE(LeNet5)
 
 BOOST_AUTO_TEST_SUITE_END()
 BOOST_AUTO_TEST_SUITE_END()
-#endif
+#endif /* DOXYGEN_SKIP_THIS */
 #endif /* INTERNAL_ONLY */