From bc60ab6a77a3edb30cbafb1325a6626afdbacbb4 Mon Sep 17 00:00:00 2001 From: AntoinePrv Date: Wed, 6 May 2026 15:43:44 +0200 Subject: [PATCH] Uniform header inclusion --- .../arch/common/xsimd_common_logical.hpp | 4 +- .../xsimd/arch/common/xsimd_common_math.hpp | 4 +- .../xsimd/arch/common/xsimd_common_trigo.hpp | 4 +- include/xsimd/arch/xsimd_avx2.hpp | 3 +- include/xsimd/arch/xsimd_scalar.hpp | 2 +- include/xsimd/arch/xsimd_sse3.hpp | 3 +- include/xsimd/arch/xsimd_vsx.hpp | 5 +- include/xsimd/memory/xsimd_alignment.hpp | 2 +- include/xsimd/types/xsimd_all_registers.hpp | 62 +++++++++---------- include/xsimd/types/xsimd_neon64_register.hpp | 2 +- include/xsimd/types/xsimd_sve_register.hpp | 4 +- include/xsimd/types/xsimd_wasm_register.hpp | 4 +- include/xsimd/xsimd.hpp | 18 +++--- test/test_shuffle.cpp | 2 +- 14 files changed, 60 insertions(+), 59 deletions(-) diff --git a/include/xsimd/arch/common/xsimd_common_logical.hpp b/include/xsimd/arch/common/xsimd_common_logical.hpp index 6ee5218aa..7c1a5e507 100644 --- a/include/xsimd/arch/common/xsimd_common_logical.hpp +++ b/include/xsimd/arch/common/xsimd_common_logical.hpp @@ -12,11 +12,11 @@ #ifndef XSIMD_COMMON_LOGICAL_HPP #define XSIMD_COMMON_LOGICAL_HPP +#include + #include "./xsimd_common_bit.hpp" #include "./xsimd_common_details.hpp" -#include - namespace xsimd { diff --git a/include/xsimd/arch/common/xsimd_common_math.hpp b/include/xsimd/arch/common/xsimd_common_math.hpp index 7dbb0ac05..7f44a428c 100644 --- a/include/xsimd/arch/common/xsimd_common_math.hpp +++ b/include/xsimd/arch/common/xsimd_common_math.hpp @@ -12,12 +12,12 @@ #ifndef XSIMD_COMMON_MATH_HPP #define XSIMD_COMMON_MATH_HPP +#include + #include "../xsimd_scalar.hpp" #include "./xsimd_common_details.hpp" #include "./xsimd_common_trigo.hpp" -#include - namespace xsimd { diff --git a/include/xsimd/arch/common/xsimd_common_trigo.hpp b/include/xsimd/arch/common/xsimd_common_trigo.hpp index d85511d2e..1939b5196 100644 --- a/include/xsimd/arch/common/xsimd_common_trigo.hpp +++ b/include/xsimd/arch/common/xsimd_common_trigo.hpp @@ -12,10 +12,10 @@ #ifndef XSIMD_COMMON_TRIGO_HPP #define XSIMD_COMMON_TRIGO_HPP -#include "./xsimd_common_details.hpp" - #include +#include "./xsimd_common_details.hpp" + namespace xsimd { diff --git a/include/xsimd/arch/xsimd_avx2.hpp b/include/xsimd/arch/xsimd_avx2.hpp index ebffd910b..dd348d871 100644 --- a/include/xsimd/arch/xsimd_avx2.hpp +++ b/include/xsimd/arch/xsimd_avx2.hpp @@ -13,14 +13,13 @@ #define XSIMD_AVX2_HPP #include +#include #include #include "../types/xsimd_avx2_register.hpp" #include "../types/xsimd_batch_constant.hpp" #include "./utils/shifts.hpp" -#include - namespace xsimd { diff --git a/include/xsimd/arch/xsimd_scalar.hpp b/include/xsimd/arch/xsimd_scalar.hpp index 5cf38b71c..5443d69f6 100644 --- a/include/xsimd/arch/xsimd_scalar.hpp +++ b/include/xsimd/arch/xsimd_scalar.hpp @@ -20,7 +20,7 @@ #include #include -#include "xsimd/config/xsimd_macros.hpp" +#include "../config/xsimd_macros.hpp" #ifdef XSIMD_ENABLE_XTL_COMPLEX #include "xtl/xcomplex.hpp" diff --git a/include/xsimd/arch/xsimd_sse3.hpp b/include/xsimd/arch/xsimd_sse3.hpp index 3ece0ae3b..b65d430b2 100644 --- a/include/xsimd/arch/xsimd_sse3.hpp +++ b/include/xsimd/arch/xsimd_sse3.hpp @@ -12,9 +12,10 @@ #ifndef XSIMD_SSE3_HPP #define XSIMD_SSE3_HPP -#include "../types/xsimd_sse3_register.hpp" #include +#include "../types/xsimd_sse3_register.hpp" + namespace xsimd { diff --git a/include/xsimd/arch/xsimd_vsx.hpp b/include/xsimd/arch/xsimd_vsx.hpp index 7af3ef807..19c0761dc 100644 --- a/include/xsimd/arch/xsimd_vsx.hpp +++ b/include/xsimd/arch/xsimd_vsx.hpp @@ -15,11 +15,12 @@ #include #include +#include + +#include "../types/xsimd_batch_fwd.hpp" #include "../types/xsimd_vsx_register.hpp" #include "./common/xsimd_common_cast.hpp" -#include - namespace xsimd { template diff --git a/include/xsimd/memory/xsimd_alignment.hpp b/include/xsimd/memory/xsimd_alignment.hpp index fd1918bea..30c2d16de 100644 --- a/include/xsimd/memory/xsimd_alignment.hpp +++ b/include/xsimd/memory/xsimd_alignment.hpp @@ -13,7 +13,7 @@ #define XSIMD_ALIGNMENT_HPP #include "../types/xsimd_utils.hpp" -#include "xsimd_aligned_allocator.hpp" +#include "./xsimd_aligned_allocator.hpp" namespace xsimd { diff --git a/include/xsimd/types/xsimd_all_registers.hpp b/include/xsimd/types/xsimd_all_registers.hpp index 69697ac7b..af693132f 100644 --- a/include/xsimd/types/xsimd_all_registers.hpp +++ b/include/xsimd/types/xsimd_all_registers.hpp @@ -9,49 +9,49 @@ * The full license is in the file LICENSE, distributed with this software. * ****************************************************************************/ -#include "xsimd_fma3_sse_register.hpp" -#include "xsimd_fma4_register.hpp" -#include "xsimd_sse2_register.hpp" -#include "xsimd_sse3_register.hpp" -#include "xsimd_sse4_1_register.hpp" -#include "xsimd_sse4_2_register.hpp" +#include "./xsimd_fma3_sse_register.hpp" +#include "./xsimd_fma4_register.hpp" +#include "./xsimd_sse2_register.hpp" +#include "./xsimd_sse3_register.hpp" +#include "./xsimd_sse4_1_register.hpp" +#include "./xsimd_sse4_2_register.hpp" -#include "xsimd_avx2_register.hpp" -#include "xsimd_avx_register.hpp" -#include "xsimd_avxvnni_register.hpp" -#include "xsimd_fma3_avx2_register.hpp" -#include "xsimd_fma3_avx_register.hpp" +#include "./xsimd_avx2_register.hpp" +#include "./xsimd_avx_register.hpp" +#include "./xsimd_avxvnni_register.hpp" +#include "./xsimd_fma3_avx2_register.hpp" +#include "./xsimd_fma3_avx_register.hpp" -#include "xsimd_avx512vnni_avx512bw_register.hpp" -#include "xsimd_avx512vnni_avx512vbmi2_register.hpp" +#include "./xsimd_avx512vnni_avx512bw_register.hpp" +#include "./xsimd_avx512vnni_avx512vbmi2_register.hpp" -#include "xsimd_avx512ifma_register.hpp" -#include "xsimd_avx512vbmi2_register.hpp" -#include "xsimd_avx512vbmi_register.hpp" +#include "./xsimd_avx512ifma_register.hpp" +#include "./xsimd_avx512vbmi2_register.hpp" +#include "./xsimd_avx512vbmi_register.hpp" -#include "xsimd_avx512er_register.hpp" -#include "xsimd_avx512pf_register.hpp" +#include "./xsimd_avx512er_register.hpp" +#include "./xsimd_avx512pf_register.hpp" -#include "xsimd_avx512bw_register.hpp" -#include "xsimd_avx512cd_register.hpp" -#include "xsimd_avx512dq_register.hpp" -#include "xsimd_avx512f_register.hpp" +#include "./xsimd_avx512bw_register.hpp" +#include "./xsimd_avx512cd_register.hpp" +#include "./xsimd_avx512dq_register.hpp" +#include "./xsimd_avx512f_register.hpp" -#include "xsimd_i8mm_neon64_register.hpp" +#include "./xsimd_i8mm_neon64_register.hpp" -#include "xsimd_neon64_register.hpp" -#include "xsimd_neon_register.hpp" +#include "./xsimd_neon64_register.hpp" +#include "./xsimd_neon_register.hpp" -#include "xsimd_sve_register.hpp" +#include "./xsimd_sve_register.hpp" -#include "xsimd_rvv_register.hpp" +#include "./xsimd_rvv_register.hpp" -#include "xsimd_wasm_register.hpp" +#include "./xsimd_wasm_register.hpp" -#include "xsimd_vsx_register.hpp" +#include "./xsimd_vsx_register.hpp" -#include "xsimd_vxe_register.hpp" +#include "./xsimd_vxe_register.hpp" #if XSIMD_WITH_EMULATED -#include "xsimd_emulated_register.hpp" +#include "./xsimd_emulated_register.hpp" #endif diff --git a/include/xsimd/types/xsimd_neon64_register.hpp b/include/xsimd/types/xsimd_neon64_register.hpp index 7fa0b2ce5..1df2d4abb 100644 --- a/include/xsimd/types/xsimd_neon64_register.hpp +++ b/include/xsimd/types/xsimd_neon64_register.hpp @@ -12,7 +12,7 @@ #ifndef XSIMD_NEON64_REGISTER_HPP #define XSIMD_NEON64_REGISTER_HPP -#include "xsimd_neon_register.hpp" +#include "./xsimd_neon_register.hpp" namespace xsimd { diff --git a/include/xsimd/types/xsimd_sve_register.hpp b/include/xsimd/types/xsimd_sve_register.hpp index a0d1b5b99..802588691 100644 --- a/include/xsimd/types/xsimd_sve_register.hpp +++ b/include/xsimd/types/xsimd_sve_register.hpp @@ -13,8 +13,8 @@ #ifndef XSIMD_SVE_REGISTER_HPP #define XSIMD_SVE_REGISTER_HPP -#include "xsimd_common_arch.hpp" -#include "xsimd_register.hpp" +#include "./xsimd_common_arch.hpp" +#include "./xsimd_register.hpp" #if XSIMD_WITH_SVE #include diff --git a/include/xsimd/types/xsimd_wasm_register.hpp b/include/xsimd/types/xsimd_wasm_register.hpp index 70b6ff9ad..5091b7636 100644 --- a/include/xsimd/types/xsimd_wasm_register.hpp +++ b/include/xsimd/types/xsimd_wasm_register.hpp @@ -13,8 +13,8 @@ #ifndef XSIMD_WASM_REGISTER_HPP #define XSIMD_WASM_REGISTER_HPP -#include "xsimd_common_arch.hpp" -#include "xsimd_register.hpp" +#include "./xsimd_common_arch.hpp" +#include "./xsimd_register.hpp" #if XSIMD_WITH_WASM #include diff --git a/include/xsimd/xsimd.hpp b/include/xsimd/xsimd.hpp index ea9087ef9..351f4935d 100644 --- a/include/xsimd/xsimd.hpp +++ b/include/xsimd/xsimd.hpp @@ -12,12 +12,12 @@ #ifndef XSIMD_HPP #define XSIMD_HPP -#include "config/xsimd_config.hpp" -#include "config/xsimd_macros.hpp" +#include "./config/xsimd_config.hpp" +#include "./config/xsimd_macros.hpp" -#include "arch/xsimd_scalar.hpp" -#include "memory/xsimd_aligned_allocator.hpp" -#include "types/xsimd_batch_fwd.hpp" +#include "./arch/xsimd_scalar.hpp" +#include "./memory/xsimd_aligned_allocator.hpp" +#include "./types/xsimd_batch_fwd.hpp" #if defined(XSIMD_NO_SUPPORTED_ARCHITECTURE) namespace xsimd @@ -32,12 +32,12 @@ namespace xsimd } #else -#include "types/xsimd_batch.hpp" -#include "types/xsimd_batch_constant.hpp" -#include "types/xsimd_traits.hpp" +#include "./types/xsimd_batch.hpp" +#include "./types/xsimd_batch_constant.hpp" +#include "./types/xsimd_traits.hpp" // This include must come last -#include "types/xsimd_api.hpp" +#include "./types/xsimd_api.hpp" #endif // XSIMD_NO_SUPPORTED_ARCHITECTURE #endif diff --git a/test/test_shuffle.cpp b/test/test_shuffle.cpp index ff4ab1ed5..b287e60c5 100644 --- a/test/test_shuffle.cpp +++ b/test/test_shuffle.cpp @@ -17,7 +17,7 @@ #include "test_utils.hpp" #ifdef __linux__ -#include "endian.h" +#include #if BYTE_ORDER == BIG_ENDIAN #define XSIMD_NO_SLIDE #endif