Skip to content

Commit e0e6b2e

Browse files
AntoinePrvAntoinePrv
committed
Uniform header inclusion
1 parent cc9ca38 commit e0e6b2e

16 files changed

Lines changed: 465 additions & 59 deletions

‎CMakePresets.json‎

Lines changed: 175 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,175 @@
1+
{
2+
"version": 5,
3+
"cmakeMinimumRequired": {
4+
"major": 3,
5+
"minor": 23,
6+
"patch": 0
7+
},
8+
"configurePresets": [
9+
{
10+
"name": "xsimd-all",
11+
"cacheVariables": {
12+
"ENABLE_XTL_COMPLEX": "ON",
13+
"BUILD_TESTS": "ON",
14+
"BUILD_BENCHMARK": "ON"
15+
}
16+
},
17+
18+
{
19+
"name": "debug-base",
20+
"hidden": true,
21+
"cacheVariables": {
22+
"CMAKE_BUILD_TYPE": "Debug"
23+
}
24+
},
25+
{
26+
"name": "release-base",
27+
"hidden": true,
28+
"cacheVariables": {
29+
"CMAKE_BUILD_TYPE": "Release"
30+
}
31+
},
32+
33+
{
34+
"name": "native-base",
35+
"hidden": true,
36+
"cacheVariables": {
37+
"CMAKE_CXX_FLAGS": "$env{CXXFLAGS} -march=native"
38+
}
39+
},
40+
{
41+
"name": "sse2-base",
42+
"hidden": true,
43+
"cacheVariables": {
44+
"CMAKE_CXX_FLAGS": "$env{CXXFLAGS} -march=x86-64 -msse2 -mno-sse3"
45+
}
46+
},
47+
{
48+
"name": "sse3-base",
49+
"hidden": true,
50+
"cacheVariables": {
51+
"CMAKE_CXX_FLAGS": "$env{CXXFLAGS} -march=x86-64 -msse3 -mno-ssse3"
52+
}
53+
},
54+
{
55+
"name": "ssse3-base",
56+
"hidden": true,
57+
"cacheVariables": {
58+
"CMAKE_CXX_FLAGS": "$env{CXXFLAGS} -march=x86-64 -mssse3 -mno-sse4.1"
59+
}
60+
},
61+
{
62+
"name": "sse4.1-base",
63+
"hidden": true,
64+
"cacheVariables": {
65+
"CMAKE_CXX_FLAGS": "$env{CXXFLAGS} -march=x86-64 -msse4.1 -mno-sse4.2"
66+
}
67+
},
68+
{
69+
"name": "sse4.2-base",
70+
"hidden": true,
71+
"cacheVariables": {
72+
"CMAKE_CXX_FLAGS": "$env{CXXFLAGS} -march=x86-64 -msse4.2 -mno-avx"
73+
}
74+
},
75+
{
76+
"name": "avx-base",
77+
"hidden": true,
78+
"cacheVariables": {
79+
"CMAKE_CXX_FLAGS": "$env{CXXFLAGS} -march=x86-64 -mavx -mno-avx2"
80+
}
81+
},
82+
{
83+
"name": "avx2-base",
84+
"hidden": true,
85+
"cacheVariables": {
86+
"CMAKE_CXX_FLAGS": "$env{CXXFLAGS} -march=x86-64 -mavx2 -mno-avx512f"
87+
}
88+
},
89+
{
90+
"name": "neon-base",
91+
"hidden": true,
92+
"cacheVariables": {
93+
"CMAKE_CXX_FLAGS": "$env{CXXFLAGS} -march=armv7-a -mfpu=neon -mfloat-abi=softfp"
94+
}
95+
},
96+
{
97+
"name": "neon64-base",
98+
"hidden": true,
99+
"cacheVariables": {
100+
"CMAKE_CXX_FLAGS": "$env{CXXFLAGS} -march=armv8-a"
101+
}
102+
},
103+
{
104+
"name": "sve128-base",
105+
"hidden": true,
106+
"cacheVariables": {
107+
"CMAKE_CXX_FLAGS": "$env{CXXFLAGS} -march=armv8.2-a+sve -msve-vector-bits=128"
108+
}
109+
},
110+
{
111+
"name": "sve256-base",
112+
"hidden": true,
113+
"cacheVariables": {
114+
"CMAKE_CXX_FLAGS": "$env{CXXFLAGS} -march=armv8.2-a+sve -msve-vector-bits=256"
115+
}
116+
},
117+
118+
{
119+
"name": "dev-base",
120+
"hidden": true,
121+
"inherits": [
122+
"debug-base",
123+
"xsimd-all"
124+
]
125+
},
126+
{
127+
"name": "dev-native",
128+
"inherits": ["dev-base", "native-base"]
129+
},
130+
{
131+
"name": "dev-sse2",
132+
"inherits": ["dev-base", "sse2-base"]
133+
},
134+
{
135+
"name": "dev-sse3",
136+
"inherits": ["dev-base", "sse3-base"]
137+
},
138+
{
139+
"name": "dev-ssse3",
140+
"inherits": ["dev-base", "ssse3-base"]
141+
},
142+
{
143+
"name": "dev-sse4.1",
144+
"inherits": ["dev-base", "sse4.1-base"]
145+
},
146+
{
147+
"name": "dev-sse4.2",
148+
"inherits": ["dev-base", "sse4.2-base"]
149+
},
150+
{
151+
"name": "dev-avx",
152+
"inherits": ["dev-base", "avx-base"]
153+
},
154+
{
155+
"name": "dev-avx2",
156+
"inherits": ["dev-base", "avx2-base"]
157+
},
158+
{
159+
"name": "dev-neon",
160+
"inherits": ["dev-base", "neon-base"]
161+
},
162+
{
163+
"name": "dev-neon64",
164+
"inherits": ["dev-base", "neon64-base"]
165+
},
166+
{
167+
"name": "dev-sve128",
168+
"inherits": ["dev-base", "sve128-base"]
169+
},
170+
{
171+
"name": "dev-sve256",
172+
"inherits": ["dev-base", "sve256-base"]
173+
}
174+
]
175+
}

