Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

raid6: skip avx512 checks

It is no longer necessary to check for CONFIG_AS_AVX512, since the minimum
assembler version is now from binutils-2.30 and this always supports it.

Acked-by: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>

-19
-6
lib/raid6/algos.c
··· 28 28 29 29 const struct raid6_calls * const raid6_algos[] = { 30 30 #if defined(__i386__) && !defined(__arch_um__) 31 - #ifdef CONFIG_AS_AVX512 32 31 &raid6_avx512x2, 33 32 &raid6_avx512x1, 34 - #endif 35 33 &raid6_avx2x2, 36 34 &raid6_avx2x1, 37 35 &raid6_sse2x2, ··· 40 42 &raid6_mmxx1, 41 43 #endif 42 44 #if defined(__x86_64__) && !defined(__arch_um__) 43 - #ifdef CONFIG_AS_AVX512 44 45 &raid6_avx512x4, 45 46 &raid6_avx512x2, 46 47 &raid6_avx512x1, 47 - #endif 48 48 &raid6_avx2x4, 49 49 &raid6_avx2x2, 50 50 &raid6_avx2x1, ··· 92 96 93 97 const struct raid6_recov_calls *const raid6_recov_algos[] = { 94 98 #ifdef CONFIG_X86 95 - #ifdef CONFIG_AS_AVX512 96 99 &raid6_recov_avx512, 97 - #endif 98 100 &raid6_recov_avx2, 99 101 &raid6_recov_ssse3, 100 102 #endif
-4
lib/raid6/avx512.c
··· 17 17 * 18 18 */ 19 19 20 - #ifdef CONFIG_AS_AVX512 21 - 22 20 #include <linux/raid/pq.h> 23 21 #include "x86.h" 24 22 ··· 558 560 .priority = 2 /* Prefer AVX512 over priority 1 (SSE2 and others) */ 559 561 }; 560 562 #endif 561 - 562 - #endif /* CONFIG_AS_AVX512 */
-6
lib/raid6/recov_avx512.c
··· 6 6 * Author: Megha Dey <megha.dey@linux.intel.com> 7 7 */ 8 8 9 - #ifdef CONFIG_AS_AVX512 10 - 11 9 #include <linux/raid/pq.h> 12 10 #include "x86.h" 13 11 ··· 375 377 #endif 376 378 .priority = 3, 377 379 }; 378 - 379 - #else 380 - #warning "your version of binutils lacks AVX512 support" 381 - #endif
-3
lib/raid6/test/Makefile
··· 54 54 ifeq ($(IS_X86),yes) 55 55 OBJS += mmx.o sse1.o sse2.o avx2.o recov_ssse3.o recov_avx2.o avx512.o recov_avx512.o 56 56 CFLAGS += -DCONFIG_X86 57 - CFLAGS += $(shell echo "vpmovm2b %k1, %zmm5" | \ 58 - gcc -c -x assembler - >/dev/null 2>&1 && \ 59 - rm ./-.o && echo -DCONFIG_AS_AVX512=1) 60 57 else ifeq ($(HAS_NEON),yes) 61 58 OBJS += neon.o neon1.o neon2.o neon4.o neon8.o recov_neon.o recov_neon_inner.o 62 59 CFLAGS += -DCONFIG_KERNEL_MODE_NEON=1