[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 11/20] tests/tcg: unify ppc64 and ppc64le Makefiles
From: |
Paolo Bonzini |
Subject: |
[PATCH 11/20] tests/tcg: unify ppc64 and ppc64le Makefiles |
Date: |
Fri, 26 Aug 2022 00:27:36 +0200 |
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>
---
tests/tcg/ppc64/Makefile.target | 1 -
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/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/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/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/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.37.1
- [PATCH 01/20] configure: do not invoke as/ld directly for pc-bios/optionrom, (continued)
- [PATCH 01/20] configure: do not invoke as/ld directly for pc-bios/optionrom, Paolo Bonzini, 2022/08/25
- [PATCH 03/20] pc-bios/s390-ccw: detect CC options just once, Paolo Bonzini, 2022/08/25
- [PATCH 05/20] build: add recursive distclean rules, Paolo Bonzini, 2022/08/25
- [PATCH 02/20] pc-bios/optionrom: detect CC options just once, Paolo Bonzini, 2022/08/25
- [PATCH 06/20] configure: return status code from probe_target_compiler, Paolo Bonzini, 2022/08/25
- [PATCH 04/20] vof: add distclean target, Paolo Bonzini, 2022/08/25
- [PATCH 07/20] configure: store container engine in config-host.mak, Paolo Bonzini, 2022/08/25
- [PATCH 08/20] tests: simplify Makefile invocation for tests/tcg, Paolo Bonzini, 2022/08/25
- [PATCH 09/20] tests/tcg: remove -f from Makefile invocation, Paolo Bonzini, 2022/08/25
- [PATCH 10/20] tests/tcg: add distclean rule, Paolo Bonzini, 2022/08/25
- [PATCH 11/20] tests/tcg: unify ppc64 and ppc64le Makefiles,
Paolo Bonzini <=
- [PATCH 12/20] tests/tcg: clean up calls to run-test, Paolo Bonzini, 2022/08/25
- [PATCH 13/20] tests/tcg: move compiler tests to Makefiles, Paolo Bonzini, 2022/08/25
- [PATCH 14/20] configure: move tests/tcg/Makefile.prereqs to root build directory, Paolo Bonzini, 2022/08/25
- [PATCH 15/20] configure: unify creation of cross-compilation Makefiles, Paolo Bonzini, 2022/08/25
- [PATCH 17/20] configure: build ROMs with container-based cross compilers, Paolo Bonzini, 2022/08/25
- [PATCH 18/20] pc-bios/optionrom: Adopt meson style Make output, Paolo Bonzini, 2022/08/25
- [PATCH 16/20] configure: cleanup creation of tests/tcg target config, Paolo Bonzini, 2022/08/25
- [PATCH 19/20] pc-bios/s390-ccw: Adopt meson style Make output, Paolo Bonzini, 2022/08/25
- [PATCH 20/20] pc-bios/vof: Adopt meson style Make output, Paolo Bonzini, 2022/08/25