Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docker/cross-files/aarch64-clang-20-ccache.cross
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ cpp_ld = 'lld'
exe_wrapper = ['qemu-aarch64-static', '-L', '/usr/aarch64-linux-gnu']

[built-in options]
c_args = ['--target=aarch64-linux-gnu', '-march=armv9.3-a+crypto+sha3+sm4', '-Wextra', '-isystem=/usr/aarch64-linux-gnu/include', '-Weverything', '-fno-lax-vector-conversions', '-Werror', '-Wno-unsafe-buffer-usage', '-Wno-switch-default']
cpp_args = ['--target=aarch64-linux-gnu', '-march=armv9.3-a+crypto+sha3+sm4', '-Wextra', '-isystem=/usr/aarch64-linux-gnu/include', '-Weverything', '-fno-lax-vector-conversions', '-Werror', '-Wno-unsafe-buffer-usage', '-Wno-switch-default']
c_args = ['--target=aarch64-linux-gnu', '-march=armv9.3-a+crypto+sha3+sm4+sve2-bitperm', '-Wextra', '-isystem=/usr/aarch64-linux-gnu/include', '-Weverything', '-fno-lax-vector-conversions', '-Werror', '-Wno-unsafe-buffer-usage', '-Wno-switch-default']
cpp_args = ['--target=aarch64-linux-gnu', '-march=armv9.3-a+crypto+sha3+sm4+sve2-bitperm', '-Wextra', '-isystem=/usr/aarch64-linux-gnu/include', '-Weverything', '-fno-lax-vector-conversions', '-Werror', '-Wno-unsafe-buffer-usage', '-Wno-switch-default']
c_link_args = ['--target=aarch64-linux-gnu']
cpp_link_args = ['--target=aarch64-linux-gnu']

Expand Down
4 changes: 2 additions & 2 deletions docker/cross-files/aarch64-gcc-14-ccache.cross
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ ld = 'aarch64-linux-gnu-ld'
exe_wrapper = ['qemu-aarch64-static', '-L', '/usr/aarch64-linux-gnu']

[properties]
c_args = ['-march=armv9.3-a+crypto+sha3+sm4', '-Wextra', '-Werror']
cpp_args = ['-march=armv9.3-a+crypto+sha3+sm4', '-Wextra', '-Werror']
c_args = ['-march=armv9.3-a+crypto+sha3+sm4+sve2-bitperm', '-Wextra', '-Werror']
cpp_args = ['-march=armv9.3-a+crypto+sha3+sm4+sve2-bitperm', '-Wextra', '-Werror']

[host_machine]
system = 'linux'
Expand Down
1 change: 1 addition & 0 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -501,6 +501,7 @@ if not meson.is_subproject()
'simde/x86/avx512.h',
'simde/x86/avx2.h',
'simde/x86/avx.h',
'simde/x86/bmi.h',
'simde/x86/clmul.h',
'simde/x86/fma.h',
'simde/x86/f16c.h',
Expand Down
12 changes: 12 additions & 0 deletions simde/simde-arch.h
Original file line number Diff line number Diff line change
Expand Up @@ -166,9 +166,15 @@
#if defined(__ARM_FEATURE_SVE) && __ARM_FEATURE_SVE
# define SIMDE_ARCH_ARM_SVE
#endif
#if defined(__ARM_FEATURE_SVE2) && __ARM_FEATURE_SVE2
# define SIMDE_ARCH_ARM_SVE2
#endif
#if defined(__ARM_FEATURE_QRDMX) && __ARM_FEATURE_QRDMX
# define SIMDE_ARCH_ARM_QRDMX
#endif
#if defined(__ARM_FEATURE_SVE2_BITPERM) && __ARM_FEATURE_SVE2_BITPERM
# define SIMDE_ARCH_ARM_SVE2_BITPERM
#endif

/* Blackfin
<https://en.wikipedia.org/wiki/Blackfin> */
Expand Down Expand Up @@ -387,6 +393,12 @@
# if defined(__AES__)
# define SIMDE_ARCH_X86_AES 1
# endif
# if defined(__BMI__)
# define SIMDE_ARCH_X86_BMI1 1
# endif
# if defined(__BMI2__)
# define SIMDE_ARCH_X86_BMI2 1
# endif
#endif

