From patchwork Fri Jun 8 12:32:59 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 138012 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp872878lji; Fri, 8 Jun 2018 06:25:50 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLPEYlREjH5tIXAZPA6rOcsgwrffhj9AeFQjdfOmQCVN/t3ZuPt0dZyNKEss76Z7ZzmkXjO X-Received: by 2002:a37:3641:: with SMTP id d62-v6mr5106228qka.419.1528464350013; Fri, 08 Jun 2018 06:25:50 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528464350; cv=none; d=google.com; s=arc-20160816; b=DAhs6+cNJ05ZyFbTv3xzoCpBk7JE7LIjA54t9+mEamjttbBTWuK87AP1YMfJw8CZFP d0U08kFvW0PPkZkIR/cipBX4v09CI6hLC5rJJupRcFVFAFHWbDsuX7irWjsVORMullgf LnRdcVOF6X/1v26h1p4AgV4Fzbb+mr7evbHI/Wz6wX4t/oQrg5uPW6PVDdZ7ImJo203/ DDzVG4u6DFJAwVdwN+i8EgPqvu+OtxjnIsLrTyh6kjiIuNiB5JScj5reIt0N9UZecLn/ hWxZ5U8LenFl+X6f3ycK5XAVfL1+Rd3Ito7qVoGltUBw0lP6DtxbIedhbFnoJqUJwoBL US1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=pi0njI8ufUbqZJ3hEt90PFz5okFu3hw931b80iDfU7k=; b=JlEOC420u9Y3M7h2gx4oNZe3tGTqm+cUA7mdqn+7SmV19cKpFl7yZf0EeR9iadMRkZ EqMYKYkMW8qTyq9Xj5oJWSKOPMlzjpKCE//3uEASBYufZySo/D7VJ13pD/dfVD4MKrsA ugsznb9S/Vy7PPP1gZJ73QeUpd5h7qGar/gh6dWw/xom7U531jyEN5KYUiPUpOW0YUuu KLUPbkmzir42gL3DAtSBhVXRb/rWixTmom/1sG3QgVEldQfwkSv5d78P6D4EtFy4g09T d47TLj92z6d8BfWZAJycM6ht2jAfIaGauPKf1YVDOtRpDQqkdxS2fMdIrdqL04P7HFdW 8D5Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=H5tX0tPy; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id g31-v6si3095015qtg.43.2018.06.08.06.25.49 for (version=TLS1 cipher=AES128-SHA bits=128/128); Fri, 08 Jun 2018 06:25:49 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=H5tX0tPy; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:35650 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRHOn-00037f-9o for patch@linaro.org; Fri, 08 Jun 2018 09:25:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:48499) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fRGfv-0005yo-WF for qemu-devel@nongnu.org; Fri, 08 Jun 2018 08:39:29 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fRGfu-00012c-0i for qemu-devel@nongnu.org; Fri, 08 Jun 2018 08:39:28 -0400 Received: from mail-wr0-x242.google.com ([2a00:1450:400c:c0c::242]:34573) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fRGft-00012F-NR for qemu-devel@nongnu.org; Fri, 08 Jun 2018 08:39:25 -0400 Received: by mail-wr0-x242.google.com with SMTP id a12-v6so13262423wro.1 for ; Fri, 08 Jun 2018 05:39:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pi0njI8ufUbqZJ3hEt90PFz5okFu3hw931b80iDfU7k=; b=H5tX0tPyCQaWWa9J2hgySz409QgJX3JiUZsDQuSrfkV2QRBhRh+7FhnCuYSe/0aDQs Q6ja2P/ZBORfvebK12UQEqm33pWv3zbeJHtcYcFNIwv/uaI6VXAJUjtDffLyzZv8gqFe BJ+TPA2YHkh2Ln8EuW0RR+RiWUIMeBNRXPZs8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=pi0njI8ufUbqZJ3hEt90PFz5okFu3hw931b80iDfU7k=; b=ciooTybySUqlO/bnOkEvgkPvh5kB+GNILKWraD9RMnKEWiSS9KznqBS7OHHtaWyaX4 Kg1pCQ40spZ63VHTZT1SuAYzWGCKTxFy0/Z5LAzlFgR8isb0HP2kl1au8eOi5j+fTNOh m53AKjiU0ktVMp0+ipqUVsnxPTYZcu8DlTqxDQZ58CuwIrHCnN8KukXFDZziJ/xEKhSZ MdMcOQQE25hq1TuR1khmV+dGXCkZsqD2E9tMeYcuyHoXsUvYkjgiI93cWHrcz/FDz5bT Xk4mqF18lq9X43oJHFWMXb1paHOVA+NF237o1mVIrMaNtySjkKXlJi8B5kToDjqDYip+ 6Pqg== X-Gm-Message-State: APt69E20agdG+M7RB+mz7HZ5ZZFsC/ps0QEYk9tQAJNn0nNtWclyxcYy GrrZ+j9Fqf7I7K3Cbdexn1aC2g== X-Received: by 2002:adf:ab10:: with SMTP id q16-v6mr4812478wrc.239.1528461564622; Fri, 08 Jun 2018 05:39:24 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id g4-v6sm14967183wrq.32.2018.06.08.05.39.13 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Jun 2018 05:39:19 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id B5E7E3E0260; Fri, 8 Jun 2018 13:33:10 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: cota@braap.org, famz@redhat.com, berrange@redhat.com, f4bug@amsat.org, richard.henderson@linaro.org, balrogg@gmail.com, aurelien@aurel32.net, agraf@suse.de, pbonzini@redhat.com, stefanha@redhat.com, stefanb@linux.vnet.ibm.com, marcandre.lureau@redhat.com Date: Fri, 8 Jun 2018 13:32:59 +0100 Message-Id: <20180608123307.24773-42-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180608123307.24773-1-alex.bennee@linaro.org> References: <20180608123307.24773-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c0c::242 Subject: [Qemu-devel] [PATCH v6 41/49] tests/tcg/Makefile: update to be called from Makefile.target X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This make is now invoked from each individual target make with the appropriate CC and EXTRA_CFLAGS set for each guest. It then includes additional Makefile.targets from: - tests/tcg/multiarch (always) - tests/tcg/$(TARGET_BASE_ARCH) (if available) - tests/tcg/$(TARGET_NAME) The order is important as the later Makefile's may want to suppress TESTS from its base arch profile. Each included Makefile.target is responsible for adding TESTS as well as defining any special build instructions for individual tests. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé --- v2 - cleaner approach to include sub makefiles - move TESTS/VPATH manipulation into sub-makefile - avoid double inclusion when TARGET_BASE_ARCH==TARGET_NAME v4 - add timeout to default runner - clean-up comments about build flags - update to handle BUILD_STATIC - add MAINTAINERS entry v5 - support EXTRA_RUNS for run variants v6 - extend timeout for DEBUG_TCG --- MAINTAINERS | 5 ++ tests/tcg/Makefile | 183 +++++++++++++++++++-------------------------- 2 files changed, 81 insertions(+), 107 deletions(-) -- 2.17.1 diff --git a/MAINTAINERS b/MAINTAINERS index b8fbef495b..4761f8cab4 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2144,6 +2144,11 @@ W: https://travis-ci.org/qemu/qemu W: https://app.shippable.com/github/qemu/qemu W: http://patchew.org/QEMU/ +Guest Test Compilation Support +M: Alex Bennée +F: tests/tcg/Makefile +L: qemu-devel@nongnu.org + Documentation ------------- Build system architecture diff --git a/tests/tcg/Makefile b/tests/tcg/Makefile index e12395117a..e7dbcdb5bf 100644 --- a/tests/tcg/Makefile +++ b/tests/tcg/Makefile @@ -1,125 +1,94 @@ +# -*- 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. +# + -include ../../config-host.mak --include $(SRC_PATH)/rules.mak +-include ../config-target.mak -$(call set-vpath, $(SRC_PATH)/tests/tcg) +quiet-command = $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1, @$1)) -QEMU=../../i386-linux-user/qemu-i386 -QEMU_X86_64=../../x86_64-linux-user/qemu-x86_64 -CC_X86_64=$(CC_I386) -m64 +# Tests we are building +TESTS= -QEMU_INCLUDES += -I../.. -CFLAGS=-Wall -O2 -g -fno-strict-aliasing -#CFLAGS+=-msse2 +# Start with a blank slate, the build targets get to add stuff first +CFLAGS= +QEMU_CFLAGS= LDFLAGS= -# TODO: automatically detect ARM and MIPS compilers, and run those too - -# runcom maps page 0, so it requires root privileges -# also, pi_10.com runs indefinitely - -I386_TESTS=hello-i386 \ - sha1-i386 \ - test-i386 \ - test-i386-fprem \ - # runcom +# The QEMU for this TARGET +QEMU=../qemu-$(TARGET_NAME) -# native i386 compilers sometimes are not biarch. assume cross-compilers are -ifneq ($(ARCH),i386) -I386_TESTS+=run-test-x86_64 +# If TCG debugging is enabled things are a lot slower +ifeq ($(CONFIG_DEBUG_TCG),y) +TIMEOUT=45 +else +TIMEOUT=15 endif -TESTS = test_path -ifneq ($(call find-in-path, $(CC_I386)),) -TESTS += $(I386_TESTS) +# The order we include is important. We include multiarch, base arch +# and finally arch if it's not the same as base arch. +-include $(SRC_PATH)/tests/tcg/multiarch/Makefile.target +-include $(SRC_PATH)/tests/tcg/$(TARGET_BASE_ARCH)/Makefile.target +ifneq ($(TARGET_BASE_ARCH),$(TARGET_NAME)) +-include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.target endif -all: $(patsubst %,run-%,$(TESTS)) -test: all - -# rules to run tests - -.PHONY: $(patsubst %,run-%,$(TESTS)) - -run-%: % - -$(QEMU) ./$* - -run-hello-i386: hello-i386 -run-sha1-i386: sha1-i386 - -run-test-i386: test-i386 - ./test-i386 > test-i386.ref - -$(QEMU) test-i386 > test-i386.out - @if diff -u test-i386.ref test-i386.out ; then echo "Auto Test OK"; fi - -run-test-i386-fprem: test-i386-fprem - ./test-i386-fprem > test-i386-fprem.ref - -$(QEMU) test-i386-fprem > test-i386-fprem.out - @if diff -u test-i386-fprem.ref test-i386-fprem.out ; then echo "Auto Test OK"; fi - -run-test-x86_64: test-x86_64 - ./test-x86_64 > test-x86_64.ref - -$(QEMU_X86_64) test-x86_64 > test-x86_64.out - @if diff -u test-x86_64.ref test-x86_64.out ; then echo "Auto Test OK"; fi - - -run-runcom: runcom - -$(QEMU) ./runcom $(SRC_PATH)/tests/pi_10.com - -run-test_path: test_path - ./test_path - -# rules to compile tests - -hello-i386: hello-i386.c - $(CC_I386) -nostdlib $(CFLAGS) -static $(LDFLAGS) -o $@ $< - strip $@ - -# i386/x86_64 emulation test (test various opcodes) */ -test-i386: test-i386.c test-i386-code16.S test-i386-vm86.S \ - test-i386.h test-i386-shift.h test-i386-muldiv.h - $(CC_I386) $(QEMU_INCLUDES) $(CFLAGS) $(LDFLAGS) -o $@ \ - $( $<.out, \ + "TEST", "$< on $(TARGET_NAME)") -# testsuite for the LM32 port. -test-lm32: - $(MAKE) -C lm32 check +.PHONY: run +run: $(RUN_TESTS) -clean: - rm -f *~ *.o test-i386.out test-i386.ref \ - test-x86_64.log test-x86_64.ref qruncom $(TESTS) +# There is no clean target, the calling make just rm's the tests build dir