Commit c6f5012b authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-next-260919-1' into staging 



Testing updates plus alpha FP fixes:

  - fix alpha handling of FtoI overflow
  - various docker cleanups
  - fix docker.py cleanup race
  - fix podman invocation
  - tests/tcg: add float and record/replay tests
  - remove unused docker images
  - expand documentation for check-tcg

# gpg: Signature made Thu 26 Sep 2019 19:33:38 BST
# gpg:                using RSA key 6685AE99E75167BCAFC8DF35FBD0DB095A9E2A44
# gpg: Good signature from "Alex Bennée (Master Work Key) <alex.bennee@linaro.org>" [full]
# Primary key fingerprint: 6685 AE99 E751 67BC AFC8  DF35 FBD0 DB09 5A9E 2A44

* remotes/stsquad/tags/pull-testing-next-260919-1: (28 commits)
  tests/docker: remove debian-powerpc-user-cross
  docker: move tests from python2 to python3
  docker: remove unused debian-sid
  docker: remove unused debian-ports
  docker: remove 'deprecated' image definitions
  docker: remove unused debian8 partial image
  docker: remove debian8-mxe definitions
  target/i386: Fix broken build with WHPX enabled
  docs/devel: add "check-tcg" to testing.rst
  configure: preserve PKG_CONFIG for subdir builds
  tests/tcg: add simple record/replay smoke test for aarch64
  tests/tcg: add generic version of float_convs
  tests/tcg: add float_madds test to multiarch
  tests/tcg: re-enable linux-test for ppc64abi32
  tests/tcg: clean-up some comments after the de-tangling
  podman: fix command invocation
  tests/docker: reduce scary warnings by cleaning up clean up
  tests/docker: remove python2.7 from debian9-mxe
  tests/docker: fix DOCKER_PARTIAL_IMAGES
  tests/docker: add sanitizers back to clang build
  ...

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents deee6ff7 80394ccf

Makefile

+5 −1
Original line number Diff line number Diff line
@@ -510,7 +510,11 @@ capstone/all: .git-submodule-status 


.PHONY: slirp/all

slirp/all: .git-submodule-status

	$(call quiet-command,$(MAKE) -C $(SRC_PATH)/slirp BUILD_DIR="$(BUILD_DIR)/slirp" CC="$(CC)" AR="$(AR)" LD="$(LD)" RANLIB="$(RANLIB)" CFLAGS="$(QEMU_CFLAGS) $(CFLAGS)" LDFLAGS="$(LDFLAGS)")

	$(call quiet-command,$(MAKE) -C $(SRC_PATH)/slirp		\

		BUILD_DIR="$(BUILD_DIR)/slirp" 			\

		PKG_CONFIG="$(PKG_CONFIG)" 				\

		CC="$(CC)" AR="$(AR)" 	LD="$(LD)" RANLIB="$(RANLIB)"	\

		CFLAGS="$(QEMU_CFLAGS) $(CFLAGS)" LDFLAGS="$(LDFLAGS)")



# Compatibility gunk to keep make working across the rename of targets

# for recursion, to be removed some time after 4.1.

configure

+1 −0
Original line number Diff line number Diff line
@@ -7302,6 +7302,7 @@ echo "OBJCOPY=$objcopy" >> $config_host_mak 
echo "LD=$ld" >> $config_host_mak

echo "RANLIB=$ranlib" >> $config_host_mak

echo "NM=$nm" >> $config_host_mak

echo "PKG_CONFIG=$pkg_config_exe" >> $config_host_mak

echo "WINDRES=$windres" >> $config_host_mak

echo "CFLAGS=$CFLAGS" >> $config_host_mak

echo "CFLAGS_NOPIE=$CFLAGS_NOPIE" >> $config_host_mak

docs/devel/testing.rst

+76 −0
Original line number Diff line number Diff line
@@ -266,6 +266,8 @@ another application on the host may have locked the file, possibly leading to a 
test failure.  If using such devices are explicitly desired, consider adding

``locking=off`` option to disable image locking.



.. _docker-ref:



Docker based tests

==================
@@ -799,3 +801,77 @@ And remove any package you want with:: 


If you've used ``make check-acceptance``, the Python virtual environment where

Avocado is installed will be cleaned up as part of ``make check-clean``.



Testing with "make check-tcg"

=============================



