[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v1 22/51] tests/tcg: unify ppc64 and ppc64le Makefiles
From: |
Alex Bennée |
Subject: |
[PATCH v1 22/51] tests/tcg: unify ppc64 and ppc64le Makefiles |
Date: |
Thu, 29 Sep 2022 12:42:02 +0100 |
From: Paolo Bonzini <pbonzini@redhat.com>
Make tests/tcg/ppc64le include tests/tcg/ppc64 instead of duplicating
the rules. Because the ppc64le vpath includes tests/tcg/ppc64 but
not vice versa, the tests have to be moved from tests/tcg/ppc64le/
to tests/tcg/ppc64.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
---
tests/tcg/{ppc64le => ppc64}/bcdsub.c | 0
tests/tcg/{ppc64le => ppc64}/byte_reverse.c | 0
tests/tcg/{ppc64le => ppc64}/mffsce.c | 0
tests/tcg/{ppc64le => ppc64}/mtfsf.c | 0
.../{ppc64le => ppc64}/non_signalling_xscv.c | 0
.../signal_save_restore_xer.c | 0
tests/tcg/{ppc64le => ppc64}/xxspltw.c | 0
tests/tcg/ppc64/Makefile.target | 1 -
tests/tcg/ppc64le/Makefile.target | 26 +------------------
9 files changed, 1 insertion(+), 26 deletions(-)
rename tests/tcg/{ppc64le => ppc64}/bcdsub.c (100%)
rename tests/tcg/{ppc64le => ppc64}/byte_reverse.c (100%)
rename tests/tcg/{ppc64le => ppc64}/mffsce.c (100%)
rename tests/tcg/{ppc64le => ppc64}/mtfsf.c (100%)
rename tests/tcg/{ppc64le => ppc64}/non_signalling_xscv.c (100%)
rename tests/tcg/{ppc64le => ppc64}/signal_save_restore_xer.c (100%)
rename tests/tcg/{ppc64le => ppc64}/xxspltw.c (100%)
diff --git a/tests/tcg/ppc64le/bcdsub.c b/tests/tcg/ppc64/bcdsub.c
similarity index 100%
rename from tests/tcg/ppc64le/bcdsub.c
rename to tests/tcg/ppc64/bcdsub.c
diff --git a/tests/tcg/ppc64le/byte_reverse.c b/tests/tcg/ppc64/byte_reverse.c
similarity index 100%
rename from tests/tcg/ppc64le/byte_reverse.c
rename to tests/tcg/ppc64/byte_reverse.c
diff --git a/tests/tcg/ppc64le/mffsce.c b/tests/tcg/ppc64/mffsce.c
similarity index 100%
rename from tests/tcg/ppc64le/mffsce.c
rename to tests/tcg/ppc64/mffsce.c
diff --git a/tests/tcg/ppc64le/mtfsf.c b/tests/tcg/ppc64/mtfsf.c
similarity index 100%
rename from tests/tcg/ppc64le/mtfsf.c
rename to tests/tcg/ppc64/mtfsf.c
diff --git a/tests/tcg/ppc64le/non_signalling_xscv.c
b/tests/tcg/ppc64/non_signalling_xscv.c
similarity index 100%
rename from tests/tcg/ppc64le/non_signalling_xscv.c
rename to tests/tcg/ppc64/non_signalling_xscv.c
diff --git a/tests/tcg/ppc64le/signal_save_restore_xer.c
b/tests/tcg/ppc64/signal_save_restore_xer.c
similarity index 100%
rename from tests/tcg/ppc64le/signal_save_restore_xer.c
rename to tests/tcg/ppc64/signal_save_restore_xer.c
diff --git a/tests/tcg/ppc64le/xxspltw.c b/tests/tcg/ppc64/xxspltw.c
similarity index 100%
rename from tests/tcg/ppc64le/xxspltw.c
rename to tests/tcg/ppc64/xxspltw.c
diff --git a/tests/tcg/ppc64/Makefile.target b/tests/tcg/ppc64/Makefile.target
index 331fae628e..7db7a3e2b3 100644
--- a/tests/tcg/ppc64/Makefile.target
+++ b/tests/tcg/ppc64/Makefile.target
@@ -3,7 +3,6 @@
# ppc64 specific tweaks
VPATH += $(SRC_PATH)/tests/tcg/ppc64
-VPATH += $(SRC_PATH)/tests/tcg/ppc64le
ifneq ($(CROSS_CC_HAS_POWER8_VECTOR),)
PPC64_TESTS=bcdsub non_signalling_xscv
diff --git a/tests/tcg/ppc64le/Makefile.target
b/tests/tcg/ppc64le/Makefile.target
index 6ca3003f02..daad5118a5 100644
--- a/tests/tcg/ppc64le/Makefile.target
+++ b/tests/tcg/ppc64le/Makefile.target
@@ -4,28 +4,4 @@
VPATH += $(SRC_PATH)/tests/tcg/ppc64le
-ifneq ($(CROSS_CC_HAS_POWER8_VECTOR),)
-PPC64LE_TESTS=bcdsub non_signalling_xscv
-endif
-$(PPC64LE_TESTS): CFLAGS += -mpower8-vector
-
-ifneq ($(CROSS_CC_HAS_POWER10),)
-PPC64LE_TESTS += byte_reverse sha512-vector
-endif
-byte_reverse: CFLAGS += -mcpu=power10
-run-byte_reverse: QEMU_OPTS+=-cpu POWER10
-run-plugin-byte_reverse-with-%: QEMU_OPTS+=-cpu POWER10
-
-sha512-vector: CFLAGS +=-mcpu=power10 -O3
-sha512-vector: sha512.c
- $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS)
-
-run-sha512-vector: QEMU_OPTS+=-cpu POWER10
-run-plugin-sha512-vector-with-%: QEMU_OPTS+=-cpu POWER10
-
-PPC64LE_TESTS += mtfsf
-PPC64LE_TESTS += mffsce
-PPC64LE_TESTS += signal_save_restore_xer
-PPC64LE_TESTS += xxspltw
-
-TESTS += $(PPC64LE_TESTS)
+include $(SRC_PATH)/tests/tcg/ppc64/Makefile.target
--
2.34.1
- [PATCH v1 18/51] configure: store container engine in config-host.mak, (continued)
- [PATCH v1 18/51] configure: store container engine in config-host.mak, Alex Bennée, 2022/09/29
- [PATCH v1 20/51] tests/tcg: remove -f from Makefile invocation, Alex Bennée, 2022/09/29
- [PATCH v1 48/51] contrib/gitdm: add Paul to individual contributors, Alex Bennée, 2022/09/29
- [PATCH v1 50/51] contrib/gitdm: add ISCAS to the academics group, Alex Bennée, 2022/09/29
- [PATCH v1 44/51] gdbstub: move breakpoint logic to accel ops, Alex Bennée, 2022/09/29
- [PATCH v1 33/51] disas: generalise plugin_printf and use for monitor_disas, Alex Bennée, 2022/09/29
- [PATCH v1 42/51] gdbstub: move into its own sub directory, Alex Bennée, 2022/09/29
- [PATCH v1 39/51] contrib/plugins: reset skip when matching in execlog, Alex Bennée, 2022/09/29
- [PATCH v1 35/51] plugins: extend execlog to filter matches, Alex Bennée, 2022/09/29
- [PATCH v1 26/51] configure: unify creation of cross-compilation Makefiles, Alex Bennée, 2022/09/29
- [PATCH v1 22/51] tests/tcg: unify ppc64 and ppc64le Makefiles,
Alex Bennée <=
- [PATCH v1 32/51] monitor: expose monitor_puts to rest of code, Alex Bennée, 2022/09/29
- [PATCH v1 41/51] semihosting: update link to spec, Alex Bennée, 2022/09/29
- [PATCH v1 30/51] pc-bios/s390-ccw: Adopt meson style Make output, Alex Bennée, 2022/09/29
- [PATCH v1 51/51] contrib/gitdm: add China Telecom to the domain map, Alex Bennée, 2022/09/29
- [PATCH v1 40/51] docs/devel: document the test plugins, Alex Bennée, 2022/09/29
- [PATCH v1 46/51] accel/kvm: move kvm_update_guest_debug to inline stub, Alex Bennée, 2022/09/29
- [PATCH v1 31/51] pc-bios/vof: Adopt meson style Make output, Alex Bennée, 2022/09/29
- [PATCH v1 45/51] gdbstub: move guest debug support check to ops, Alex Bennée, 2022/09/29
- [PATCH v1 37/51] docs/devel: clean-up qemu invocations in tcg-plugins, Alex Bennée, 2022/09/29