Skip to content

Commit f629a99

Browse files
committed
Shorter name
1 parent a5cdb36 commit f629a99

2 files changed

Lines changed: 29 additions & 29 deletions

File tree

include/xsimd/config/xsimd_cpuid.hpp

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -118,49 +118,49 @@ namespace xsimd
118118
const auto cpuid = xsimd::x86_cpu_id::read();
119119
auto xcr0 = xsimd::x86_xcr0::make_false();
120120

121-
bool sse_state_os_enabled = true;
121+
bool sse_enabled = true;
122122
// AVX and AVX512 strictly require OSXSAVE to be enabled by the OS.
123123
// If OSXSAVE is disabled (e.g., via bcdedit /set xsavedisable 1),
124124
// AVX state won't be preserved across context switches, so AVX cannot be used.
125-
bool avx_state_os_enabled = false;
126-
bool avx512_state_os_enabled = false;
125+
bool avx_enabled = false;
126+
bool avx512_enabled = false;
127127

128128
if (cpuid.osxsave())
129129
{
130130
xcr0 = xsimd::x86_xcr0::read();
131131

132-
sse_state_os_enabled = xcr0.sse_state_os_enabled();
133-
avx_state_os_enabled = xcr0.avx_state_os_enabled();
134-
avx512_state_os_enabled = xcr0.avx512_state_os_enabled();
132+
sse_enabled = xcr0.sse_enabled();
133+
avx_enabled = xcr0.avx_enabled();
134+
avx512_enabled = xcr0.avx512_enabled();
135135
}
136136

137-
sse2 = cpuid.sse2() && sse_state_os_enabled;
138-
sse3 = cpuid.sse3() && sse_state_os_enabled;
139-
ssse3 = cpuid.ssse3() && sse_state_os_enabled;
140-
sse4_1 = cpuid.sse4_1() && sse_state_os_enabled;
141-
sse4_2 = cpuid.sse4_2() && sse_state_os_enabled;
142-
fma3_sse42 = cpuid.fma3() && sse_state_os_enabled;
137+
sse2 = cpuid.sse2() && sse_enabled;
138+
sse3 = cpuid.sse3() && sse_enabled;
139+
ssse3 = cpuid.ssse3() && sse_enabled;
140+
sse4_1 = cpuid.sse4_1() && sse_enabled;
141+
sse4_2 = cpuid.sse4_2() && sse_enabled;
142+
fma3_sse42 = cpuid.fma3() && sse_enabled;
143143

144144
// sse4a not implemented in cpu_id yet
145145
// xop not implemented in cpu_id yet
146146

147-
avx = cpuid.avx() && avx_state_os_enabled;
147+
avx = cpuid.avx() && avx_enabled;
148148
fma3_avx = avx && fma3_sse42;
149-
fma4 = cpuid.fma4() && avx_state_os_enabled;
150-
avx2 = cpuid.avx2() && avx_state_os_enabled;
151-
avxvnni = cpuid.avxvnni() && avx_state_os_enabled;
149+
fma4 = cpuid.fma4() && avx_enabled;
150+
avx2 = cpuid.avx2() && avx_enabled;
151+
avxvnni = cpuid.avxvnni() && avx_enabled;
152152
fma3_avx2 = avx2 && fma3_sse42;
153153

154-
avx512f = cpuid.avx512f() && avx512_state_os_enabled;
155-
avx512cd = cpuid.avx512cd() && avx512_state_os_enabled;
156-
avx512dq = cpuid.avx512dq() && avx512_state_os_enabled;
157-
avx512bw = cpuid.avx512bw() && avx512_state_os_enabled;
158-
avx512er = cpuid.avx512er() && avx512_state_os_enabled;
159-
avx512pf = cpuid.avx512pf() && avx512_state_os_enabled;
160-
avx512ifma = cpuid.avx512ifma() && avx512_state_os_enabled;
161-
avx512vbmi = cpuid.avx512vbmi() && avx512_state_os_enabled;
162-
avx512vbmi2 = cpuid.avx512vbmi2() && avx512_state_os_enabled;
163-
avx512vnni_bw = cpuid.avx512vnni_bw() && avx512_state_os_enabled;
154+
avx512f = cpuid.avx512f() && avx512_enabled;
155+
avx512cd = cpuid.avx512cd() && avx512_enabled;
156+
avx512dq = cpuid.avx512dq() && avx512_enabled;
157+
avx512bw = cpuid.avx512bw() && avx512_enabled;
158+
avx512er = cpuid.avx512er() && avx512_enabled;
159+
avx512pf = cpuid.avx512pf() && avx512_enabled;
160+
avx512ifma = cpuid.avx512ifma() && avx512_enabled;
161+
avx512vbmi = cpuid.avx512vbmi() && avx512_enabled;
162+
avx512vbmi2 = cpuid.avx512vbmi2() && avx512_enabled;
163+
avx512vnni_bw = cpuid.avx512vnni_bw() && avx512_enabled;
164164
avx512vnni_vbmi2 = avx512vbmi2 && avx512vnni_bw;
165165
}
166166
};

include/xsimd/xsimd_cpu_features_x86.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,18 +65,18 @@ namespace xsimd
6565
return x86_xcr0(detail::get_xcr0_low());
6666
}
6767

68-
constexpr bool sse_state_os_enabled() const noexcept
68+
constexpr bool sse_enabled() const noexcept
6969
{
7070
return utils::bit_is_set<1>(m_low);
7171
}
7272

73-
constexpr bool avx_state_os_enabled() const noexcept
73+
constexpr bool avx_enabled() const noexcept
7474
{
7575
// Check both SSE and AVX bits even though AVX must imply SSE
7676
return utils::bit_is_set<1, 2>(m_low);
7777
}
7878

79-
constexpr bool avx512_state_os_enabled() const noexcept
79+
constexpr bool avx512_enabled() const noexcept
8080
{
8181
// Check all SSE, AVX, and AVX512 bits even though AVX512 must
8282
// imply AVX and SSE

0 commit comments

Comments
 (0)