The check-tcg tests are intended for simple smoke tests of both

linux-user and softmmu TCG functionality. However to build test

programs for guest targets you need to have cross compilers available.

If your distribution supports cross compilers you can do something as

simple as::



  apt install gcc-aarch64-linux-gnu



The configure script will automatically pick up their presence.

Sometimes compilers have slightly odd names so the availability of

them can be prompted by passing in the appropriate configure option

for the architecture in question, for example::



  $(configure) --cross-cc-aarch64=aarch64-cc



There is also a ``--cross-cc-flags-ARCH`` flag in case additional

compiler flags are needed to build for a given target.



If you have the ability to run containers as the user you can also

take advantage of the build systems "Docker" support. It will then use

containers to build any test case for an enabled guest where there is

no system compiler available. See :ref: `_docker-ref` for details.



Running subset of tests

-----------------------



You can build the tests for one architecture::



  make build-tcg-tests-$TARGET



And run with::



  make run-tcg-tests-$TARGET



Adding ``V=1`` to the invocation will show the details of how to

invoke QEMU for the test which is useful for debugging tests.



TCG test dependencies

---------------------



The TCG tests are deliberately very light on dependencies and are

either totally bare with minimal gcc lib support (for softmmu tests)

or just glibc (for linux-user tests). This is because getting a cross

compiler to work with additional libraries can be challenging.



Other TCG Tests

---------------



There are a number of out-of-tree test suites that are used for more

extensive testing of processor features.



KVM Unit Tests

~~~~~~~~~~~~~~



The KVM unit tests are designed to run as a Guest OS under KVM but

there is no reason why they can't exercise the TCG as well. It

provides a minimal OS kernel with hooks for enabling the MMU as well

as reporting test results via a special device::



  https://git.kernel.org/pub/scm/virt/kvm/kvm-unit-tests.git



Linux Test Project

~~~~~~~~~~~~~~~~~~



The LTP is focused on exercising the syscall interface of a Linux

kernel. It checks that syscalls behave as documented and strives to

exercise as many corner cases as possible. It is a useful test suite

to run to exercise QEMU's linux-user code::



  https://linux-test-project.github.io/

linux-user/ppc/signal.c

+3 −1
Original line number Diff line number Diff line
@@ -501,7 +501,9 @@ void setup_rt_frame(int sig, struct target_sigaction *ka, 
    int i, err = 0;

#if defined(TARGET_PPC64)

    struct target_sigcontext *sc = 0;

#if !defined(TARGET_ABI32)

    struct image_info *image = ((TaskState *)thread_cpu->opaque)->info;

#endif

#endif



    rt_sf_addr = get_sigframe(ka, env, sizeof(*rt_sf));
@@ -557,7 +559,7 @@ void setup_rt_frame(int sig, struct target_sigaction *ka, 
    env->gpr[5] = (target_ulong) h2g(&rt_sf->uc);

    env->gpr[6] = (target_ulong) h2g(rt_sf);



#if defined(TARGET_PPC64)

#if defined(TARGET_PPC64) && !defined(TARGET_ABI32)

    if (get_ppc64_abi(image) < 2) {

        /* ELFv1 PPC64 function pointers are pointers to OPD entries. */

        struct target_func_ptr *handler =

target/alpha/fpu_helper.c

+4 −11
Original line number Diff line number Diff line
@@ -90,25 +90,18 @@ void helper_fp_exc_raise_s(CPUAlphaState *env, uint32_t ignore, uint32_t regno) 
    uint32_t exc = env->error_code & ~ignore;

    if (exc) {

        env->fpcr |= exc;

        exc &= ~ignore;

#ifdef CONFIG_USER_ONLY

        /*

         * In user mode, the kernel's software handler only

         * delivers a signal if the exception is enabled.

         */

        if (!(exc & env->fpcr_exc_enable)) {

            return;

        }

#else

        exc &= env->fpcr_exc_enable;

        /*

         * In system mode, the software handler gets invoked

         * for any non-ignored exception.

         * In user mode, the kernel's software handler only

         * delivers a signal if the exception is enabled.

         */

#ifdef CONFIG_USER_ONLY

        if (!exc) {

            return;

        }

#endif

        exc &= env->fpcr_exc_enable;

        fp_exc_raise1(env, GETPC(), exc, regno, EXC_M_SWC);

    }

}