From patchwork Mon Dec 10 15:28:23 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: 153280 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3690560ljp; Mon, 10 Dec 2018 07:34:10 -0800 (PST) X-Google-Smtp-Source: AFSGD/Xr6s/YFEbwYKGyFxroY9xfcMqdM2fenHLbjbSZFEAoAmmt2A9NgfCgoyRbcwr9qGNZWtOV X-Received: by 2002:a0c:c60b:: with SMTP id v11mr11872171qvi.198.1544456050756; Mon, 10 Dec 2018 07:34:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544456050; cv=none; d=google.com; s=arc-20160816; b=jovwrVorM36UKTOOosEIErimFXY1e63MS8F+JaVgr10ErqJufF7pye2SRG/hGBNAbv NgjBdLTwv2FvQST4+inn9GNzyDDvjX/oCRf5xWQl8cq7PYNhi8ztODAcWL6eN3Gny0CC ZL//29FQOednwaOVlBA9qTq5UlhUhoNEbgdFtYzuRXjzm1n1G0zMIrBPwbZZSpsdWQ5x pZOLG0+oFMr1e95R2+dKYZg46f0vO1vYWrpqDBjiLlWr5imEEqDoD3EQ+HuH1DLTPidu rXHQwc2p3WLAm4YTwP+81bALF5FrHwxvfhEQw8MUbGyWIAt6Rw09rZxghX+i53kiaeCJ 2mcw== 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; bh=wBfEKZgCTRTaf+EwSeQtsSLmWyNxlaEzsSzX6DZl3EU=; b=kky2ezKO/rRAciu6IOWf0d5RMg6C3vPWReZMKHyeJ+atOYq1p0tS/gEZYEjMSMI99U q9nVl4oq7qU0YxXmVNdJiVyrYi8brUxDcA9isbnWCwR8pa8SA6B/puQfWtg0fGwTaEno RKCjaKWxa/moW410asw7Xwl4RaZJ+ELYDq0iTES+v+zjx51E4xdEZCa1nHjA+CnDpUUs GAVHgi4cTBUrP5TDWuD6OYIJFdJySM7PUpJHpUMdprHeAdwexy1NHF8VBz/kgldET+QF +tv6tmFzAOk1zT6pmxCTX3Ff0T0NC38nAHsZ0iwCEHOHXsPGU5hyEB86LefLAiwHSqNq 5tog== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KhRfoAY2; 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 q15si1259086qti.20.2018.12.10.07.34.10 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 10 Dec 2018 07:34:10 -0800 (PST) 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=KhRfoAY2; 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]:33355 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWNZR-0003RM-NB for patch@linaro.org; Mon, 10 Dec 2018 10:34:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43313) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWNU7-00086s-6P for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWNU6-0000Wb-6f for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:39 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:35522) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gWNU5-0000W3-VA for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:38 -0500 Received: by mail-wr1-x442.google.com with SMTP id 96so10928354wrb.2 for ; Mon, 10 Dec 2018 07:28:37 -0800 (PST) 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=wBfEKZgCTRTaf+EwSeQtsSLmWyNxlaEzsSzX6DZl3EU=; b=KhRfoAY2nHKZSIWqDKDamVkMs82FmIlFp2b6EPXdaTWas6b4+lBktEe4fMVKhuPVN9 snmf6xNjaBtVJh4ORQs5oG5XZ002oPqIheZkKPHf2uS+y1O0Lw2iAU3BExjwR1LIp1mh gsCcjG4mvXE277kSvP/RBN1O+pOPwfmJKkwv4= 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=wBfEKZgCTRTaf+EwSeQtsSLmWyNxlaEzsSzX6DZl3EU=; b=epYFuv/4epjERE2VVphvJvYB5pcN7xZ88OGbAaQjkmg9XeTk74oVSCdX8c7rZEWXNK +1QSwCTKj6iDjX23np0x6Ma5Ljn6C1TfzW9qiCGb71YMrh+ZU4GjKufKRaoSKskoRyHR QfSU0a7pIuHRNMuzy9XkZTf83KopX79SdMGjBrydOxt5R7HiO+MnOCDhTFBy/DJuQVp3 yydyy8ER5TnAFJxnxBV49P1OUJEPtBTsCX7G6NN92x2Dem/Zqvrx5JgMf4QAWVlm0zMM sZFlMMFL0swVg7MnCJoEvrwJuiGVp5bjBDVmyEr8wBJzePObnxJaUsgKE6CD9fSoUer2 X3ZQ== X-Gm-Message-State: AA+aEWaVJ8UNYxP5hWOR6nj8JZ9OALRGiJ/Dj3zBKbhd4BziRgnXYlMv m4ye2N7/1egsE8t0Bniuh/cWSA== X-Received: by 2002:adf:8068:: with SMTP id 95mr10215707wrk.181.1544455716959; Mon, 10 Dec 2018 07:28:36 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id x20sm23704773wme.6.2018.12.10.07.28.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Dec 2018 07:28:33 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 693F43E05F2; Mon, 10 Dec 2018 15:28:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Mon, 10 Dec 2018 15:28:23 +0000 Message-Id: <20181210152829.29271-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181210152829.29271-1-alex.bennee@linaro.org> References: <20181210152829.29271-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:4864:20::442 Subject: [Qemu-devel] [RFC PATCH 07/13] tests/tcg/xtensa: enable system tests 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: jcmvbkbc@gmail.com, michael@walle.cc, amarkovic@wavecomp.com, edgar.iglesias@gmail.com, shorne@gmail.com, =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée --- tests/tcg/xtensa/Makefile | 93 ------------------------ tests/tcg/xtensa/Makefile.softmmu-target | 43 +++++++++++ 2 files changed, 43 insertions(+), 93 deletions(-) delete mode 100644 tests/tcg/xtensa/Makefile create mode 100644 tests/tcg/xtensa/Makefile.softmmu-target -- 2.17.1 diff --git a/tests/tcg/xtensa/Makefile b/tests/tcg/xtensa/Makefile deleted file mode 100644 index 2f5691f75b..0000000000 --- a/tests/tcg/xtensa/Makefile +++ /dev/null @@ -1,93 +0,0 @@ --include ../../../config-host.mak - -CORE=dc232b -CROSS=xtensa-$(CORE)-elf- - -ifndef XT -SIM = ../../../xtensa-softmmu/qemu-system-xtensa -SIMFLAGS = -M sim -cpu $(CORE) -nographic -semihosting -icount 6 $(EXTFLAGS) -kernel -SIMDEBUG = -s -S -else -SIM = xt-run -SIMFLAGS = --xtensa-core=DC_B_232L --exit_with_target_code $(EXTFLAGS) -SIMDEBUG = --gdbserve=0 -endif - -HOST_CC = gcc -CC = $(CROSS)gcc -AS = $(CROSS)gcc -x assembler-with-cpp -LD = $(CROSS)ld - -XTENSA_SRC_PATH = $(SRC_PATH)/tests/tcg/xtensa -INCLUDE_DIRS = $(XTENSA_SRC_PATH) $(SRC_PATH)/target/xtensa/core-$(CORE) -XTENSA_INC = $(addprefix -I,$(INCLUDE_DIRS)) - -LDFLAGS = -Tlinker.ld - -CRT = crt.o vectors.o - -TESTCASES += test_b.tst -TESTCASES += test_bi.tst -#TESTCASES += test_boolean.tst -TESTCASES += test_break.tst -TESTCASES += test_bz.tst -TESTCASES += test_cache.tst -TESTCASES += test_clamps.tst -TESTCASES += test_extui.tst -TESTCASES += test_fail.tst -TESTCASES += test_interrupt.tst -TESTCASES += test_loop.tst -TESTCASES += test_mac16.tst -TESTCASES += test_max.tst -TESTCASES += test_min.tst -TESTCASES += test_mmu.tst -TESTCASES += test_mul16.tst -TESTCASES += test_mul32.tst -TESTCASES += test_nsa.tst -TESTCASES += test_phys_mem.tst -ifdef XT -TESTCASES += test_pipeline.tst -endif -TESTCASES += test_quo.tst -TESTCASES += test_rem.tst -TESTCASES += test_rst0.tst -TESTCASES += test_s32c1i.tst -TESTCASES += test_sar.tst -TESTCASES += test_sext.tst -TESTCASES += test_shift.tst -TESTCASES += test_sr.tst -TESTCASES += test_timer.tst -TESTCASES += test_windowed.tst - -all: build - -linker.ld: $(XTENSA_SRC_PATH)/linker.ld.S - $(HOST_CC) $(XTENSA_INC) -E -P $< -o $@ - -%.o: $(XTENSA_SRC_PATH)/%.c - $(CC) $(XTENSA_INC) $(CFLAGS) -c $< -o $@ - -%.o: $(XTENSA_SRC_PATH)/%.S - $(CC) $(XTENSA_INC) $(ASFLAGS) -c $< -o $@ - -%.tst: %.o linker.ld $(XTENSA_SRC_PATH)/macros.inc $(CRT) Makefile - $(LD) $(LDFLAGS) $(NOSTDFLAGS) $(CRT) $< -o $@ - -build: $(TESTCASES) - -check: $(addprefix run-, $(TESTCASES)) - -run-%.tst: %.tst - $(SIM) $(SIMFLAGS) ./$< - -run-test_fail.tst: test_fail.tst - ! $(SIM) $(SIMFLAGS) ./$< - -debug-%.tst: %.tst - $(SIM) $(SIMDEBUG) $(SIMFLAGS) ./$< - -host-debug-%.tst: %.tst - gdb --args $(SIM) $(SIMFLAGS) ./$< - -clean: - $(RM) -fr $(TESTCASES) $(CRT) linker.ld diff --git a/tests/tcg/xtensa/Makefile.softmmu-target b/tests/tcg/xtensa/Makefile.softmmu-target new file mode 100644 index 0000000000..e9d6939990 --- /dev/null +++ b/tests/tcg/xtensa/Makefile.softmmu-target @@ -0,0 +1,43 @@ +# +# Xtensa softmmu tests +# + +XTENSA_SRC = $(SRC_PATH)/tests/tcg/xtensa +XTENSA_ALL = $(wildcard $(XTENSA_SRC)/*.S) +XTENSA_TESTS = $(patsubst $(XTENSA_SRC)/%.S, %, $(XTENSA_ALL)) +# Filter out common blobs and broken tests +XTENSA_BROKEN_TESTS = crt vectors test_boolean test_pipeline +XTENSA_USABLE_TESTS = $(filter-out $(XTENSA_BROKEN_TESTS), $(XTENSA_TESTS)) +XTENSA_RUNS = $(patsubst %, run-%, $(XTENSA_USABLE_TESTS)) + +# add to the list of tests +TESTS += $(XTENSA_USABLE_TESTS) +VPATH += $(XTENSA_SRC) + +CORE=dc232b +QEMU_OPTS = -M sim -cpu $(CORE) -nographic -semihosting -icount 6 $(EXTFLAGS) -kernel + +INCLUDE_DIRS = $(SRC_PATH)/target/xtensa/core-$(CORE) +XTENSA_INC = $(addprefix -I,$(INCLUDE_DIRS)) + +LDFLAGS = -Tlinker.ld -nostartfiles -nostdlib + +CRT = crt.o vectors.o + +linker.ld: linker.ld.S + $(HOST_CC) $(XTENSA_INC) -E -P $< -o $@ + +$(XTENSA_USABLE_TESTS): linker.ld macros.inc $(CRT) Makefile.softmmu-target + +# special rule for common blobs +%.o: %.S + $(CC) $(XTENSA_INC) $(ASFLAGS) -c $< -o $@ + +%: %.S + $(CC) $(XTENSA_INC) $(ASFLAGS) $< -o $@ $(LDFLAGS) $(NOSTDFLAGS) $(CRT) + +# Special runner +$(XTENSA_RUNS): $(XTENSA_USABLE_TESTS) + $(call quiet-command, \ + timeout $(TIMEOUT) $(QEMU) $(QEMU_OPTS) $<, \ + "TEST","$< on $(TARGET_NAME) $(QEMU_OPTS)")