mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests/tcg: clean-up some comments after the de-tangling

Browse Source 
These were missed in the recent de-tangling so have been updated to be
more actuate. I've also built up ARM_TESTS in a manner similar to
AARCH64_TESTS for better consistency.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Message-id: 20190913151845.12582-2-alex.bennee@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Alex Bennée 2019-09-19 14:18:40 +01:00 committed by Peter Maydell
parent d56974afe9
commit 72ab7f9e1d
3 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/tcg/Makefile.target
View File

@ -74,8 +74,11 @@ TIMEOUT=15
endif endif
ifdef CONFIG_USER_ONLY ifdef CONFIG_USER_ONLY
# The order we include is important. We include multiarch, base arch # The order we include is important. We include multiarch first and
# and finally arch if it's not the same as base arch. # then the target. If there are common tests shared between
# sub-targets (e.g. ARM & AArch64) then it is up to
# $(TARGET_NAME)/Makefile.target to include the common parent
# architecture in its VPATH.
-include $(SRC_PATH)/tests/tcg/multiarch/Makefile.target -include $(SRC_PATH)/tests/tcg/multiarch/Makefile.target
-include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.target -include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.target

3
tests/tcg/aarch64/Makefile.target
View File

@ -8,7 +8,7 @@ VPATH += $(ARM_SRC)
AARCH64_SRC=$(SRC_PATH)/tests/tcg/aarch64 AARCH64_SRC=$(SRC_PATH)/tests/tcg/aarch64
VPATH += $(AARCH64_SRC) VPATH += $(AARCH64_SRC)
# we don't build any other ARM test # Float-convert Tests
AARCH64_TESTS=fcvt AARCH64_TESTS=fcvt
fcvt: LDFLAGS+=-lm fcvt: LDFLAGS+=-lm
@ -17,6 +17,7 @@ run-fcvt: fcvt
$(call run-test,$<,$(QEMU) $<, "$< on $(TARGET_NAME)") $(call run-test,$<,$(QEMU) $<, "$< on $(TARGET_NAME)")
$(call diff-out,$<,$(AARCH64_SRC)/fcvt.ref) $(call diff-out,$<,$(AARCH64_SRC)/fcvt.ref)
# Pauth Tests
AARCH64_TESTS += pauth-1 pauth-2 AARCH64_TESTS += pauth-1 pauth-2
run-pauth-%: QEMU_OPTS += -cpu max run-pauth-%: QEMU_OPTS += -cpu max

15
tests/tcg/arm/Makefile.target
View File

@ -8,25 +8,26 @@ ARM_SRC=$(SRC_PATH)/tests/tcg/arm
# Set search path for all sources # Set search path for all sources
VPATH += $(ARM_SRC) VPATH += $(ARM_SRC)
ARM_TESTS=hello-arm test-arm-iwmmxt # Basic Hello World
ARM_TESTS = hello-arm
TESTS += $(ARM_TESTS) fcvt
hello-arm: CFLAGS+=-marm -ffreestanding hello-arm: CFLAGS+=-marm -ffreestanding
hello-arm: LDFLAGS+=-nostdlib hello-arm: LDFLAGS+=-nostdlib
# IWMXT floating point extensions
ARM_TESTS += test-arm-iwmmxt
test-arm-iwmmxt: CFLAGS+=-marm -march=iwmmxt -mabi=aapcs -mfpu=fpv4-sp-d16 test-arm-iwmmxt: CFLAGS+=-marm -march=iwmmxt -mabi=aapcs -mfpu=fpv4-sp-d16
test-arm-iwmmxt: test-arm-iwmmxt.S test-arm-iwmmxt: test-arm-iwmmxt.S
$(CC) $(CFLAGS) $< -o $@ $(LDFLAGS) $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS)
ifeq ($(TARGET_NAME), arm) # Float-convert Tests
ARM_TESTS += fcvt
fcvt: LDFLAGS+=-lm fcvt: LDFLAGS+=-lm
# fcvt: CFLAGS+=-march=armv8.2-a+fp16 -mfpu=neon-fp-armv8 # fcvt: CFLAGS+=-march=armv8.2-a+fp16 -mfpu=neon-fp-armv8
run-fcvt: fcvt run-fcvt: fcvt
$(call run-test,fcvt,$(QEMU) $<,"$< on $(TARGET_NAME)") $(call run-test,fcvt,$(QEMU) $<,"$< on $(TARGET_NAME)")
$(call diff-out,fcvt,$(ARM_SRC)/fcvt.ref) $(call diff-out,fcvt,$(ARM_SRC)/fcvt.ref)
endif
TESTS += $(ARM_TESTS)
# On ARM Linux only supports 4k pages # On ARM Linux only supports 4k pages
EXTRA_RUNS+=run-test-mmap-4096 EXTRA_RUNS+=run-test-mmap-4096