From patchwork Tue Jun 19 15:44:22 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: 139193 Delivered-To: patch@linaro.org Received: by 2002:a2e:970d:0:0:0:0:0 with SMTP id r13-v6csp5394731lji; Tue, 19 Jun 2018 09:11:10 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJ9zYiA9fvPGGv3Yonqsnj51NyKtvnMoCevGHCII8TaCBmyyP0ulCVG3f8WJ6I8YJR9W3il X-Received: by 2002:a0c:e84d:: with SMTP id l13-v6mr15138373qvo.55.1529424670205; Tue, 19 Jun 2018 09:11:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529424670; cv=none; d=google.com; s=arc-20160816; b=malx8Rk2nLymNGUz0jyvpDRqJcM3qOmBB5q2FjKRCq9xWDOUXes/xoHYcPt4rNdShb NFRRRiH93LXo1NbFtkCZ+LYzvNKNKhGtqM1Pt6+VKELyzvLpcPoY7ejZD2pho7cFuggI ajX70HRU0z6zPLP0I+H4jnqcM+xLAf2SMxIAsakf7cdK2KDLo+V7ZTqN8vy/RpDt3K2b jr1DnORfP9V+KHgtE63sRDJcrCHitSmWf0thBrT5f4RBfnjJa2uhPhbasUgo0H+wxTDu 0V7UXrCUwlEJq0Xofl1YxM/sP6a29kiX9/eqEwUQHw1s05eeWA1PO2zNGYuxNhhRzcAF 02Fw== 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=yx3yU74Gh4wQna8tUgTc+AoQS1s4fDXeI5WWQoHhLhQ=; b=jxkLEzTO66EqmX9AD/IbsExq4sWbRL8EElZ3aCduYZeY2lmilvYFC68huP1l38PLF/ TjY4TARUrxLmio6gWynjQchajvZntutIPVNY6rTQT+Tb/IZEIojcaeYrwWwJVqu5xq4q a6cJAdOE7KXGlEnHRLHjwIh/0E+doa2kwtCF/5b4V0Vu6ot10BfIi90plTcLW0g+JxbV PYR1rYm/fXVR7y4iuoYIKHt3wSfOYFlOH55MDbuFyuQmbu77A1yjTR3tKJsSTy81C7iw Qx/NR/4ZDr5R9DWlS49X658Jor3On4Tk1QmD6KKV+dnGwakn8zqFtuQJmKXmEOPUwEq1 aoIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=eyi53e3A; 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 m6-v6si41087qkb.400.2018.06.19.09.11.10 for (version=TLS1 cipher=AES128-SHA bits=128/128); Tue, 19 Jun 2018 09:11:10 -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=eyi53e3A; 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]:43488 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVJDp-0002JX-KU for patch@linaro.org; Tue, 19 Jun 2018 12:11:09 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38920) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fVIvL-0004Ag-W8 for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:52:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fVIvA-0001hO-Jj for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:52:03 -0400 Received: from mail-wr0-x241.google.com ([2a00:1450:400c:c0c::241]:43776) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fVIv9-0001dt-3D for qemu-devel@nongnu.org; Tue, 19 Jun 2018 11:51:52 -0400 Received: by mail-wr0-x241.google.com with SMTP id d2-v6so156267wrm.10 for ; Tue, 19 Jun 2018 08:51:50 -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=yx3yU74Gh4wQna8tUgTc+AoQS1s4fDXeI5WWQoHhLhQ=; b=eyi53e3Ainm3XUa+NsT+0ZG2BRcykkAJ8oiQf32HU6bn2rece8oeCjR4UHLdXI3ym1 t6IEf6DgNzQExmzjHjOUNjBENFWkoVHTNaEBkrkb2Uo3EKiZuIWLebvGkk2ednlQLqnl d9Q+jZXN9C4CO6xSmlfiW5wkOPQ+NA2lGDoLA= 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=yx3yU74Gh4wQna8tUgTc+AoQS1s4fDXeI5WWQoHhLhQ=; b=pWta0nWGfJkCHDH93q2NhrQzfsbZ3wQvh+2bwVzdUWfSE5Yebu3Z2yHMuDJ+CLFYt9 rf78NsKrA3/chalNGmPuHhqxQdF5oL2kf+69pwPO815biXC3IfY3MUq7V5EHu6fiUZvo TkJyVVNXgW74gLb2v+xJpB7MXOeboxNiYx1lcLU6jwpWhBNPjSWRWObtcbxGqfUpL7Cf INg5wibKSarvIh9vomvmRxLBfAJIGXaJzl3Uxq2pUe6n2w3DqtV4ddSZ2duaXbFW4Ica lIE3it1mbgFLmwRhdSLpZvl657pIjozjFnCQmvnvaZ1Q1k+o8f6zOv56j5uiLR75pYVr ZoTA== X-Gm-Message-State: APt69E3lXjqziRAsqZAg77VDxX/RzSjyGOpbifJm6ly9JkRTCEOb78j2 g+vniRqmSRsBp2kiaBb8X0gd7A== X-Received: by 2002:adf:8610:: with SMTP id 16-v6mr14353899wrv.255.1529423509958; Tue, 19 Jun 2018 08:51:49 -0700 (PDT) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id j21-v6sm190950wme.36.2018.06.19.08.51.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 19 Jun 2018 08:51:49 -0700 (PDT) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 553D53E0F6C; Tue, 19 Jun 2018 16:44:39 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 19 Jun 2018 16:44:22 +0100 Message-Id: <20180619154435.18898-44-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180619154435.18898-1-alex.bennee@linaro.org> References: <20180619154435.18898-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::241 Subject: [Qemu-devel] [PULL 43/56] 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: agraf@suse.de, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, qemu-devel@nongnu.org, f4bug@amsat.org, cota@braap.org, famz@redhat.com, aurelien@aurel32.net 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 v7 - add f4bug to as a reviewer -- 2.17.1 diff --git a/MAINTAINERS b/MAINTAINERS index c4fc6fa357..aea5788c1d 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2150,6 +2150,12 @@ 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 +R: Philippe Mathieu-Daudé +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