/* Itanium
Expand Down
25 changes: 25 additions & 0 deletions simde/simde-features.h
Original file line number Diff line number Diff line change
Expand Up @@ -299,6 +299,18 @@
#endif
#endif

#if !defined(SIMDE_X86_BMI1_NATIVE) && !defined(SIMDE_X86_BMI1_NO_NATIVE) && !defined(SIMDE_NO_NATIVE)
#if defined(SIMDE_ARCH_X86_BMI1)
#define SIMDE_X86_BMI1_NATIVE
#endif
#endif

#if !defined(SIMDE_X86_BMI2_NATIVE) && !defined(SIMDE_X86_BMI2_NO_NATIVE) && !defined(SIMDE_NO_NATIVE)
#if defined(SIMDE_ARCH_X86_BMI2)
#define SIMDE_X86_BMI2_NATIVE
#endif
#endif

#if defined(HEDLEY_MSVC_VERSION)
#pragma warning(push)
#pragma warning(disable:4799)
Expand Down Expand Up @@ -379,6 +391,13 @@
#endif
#endif

#if !defined(SIMDE_ARM_SVE2_NATIVE) && !defined(SIMDE_ARM_SVE2_NO_NATIVE) && !defined(SIMDE_NO_NATIVE)
#if defined(SIMDE_ARCH_ARM_SVE2)
#define SIMDE_ARM_SVE2_NATIVE
#include <arm_sve.h>
#endif
#endif

#if !defined(SIMDE_RISCV_V_NATIVE) && !defined(SIMDE_RISCV_V_NO_NATIVE) && !defined(SIMDE_NO_NATIVE)
#if defined(SIMDE_ARCH_RISCV_V) && defined(__riscv_v_fixed_vlen)
#define SIMDE_RISCV_V_NATIVE
Expand Down Expand Up @@ -680,6 +699,12 @@
#if !defined(SIMDE_X86_VPCLMULQDQ_NATIVE)
#define SIMDE_X86_VPCLMULQDQ_ENABLE_NATIVE_ALIASES
#endif
#if !defined(SIMDE_X86_BMI1_NATIVE)
#define SIMDE_X86_BMI1_ENABLE_NATIVE_ALIASES
#endif
#if !defined(SIMDE_X86_BMI2_NATIVE)
#define SIMDE_X86_BMI2_ENABLE_NATIVE_ALIASES
#endif
#if !defined(SIMDE_X86_F16C_NATIVE)
#define SIMDE_X86_F16C_ENABLE_NATIVE_ALIASES
#endif
Expand Down
172 changes: 172 additions & 0 deletions simde/x86/bmi.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,172 @@
/* SPDX-License-Identifier: MIT
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
* files (the "Software"), to deal in the Software without
* restriction, including without limitation the rights to use, copy,
* modify, merge, publish, distribute, sublicense, and/or sell copies
* of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
* The above copyright notice and this permission notice shall be
* included in all copies or substantial portions of the Software.
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
* SOFTWARE.
*
* Copyright:
Comment thread
mr-c marked this conversation as resolved.
* 2025 Thomas Magnusson <herr.thomas.magnusson@gmail.com>
*/

#if !defined(SIMDE_X86_BMI_H)
#define SIMDE_X86_BMI_H

SIMDE_FUNCTION_ATTRIBUTES
uint32_t
simde_pext_u32(uint32_t a, uint32_t mask)
{
#if defined(SIMDE_ARCH_ARM_SVE2_BITPERM) && defined(SIMDE_ARM_SVE2_NATIVE)
svuint32_t va = svdup_u32(a);
svuint32_t r = svbext_n_u32(va, mask);
return svlastb_u32(svptrue_b32(), r);
#else
uint32_t r = 0;
int k = 0;
for (uint32_t m = mask; m; m >>= 1, a >>= 1) {
if (m & 1) {
r |= (a & 1) << k++;
}
}
return r;
#endif
}
#if defined(SIMDE_X86_BMI2_NATIVE)
#define simde_pext_u32(a, mask) _pext_u32(a, mask)
#endif
#if defined(SIMDE_X86_BMI2_ENABLE_NATIVE_ALIASES)
#undef _pext_u32
#define _pext_u32(a, mask) simde_pext_u32(a, mask)
#endif

