c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-05-22 18:40:43 +03:00
Code Issues Packages Projects Releases Wiki Activity

Convert all HAVE_<name> SIMD gates to HAVE_SIMD(<name>)

Browse Source 
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:
Rob Norris
2026-03-04 22:28:21 +11:00
committed by Brian Behlendorf
parent 92a6ab405f
commit 35f74f84e6
33 changed files with 113 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/icp/asm-x86_64/modes/aesni-gcm-avx2-vaes.S
+3 -3
View File
@@ -5,8 +5,8 @@
// perlasm source: https://github.com/google/boringssl/blob/d5440dd2c2c500ac2d3bba4afec47a054b4d99ae/crypto/fipsmodule/aes/asm/aes-gcm-avx2-x86_64.pl
// generated source: https://github.com/google/boringssl/blob/d5440dd2c2c500ac2d3bba4afec47a054b4d99ae/gen/bcm/aes-gcm-avx2-x86_64-linux.S
#if defined(__x86_64__) && defined(HAVE_AVX2) && \
defined(HAVE_VAES) && defined(HAVE_VPCLMULQDQ)
#if defined(__x86_64__) && HAVE_SIMD(AVX2) && \
HAVE_SIMD(VAES) && HAVE_SIMD(VPCLMULQDQ)
#define _ASM
#include <sys/asm_linkage.h>
@@ -1288,4 +1288,4 @@ SET_SIZE(aes_gcm_dec_update_vaes_avx2)
.section .note.GNU-stack,"",%progbits
#endif
#endif /* defined(__x86_64__) && defined(HAVE_AVX2) && defined(HAVE_VAES) ... */
#endif /* defined(__x86_64__) && HAVE_SIMD(AVX2) && HAVE_SIMD(VAES) ... */
module/icp/asm-x86_64/modes/aesni-gcm-x86_64.S
+8 -8
View File
@@ -45,8 +45,8 @@
# and modified for ICP. Modification are kept at a bare minimum to ease later
# upstream merges.
#if defined(__x86_64__) && defined(HAVE_AVX) && \
defined(HAVE_AES) && defined(HAVE_PCLMULQDQ)
#if defined(__x86_64__) && HAVE_SIMD(AVX) && \
HAVE_SIMD(AES) && HAVE_SIMD(PCLMULQDQ)
#define _ASM
#include <sys/asm_linkage.h>
@@ -64,7 +64,7 @@
.text
#ifdef HAVE_MOVBE
#if HAVE_SIMD(MOVBE)
.balign 32
FUNCTION(_aesni_ctr32_ghash_6x)
.cfi_startproc
@@ -380,7 +380,7 @@ FUNCTION(_aesni_ctr32_ghash_6x)
.cfi_endproc
SET_SIZE(_aesni_ctr32_ghash_6x)
STACK_FRAME_NON_STANDARD _aesni_ctr32_ghash_6x
#endif /* ifdef HAVE_MOVBE */
#endif /* HAVE_SIMD(MOVBE) */
.balign 32
FUNCTION(_aesni_ctr32_ghash_no_movbe_6x)
@@ -781,7 +781,7 @@ ENTRY_ALIGN(aesni_gcm_decrypt, 32)
vmovdqu %xmm2,96(%rsp)
vmovdqu %xmm3,112(%rsp)
#ifdef HAVE_MOVBE
#if HAVE_SIMD(MOVBE)
#ifdef _KERNEL
testl $1,gcm_avx_can_use_movbe(%rip)
#else
@@ -992,7 +992,7 @@ ENTRY_ALIGN(aesni_gcm_encrypt, 32)
movq $192,%r10
vpshufb %xmm0,%xmm8,%xmm8
#ifdef HAVE_MOVBE
#if HAVE_SIMD(MOVBE)
#ifdef _KERNEL
testl $1,gcm_avx_can_use_movbe(%rip)
#else
@@ -1266,7 +1266,7 @@ SECTION_STATIC
#if defined(__linux__) && defined(HAVE_STACK_FRAME_NON_STANDARD) && \
! defined(HAVE_STACK_FRAME_NON_STANDARD_ASM)
.section .discard.func_stack_frame_non_standard, "aw"
#ifdef HAVE_MOVBE
#if HAVE_SIMD(MOVBE)
.long _aesni_ctr32_ghash_6x - .
#endif
.long _aesni_ctr32_ghash_no_movbe_6x - .
@@ -1279,4 +1279,4 @@ SECTION_STATIC
.section .note.GNU-stack,"",%progbits
#endif
#endif /* defined(__x86_64__) && defined(HAVE_AVX) && defined(HAVE_AES) ... */
#endif /* defined(__x86_64__) && HAVE_SIMD(AVX) && HAVE_SIMD(AES) ... */
module/icp/asm-x86_64/modes/gcm_pclmulqdq.S
+1 -1
View File
@@ -91,7 +91,7 @@ gcm_mul_pclmulqdq(uint64_t *x_in, uint64_t *y, uint64_t *res) {
(void) x_in, (void) y, (void) res;
}
#elif defined(HAVE_PCLMULQDQ) /* guard by instruction set */
#elif HAVE_SIMD(PCLMULQDQ) /* guard by instruction set */
#define _ASM
#include <sys/asm_linkage.h>
module/icp/asm-x86_64/modes/ghash-x86_64.S
+3 -3
View File
@@ -95,8 +95,8 @@
# and modified for ICP. Modification are kept at a bare minimum to ease later
# upstream merges.
#if defined(__x86_64__) && defined(HAVE_AVX) && \
defined(HAVE_AES) && defined(HAVE_PCLMULQDQ)
#if defined(__x86_64__) && HAVE_SIMD(AVX) && \
HAVE_SIMD(AES) && HAVE_SIMD(PCLMULQDQ)
#define _ASM
#include <sys/asm_linkage.h>
@@ -654,4 +654,4 @@ SET_OBJ(.Lrem_8bit)
.section .note.GNU-stack,"",%progbits
#endif
#endif /* defined(__x86_64__) && defined(HAVE_AVX) && defined(HAVE_AES) ... */
#endif /* defined(__x86_64__) && HAVE_SIMD(AVX) && HAVE_SIMD(AES) ... */