Testing and one plugin fix:
- support alternates for genisoimage to test/vm - add clang++ to clang tests - fix record/replay smoke test - enable more softfloat tests - better detection of hung gdb - upgrade aarch64 tcg test x-compile to gcc-10 - fix plugin cpu_index clash vs threads -----BEGIN PGP SIGNATURE----- iQEzBAABCgAdFiEEZoWumedRZ7yvyN81+9DbCVqeKkQFAl7OazAACgkQ+9DbCVqe KkRFQwf/VPIy5u556hyXsXLW4cZeJG8zx4fOUhkLTecDL1ch6A+9io1EIyWCmkyU GmyuR7Lg5J3f5gsOHydNTiOKu3/VKYkjFAGhGGjz2jDHFz7tA3UWgMO58Nce0g5R IxNGD0IrJwyM0m1H5tB8NEkd7AAOnpGslr0YoE5eX1MHpeXSiDmXxIvYUA/7nktY AFld8wNh9IG1Gg8Ww5Iyxn4fuxggEtzFFvvjrZVZq5rKdDgv+9D3M2cIjNvfmSGV zIBjZBOFwopGk9cNMTk91oo4mEqH3BBrCHsxAmOnyf4WzH4us8TdRCr9dHKzxiFt YN/3iOP2IUZqstGGV/PY50WI0RQEoQ== =2Krq -----END PGP SIGNATURE----- Merge remote-tracking branch 'remotes/stsquad/tags/pull-testing-tcg-plugins-270520-1' into staging Testing and one plugin fix: - support alternates for genisoimage to test/vm - add clang++ to clang tests - fix record/replay smoke test - enable more softfloat tests - better detection of hung gdb - upgrade aarch64 tcg test x-compile to gcc-10 - fix plugin cpu_index clash vs threads # gpg: Signature made Wed 27 May 2020 14:29:20 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-tcg-plugins-270520-1: tests/tcg: add new threadcount test linux-user: properly "unrealize" vCPU object cpus-common: ensure auto-assigned cpu_indexes don't clash tests/docker: use a gcc-10 based image for arm64 tests tests/docker: add debian11 base image tests/tcg: better detect confused gdb which can't connect tests/fp: split and audit the conversion tests tests/fp: enable extf80_le_quite tests tests/tcg: fix invocation of the memory record/replay tests travis.yml: Use clang++ in the Clang tests tests/vm: pass --genisoimage to basevm script configure: add alternate binary for genisoimage Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell
commit
c86274bc2e
@ -205,14 +205,15 @@ jobs:
|
||||
# Test with Clang for compile portability (Travis uses clang-5.0)
|
||||
- name: "Clang (user)"
|
||||
env:
|
||||
- CONFIG="--disable-system"
|
||||
- CONFIG="--disable-system --host-cc=clang --cxx=clang++"
|
||||
- CACHE_NAME="${TRAVIS_BRANCH}-linux-clang-default"
|
||||
compiler: clang
|
||||
|
||||
|
||||
- name: "Clang (main-softmmu)"
|
||||
env:
|
||||
- CONFIG="--target-list=${MAIN_SOFTMMU_TARGETS} "
|
||||
- CONFIG="--target-list=${MAIN_SOFTMMU_TARGETS}
|
||||
--host-cc=clang --cxx=clang++"
|
||||
- CACHE_NAME="${TRAVIS_BRANCH}-linux-clang-sanitize"
|
||||
compiler: clang
|
||||
before_script:
|
||||
@ -222,7 +223,8 @@ jobs:
|
||||
|
||||
- name: "Clang (other-softmmu)"
|
||||
env:
|
||||
- CONFIG="--disable-user --target-list-exclude=${MAIN_SOFTMMU_TARGETS}"
|
||||
- CONFIG="--disable-user --target-list-exclude=${MAIN_SOFTMMU_TARGETS}
|
||||
--host-cc=clang --cxx=clang++"
|
||||
- CACHE_NAME="${TRAVIS_BRANCH}-linux-clang-default"
|
||||
compiler: clang
|
||||
|
||||
|
||||
2
configure
vendored
2
configure
vendored
@ -941,7 +941,7 @@ done
|
||||
|
||||
# Check for ancillary tools used in testing
|
||||
genisoimage=
|
||||
for binary in genisoimage
|
||||
for binary in genisoimage mkisofs
|
||||
do
|
||||
if has $binary
|
||||
then
|
||||
|
||||
@ -61,13 +61,15 @@ static bool cpu_index_auto_assigned;
|
||||
static int cpu_get_free_index(void)
|
||||
{
|
||||
CPUState *some_cpu;
|
||||
int cpu_index = 0;
|
||||
int max_cpu_index = 0;
|
||||
|
||||
cpu_index_auto_assigned = true;
|
||||
CPU_FOREACH(some_cpu) {
|
||||
cpu_index++;
|
||||
if (some_cpu->cpu_index >= max_cpu_index) {
|
||||
max_cpu_index = some_cpu->cpu_index + 1;
|
||||
}
|
||||
}
|
||||
return cpu_index;
|
||||
return max_cpu_index;
|
||||
}
|
||||
|
||||
void cpu_list_add(CPUState *cpu)
|
||||
@ -90,8 +92,6 @@ void cpu_list_remove(CPUState *cpu)
|
||||
return;
|
||||
}
|
||||
|
||||
assert(!(cpu_index_auto_assigned && cpu != QTAILQ_LAST(&cpus)));
|
||||
|
||||
QTAILQ_REMOVE_RCU(&cpus, cpu, node);
|
||||
cpu->cpu_index = UNASSIGNED_CPU_INDEX;
|
||||
}
|
||||
|
||||
@ -7635,30 +7635,33 @@ static abi_long do_syscall1(void *cpu_env, int num, abi_long arg1,
|
||||
return -TARGET_ERESTARTSYS;
|
||||
}
|
||||
|
||||
cpu_list_lock();
|
||||
pthread_mutex_lock(&clone_lock);
|
||||
|
||||
if (CPU_NEXT(first_cpu)) {
|
||||
TaskState *ts;
|
||||
TaskState *ts = cpu->opaque;
|
||||
|
||||
/* Remove the CPU from the list. */
|
||||
QTAILQ_REMOVE_RCU(&cpus, cpu, node);
|
||||
object_property_set_bool(OBJECT(cpu), false, "realized", NULL);
|
||||
object_unref(OBJECT(cpu));
|
||||
/*
|
||||
* At this point the CPU should be unrealized and removed
|
||||
* from cpu lists. We can clean-up the rest of the thread
|
||||
* data without the lock held.
|
||||
*/
|
||||
|
||||
cpu_list_unlock();
|
||||
pthread_mutex_unlock(&clone_lock);
|
||||
|
||||
ts = cpu->opaque;
|
||||
if (ts->child_tidptr) {
|
||||
put_user_u32(0, ts->child_tidptr);
|
||||
do_sys_futex(g2h(ts->child_tidptr), FUTEX_WAKE, INT_MAX,
|
||||
NULL, NULL, 0);
|
||||
}
|
||||
thread_cpu = NULL;
|
||||
object_unref(OBJECT(cpu));
|
||||
g_free(ts);
|
||||
rcu_unregister_thread();
|
||||
pthread_exit(NULL);
|
||||
}
|
||||
|
||||
cpu_list_unlock();
|
||||
pthread_mutex_unlock(&clone_lock);
|
||||
preexit_cleanup(cpu_env, arg1);
|
||||
_exit(arg1);
|
||||
return 0; /* avoid warning */
|
||||
|
||||
@ -687,11 +687,26 @@ test-softfloat = $(call quiet-command, \
|
||||
(cat $2.out && exit 1;), \
|
||||
"FLOAT TEST", $2)
|
||||
|
||||
# Conversion Routines:
|
||||
# Conversion Routines: Float to Float
|
||||
# FIXME: f32_to_f128 (broken), f64_to_f128 (broken)
|
||||
# FIXME: f128_to_f32(broken), f128_to_f64 (broken)
|
||||
# FIXME: f128_to_extF80 (broken)
|
||||
check-softfloat-conv-f2f: $(FP_TEST_BIN)
|
||||
$(call test-softfloat, \
|
||||
f16_to_f32 f16_to_f64 \
|
||||
f16_to_extF80 f16_to_f128 \
|
||||
f32_to_f16 f32_to_f64 \
|
||||
f32_to_extF80 \
|
||||
f64_to_f16 f64_to_f32 \
|
||||
extF80_to_f16 extF80_to_f32 \
|
||||
extF80_to_f64 extF80_to_f128 \
|
||||
f128_to_f16, \
|
||||
float-to-float)
|
||||
|
||||
# Conversion Routines: Int and Uint to Float
|
||||
# FIXME: i32_to_extF80 (broken), i64_to_extF80 (broken)
|
||||
# ui32_to_f128 (not implemented), extF80_roundToInt (broken)
|
||||
#
|
||||
check-softfloat-conv: $(FP_TEST_BIN)
|
||||
# ui32_to_f128 (not implemented)
|
||||
check-softfloat-conv-to-float: $(FP_TEST_BIN)
|
||||
$(call test-softfloat, \
|
||||
i32_to_f16 i64_to_f16 \
|
||||
i32_to_f32 i64_to_f32 \
|
||||
@ -701,7 +716,12 @@ check-softfloat-conv: $(FP_TEST_BIN)
|
||||
ui32_to_f16 ui64_to_f16 \
|
||||
ui32_to_f32 ui64_to_f32 \
|
||||
ui32_to_f64 ui64_to_f64 \
|
||||
ui32_to_extF80 ui64_to_extF80 \
|
||||
ui64_to_f128, uint-to-float)
|
||||
|
||||
# Conversion Routines: Float to integers
|
||||
# FIXME: extF80_roundToInt (broken)
|
||||
check-softfloat-conv-to-int: $(FP_TEST_BIN)
|
||||
$(call test-softfloat, \
|
||||
f16_to_i32 f16_to_i32_r_minMag \
|
||||
f32_to_i32 f32_to_i32_r_minMag \
|
||||
@ -718,10 +738,12 @@ check-softfloat-conv: $(FP_TEST_BIN)
|
||||
f16_to_ui32 f16_to_ui32_r_minMag \
|
||||
f32_to_ui32 f32_to_ui32_r_minMag \
|
||||
f64_to_ui32 f64_to_ui32_r_minMag \
|
||||
extF80_to_ui32 extF80_to_ui32_r_minMag \
|
||||
f128_to_ui32 f128_to_ui32_r_minMag \
|
||||
f16_to_ui64 f16_to_ui64_r_minMag \
|
||||
f32_to_ui64 f32_to_ui64_r_minMag \
|
||||
f64_to_ui64 f64_to_ui64_r_minMag \
|
||||
extF80_to_ui64 extF80_to_ui64_r_minMag \
|
||||
f128_to_ui64 f128_to_ui64_r_minMag, \
|
||||
float-to-uint)
|
||||
$(call test-softfloat, \
|
||||
@ -729,9 +751,14 @@ check-softfloat-conv: $(FP_TEST_BIN)
|
||||
f64_roundToInt f128_roundToInt, \
|
||||
round-to-integer)
|
||||
|
||||
.PHONY: check-softfloat-conv
|
||||
check-softfloat-conv: check-softfloat-conv-f2f
|
||||
check-softfloat-conv: check-softfloat-conv-to-float
|
||||
check-softfloat-conv: check-softfloat-conv-to-int
|
||||
|
||||
# Generic rule for all float operations
|
||||
#
|
||||
# Some patterns are overidden due to broken or missing tests.
|
||||
# Some patterns are overridden due to broken or missing tests.
|
||||
# Hopefully these can be removed over time.
|
||||
|
||||
check-softfloat-%: $(FP_TEST_BIN)
|
||||
@ -741,13 +768,6 @@ check-softfloat-%: $(FP_TEST_BIN)
|
||||
SF_COMPARE_OPS=eq eq_signaling le le_quiet lt_quiet
|
||||
SF_COMPARE_RULES=$(patsubst %,check-softfloat-%, $(SF_COMPARE_OPS))
|
||||
|
||||
# FIXME: extF80_le_quiet (broken)
|
||||
check-softfloat-le_quiet: $(FP_TEST_BIN)
|
||||
$(call test-softfloat, \
|
||||
f16_le_quiet f32_le_quiet f64_le_quiet \
|
||||
f128_le_quiet, \
|
||||
le_quiet)
|
||||
|
||||
# FIXME: extF80_lt_quiet (broken)
|
||||
check-softfloat-lt_quiet: $(FP_TEST_BIN)
|
||||
$(call test-softfloat, \
|
||||
|
||||
@ -7,7 +7,7 @@ HOST_ARCH = $(if $(ARCH),$(ARCH),$(shell uname -m))
|
||||
DOCKER_SUFFIX := .docker
|
||||
DOCKER_FILES_DIR := $(SRC_PATH)/tests/docker/dockerfiles
|
||||
# we don't run tests on intermediate images (used as base by another image)
|
||||
DOCKER_PARTIAL_IMAGES := debian9 debian10
|
||||
DOCKER_PARTIAL_IMAGES := debian9 debian10 debian11
|
||||
DOCKER_PARTIAL_IMAGES += debian9-mxe debian-bootstrap
|
||||
DOCKER_IMAGES := $(sort $(notdir $(basename $(wildcard $(DOCKER_FILES_DIR)/*.docker))))
|
||||
DOCKER_TARGETS := $(patsubst %,docker-image-%,$(DOCKER_IMAGES))
|
||||
@ -131,9 +131,11 @@ docker-image-travis: NOUSER=1
|
||||
|
||||
# Specialist build images, sometimes very limited tools
|
||||
docker-image-tricore-cross: docker-image-debian9
|
||||
docker-image-debian-arm64-test-cross: docker-image-debian11
|
||||
|
||||
# These images may be good enough for building tests but not for test builds
|
||||
DOCKER_PARTIAL_IMAGES += debian-alpha-cross
|
||||
DOCKER_PARTIAL_IMAGES += debian-arm64-test-cross
|
||||
DOCKER_PARTIAL_IMAGES += debian-hppa-cross
|
||||
DOCKER_PARTIAL_IMAGES += debian-m68k-cross debian-mips64-cross
|
||||
DOCKER_PARTIAL_IMAGES += debian-powerpc-cross debian-ppc64-cross
|
||||
|
||||
13
tests/docker/dockerfiles/debian-arm64-test-cross.docker
Normal file
13
tests/docker/dockerfiles/debian-arm64-test-cross.docker
Normal file
@ -0,0 +1,13 @@
|
||||
#
|
||||
# Docker arm64 cross-compiler target (tests only)
|
||||
#
|
||||
# This docker target builds on the debian Bullseye base image.
|
||||
#
|
||||
FROM qemu:debian11
|
||||
|
||||
# Add the foreign architecture we want and install dependencies
|
||||
RUN dpkg --add-architecture arm64
|
||||
RUN apt update && \
|
||||
DEBIAN_FRONTEND=noninteractive eatmydata \
|
||||
apt install -y --no-install-recommends \
|
||||
crossbuild-essential-arm64 gcc-10-aarch64-linux-gnu
|
||||
18
tests/docker/dockerfiles/debian11.docker
Normal file
18
tests/docker/dockerfiles/debian11.docker
Normal file
@ -0,0 +1,18 @@
|
||||
#
|
||||
# Docker multiarch cross-compiler target
|
||||
#
|
||||
# This docker target uses the current development version of Debian as
|
||||
# a base for cross compilers for building test binaries. We won't
|
||||
# attempt to build QEMU on it yet given it is still in development.
|
||||
#
|
||||
# On its own you can't build much but the docker-foo-cross targets
|
||||
# build on top of the base debian image.
|
||||
#
|
||||
FROM debian:bullseye-slim
|
||||
|
||||
# Duplicate deb line as deb-src
|
||||
RUN cat /etc/apt/sources.list | sed "s/^deb\ /deb-src /" >> /etc/apt/sources.list
|
||||
|
||||
# Install common build utilities
|
||||
RUN apt update && \
|
||||
DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata
|
||||
@ -61,7 +61,7 @@ run-memory-replay: memory-replay run-memory-record
|
||||
$(QEMU_OPTS) memory, \
|
||||
"$< on $(TARGET_NAME)")
|
||||
|
||||
EXTRA_TESTS+=memory-record memory-replay
|
||||
EXTRA_RUNS+=run-memory-replay
|
||||
|
||||
ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_ARMV8_3),)
|
||||
pauth-3: CFLAGS += -march=armv8.3-a
|
||||
|
||||
@ -97,8 +97,8 @@ for target in $target_list; do
|
||||
case $target in
|
||||
aarch64-*)
|
||||
# We don't have any bigendian build tools so we only use this for AArch64
|
||||
container_image=debian-arm64-cross
|
||||
container_cross_cc=aarch64-linux-gnu-gcc
|
||||
container_image=debian-arm64-test-cross
|
||||
container_cross_cc=aarch64-linux-gnu-gcc-10
|
||||
;;
|
||||
alpha-*)
|
||||
container_image=debian-alpha-cross
|
||||
|
||||
@ -28,6 +28,8 @@ run-float_%: float_%
|
||||
|
||||
testthread: LDFLAGS+=-lpthread
|
||||
|
||||
threadcount: LDFLAGS+=-lpthread
|
||||
|
||||
# We define the runner for test-mmap after the individual
|
||||
# architectures have defined their supported pages sizes. If no
|
||||
# additional page sizes are defined we only run the default test.
|
||||
|
||||
@ -65,6 +65,10 @@ except (gdb.error, AttributeError):
|
||||
print("SKIPPING (not connected)", file=sys.stderr)
|
||||
exit(0)
|
||||
|
||||
if gdb.parse_and_eval('$pc') == 0:
|
||||
print("SKIP: PC not set")
|
||||
exit(0)
|
||||
|
||||
try:
|
||||
# These are not very useful in scripts
|
||||
gdb.execute("set pagination off")
|
||||
|
||||
64
tests/tcg/multiarch/threadcount.c
Normal file
64
tests/tcg/multiarch/threadcount.c
Normal file
@ -0,0 +1,64 @@
|
||||
/*
|
||||
* Thread Exerciser
|
||||
*
|
||||
* Unlike testthread which is mainly concerned about testing thread
|
||||
* semantics this test is used to exercise the thread creation and
|
||||
* accounting. A version of this test found a problem with clashing
|
||||
* cpu_indexes which caused a break in plugin handling.
|
||||
*
|
||||
* Based on the original test case by Nikolay Igotti.
|
||||
*
|
||||
* Copyright (c) 2020 Linaro Ltd
|
||||
*
|
||||
* SPDX-License-Identifier: GPL-2.0-or-later
|
||||
*/
|
||||
|
||||
#include <stdint.h>
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <pthread.h>
|
||||
|
||||
int max_threads = 10;
|
||||
|
||||
typedef struct {
|
||||
int delay;
|
||||
} ThreadArg;
|
||||
|
||||
static void *thread_fn(void* varg)
|
||||
{
|
||||
ThreadArg *arg = varg;
|
||||
usleep(arg->delay);
|
||||
free(arg);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
int i;
|
||||
pthread_t *threads;
|
||||
|
||||
if (argc > 1) {
|
||||
max_threads = atoi(argv[1]);
|
||||
}
|
||||
threads = calloc(sizeof(pthread_t), max_threads);
|
||||
|
||||
for (i = 0; i < max_threads; i++) {
|
||||
ThreadArg *arg = calloc(sizeof(ThreadArg), 1);
|
||||
arg->delay = i * 100;
|
||||
pthread_create(threads + i, NULL, thread_fn, arg);
|
||||
}
|
||||
|
||||
printf("Created %d threads\n", max_threads);
|
||||
|
||||
/* sleep until roughly half the threads have "finished" */
|
||||
usleep(max_threads * 50);
|
||||
|
||||
for (i = 0; i < max_threads; i++) {
|
||||
pthread_join(threads[i], NULL);
|
||||
}
|
||||
|
||||
printf("Done\n");
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -56,6 +56,7 @@ $(IMAGES_DIR)/%.img: $(SRC_PATH)/tests/vm/% \
|
||||
$(call quiet-command, \
|
||||
$(PYTHON) $< \
|
||||
$(if $(V)$(DEBUG), --debug) \
|
||||
$(if $(GENISOIMAGE),--genisoimage $(GENISOIMAGE)) \
|
||||
--image "$@" \
|
||||
--force \
|
||||
--build-image $@, \
|
||||
|
||||
@ -61,8 +61,9 @@ class BaseVM(object):
|
||||
# 4 is arbitrary, but greater than 2,
|
||||
# since we found we need to wait more than twice as long.
|
||||
tcg_ssh_timeout_multiplier = 4
|
||||
def __init__(self, debug=False, vcpus=None):
|
||||
def __init__(self, debug=False, vcpus=None, genisoimage=None):
|
||||
self._guest = None
|
||||
self._genisoimage = genisoimage
|
||||
self._tmpdir = os.path.realpath(tempfile.mkdtemp(prefix="vm-test-",
|
||||
suffix=".tmp",
|
||||
dir="."))
|
||||
@ -381,12 +382,12 @@ class BaseVM(object):
|
||||
udata.writelines(["apt:\n",
|
||||
" proxy: %s" % proxy])
|
||||
udata.close()
|
||||
subprocess.check_call(["genisoimage", "-output", "cloud-init.iso",
|
||||
subprocess.check_call([self._genisoimage, "-output", "cloud-init.iso",
|
||||
"-volid", "cidata", "-joliet", "-rock",
|
||||
"user-data", "meta-data"],
|
||||
cwd=cidir,
|
||||
stdin=self._devnull, stdout=self._stdout,
|
||||
stderr=self._stdout)
|
||||
cwd=cidir,
|
||||
stdin=self._devnull, stdout=self._stdout,
|
||||
stderr=self._stdout)
|
||||
|
||||
return os.path.join(cidir, "cloud-init.iso")
|
||||
|
||||
@ -424,6 +425,8 @@ def parse_args(vmcls):
|
||||
help="Interactively run command")
|
||||
parser.add_option("--snapshot", "-s", action="store_true",
|
||||
help="run tests with a snapshot")
|
||||
parser.add_option("--genisoimage", default="genisoimage",
|
||||
help="iso imaging tool")
|
||||
parser.disable_interspersed_args()
|
||||
return parser.parse_args()
|
||||
|
||||
@ -435,7 +438,8 @@ def main(vmcls):
|
||||
return 1
|
||||
logging.basicConfig(level=(logging.DEBUG if args.debug
|
||||
else logging.WARN))
|
||||
vm = vmcls(debug=args.debug, vcpus=args.jobs)
|
||||
vm = vmcls(debug=args.debug, vcpus=args.jobs,
|
||||
genisoimage=args.genisoimage)
|
||||
if args.build_image:
|
||||
if os.path.exists(args.image) and not args.force:
|
||||
sys.stderr.writelines(["Image file exists: %s\n" % args.image,
|
||||
|
||||
Loading…
Reference in New Issue
Block a user