SIMDE_FUNCTION_ATTRIBUTES
uint64_t
simde_pext_u64(uint64_t a, uint64_t mask)
{
#if defined(SIMDE_ARCH_ARM_SVE2_BITPERM) && defined(SIMDE_ARM_SVE2_NATIVE)
svuint64_t va = svdup_u64(a);
svuint64_t r = svbext_n_u64(va, mask);
return svlastb_u64(svptrue_b64(), r);
#else
uint64_t r = 0;
int k = 0;
for (uint64_t m = mask; m; m >>= 1, a >>= 1) {
if (m & 1) {
r |= (a & 1) << k++;
}
}
return r;
#endif
}
#if defined(SIMDE_X86_BMI2_NATIVE)
#define simde_pext_u64(a, mask) _pext_u64(a, mask)
#endif
#if defined(SIMDE_X86_BMI2_ENABLE_NATIVE_ALIASES)
#undef _pext_u64
#define _pext_u64(a, mask) simde_pext_u64(a, mask)
#endif

SIMDE_FUNCTION_ATTRIBUTES
uint32_t
simde_pdep_u32(uint32_t a, uint32_t mask)
{
#if defined(SIMDE_ARCH_ARM_SVE2_BITPERM) && defined(SIMDE_ARM_SVE2_NATIVE)
svuint32_t va = svdup_u32(a);
svuint32_t r = svbdep_n_u32(va, mask);
return svlastb_u32(svptrue_b32(), r);
#else
uint32_t r = 0;
int k = 0;
for (uint32_t m = mask; m; m >>= 1, k++) {
if (m & 1) {
r |= (a & 1) << k;
a >>= 1;
}
}
return r;
#endif
}
#if defined(SIMDE_X86_BMI2_NATIVE)
#define simde_pdep_u32(a, mask) _pdep_u32(a, mask)
#endif
#if defined(SIMDE_X86_BMI2_ENABLE_NATIVE_ALIASES)
#undef _pdep_u32
#define _pdep_u32(a, mask) simde_pdep_u32(a, mask)
#endif

SIMDE_FUNCTION_ATTRIBUTES
uint64_t
simde_pdep_u64(uint64_t a, uint64_t mask)
{
#if defined(SIMDE_ARCH_ARM_SVE2_BITPERM) && defined(SIMDE_ARM_SVE2_NATIVE)
svuint64_t va = svdup_u64(a);
svuint64_t r = svbdep_n_u64(va, mask);
return svlastb_u64(svptrue_b64(), r);
#else
uint64_t r = 0;
int k = 0;
for (uint64_t m = mask; m; m >>= 1, k++) {
if (m & 1) {
r |= (a & 1) << k;
a >>= 1;
}
}
return r;
#endif
}
#if defined(SIMDE_X86_BMI2_NATIVE)
#define simde_pdep_u64(a, mask) _pdep_u64(a, mask)
#endif
#if defined(SIMDE_X86_BMI2_ENABLE_NATIVE_ALIASES)
#undef _pdep_u64
#define _pdep_u64(a, mask) simde_pdep_u64(a, mask)
#endif

SIMDE_FUNCTION_ATTRIBUTES
uint32_t
simde_bextr_u32(uint32_t a, unsigned int start, unsigned int len) {
const uint32_t mask = 0xffffffffu;
if (len == 0 || start >= 32) return 0;
if (len > 32 - start) len = 32 - start;
return (a >> start) & (mask >> (32 - len));
}
#if defined(SIMDE_X86_BMI1_NATIVE)
#define simde_bextr_u32(a, start, len) _bextr_u32(a, start, len)
#endif
#if defined(SIMDE_X86_BMI1_ENABLE_NATIVE_ALIASES)
#undef _bextr_u32
#define _bextr_u32(a, start, len) simde_bextr_u32(a, start, len)
#endif

SIMDE_FUNCTION_ATTRIBUTES
uint64_t
simde_bextr_u64(uint64_t a, unsigned int start, unsigned int len) {
const uint64_t mask = 0xffffffffffffffffull;
if (len == 0 || start >= 64) return 0;
if (len > 64 - start) len = 64 - start;
return (a >> start) & (mask >> (64 - len));
}
#if defined(SIMDE_X86_BMI1_NATIVE)
#define simde_bextr_u64(a, start, len) _bextr_u64(a, start, len)
#endif
#if defined(SIMDE_X86_BMI1_ENABLE_NATIVE_ALIASES)
#undef _bextr_u64
#define _bextr_u64(a, start, len) simde_bextr_u64(a, start, len)
#endif

#endif /* !defined(SIMDE_X86_BMI_H) */
Loading
Loading