[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 04/33] tests/tcg/mips: Run MSA opcodes tests on user-mode emu
|
From: |
Philippe Mathieu-Daudé |
|
Subject: |
Re: [PATCH 04/33] tests/tcg/mips: Run MSA opcodes tests on user-mode emulation |
|
Date: |
Wed, 27 Oct 2021 12:38:51 +0200 |
|
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.2.0 |
On 10/23/21 23:47, Philippe Mathieu-Daudé wrote:
> The following commits added various user-mode tests
> for various MSA instructions:
>
> - 0fdd986a6c8 ("Add tests for MSA integer add instructions")
> - 1be82d89011 ("Add tests for MSA integer average instructions")
> - 1d336c87a3c ("Add tests for MSA bit set instructions")
> - 1e6bea794c8 ("Add tests for MSA integer max/min instructions")
> - 2a367db039f ("Add tests for MSA pack instructions")
> - 3d9569b8550 ("Add tests for MSA move instructions")
> - 4b302ce90db ("Add tests for MSA integer multiply instructions")
> - 520e210c0aa ("Add tests for MSA integer compare instructions")
> - 53e116fed6d ("Add tests for MSA integer subtract instructions")
> - 666952ea7c1 ("Add tests for MSA bit move instructions")
> - 72f463bc080 ("Add tests for MSA integer divide instructions")
> - 8598f5fac1c ("Add tests for MSA FP max/min instructions")
> - 99d423e576a ("Add tests for MSA shift instructions")
> - a8f91dd9fd0 ("Add tests for MSA integer dot product instructions")
> - b62592ab655 ("Add tests for MSA bit counting instructions")
> - ba632924450 ("Add tests for MSA logic instructions")
> - fc76f486677 ("Add tests for MSA interleave instructions")
>
> Cover them in the buildsys machinery so they are run automatically
> when calling 'make check-tcg'.
>
> Start running them on the mips64el target.
>
> Cc: Alex Bennée <alex.bennee@linaro.org>
> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
> ---
> tests/tcg/mips/ase-msa.mak | 30 ++++++++++++++++++++++++++++++
> MAINTAINERS | 1 +
> tests/tcg/mips/Makefile.target | 5 +++++
> tests/tcg/mips64/Makefile.target | 9 +++++++++
> tests/tcg/mips64el/Makefile.target | 12 ++++++++++++
> tests/tcg/mipsel/Makefile.target | 9 +++++++++
> 6 files changed, 66 insertions(+)
> create mode 100644 tests/tcg/mips/ase-msa.mak
> create mode 100644 tests/tcg/mips64/Makefile.target
> create mode 100644 tests/tcg/mips64el/Makefile.target
> create mode 100644 tests/tcg/mipsel/Makefile.target
>
> diff --git a/tests/tcg/mips/ase-msa.mak b/tests/tcg/mips/ase-msa.mak
> new file mode 100644
> index 00000000000..be1ba967a5b
> --- /dev/null
> +++ b/tests/tcg/mips/ase-msa.mak
> @@ -0,0 +1,30 @@
> +# -*- Mode: makefile -*-
> +#
> +# MIPS MSA specific TCG tests
> +#
> +# Copyright (c) 2021 Philippe Mathieu-Daudé <f4bug@amsat.org>
> +#
> +# SPDX-License-Identifier: GPL-2.0-or-later
> +
> +MSA_DIR = $(SRC_PATH)/tests/tcg/mips/user/ase/msa
> +
> +MSA_TEST_CLASS = bit-count bit-move bit-set fixed-multiply \
> + float-max-min int-add int-average int-compare
> int-divide \
> + int-dot-product interleave int-max-min
> int-modulo \
> + int-multiply int-subtract logic move pack shift
> +
> +MSA_TEST_SRCS = $(foreach class,$(MSA_TEST_CLASS),$(wildcard
> $(MSA_DIR)/$(class)/*.c))
> +
> +MSA_TESTS = $(patsubst %.c,%,$(notdir $(MSA_TEST_SRCS)))
> +
> +$(MSA_TESTS): CFLAGS+=-mmsa $(MSA_CFLAGS)
> +$(MSA_TESTS): %: $(foreach CLASS,$(MSA_TEST_CLASS),$(wildcard
> $(MSA_DIR)/$(CLASS)/%.c))
> + $(CC) -static $(CFLAGS) -o $@ \
> + $(foreach CLASS,$(MSA_TEST_CLASS),$(wildcard
> $(MSA_DIR)/$(CLASS)/$@.c))
FYI I am using $wilcard because because the test files are in multiple
directories ($MSA_TEST_CLASS).
> +
> +$(foreach test,$(MSA_TESTS),run-$(test)): QEMU_OPTS += -cpu $(MSA_CPU)
> +
> +# FIXME: These tests fail when using plugins
> +ifneq ($(CONFIG_PLUGIN),y)
> +TESTS += $(MSA_TESTS)
> +endif
> diff --git a/MAINTAINERS b/MAINTAINERS
> index 4e77d03651b..53c6c549b80 100644
> --- a/MAINTAINERS
> +++ b/MAINTAINERS
> @@ -3111,6 +3111,7 @@ R: Jiaxun Yang <jiaxun.yang@flygoat.com>
> R: Aleksandar Rikalo <aleksandar.rikalo@syrmia.com>
> S: Odd Fixes
> F: tcg/mips/
> +F: tests/tcg/mips*
>
> PPC TCG target
> M: Richard Henderson <richard.henderson@linaro.org>
> diff --git a/tests/tcg/mips/Makefile.target b/tests/tcg/mips/Makefile.target
> index 1a994d5525e..191fe179119 100644
> --- a/tests/tcg/mips/Makefile.target
> +++ b/tests/tcg/mips/Makefile.target
> @@ -17,3 +17,8 @@ TESTS += $(MIPS_TESTS)
> hello-mips: CFLAGS+=-mno-abicalls -fno-PIC -mabi=32
> hello-mips: LDFLAGS+=-nostdlib
> endif
> +
> +# FIXME enable MSA tests
This is commented because the Debian toolchain produces:
/usr/mips-linux-gnu/include/gnu/stubs.h:17:11: fatal error:
gnu/stubs-o32_hard_2008.h: No such file or directory
# include <gnu/stubs-o32_hard_2008.h>
^~~~~~~~~~~~~~~~~~~~~~~~~~~
> +#MSA_CFLAGS=-march=mips64r5 -mnan=2008
Here I meant:
MSA_CFLAGS=-march=mips32r5 -mnan=2008
Anyhow, similar error using -march=mips32r6.
> +#MSA_CPU=P5600
> +#include $(SRC_PATH)/tests/tcg/mips/ase-msa.mak
> diff --git a/tests/tcg/mips64/Makefile.target
> b/tests/tcg/mips64/Makefile.target
> new file mode 100644
> index 00000000000..d876b92f219
> --- /dev/null
> +++ b/tests/tcg/mips64/Makefile.target
> @@ -0,0 +1,9 @@
> +# -*- Mode: makefile -*-
> +#
> +# mips64el specific TCG tests
> +#
> +# Copyright (c) 2021 Philippe Mathieu-Daudé <f4bug@amsat.org>
> +#
> +# SPDX-License-Identifier: GPL-2.0-or-later
> +
> +# 64-bit MSA is tested on little-endian target
> diff --git a/tests/tcg/mips64el/Makefile.target
> b/tests/tcg/mips64el/Makefile.target
> new file mode 100644
> index 00000000000..87c0d6dce18
> --- /dev/null
> +++ b/tests/tcg/mips64el/Makefile.target
> @@ -0,0 +1,12 @@
> +# -*- Mode: makefile -*-
> +#
> +# mips64el specific TCG tests
> +#
> +# Copyright (c) 2021 Philippe Mathieu-Daudé <f4bug@amsat.org>
> +#
> +# SPDX-License-Identifier: GPL-2.0-or-later
> +
> +# MSA
> +MSA_CFLAGS=-march=mips64r5 -mnan=legacy
> +MSA_CPU=Loongson-3A4000
> +include $(SRC_PATH)/tests/tcg/mips/ase-msa.mak
> diff --git a/tests/tcg/mipsel/Makefile.target
> b/tests/tcg/mipsel/Makefile.target
> new file mode 100644
> index 00000000000..c8acacb4497
> --- /dev/null
> +++ b/tests/tcg/mipsel/Makefile.target
> @@ -0,0 +1,9 @@
> +# -*- Mode: makefile -*-
> +#
> +# mipsel specific TCG tests
> +#
> +# Copyright (c) 2021 Philippe Mathieu-Daudé <f4bug@amsat.org>
> +#
> +# SPDX-License-Identifier: GPL-2.0-or-later
> +
> +# 32-bit MSA is tested on big-endian target
>
- [PATCH 00/33] target/mips: Fully convert MSA opcodes to decodetree, Philippe Mathieu-Daudé, 2021/10/23
- [PATCH 01/33] tests/tcg: Fix some targets default cross compiler path, Philippe Mathieu-Daudé, 2021/10/23
- [PATCH 02/33] target/mips: Fix MSA MADDV.B opcode, Philippe Mathieu-Daudé, 2021/10/23
- [PATCH 03/33] target/mips: Fix MSA MSUBV.B opcode, Philippe Mathieu-Daudé, 2021/10/23
- [PATCH 04/33] tests/tcg/mips: Run MSA opcodes tests on user-mode emulation, Philippe Mathieu-Daudé, 2021/10/23
- Re: [PATCH 04/33] tests/tcg/mips: Run MSA opcodes tests on user-mode emulation,
Philippe Mathieu-Daudé <=
- [PATCH 05/33] target/mips: Have check_msa_access() return a boolean, Philippe Mathieu-Daudé, 2021/10/23
- [PATCH 06/33] target/mips: Use enum definitions from CPUMIPSMSADataFormat enum, Philippe Mathieu-Daudé, 2021/10/23
- [PATCH 07/33] target/mips: Rename sa16 -> sa, bz_df -> bz -> bz_v, Philippe Mathieu-Daudé, 2021/10/23
- [PATCH 08/33] target/mips: Convert MSA LDI opcode to decodetree, Philippe Mathieu-Daudé, 2021/10/23
- [PATCH 09/33] target/mips: Introduce generic TRANS_CHECK() for decodetree helpers, Philippe Mathieu-Daudé, 2021/10/23