c81950a2f1
When we make changes to the TCG we sometimes cause regressions that are deep into the execution cycle of the guest. Debugging this often requires comparing large volumes of trace information to figure out where behaviour has diverged. The lockstep plugin utilises a shared socket so two QEMU's running with the plugin will write their current execution position and wait to receive the position of their partner process. When execution diverges the plugins output where they were and the previous few blocks before unloading themselves and letting execution continue. Originally I planned for this to be most useful with -icount but it turns out you can get divergence pretty quickly due to asynchronous qemu_cpu_kick_rr_cpus() events causing one side to eventually run into a short block a few cycles before the other side. For this reason I've added a bit of tracking and I think the divergence reporting could be finessed to report only if we really start to diverge in execution. An example run would be: qemu-system-sparc -monitor none -parallel none -net none \ -M SS-20 -m 256 -kernel day11/zImage.elf \ -plugin ./tests/plugin/liblockstep.so,arg=lockstep-sparc.sock \ -d plugin,nochain with an identical command in another window in the same working directory. Signed-off-by: Alex Bennée <alex.bennee@linaro.org> Reviewed-by: Robert Foley <robert.foley@linaro.org> Tested-by: Robert Foley <robert.foley@linaro.org> Cc: Richard Henderson <richard.henderson@linaro.org> Cc: Mark Cave-Ayland <mark.cave-ayland@ilande.co.uk> Message-Id: <20200610155509.12850-3-alex.bennee@linaro.org>
186 lines
5.5 KiB
Makefile
186 lines
5.5 KiB
Makefile
# -*- Mode: makefile -*-
|
|
#
|
|
# TCG tests
|
|
#
|
|
# These are complicated by the fact we want to build them for guest
|
|
# systems. This requires knowing what guests we are building and which
|
|
# ones we have cross-compilers for or docker images with
|
|
# cross-compilers.
|
|
#
|
|
# The tests themselves should be as minimal as possible as
|
|
# cross-compilers don't always have a large amount of libraries
|
|
# available.
|
|
#
|
|
# We only include the host build system for SRC_PATH and we don't
|
|
# bother with the common rules.mk. We expect the following:
|
|
#
|
|
# CC - the C compiler command
|
|
# EXTRA_CFLAGS - any extra CFLAGS
|
|
# BUILD_STATIC - are we building static binaries
|
|
#
|
|
# By default all tests are statically compiled but some host systems
|
|
# may not package static libraries by default. If an external
|
|
# cross-compiler can only build dynamic libraries the user might need
|
|
# to make extra efforts to ensure ld.so can link at runtime when the
|
|
# tests are run.
|
|
#
|
|
# We also accept SPEED=slow to enable slower running tests
|
|
#
|
|
# We also expect to be in the tests build dir for the FOO-(linux-user|softmmu).
|
|
#
|
|
|
|
all:
|
|
-include ../../../config-host.mak
|
|
-include ../config-$(TARGET).mak
|
|
|
|
# for including , in command strings
|
|
COMMA := ,
|
|
|
|
quiet-command = $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1, @$1))
|
|
|
|
# $1 = test name, $2 = cmd, $3 = desc
|
|
ifdef CONFIG_USER_ONLY
|
|
run-test = $(call quiet-command, timeout $(TIMEOUT) $2 > $1.out,"TEST",$3)
|
|
else
|
|
run-test = $(call quiet-command, timeout $(TIMEOUT) $2,"TEST",$3)
|
|
endif
|
|
|
|
# $1 = test name, $2 = reference
|
|
# to work around the pipe squashing the status we only pipe the result if
|
|
# we know it failed and then force failure at the end.
|
|
diff-out = $(call quiet-command, diff -q $1.out $2 || \
|
|
(diff -u $1.out $2 | head -n 10 && false), \
|
|
"DIFF","$1.out with $2")
|
|
|
|
# $1 = test name, $2 = reason
|
|
skip-test = @printf " SKIPPED %s on $(TARGET_NAME) because %s\n" $1 $2
|
|
|
|
# $1 = test name, $2 = reference
|
|
# As above but only diff if reference file exists, otherwise the test
|
|
# passes if it managed to complete with a status of zero
|
|
conditional-diff-out = \
|
|
$(if $(wildcard $2), \
|
|
$(call diff-out,$1,$2), \
|
|
$(call skip-test,"$1 check","no reference"))
|
|
|
|
|
|
# Tests we are building
|
|
TESTS=
|
|
# additional tests which may re-use existing binaries
|
|
EXTRA_TESTS=
|
|
|
|
# Start with a blank slate, the build targets get to add stuff first
|
|
CFLAGS=
|
|
QEMU_CFLAGS=
|
|
LDFLAGS=
|
|
|
|
QEMU_OPTS=
|
|
|
|
|
|
# If TCG debugging is enabled things are a lot slower
|
|
ifeq ($(CONFIG_DEBUG_TCG),y)
|
|
TIMEOUT=60
|
|
else
|
|
TIMEOUT=15
|
|
endif
|
|
|
|
ifdef CONFIG_USER_ONLY
|
|
# The order we include is important. We include multiarch first and
|
|
# 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/$(TARGET_NAME)/Makefile.target
|
|
|
|
# Add the common build options
|
|
CFLAGS+=-Wall -O0 -g -fno-strict-aliasing
|
|
ifeq ($(BUILD_STATIC),y)
|
|
LDFLAGS+=-static
|
|
endif
|
|
|
|
%: %.c
|
|
$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS)
|
|
else
|
|
# For softmmu targets we include a different Makefile fragement as the
|
|
# build options for bare programs are usually pretty different. They
|
|
# are expected to provide their own build recipes.
|
|
-include $(SRC_PATH)/tests/tcg/minilib/Makefile.target
|
|
-include $(SRC_PATH)/tests/tcg/multiarch/system/Makefile.softmmu-target
|
|
-include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.softmmu-target
|
|
|
|
endif
|
|
|
|
all: $(TESTS) $(EXTRA_TESTS)
|
|
|
|
#
|
|
# Test Runners
|
|
#
|
|
# By default we just run the test with the appropriate QEMU for the
|
|
# target. More advanced tests may want to override the runner in their
|
|
# specific make rules. Additional runners for the same binary should
|
|
# be added to EXTRA_RUNS.
|
|
#
|
|
|
|
RUN_TESTS=$(patsubst %,run-%, $(TESTS))
|
|
|
|
# If plugins exist also include those in the tests
|
|
ifeq ($(CONFIG_PLUGIN),y)
|
|
PLUGIN_SRC=$(SRC_PATH)/tests/plugin
|
|
PLUGIN_LIB=../../plugin
|
|
VPATH+=$(PLUGIN_LIB)
|
|
PLUGINS=$(filter-out liblockstep.so,\
|
|
$(patsubst %.c, lib%.so, $(notdir $(wildcard $(PLUGIN_SRC)/*.c))))
|
|
|
|
# We need to ensure expand the run-plugin-TEST-with-PLUGIN
|
|
# pre-requistes manually here as we can't use stems to handle it. We
|
|
# also add some special helpers the run-plugin- rules can use bellow.
|
|
|
|
$(foreach p,$(PLUGINS), \
|
|
$(foreach t,$(TESTS),\
|
|
$(eval run-plugin-$(t)-with-$(p): $t $p) \
|
|
$(eval run-plugin-$(t)-with-$(p): TIMEOUT=60) \
|
|
$(eval RUN_TESTS+=run-plugin-$(t)-with-$(p))))
|
|
endif
|
|
|
|
strip-plugin = $(wordlist 1, 1, $(subst -with-, ,$1))
|
|
extract-plugin = $(wordlist 2, 2, $(subst -with-, ,$1))
|
|
|
|
RUN_TESTS+=$(EXTRA_RUNS)
|
|
|
|
ifdef CONFIG_USER_ONLY
|
|
run-%: %
|
|
$(call run-test, $<, $(QEMU) $(QEMU_OPTS) $<, "$< on $(TARGET_NAME)")
|
|
|
|
run-plugin-%:
|
|
$(call run-test, $@, $(QEMU) $(QEMU_OPTS) \
|
|
-plugin $(PLUGIN_LIB)/$(call extract-plugin,$@) \
|
|
-d plugin -D $*.pout \
|
|
$(call strip-plugin,$<), \
|
|
"$* on $(TARGET_NAME)")
|
|
else
|
|
run-%: %
|
|
$(call run-test, $<, \
|
|
$(QEMU) -monitor none -display none \
|
|
-chardev file$(COMMA)path=$<.out$(COMMA)id=output \
|
|
$(QEMU_OPTS) $<, \
|
|
"$< on $(TARGET_NAME)")
|
|
|
|
run-plugin-%:
|
|
$(call run-test, $@, \
|
|
$(QEMU) -monitor none -display none \
|
|
-chardev file$(COMMA)path=$@.out$(COMMA)id=output \
|
|
-plugin $(PLUGIN_LIB)/$(call extract-plugin,$@) \
|
|
-d plugin -D $*.pout \
|
|
$(QEMU_OPTS) $(call strip-plugin,$<), \
|
|
"$* on $(TARGET_NAME)")
|
|
endif
|
|
|
|
gdb-%: %
|
|
gdb --args $(QEMU) $(QEMU_OPTS) $<
|
|
|
|
.PHONY: run
|
|
run: $(RUN_TESTS)
|
|
|
|
# There is no clean target, the calling make just rm's the tests build dir
|