Clean header in benchmarks and tests

AntoinePrv · AntoinePrv · commit 2f372af652dc · 2026-05-13T15:04:22.000+02:00
diff --git a/benchmark/main.cpp b/benchmark/main.cpp
@@ -9,12 +9,12 @@
  * The full license is in the file LICENSE, distributed with this software. *
  ****************************************************************************/
 
+#include "xsimd_benchmark.hpp"
+
 #include <iostream>
 #include <map>
 #include <string>
 
-#include "xsimd_benchmark.hpp"
-
 void benchmark_operation()
 {
     // std::size_t size = 9984;
diff --git a/benchmark/xsimd_benchmark.hpp b/benchmark/xsimd_benchmark.hpp
@@ -14,6 +14,7 @@
 
 #include "xsimd/arch/xsimd_scalar.hpp"
 #include "xsimd/xsimd.hpp"
+
 #include <chrono>
 #include <string>
 #include <vector>
diff --git a/examples/mandelbrot.cpp b/examples/mandelbrot.cpp
@@ -13,15 +13,15 @@
 // https://github.com/ospray/tsimd/blob/master/benchmarks/mandelbrot.cpp
 // Author Jefferson Amstutz / intel
 
+#include "pico_bench.hpp"
+
+#include <xsimd/xsimd.hpp>
+
 #include <cstdio>
 #include <iostream>
 #include <string>
 #include <vector>
 
-#include "pico_bench.hpp"
-
-#include <xsimd/xsimd.hpp>
-
 // helper function to write the rendered image as PPM file
 inline void writePPM(const std::string& fileName,
                      const int sizeX,
diff --git a/test/doc/explicit_use_of_an_instruction_set.cpp b/test/doc/explicit_use_of_an_instruction_set.cpp
@@ -1,4 +1,5 @@
 #include "xsimd/xsimd.hpp"
+
 #include <iostream>
 
 namespace xs = xsimd;
diff --git a/test/doc/explicit_use_of_an_instruction_set_mean.cpp b/test/doc/explicit_use_of_an_instruction_set_mean.cpp
@@ -1,4 +1,5 @@
 #include "xsimd/xsimd.hpp"
+
 #include <cstddef>
 #include <vector>
 
diff --git a/test/doc/explicit_use_of_an_instruction_set_mean_aligned.cpp b/test/doc/explicit_use_of_an_instruction_set_mean_aligned.cpp
@@ -1,4 +1,5 @@
 #include "xsimd/xsimd.hpp"
+
 #include <cstddef>
 #include <vector>
 
diff --git a/test/doc/explicit_use_of_an_instruction_set_mean_arch_independent.cpp b/test/doc/explicit_use_of_an_instruction_set_mean_arch_independent.cpp
@@ -1,4 +1,5 @@
 #include "xsimd/xsimd.hpp"
+
 #include <cstddef>
 
 struct mean
diff --git a/test/doc/explicit_use_of_an_instruction_set_mean_tag_dispatch.cpp b/test/doc/explicit_use_of_an_instruction_set_mean_tag_dispatch.cpp
@@ -1,4 +1,5 @@
 #include "xsimd/xsimd.hpp"
+
 #include <cstddef>
 
 template <class C, class Tag>
diff --git a/test/main.cpp b/test/main.cpp
@@ -10,11 +10,11 @@
  ****************************************************************************/
 #ifndef EMSCRIPTEN
 #define DOCTEST_CONFIG_IMPLEMENT_WITH_MAIN
-#include "doctest/doctest.h"
+#include <doctest/doctest.h>
 #else
 
 #define DOCTEST_CONFIG_IMPLEMENT
-#include "doctest/doctest.h"
+#include <doctest/doctest.h>
 #include <emscripten/bind.h>
 
 int run_tests()
@@ -28,4 +28,4 @@ EMSCRIPTEN_BINDINGS(my_module)
     emscripten::function("run_tests", &run_tests);
 }
 
-#endif
+#endif
diff --git a/test/test_api.cpp b/test/test_api.cpp
@@ -12,12 +12,12 @@
 #include "xsimd/xsimd.hpp"
 #ifndef XSIMD_NO_SUPPORTED_ARCHITECTURE
 
+#include "test_utils.hpp"
+
 #include <functional>
 #include <numeric>
 #include <random>
 
-#include "test_utils.hpp"
-
 template <class B>
 struct xsimd_api_test
 {
diff --git a/test/test_arch.cpp b/test/test_arch.cpp
@@ -12,12 +12,12 @@
 #include "xsimd/xsimd.hpp"
 #ifndef XSIMD_NO_SUPPORTED_ARCHITECTURE
 
-#include <numeric>
-#include <type_traits>
-
 #include "test_sum.hpp"
 #include "test_utils.hpp"
 
+#include <numeric>
+#include <type_traits>
+
 #ifndef XSIMD_DEFAULT_ARCH
 static_assert(xsimd::default_arch::supported(), "default arch must be supported");
 static_assert(std::is_same<xsimd::default_arch, xsimd::best_arch>::value, "default arch is the best available");
diff --git a/test/test_batch.cpp b/test/test_batch.cpp
@@ -12,13 +12,13 @@
 #include "xsimd/xsimd.hpp"
 #ifndef XSIMD_NO_SUPPORTED_ARCHITECTURE
 
+#include "test_utils.hpp"
+
 #include <cmath>
 #include <functional>
 #include <numeric>
 #include <sstream>
 
-#include "test_utils.hpp"
-
 using namespace std::placeholders;
 
 template <class B>
diff --git a/test/test_batch_bool.cpp b/test/test_batch_bool.cpp
@@ -12,13 +12,13 @@
 #include "xsimd/xsimd.hpp"
 #ifndef XSIMD_NO_SUPPORTED_ARCHITECTURE
 
+#include "test_utils.hpp"
+
 #include <array>
 #include <functional>
 #include <type_traits>
 #include <vector>
 
-#include "test_utils.hpp"
-
 namespace xsimd
 {
 
diff --git a/test/test_batch_complex.cpp b/test/test_batch_complex.cpp
@@ -12,12 +12,12 @@
 #include "xsimd/xsimd.hpp"
 #ifndef XSIMD_NO_SUPPORTED_ARCHITECTURE
 
+#include "test_utils.hpp"
+
 #include <cmath>
 #include <functional>
 #include <numeric>
 
-#include "test_utils.hpp"
-
 using namespace std::placeholders;
 
 template <class B>
diff --git a/test/test_batch_constant.cpp b/test/test_batch_constant.cpp
@@ -9,9 +9,9 @@
  * The full license is in the file LICENSE, distributed with this software. *
  ****************************************************************************/
 
-#include <numeric>
-
 #include "xsimd/xsimd.hpp"
+
+#include <numeric>
 #ifndef XSIMD_NO_SUPPORTED_ARCHITECTURE
 
 #include "test_utils.hpp"
diff --git a/test/test_cpu_features.cpp b/test/test_cpu_features.cpp
@@ -9,15 +9,15 @@
  * The full license is in the file LICENSE, distributed with this software. *
  ****************************************************************************/
 
+#include "xsimd/xsimd.hpp"
+
+#include <doctest/doctest.h>
+
 #include <algorithm>
 #include <array>
 #include <cstdlib>
 #include <string>
 
-#include <doctest/doctest.h>
-
-#include "xsimd/xsimd.hpp"
-
 #define CHECK_IMPLICATION(a, b) CHECK_UNARY(!(a) || (b))
 
 namespace detail
diff --git a/test/test_custom_default_arch.cpp b/test/test_custom_default_arch.cpp
@@ -11,10 +11,11 @@
 #ifdef __STSE2__
 
 #define XSIMD_DEFAULT_ARCH xsimd::sse2
-#include "xsimd/xsimd.hpp"
 
 #include "test_utils.hpp"
 
+#include "xsimd/xsimd.hpp"
+
 // Could be different than sse2 if we compile for other architecture avx
 static_assert(std::is_same<xsimd::default_arch, xsimd::sse2>::value, "default arch correctly hooked");
 
diff --git a/test/test_gnu_source.cpp b/test/test_gnu_source.cpp
@@ -17,7 +17,7 @@
 #endif
 #include "xsimd/xsimd.hpp"
 
-#include "doctest/doctest.h"
+#include <doctest/doctest.h>
 
 TEST_CASE("[GNU_SOURCE support]")
 {
diff --git a/test/test_load_store.cpp b/test/test_load_store.cpp
@@ -12,12 +12,12 @@
 #include "xsimd/xsimd.hpp"
 #ifndef XSIMD_NO_SUPPORTED_ARCHITECTURE
 
+#include "test_utils.hpp"
+
 #include <algorithm>
 #include <random>
 #include <type_traits>
 
-#include "test_utils.hpp"
-
 template <class B>
 struct load_store_test
 {
diff --git a/test/test_memory.cpp b/test/test_memory.cpp
@@ -12,14 +12,14 @@
 #include "xsimd/xsimd.hpp"
 #ifndef XSIMD_NO_SUPPORTED_ARCHITECTURE
 
-#include <type_traits>
-#include <vector>
-
-#include "doctest/doctest.h"
-
 #include "xsimd/memory/xsimd_aligned_allocator.hpp"
 #include "xsimd/memory/xsimd_alignment.hpp"
 
+#include <doctest/doctest.h>
+
+#include <type_traits>
+#include <vector>
+
 struct mock_container
 {
 };
diff --git a/test/test_shuffle.cpp b/test/test_shuffle.cpp
@@ -9,9 +9,9 @@
  * The full license is in the file LICENSE, distributed with this software. *
  ****************************************************************************/
 
-#include <vector>
-
 #include "xsimd/xsimd.hpp"
+
+#include <vector>
 #ifndef XSIMD_NO_SUPPORTED_ARCHITECTURE
 
 #include "test_utils.hpp"
diff --git a/test/test_utils.hpp b/test/test_utils.hpp
@@ -11,6 +11,8 @@
 
 #include "xsimd/xsimd.hpp"
 
+#include <doctest/doctest.h>
+
 #include <array>
 #include <cmath>
 #include <complex>
@@ -21,8 +23,6 @@
 #include <type_traits>
 #include <vector>
 
-#include "doctest/doctest.h"
-
 #ifndef XSIMD_TEST_UTILS_HPP
 #define XSIMD_TEST_UTILS_HPP
 
diff --git a/test/test_utils_bits.cpp b/test/test_utils_bits.cpp
@@ -9,11 +9,11 @@
  * The full license is in the file LICENSE, distributed with this software. *
  ***************************************************************************/
 
-#include <cstdint>
+#include "xsimd/utils/bits.hpp"
 
 #include <doctest/doctest.h>
 
-#include "xsimd/utils/bits.hpp"
+#include <cstdint>
 
 TEST_CASE("[utils::make_bit_mask] single bit")
 {
diff --git a/test/test_xsimd_api.cpp b/test/test_xsimd_api.cpp
@@ -12,7 +12,7 @@
 #include "xsimd/types/xsimd_utils.hpp"
 #include "xsimd/xsimd.hpp"
 
-#include "doctest/doctest.h"
+#include <doctest/doctest.h>
 
 template <class T>
 struct scalar_type

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#include "xsimd/xsimd.hpp"`
	`2`	`+`
`2`	`3`	`#include <iostream>`
`3`	`4`
`4`	`5`	`namespace xs = xsimd;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`#include "xsimd/xsimd.hpp"`
	`2`	`+`
`2`	`3`	`#include <cstddef>`
`3`	`4`	`#include <vector>`
`4`	`5`