From patchwork Thu Feb 28 20:25:28 2019 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: 159440 Delivered-To: patch@linaro.org Received: by 2002:a02:5cc1:0:0:0:0:0 with SMTP id w62csp1092224jad; Thu, 28 Feb 2019 12:33:23 -0800 (PST) X-Google-Smtp-Source: APXvYqystmVSlio/jbsEUvc+0W/jz6LuWpo3ZT4EjkSzQwAPh00XaeBbtdbkuL70Y/JtjNDZNVqU X-Received: by 2002:a81:4b45:: with SMTP id y66mr694933ywa.421.1551386003477; Thu, 28 Feb 2019 12:33:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1551386003; cv=none; d=google.com; s=arc-20160816; b=kt5SVZEhvmiJo65DxvqsdPDF3tWiz2hU13RoFjVqnez2rZ0NgltQbDXZqrg8+Bnfmk vbXAY2xslewGtIKTKZXQ6dWrHtO2RtbSi1xNQ65TGL8DkMC43ClNxtrhTp+ABI4yzEps VJGjc2R4kBUfc37lE5fN3UaMT0CclLl2PdUam4QrkZSJIg4olGhIHrS2D8JTXzDIiwTe Ol6DFH5Oo51xHYst/qvih4KHcmQ85VmRUYhTRNSL40R1pM6O8jhvItzUhl+Iovuj7kvV g//hYxOefkImQPQhxrR6X7+xnQJzW6dQDn1M32Kpv2Numh4/hHbbs615VW+FDB7cY9ef EPwA== 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=3TSOdPIlax1RuD630cCZAnT/ylBHj/DkmzxzTatxKBc=; b=VjiDfo6BbaWAO8ouooXSfbaf/ICxxHou+xh/xbkPg1hic09wUch2/cy8tG5xyPWKWM ovW2TOD/fdkBcRN9+qpVIqFLf8TPbYKwQ5GB7Imk7VC8C09lTSYfzSvS0RYZUHQ1E5QR 90c3FdpI5xkNIwDl6Fxf+XHPNKISt5x5j1jyK9Ux18l36RsHBkKwp6C9Llh4KO684pYY sGLIJstpml20hJcNhcgSi2FP+/0hDJmA1t5epw34Wy0V3KUATkWiqZmqrbLl6bn4Yfsk SMnlVnjrJ19g+q6dzWzEPYQFkXDSuEBTvxgR2cZ9+HD4JyFmYlxCO+AU6L1DtpZaZm+n jhsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bsR2XAnm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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. [209.51.188.17]) by mx.google.com with ESMTPS id t141si11819810ywe.21.2019.02.28.12.33.23 for (version=TLS1 cipher=AES128-SHA bits=128/128); Thu, 28 Feb 2019 12:33:23 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=bsR2XAnm; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 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 ([127.0.0.1]:46061 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSMs-0005Dz-Tr for patch@linaro.org; Thu, 28 Feb 2019 15:33:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42653) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSFX-0000RW-98 for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzSFW-0007MD-8k for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:47 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:43115) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzSFW-0007K2-1v for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:46 -0500 Received: by mail-wr1-x443.google.com with SMTP id d17so23389347wre.10 for ; Thu, 28 Feb 2019 12:25:45 -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=3TSOdPIlax1RuD630cCZAnT/ylBHj/DkmzxzTatxKBc=; b=bsR2XAnmtFXSsP+mpQ33I1EWYRp379YPzAZnoGX0gv6AhZsx9+yr8Nl1+ga6H51ekh ZEDMZO95Aaf0p+YBtXsr5U5KrS2ZkZy/zkWT/bxqp3c0xtu7C5hyKf+fQL8jVKzFKInw ItYELfEs7sVDgCOZimsGvAkMQwea1I16zCW+kpdiUNavZDNS59Wnc5Cj6NUBBjo8vmy7 JJTP+NjFO9tx9mb+znJcNtqnlAxTKEqWEtwb/P2v6xO2UND4/L8qJdrlrYYUT5qpIjWK PmSxDNU9G+GCExo0v+wI65SEyrUTVAHmTfZlIVtOlElNHEXZl95SbLStDhYSKLhH2BBA +F7w== 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=3TSOdPIlax1RuD630cCZAnT/ylBHj/DkmzxzTatxKBc=; b=MJ43+/MxivXL+I0LWBK9YZKgO5a+Lsm3UkCwsJGmB3IgRH5aKQIol6OrJCTUUrwKXt iD3I8bhtEbqSjqZuC90rg19w61Rc1IuC9FPx2pA4zorNMrofH6YPMlupnCkRDq3gYdt7 z1/K5ICJmXX1VXFZn3My5HJi3izSpoXLu2TN0AHHo7kF46sa/MCFY8WzRb8SR/i+XIqD RzE0ue897NTBNLV1ZGV88hFiw1TvfgS9Q7LyU0sXyLZuFgvNQclPT5uCqARhhjpTgG/x IJjG7YMFA8yIUyTmGMuLykdkSLFybPHxWahXH1DGM/IyLGlsWoXFLrk6Qm7uP4TWYiRd e8bw== X-Gm-Message-State: APjAAAXx0TUZkQBY1FEBkVwUwXY5Ytgs5CIDLQ04iIHNoGuFKbAuY1UK xQKjTIYuLzpP5T3QAJ6rAARjUQ== X-Received: by 2002:a5d:4903:: with SMTP id x3mr852221wrq.151.1551385545036; Thu, 28 Feb 2019 12:25:45 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id v4sm4672711wmg.1.2019.02.28.12.25.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Feb 2019 12:25:41 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B62F11FF8A; Thu, 28 Feb 2019 20:25:37 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 28 Feb 2019 20:25:28 +0000 Message-Id: <20190228202537.4638-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190228202537.4638-1-alex.bennee@linaro.org> References: <20190228202537.4638-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::443 Subject: [Qemu-devel] [PATCH v2 07/16] 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: edgar.iglesias@gmail.com, qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , jcmvbkbc@gmail.com Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée --- v2 - use cross CC for linker - fix up test selection to skip linker.ld.S --- tests/tcg/xtensa/Makefile | 93 ------------------------ tests/tcg/xtensa/Makefile.softmmu-target | 40 ++++++++++ 2 files changed, 40 insertions(+), 93 deletions(-) delete mode 100644 tests/tcg/xtensa/Makefile create mode 100644 tests/tcg/xtensa/Makefile.softmmu-target -- 2.20.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..1a4014506f --- /dev/null +++ b/tests/tcg/xtensa/Makefile.softmmu-target @@ -0,0 +1,40 @@ +# +# Xtensa softmmu tests +# + +ifneq ($(TARGET_WORDS_BIGENDIAN),y) + +XTENSA_SRC = $(SRC_PATH)/tests/tcg/xtensa +XTENSA_ALL = $(filter-out $(XTENSA_SRC)/linker.ld.S,$(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 test_fail +XTENSA_USABLE_TESTS = $(filter-out $(XTENSA_BROKEN_TESTS), $(XTENSA_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 + $(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) + +endif