‎include/xsimd/arch/common/xsimd_common_logical.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212
#ifndef XSIMD_COMMON_LOGICAL_HPP
1313
#define XSIMD_COMMON_LOGICAL_HPP
1414

15+
#include <climits>
16+
1517
#include "./xsimd_common_bit.hpp"
1618
#include "./xsimd_common_details.hpp"
1719

18-
#include <climits>
19-
2020
namespace xsimd
2121
{
2222

‎include/xsimd/arch/common/xsimd_common_math.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@
1212
#ifndef XSIMD_COMMON_MATH_HPP
1313
#define XSIMD_COMMON_MATH_HPP
1414

15+
#include <type_traits>
16+
1517
#include "../xsimd_scalar.hpp"
1618
#include "./xsimd_common_details.hpp"
1719
#include "./xsimd_common_trigo.hpp"
1820

19-
#include <type_traits>
20-
2121
namespace xsimd
2222
{
2323

‎include/xsimd/arch/common/xsimd_common_trigo.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@
1212
#ifndef XSIMD_COMMON_TRIGO_HPP
1313
#define XSIMD_COMMON_TRIGO_HPP
1414

15-
#include "./xsimd_common_details.hpp"
16-
1715
#include <array>
1816

17+
#include "./xsimd_common_details.hpp"
18+
1919
namespace xsimd
2020
{
2121

‎include/xsimd/arch/xsimd_avx2.hpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,13 @@
1313
#define XSIMD_AVX2_HPP
1414

1515
#include <complex>
16+
#include <limits>
1617
#include <type_traits>
1718

1819
#include "../types/xsimd_avx2_register.hpp"
1920
#include "../types/xsimd_batch_constant.hpp"
2021
#include "./utils/shifts.hpp"
2122

22-
#include <limits>
23-
2423
namespace xsimd
2524
{
2625

‎include/xsimd/arch/xsimd_scalar.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
#include <limits>
2121
#include <type_traits>
2222

23-
#include "xsimd/config/xsimd_macros.hpp"
23+
#include "../config/xsimd_macros.hpp"
2424

2525
#ifdef XSIMD_ENABLE_XTL_COMPLEX
2626
#include "xtl/xcomplex.hpp"

‎include/xsimd/arch/xsimd_sse3.hpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,10 @@
1212
#ifndef XSIMD_SSE3_HPP
1313
#define XSIMD_SSE3_HPP
1414

15-
#include "../types/xsimd_sse3_register.hpp"
1615
#include <type_traits>
1716

17+
#include "../types/xsimd_sse3_register.hpp"
18+
1819
namespace xsimd
1920
{
2021

‎include/xsimd/arch/xsimd_vsx.hpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,12 @@
1515
#include <complex>
1616
#include <type_traits>
1717

18+
#include <endian.h>
19+
20+
#include "../types/xsimd_batch_fwd.hpp"
1821
#include "../types/xsimd_vsx_register.hpp"
1922
#include "./common/xsimd_common_cast.hpp"
2023

21-
#include <endian.h>
22-
2324
namespace xsimd
2425
{
2526
template <typename T, class A, bool... Values>

‎include/xsimd/memory/xsimd_alignment.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
#define XSIMD_ALIGNMENT_HPP
1414

1515
#include "../types/xsimd_utils.hpp"
16-
#include "xsimd_aligned_allocator.hpp"
16+
#include "./xsimd_aligned_allocator.hpp"
1717

1818
namespace xsimd
1919
{

‎include/xsimd/types/xsimd_all_registers.hpp‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -9,49 +9,49 @@
99
* The full license is in the file LICENSE, distributed with this software. *
1010
****************************************************************************/
1111

12-
#include "xsimd_fma3_sse_register.hpp"
13-
#include "xsimd_fma4_register.hpp"
14-
#include "xsimd_sse2_register.hpp"
15-
#include "xsimd_sse3_register.hpp"
16-
#include "xsimd_sse4_1_register.hpp"
17-
#include "xsimd_sse4_2_register.hpp"
12+
#include "./xsimd_fma3_sse_register.hpp"
13+
#include "./xsimd_fma4_register.hpp"
14+
#include "./xsimd_sse2_register.hpp"
15+
#include "./xsimd_sse3_register.hpp"
16+
#include "./xsimd_sse4_1_register.hpp"
17+
#include "./xsimd_sse4_2_register.hpp"
1818

19-
#include "xsimd_avx2_register.hpp"
20-
#include "xsimd_avx_register.hpp"
21-
#include "xsimd_avxvnni_register.hpp"
22-
#include "xsimd_fma3_avx2_register.hpp"
23-
#include "xsimd_fma3_avx_register.hpp"
19+
#include "./xsimd_avx2_register.hpp"
20+
#include "./xsimd_avx_register.hpp"
21+
#include "./xsimd_avxvnni_register.hpp"
22+
#include "./xsimd_fma3_avx2_register.hpp"
23+
#include "./xsimd_fma3_avx_register.hpp"
2424

25-
#include "xsimd_avx512vnni_avx512bw_register.hpp"
26-
#include "xsimd_avx512vnni_avx512vbmi2_register.hpp"
25+
#include "./xsimd_avx512vnni_avx512bw_register.hpp"
26+
#include "./xsimd_avx512vnni_avx512vbmi2_register.hpp"
2727

28-
#include "xsimd_avx512ifma_register.hpp"
29-
#include "xsimd_avx512vbmi2_register.hpp"
30-
#include "xsimd_avx512vbmi_register.hpp"
28+
#include "./xsimd_avx512ifma_register.hpp"
29+
#include "./xsimd_avx512vbmi2_register.hpp"
30+
#include "./xsimd_avx512vbmi_register.hpp"
3131

32-
#include "xsimd_avx512er_register.hpp"
33-
#include "xsimd_avx512pf_register.hpp"
32+
#include "./xsimd_avx512er_register.hpp"
33+
#include "./xsimd_avx512pf_register.hpp"
3434

35-
#include "xsimd_avx512bw_register.hpp"
36-
#include "xsimd_avx512cd_register.hpp"
37-
#include "xsimd_avx512dq_register.hpp"
38-
#include "xsimd_avx512f_register.hpp"
35+
#include "./xsimd_avx512bw_register.hpp"
36+
#include "./xsimd_avx512cd_register.hpp"
37+
#include "./xsimd_avx512dq_register.hpp"
38+
#include "./xsimd_avx512f_register.hpp"
3939

40-
#include "xsimd_i8mm_neon64_register.hpp"
40+
#include "./xsimd_i8mm_neon64_register.hpp"
4141

42-
#include "xsimd_neon64_register.hpp"
43-
#include "xsimd_neon_register.hpp"
42+
#include "./xsimd_neon64_register.hpp"
43+
#include "./xsimd_neon_register.hpp"
4444

45-
#include "xsimd_sve_register.hpp"
45+
#include "./xsimd_sve_register.hpp"
4646

47-
#include "xsimd_rvv_register.hpp"
47+
#include "./xsimd_rvv_register.hpp"
4848

49-
#include "xsimd_wasm_register.hpp"
49+
#include "./xsimd_wasm_register.hpp"
5050

51-
#include "xsimd_vsx_register.hpp"
51+
#include "./xsimd_vsx_register.hpp"
5252

53-
#include "xsimd_vxe_register.hpp"
53+
#include "./xsimd_vxe_register.hpp"
5454

5555
#if XSIMD_WITH_EMULATED
56-
#include "xsimd_emulated_register.hpp"
56+
#include "./xsimd_emulated_register.hpp"
5757
#endif

0 commit comments

Comments
 (0)