Avoid redefining macros to encode ppc instructions instead reuse it from ppc-opcode.h, Makefile changes are necessary to compile memcmp_64.S with __ASSEMBLY__ defined from selftests.
Signed-off-by: Balamuruhan S <bal...@linux.ibm.com> --- .../selftests/powerpc/stringloops/Makefile | 34 ++++++++++++++---- .../powerpc/stringloops/asm/asm-const.h | 1 + .../powerpc/stringloops/asm/ppc-opcode.h | 36 +------------------ 3 files changed, 29 insertions(+), 42 deletions(-) create mode 120000 tools/testing/selftests/powerpc/stringloops/asm/asm-const.h mode change 100644 => 120000 tools/testing/selftests/powerpc/stringloops/asm/ppc-opcode.h diff --git a/tools/testing/selftests/powerpc/stringloops/Makefile b/tools/testing/selftests/powerpc/stringloops/Makefile index 7fc0623d85c3..efe76c5a5b94 100644 --- a/tools/testing/selftests/powerpc/stringloops/Makefile +++ b/tools/testing/selftests/powerpc/stringloops/Makefile @@ -1,26 +1,44 @@ # SPDX-License-Identifier: GPL-2.0 # The loops are all 64-bit code -CFLAGS += -I$(CURDIR) +GIT_VERSION = $(shell git describe --always --long --dirty || echo "unknown") +CFLAGS += -DGIT_VERSION='"$(GIT_VERSION)"' -I$(CURDIR) -I$(CURDIR)/../include EXTRA_SOURCES := ../harness.c build_32bit = $(shell if ($(CC) $(CFLAGS) -m32 -o /dev/null memcmp.c >/dev/null 2>&1) then echo "1"; fi) +ifneq ($(build_32bit),1) TEST_GEN_PROGS := memcmp_64 strlen +TEST_GEN_FILES := memcmp.o memcmp_64.o memcmp_64 +MEMCMP := $(OUTPUT)/memcmp.o +MEMCMP_64 := $(OUTPUT)/memcmp_64.o +HARNESS := $(OUTPUT)/../harness.o +CFLAGS += -m64 -maltivec -$(OUTPUT)/memcmp_64: memcmp.c -$(OUTPUT)/memcmp_64: CFLAGS += -m64 -maltivec +OVERRIDE_TARGETS := 1 +include ../../lib.mk -ifeq ($(build_32bit),1) +$(OUTPUT)/memcmp_64: $(MEMCMP_64) $(MEMCMP) $(HARNESS) + $(CC) $(CFLAGS) memcmp.o memcmp_64.o ../harness.o -o memcmp_64 + +$(MEMCMP_64): memcmp_64.S + $(CC) $(CFLAGS) -D__ASSEMBLY__ -o memcmp_64.o -c memcmp_64.S + +$(MEMCMP): memcmp.c + $(CC) $(CFLAGS) -o memcmp.o -c memcmp.c + +$(HARNESS): $(EXTRA_SOURCES) + $(CC) $(CFLAGS) -DGIT_VERSION='"$(GIT_VERSION)"' -o ../harness.o -c $(EXTRA_SOURCES) +else $(OUTPUT)/memcmp_32: memcmp.c $(OUTPUT)/memcmp_32: CFLAGS += -m32 TEST_GEN_PROGS += memcmp_32 endif -$(OUTPUT)/strlen: strlen.c string.c - -ifeq ($(build_32bit),1) +ifneq ($(build_32bit),1) +$(OUTPUT)/strlen: string.c +else $(OUTPUT)/strlen_32: strlen.c $(OUTPUT)/strlen_32: CFLAGS += -m32 @@ -30,6 +48,8 @@ endif ASFLAGS = $(CFLAGS) top_srcdir = ../../../../.. +ifeq ($(build_32bit),1) include ../../lib.mk +endif $(TEST_GEN_PROGS): $(EXTRA_SOURCES) diff --git a/tools/testing/selftests/powerpc/stringloops/asm/asm-const.h b/tools/testing/selftests/powerpc/stringloops/asm/asm-const.h new file mode 120000 index 000000000000..18d8be13e67f --- /dev/null +++ b/tools/testing/selftests/powerpc/stringloops/asm/asm-const.h @@ -0,0 +1 @@ +../../../../../../arch/powerpc/include/asm/asm-const.h \ No newline at end of file diff --git a/tools/testing/selftests/powerpc/stringloops/asm/ppc-opcode.h b/tools/testing/selftests/powerpc/stringloops/asm/ppc-opcode.h deleted file mode 100644 index 3edd1a1d9128..000000000000 --- a/tools/testing/selftests/powerpc/stringloops/asm/ppc-opcode.h +++ /dev/null @@ -1,35 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0-or-later */ -/* - * Copyright 2009 Freescale Semiconductor, Inc. - * - * provides masks and opcode images for use by code generation, emulation - * and for instructions that older assemblers might not know about - */ -#ifndef _ASM_POWERPC_PPC_OPCODE_H -#define _ASM_POWERPC_PPC_OPCODE_H - - -# define stringify_in_c(...) __VA_ARGS__ -# define ASM_CONST(x) x - - -#define PPC_INST_VCMPEQUD_RC 0x100000c7 -#define PPC_INST_VCMPEQUB_RC 0x10000006 - -#define __PPC_RC21 (0x1 << 10) - -/* macros to insert fields into opcodes */ -#define ___PPC_RA(a) (((a) & 0x1f) << 16) -#define ___PPC_RB(b) (((b) & 0x1f) << 11) -#define ___PPC_RS(s) (((s) & 0x1f) << 21) -#define ___PPC_RT(t) ___PPC_RS(t) - -#define VCMPEQUD_RC(vrt, vra, vrb) stringify_in_c(.long PPC_INST_VCMPEQUD_RC | \ - ___PPC_RT(vrt) | ___PPC_RA(vra) | \ - ___PPC_RB(vrb) | __PPC_RC21) - -#define VCMPEQUB_RC(vrt, vra, vrb) stringify_in_c(.long PPC_INST_VCMPEQUB_RC | \ - ___PPC_RT(vrt) | ___PPC_RA(vra) | \ - ___PPC_RB(vrb) | __PPC_RC21) - -#endif /* _ASM_POWERPC_PPC_OPCODE_H */ diff --git a/tools/testing/selftests/powerpc/stringloops/asm/ppc-opcode.h b/tools/testing/selftests/powerpc/stringloops/asm/ppc-opcode.h new file mode 120000 index 000000000000..f9b1f27ac335 --- /dev/null +++ b/tools/testing/selftests/powerpc/stringloops/asm/ppc-opcode.h @@ -0,0 +1 @@ +../../../../../../arch/powerpc/include/asm/ppc-opcode.h \ No newline at end of file -- 2.24.1
