mirror of
https://git.proxmox.com/git/mirror_zfs.git
synced 2026-05-24 03:08:51 +03:00
Convert all HAVE_<name> SIMD gates to HAVE_SIMD(<name>)
The original names no longer exist, and the new ones will need to be selectable based on the current compilation target. Sponsored-by: TrueNAS Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Rob Norris <rob.norris@truenas.com> Closes #18285
This commit is contained in:
committed by
Brian Behlendorf
parent
92a6ab405f
commit
35f74f84e6
@@ -315,19 +315,19 @@ kfpu_begin(void)
|
||||
* FPU state to be correctly preserved and restored.
|
||||
*/
|
||||
uint8_t *state = zfs_kfpu_fpregs[smp_processor_id()];
|
||||
#if defined(HAVE_XSAVES)
|
||||
#if HAVE_SIMD(XSAVES)
|
||||
if (static_cpu_has(X86_FEATURE_XSAVES)) {
|
||||
kfpu_do_xsave("xsaves", state, ~XFEATURE_MASK_XTILE);
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
#if defined(HAVE_XSAVEOPT)
|
||||
#if HAVE_SIMD(XSAVEOPT)
|
||||
if (static_cpu_has(X86_FEATURE_XSAVEOPT)) {
|
||||
kfpu_do_xsave("xsaveopt", state, ~XFEATURE_MASK_XTILE);
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
#if defined(HAVE_XSAVE)
|
||||
#if HAVE_SIMD(XSAVE)
|
||||
if (static_cpu_has(X86_FEATURE_XSAVE)) {
|
||||
kfpu_do_xsave("xsave", state, ~XFEATURE_MASK_XTILE);
|
||||
return;
|
||||
@@ -380,13 +380,13 @@ static inline void
|
||||
kfpu_end(void)
|
||||
{
|
||||
uint8_t *state = zfs_kfpu_fpregs[smp_processor_id()];
|
||||
#if defined(HAVE_XSAVES)
|
||||
#if HAVE_SIMD(XSAVES)
|
||||
if (static_cpu_has(X86_FEATURE_XSAVES)) {
|
||||
kfpu_do_xrstor("xrstors", state, ~XFEATURE_MASK_XTILE);
|
||||
goto out;
|
||||
}
|
||||
#endif
|
||||
#if defined(HAVE_XSAVE)
|
||||
#if HAVE_SIMD(XSAVE)
|
||||
if (static_cpu_has(X86_FEATURE_XSAVE)) {
|
||||
kfpu_do_xrstor("xrstor", state, ~XFEATURE_MASK_XTILE);
|
||||
goto out;
|
||||
|
||||
@@ -172,19 +172,19 @@ typedef struct reflow_node {
|
||||
extern const raidz_impl_ops_t vdev_raidz_scalar_impl;
|
||||
extern boolean_t raidz_will_scalar_work(void);
|
||||
|
||||
#if defined(__x86_64) && defined(HAVE_SSE2) /* only x86_64 for now */
|
||||
#if defined(__x86_64) && HAVE_SIMD(SSE2) /* only x86_64 for now */
|
||||
extern const raidz_impl_ops_t vdev_raidz_sse2_impl;
|
||||
#endif
|
||||
#if defined(__x86_64) && defined(HAVE_SSSE3) /* only x86_64 for now */
|
||||
#if defined(__x86_64) && HAVE_SIMD(SSSE3) /* only x86_64 for now */
|
||||
extern const raidz_impl_ops_t vdev_raidz_ssse3_impl;
|
||||
#endif
|
||||
#if defined(__x86_64) && defined(HAVE_AVX2) /* only x86_64 for now */
|
||||
#if defined(__x86_64) && HAVE_SIMD(AVX2) /* only x86_64 for now */
|
||||
extern const raidz_impl_ops_t vdev_raidz_avx2_impl;
|
||||
#endif
|
||||
#if defined(__x86_64) && defined(HAVE_AVX512F) /* only x86_64 for now */
|
||||
#if defined(__x86_64) && HAVE_SIMD(AVX512F) /* only x86_64 for now */
|
||||
extern const raidz_impl_ops_t vdev_raidz_avx512f_impl;
|
||||
#endif
|
||||
#if defined(__x86_64) && defined(HAVE_AVX512BW) /* only x86_64 for now */
|
||||
#if defined(__x86_64) && HAVE_SIMD(AVX512BW) /* only x86_64 for now */
|
||||
extern const raidz_impl_ops_t vdev_raidz_avx512bw_impl;
|
||||
#endif
|
||||
#if defined(__aarch64__)
|
||||
|
||||
@@ -97,13 +97,13 @@ typedef union fletcher_4_ctx {
|
||||
zio_cksum_t scalar;
|
||||
zfs_fletcher_superscalar_t superscalar[4];
|
||||
|
||||
#if defined(HAVE_SSE2) || (defined(HAVE_SSE2) && defined(HAVE_SSSE3))
|
||||
#if HAVE_SIMD(SSE2) || (HAVE_SIMD(SSE2) && HAVE_SIMD(SSSE3))
|
||||
zfs_fletcher_sse_t sse[4];
|
||||
#endif
|
||||
#if defined(HAVE_AVX) && defined(HAVE_AVX2)
|
||||
#if HAVE_SIMD(AVX) && HAVE_SIMD(AVX2)
|
||||
zfs_fletcher_avx_t avx[4];
|
||||
#endif
|
||||
#if defined(__x86_64) && defined(HAVE_AVX512F)
|
||||
#if defined(__x86_64) && HAVE_SIMD(AVX512F)
|
||||
zfs_fletcher_avx512_t avx512[4];
|
||||
#endif
|
||||
#if defined(__aarch64__)
|
||||
@@ -134,23 +134,23 @@ typedef struct fletcher_4_func {
|
||||
_ZFS_FLETCHER_H const fletcher_4_ops_t fletcher_4_superscalar_ops;
|
||||
_ZFS_FLETCHER_H const fletcher_4_ops_t fletcher_4_superscalar4_ops;
|
||||
|
||||
#if defined(HAVE_SSE2)
|
||||
#if HAVE_SIMD(SSE2)
|
||||
_ZFS_FLETCHER_H const fletcher_4_ops_t fletcher_4_sse2_ops;
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_SSE2) && defined(HAVE_SSSE3)
|
||||
#if HAVE_SIMD(SSE2) && HAVE_SIMD(SSSE3)
|
||||
_ZFS_FLETCHER_H const fletcher_4_ops_t fletcher_4_ssse3_ops;
|
||||
#endif
|
||||
|
||||
#if defined(HAVE_AVX) && defined(HAVE_AVX2)
|
||||
#if HAVE_SIMD(AVX) && HAVE_SIMD(AVX2)
|
||||
_ZFS_FLETCHER_H const fletcher_4_ops_t fletcher_4_avx2_ops;
|
||||
#endif
|
||||
|
||||
#if defined(__x86_64) && defined(HAVE_AVX512F)
|
||||
#if defined(__x86_64) && HAVE_SIMD(AVX512F)
|
||||
_ZFS_FLETCHER_H const fletcher_4_ops_t fletcher_4_avx512f_ops;
|
||||
#endif
|
||||
|
||||
#if defined(__x86_64) && defined(HAVE_AVX512BW)
|
||||
#if defined(__x86_64) && HAVE_SIMD(AVX512BW)
|
||||
_ZFS_FLETCHER_H const fletcher_4_ops_t fletcher_4_avx512bw_ops;
|
||||
#endif
|
||||
|
||||
|
||||
Reference in New Issue
Block a user