7a7b11d694
[ Upstream commit 633174a7046ec3b4572bec24ef98e6ee89bce14b ]
Buidling raid6test on Ubuntu 21.10 (ppc64le) with GNU Make 4.3 shows the
errors below:
$ cd lib/raid6/test/
$ make
<stdin>:1:1: error: stray ‘\’ in program
<stdin>:1:2: error: stray ‘#’ in program
<stdin>:1:11: error: expected ‘=’, ‘,’, ‘;’, ‘asm’ or ‘__attribute__’ \
before ‘<’ token
[...]
The errors come from the HAS_ALTIVEC test, which fails, and the POWER
optimized versions are not built. That’s also reason nobody noticed on the
other architectures.
GNU Make 4.3 does not remove the backslash anymore. From the 4.3 release
announcment:
> * WARNING: Backward-incompatibility!
> Number signs (#) appearing inside a macro reference or function invocation
> no longer introduce comments and should not be escaped with backslashes:
> thus a call such as:
> foo := $(shell echo '#')
> is legal. Previously the number sign needed to be escaped, for example:
> foo := $(shell echo '\#')
> Now this latter will resolve to "\#". If you want to write makefiles
> portable to both versions, assign the number sign to a variable:
> H := \#
> foo := $(shell echo '$H')
> This was claimed to be fixed in 3.81, but wasn't, for some reason.
> To detect this change search for 'nocomment' in the .FEATURES variable.
So, do the same as commit 9564a8cf42 ("Kbuild: fix # escaping in .cmd
files for future Make") and commit 929bef467771 ("bpf: Use $(pound) instead
of \# in Makefiles") and define and use a $(pound) variable.
Reference for the change in make:
https://git.savannah.gnu.org/cgit/make.git/commit/?id=c6966b323811c37acedff05b57
Cc: Matt Brown <matthew.brown.dev@gmail.com>
Signed-off-by: Paul Menzel <pmenzel@molgen.mpg.de>
Signed-off-by: Song Liu <song@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
143 lines
3.8 KiB
Makefile
143 lines
3.8 KiB
Makefile
# SPDX-License-Identifier: GPL-2.0
|
|
#
|
|
# This is a simple Makefile to test some of the RAID-6 code
|
|
# from userspace.
|
|
#
|
|
|
|
pound := \#
|
|
|
|
CC = gcc
|
|
OPTFLAGS = -O2 # Adjust as desired
|
|
CFLAGS = -I.. -I ../../../include -g $(OPTFLAGS)
|
|
LD = ld
|
|
AWK = awk -f
|
|
AR = ar
|
|
RANLIB = ranlib
|
|
OBJS = int1.o int2.o int4.o int8.o int16.o int32.o recov.o algos.o tables.o
|
|
|
|
ARCH := $(shell uname -m 2>/dev/null | sed -e /s/i.86/i386/)
|
|
ifeq ($(ARCH),i386)
|
|
CFLAGS += -DCONFIG_X86_32
|
|
IS_X86 = yes
|
|
endif
|
|
ifeq ($(ARCH),x86_64)
|
|
CFLAGS += -DCONFIG_X86_64
|
|
IS_X86 = yes
|
|
endif
|
|
|
|
ifeq ($(ARCH),arm)
|
|
CFLAGS += -I../../../arch/arm/include -mfpu=neon
|
|
HAS_NEON = yes
|
|
endif
|
|
ifeq ($(ARCH),aarch64)
|
|
CFLAGS += -I../../../arch/arm64/include
|
|
HAS_NEON = yes
|
|
endif
|
|
|
|
ifeq ($(IS_X86),yes)
|
|
OBJS += mmx.o sse1.o sse2.o avx2.o recov_ssse3.o recov_avx2.o avx512.o recov_avx512.o
|
|
CFLAGS += $(shell echo "pshufb %xmm0, %xmm0" | \
|
|
gcc -c -x assembler - >/dev/null 2>&1 && \
|
|
rm ./-.o && echo -DCONFIG_AS_SSSE3=1)
|
|
CFLAGS += $(shell echo "vpbroadcastb %xmm0, %ymm1" | \
|
|
gcc -c -x assembler - >/dev/null 2>&1 && \
|
|
rm ./-.o && echo -DCONFIG_AS_AVX2=1)
|
|
CFLAGS += $(shell echo "vpmovm2b %k1, %zmm5" | \
|
|
gcc -c -x assembler - >/dev/null 2>&1 && \
|
|
rm ./-.o && echo -DCONFIG_AS_AVX512=1)
|
|
else ifeq ($(HAS_NEON),yes)
|
|
OBJS += neon.o neon1.o neon2.o neon4.o neon8.o recov_neon.o recov_neon_inner.o
|
|
CFLAGS += -DCONFIG_KERNEL_MODE_NEON=1
|
|
else
|
|
HAS_ALTIVEC := $(shell printf '$(pound)include <altivec.h>\nvector int a;\n' |\
|
|
gcc -c -x c - >/dev/null && rm ./-.o && echo yes)
|
|
ifeq ($(HAS_ALTIVEC),yes)
|
|
CFLAGS += -I../../../arch/powerpc/include
|
|
CFLAGS += -DCONFIG_ALTIVEC
|
|
OBJS += altivec1.o altivec2.o altivec4.o altivec8.o \
|
|
vpermxor1.o vpermxor2.o vpermxor4.o vpermxor8.o
|
|
endif
|
|
endif
|
|
|
|
.c.o:
|
|
$(CC) $(CFLAGS) -c -o $@ $<
|
|
|
|
%.c: ../%.c
|
|
cp -f $< $@
|
|
|
|
%.uc: ../%.uc
|
|
cp -f $< $@
|
|
|
|
all: raid6.a raid6test
|
|
|
|
raid6.a: $(OBJS)
|
|
rm -f $@
|
|
$(AR) cq $@ $^
|
|
$(RANLIB) $@
|
|
|
|
raid6test: test.c raid6.a
|
|
$(CC) $(CFLAGS) -o raid6test $^
|
|
|
|
neon1.c: neon.uc ../unroll.awk
|
|
$(AWK) ../unroll.awk -vN=1 < neon.uc > $@
|
|
|
|
neon2.c: neon.uc ../unroll.awk
|
|
$(AWK) ../unroll.awk -vN=2 < neon.uc > $@
|
|
|
|
neon4.c: neon.uc ../unroll.awk
|
|
$(AWK) ../unroll.awk -vN=4 < neon.uc > $@
|
|
|
|
neon8.c: neon.uc ../unroll.awk
|
|
$(AWK) ../unroll.awk -vN=8 < neon.uc > $@
|
|
|
|
altivec1.c: altivec.uc ../unroll.awk
|
|
$(AWK) ../unroll.awk -vN=1 < altivec.uc > $@
|
|
|
|
altivec2.c: altivec.uc ../unroll.awk
|
|
$(AWK) ../unroll.awk -vN=2 < altivec.uc > $@
|
|
|
|
altivec4.c: altivec.uc ../unroll.awk
|
|
$(AWK) ../unroll.awk -vN=4 < altivec.uc > $@
|
|
|
|
altivec8.c: altivec.uc ../unroll.awk
|
|
$(AWK) ../unroll.awk -vN=8 < altivec.uc > $@
|
|
|
|
vpermxor1.c: vpermxor.uc ../unroll.awk
|
|
$(AWK) ../unroll.awk -vN=1 < vpermxor.uc > $@
|
|
|
|
vpermxor2.c: vpermxor.uc ../unroll.awk
|
|
$(AWK) ../unroll.awk -vN=2 < vpermxor.uc > $@
|
|
|
|
vpermxor4.c: vpermxor.uc ../unroll.awk
|
|
$(AWK) ../unroll.awk -vN=4 < vpermxor.uc > $@
|
|
|
|
vpermxor8.c: vpermxor.uc ../unroll.awk
|
|
$(AWK) ../unroll.awk -vN=8 < vpermxor.uc > $@
|
|
|
|
int1.c: int.uc ../unroll.awk
|
|
$(AWK) ../unroll.awk -vN=1 < int.uc > $@
|
|
|
|
int2.c: int.uc ../unroll.awk
|
|
$(AWK) ../unroll.awk -vN=2 < int.uc > $@
|
|
|
|
int4.c: int.uc ../unroll.awk
|
|
$(AWK) ../unroll.awk -vN=4 < int.uc > $@
|
|
|
|
int8.c: int.uc ../unroll.awk
|
|
$(AWK) ../unroll.awk -vN=8 < int.uc > $@
|
|
|
|
int16.c: int.uc ../unroll.awk
|
|
$(AWK) ../unroll.awk -vN=16 < int.uc > $@
|
|
|
|
int32.c: int.uc ../unroll.awk
|
|
$(AWK) ../unroll.awk -vN=32 < int.uc > $@
|
|
|
|
tables.c: mktables
|
|
./mktables > tables.c
|
|
|
|
clean:
|
|
rm -f *.o *.a mktables mktables.c *.uc int*.c altivec*.c vpermxor*.c neon*.c tables.c raid6test
|
|
|
|
spotless: clean
|
|
rm -f *~
|