From patchwork Tue Mar 12 15:59:27 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: 1055515 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="mFOJ2Jxw"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44Jg6j49x7z9s5c for ; Wed, 13 Mar 2019 03:15:09 +1100 (AEDT) Received: from localhost ([127.0.0.1]:55137 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3k3X-0001by-G0 for incoming@patchwork.ozlabs.org; Tue, 12 Mar 2019 12:15:07 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60689) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3jtd-0001lI-IM for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:04:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3jok-0000Ij-F5 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 11:59:51 -0400 Received: from mail-wr1-x431.google.com ([2a00:1450:4864:20::431]:34600) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3jok-0000HI-7u for qemu-devel@nongnu.org; Tue, 12 Mar 2019 11:59:50 -0400 Received: by mail-wr1-x431.google.com with SMTP id f14so3331684wrg.1 for ; Tue, 12 Mar 2019 08:59: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=L/z9MUE3cOCWWFeNa1MNv0jMC1VzRLWSs++imNZ+SgY=; b=mFOJ2Jxwbwpi84hQxobUMi9wk5PwjfEoN1ywOlS+e0ik9xeZbF4MB1XMepntH58XdA //pT5LThf5EbwoZGKXELaH9g5C5UjkQz5fq1p/p3/Qxaf6CrMePaqi50zw4UnL5WYZ/F lAclyGifcEM8Qa2jIGNq6G4i7bzNKfTPUTWHqbB94eJnKExtBNtz4qTvlSXh/Mj5Y1W8 PjTaHDFB3WmMrgbdm3zOK1hyrZw+IToYKKju36SBOucFDVQqabg3c+7SOKD4XtBMJb69 HXw8MEupVfBQwQ6SdQB3vvrj2Y31vdhmhaflqXoC00flAJZlDWoN3+89mZUSOPrwRFi8 lLHw== 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=L/z9MUE3cOCWWFeNa1MNv0jMC1VzRLWSs++imNZ+SgY=; b=iCeKTsndwQZqSgKqyeAnwXJs9ZgsEm0fLR3cmSdLTN0Mozie81PMR/sHHaFrvj97sz dRKnc+CDc2PpByFlqtyCnxZOtQKkPP33fqaxg+dDPjP3uOaly/pzff6TyDrfoMXyrdqr yWqq8mlQRiOabrPX8fLHPB+7dwyabAXyQuRMG9ZGBfgHPQtleOOHvuPPTySF8e5AgqIr SvQGLXx2v5Pz7iXZkCeulBqgLyBKace697pgDR8Ja8vhhWg6s8ercZoF8/qJPWkTFke4 nYaj4cOd8AlI1QICGv2gDveSHqAH/a5VrftRiMvnsanCTPP0L18LE+7oMZf5lYSTsrUO teVw== X-Gm-Message-State: APjAAAX+LC1keCMD+HnM8aqMKNpEU68L1yPCjhdh1a2rIN0WHF0Eebsg 4QriZpDtSPNcggpExmJ0Gx5CPg== X-Google-Smtp-Source: APXvYqxMseICFJL8yuQmHAIO3ZkuM/SL99uPn7utjBTlT8F3LRbtQCd8CFYU4Jc6gkDKlyME+rWnzQ== X-Received: by 2002:a5d:570a:: with SMTP id a10mr24861150wrv.85.1552406389063; Tue, 12 Mar 2019 08:59:49 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id o8sm4143677wma.1.2019.03.12.08.59.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 08:59:47 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6F3181FF89; Tue, 12 Mar 2019 15:59:47 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 15:59:27 +0000 Message-Id: <20190312155947.14918-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312155947.14918-1-alex.bennee@linaro.org> References: <20190312155947.14918-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::431 Subject: [Qemu-devel] [PATCH v4 01/21] tests/tcg: add softmmu awareness to Makefile 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: peter.maydell@linaro.org, famz@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, agraf@suse.de, cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- tests/tcg/Makefile | 17 ++++++++++++++++- tests/tcg/Makefile.include | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/tests/tcg/Makefile b/tests/tcg/Makefile index bf06415390..55feab0f67 100644 --- a/tests/tcg/Makefile +++ b/tests/tcg/Makefile @@ -26,7 +26,7 @@ # # 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. +# We also expect to be in the tests build dir for the FOO-(linux-user|softmmu). # -include ../../config-host.mak @@ -52,7 +52,11 @@ QEMU_CFLAGS= LDFLAGS= # The QEMU for this TARGET +ifdef CONFIG_USER_ONLY QEMU=../qemu-$(TARGET_NAME) +else +QEMU=../qemu-system-$(TARGET_NAME) +endif # If TCG debugging is enabled things are a lot slower ifeq ($(CONFIG_DEBUG_TCG),y) @@ -61,6 +65,7 @@ else TIMEOUT=15 endif +ifdef CONFIG_USER_ONLY # 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 @@ -77,6 +82,16 @@ endif %: %.c $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) +else +# For softmmu targets we include a different Makefile fragement as the +# build options for bare programs are usually pretty different. They +# are expected to provide their own build recipes. +-include $(SRC_PATH)/tests/tcg/$(TARGET_BASE_ARCH)/Makefile.softmmu-target +ifneq ($(TARGET_BASE_ARCH),$(TARGET_NAME)) +-include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.softmmu-target +endif + +endif all: $(TESTS) diff --git a/tests/tcg/Makefile.include b/tests/tcg/Makefile.include index c581bd6ffc..73b5626fc5 100644 --- a/tests/tcg/Makefile.include +++ b/tests/tcg/Makefile.include @@ -67,7 +67,7 @@ endif ifneq ($(GUEST_BUILD),) guest-tests: $(GUEST_BUILD) -run-guest-tests: guest-tests qemu-$(TARGET_NAME) +run-guest-tests: guest-tests qemu-$(subst y,system-,$(CONFIG_SOFTMMU))$(TARGET_NAME) $(call quiet-command, \ (cd tests && $(MAKE) -f $(TCG_MAKE) SPEED=$(SPEED) run), \ "RUN", "tests for $(TARGET_NAME)") From patchwork Tue Mar 12 15:59: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: 1055508 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="um0/AuUm"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44Jfzl3mllz9s4V for ; Wed, 13 Mar 2019 03:09:07 +1100 (AEDT) Received: from localhost ([127.0.0.1]:55055 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3jxh-0004ss-5k for incoming@patchwork.ozlabs.org; Tue, 12 Mar 2019 12:09:05 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60731) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3jtd-0001nj-HA for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:04:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3jol-0000JF-Ak for qemu-devel@nongnu.org; Tue, 12 Mar 2019 11:59:52 -0400 Received: from mail-wr1-x435.google.com ([2a00:1450:4864:20::435]:43040) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3jol-0000IY-2J for qemu-devel@nongnu.org; Tue, 12 Mar 2019 11:59:51 -0400 Received: by mail-wr1-x435.google.com with SMTP id d17so3274134wre.10 for ; Tue, 12 Mar 2019 08:59: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=Hhr64hbpI8MLO3wYHIUXDYTJlUOFRzT2UsYyiNe9A0A=; b=um0/AuUmSZfiPEI0zw1AdigbMIj6KTqhewTkj0Xr1FyrTtcpQS6javjEl7YB5QHvMd TkYRlg6IhR597nsUlrlBPlF6UnUwENeCQLDiKRjjljmtjQcvz+Sm3cHJAk2jzH5WP1CK OUd+C9O2KRHqByASuTt+qryp0Fow5PAarxdznRmC4eXKpBqBZCTaqvfw5VaKtjgJWZCy hdaESV9ZECcpQWQXZvkqgGsNlDp/lzSMlMaClO5h5YInG6XVTCwTbBIz38PzyTAurZCk +nkTNaWCY4GEWbqshzmicMJx5G5wx8xawn/Uieh2t+b+Jb8VdIMqIlT+7SXikez2OVy+ m53Q== 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=Hhr64hbpI8MLO3wYHIUXDYTJlUOFRzT2UsYyiNe9A0A=; b=rxIgtknKn6bhiK+Bb4995s2gb/Lnc+NuejxwAbyJVidlf48xnSzEw3ode4Al9Jq/gD U0H9yPp8n5sV85sxCfqFhAAYp2/E04Vr0VHYvaVntrK9lMbHLOMYiVBPxT+9lkbppN5J hguewq5Y0+B6xfhrR95tlpmDuKbKukEbMsMs0DQY/zWPeL41S5mDDSC7A/cw1ZXIRRnV XCwlyTOns/GkEW5JONsWBWDEabW51TcTzPTpch4bRLgU1MU/vH/bLzCOCHXpO8fmvrZU n+KhzE3NBvQwEyoY1CfcUihIST96NtHw9k7rEjeOKIFEqEDc/9bs2bsXpkUgZ0ty4pI6 OUtg== X-Gm-Message-State: APjAAAXdtprmWPCYYXiFOwooyWzJETZ6lwQYMg0kc0dllzZWoPjDuzr3 AKOPWgQkbkA6MEUkyrDF8yuL5Q== X-Google-Smtp-Source: APXvYqw9IleIMcl9Wx00y/THkeMBbHMr1p7waD2GzWNQJo+92MUbUMqw1sFtqnrQNjPBQbf64xuycA== X-Received: by 2002:adf:c593:: with SMTP id m19mr24048996wrg.124.1552406389949; Tue, 12 Mar 2019 08:59:49 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y66sm3544588wmd.37.2019.03.12.08.59.47 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 08:59:48 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 835531FF8A; Tue, 12 Mar 2019 15:59:47 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 15:59:28 +0000 Message-Id: <20190312155947.14918-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312155947.14918-1-alex.bennee@linaro.org> References: <20190312155947.14918-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::435 Subject: [Qemu-devel] [PATCH v4 02/21] tests/tcg: enable tcg tests for softmmu 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: peter.maydell@linaro.org, famz@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, agraf@suse.de, cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- Makefile.target | 2 -- tests/Makefile.include | 7 +++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/Makefile.target b/Makefile.target index d8048aab8f..ae02495951 100644 --- a/Makefile.target +++ b/Makefile.target @@ -40,9 +40,7 @@ PROGS=$(QEMU_PROG) $(QEMU_PROGW) STPFILES= # Makefile Tests -ifdef CONFIG_USER_ONLY include $(SRC_PATH)/tests/tcg/Makefile.include -endif config-target.h: config-target.h-timestamp config-target.h-timestamp: config-target.mak diff --git a/tests/Makefile.include b/tests/Makefile.include index a5719551dd..75b682cbe8 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -1061,10 +1061,9 @@ endif # Per guest TCG tests -LINUX_USER_TARGETS=$(filter %-linux-user,$(TARGET_DIRS)) -BUILD_TCG_TARGET_RULES=$(patsubst %,build-tcg-tests-%, $(LINUX_USER_TARGETS)) -CLEAN_TCG_TARGET_RULES=$(patsubst %,clean-tcg-tests-%, $(LINUX_USER_TARGETS)) -RUN_TCG_TARGET_RULES=$(patsubst %,run-tcg-tests-%, $(LINUX_USER_TARGETS)) +BUILD_TCG_TARGET_RULES=$(patsubst %,build-tcg-tests-%, $(TARGET_DIRS)) +CLEAN_TCG_TARGET_RULES=$(patsubst %,clean-tcg-tests-%, $(TARGET_DIRS)) +RUN_TCG_TARGET_RULES=$(patsubst %,run-tcg-tests-%, $(TARGET_DIRS)) ifeq ($(HAVE_USER_DOCKER),y) # Probe for the Docker Builds needed for each build From patchwork Tue Mar 12 15:59:29 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: 1055517 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="sRhi8AkV"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44JgBF5q7jz9s9N for ; Wed, 13 Mar 2019 03:18:13 +1100 (AEDT) Received: from localhost ([127.0.0.1]:55194 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3k6V-0004Q7-Kk for incoming@patchwork.ozlabs.org; Tue, 12 Mar 2019 12:18:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60778) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3jtd-0001sj-FJ for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:04:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3jom-0000Ju-37 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 11:59:52 -0400 Received: from mail-wm1-x32a.google.com ([2a00:1450:4864:20::32a]:37250) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3jol-0000JC-S4 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 11:59:52 -0400 Received: by mail-wm1-x32a.google.com with SMTP id x10so3183596wmg.2 for ; Tue, 12 Mar 2019 08:59:51 -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=1Bk/eAibaY+byMiN9KxtOjjdF5i9SnxGLz0njsaUuuw=; b=sRhi8AkVPJhkE+efXHR6bZtddrC3paJK135KxrYmTjb2gpGi62TpUkdmsiM0roB9t/ CnOBeeZDE+tbu2lEVmoQR0kJwfPWaAYlssPSVfYQLdfo5Egdi6JhMSVzVUwT45deI5CQ DU0sNbFunQJnsQcnchtsRmCNZ+QOIEUjkyBPC7tuELef5CBZ74tRTJB7bnv60zj7rpdk kI/8s+nydQec1x8Qy0yRjDGHVJiHG4nPFoqP+YI3w4vbR8krkRrm1VPX5enESGHj52cz bbNouqUevgFvd/AhrJI6LANmak9EPgVWKfFU3cRvghYxnlsWBcw8e7aFHmbvzYEE6fHz UTPQ== 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=1Bk/eAibaY+byMiN9KxtOjjdF5i9SnxGLz0njsaUuuw=; b=Sr7bUgiDknlLKi0uKrA2y0NzFHO6Npy5IGnwjTcQfeLpqsYswW7p3VbiUCVWV3UP8M yNQUsZBcpS/GinOFtEq2QjIETjDJjdWaSE2kVmprNbLQB3nCNrVz+tfDz3KmO3Hd627y vNRdKVEDGBwOOPKXECcPAcQFSIJv7NLO8Y9hZz6gik7vl5uKtvbDekxLU+YoJUNi/T20 jeyBnZWJEeSumYZNjbGJU97fp1AKNC1Kpoojqy+qT/kvXA4v/sV/8BDGS60na3EzPjv9 V38fVcdPa96CvZHYw6VSPDAjQayWVPN6HH5DoDgaZOo9SlBexHKrWpOWytBNfn9EE+lT WzsQ== X-Gm-Message-State: APjAAAUFkw9ToN5MYA3YfBfuAACfZFUDCjYg7lkuq/9rol2I1CDSeNbO SgdhtwwuIbMuRymiv0qK/QUtvg== X-Google-Smtp-Source: APXvYqyX8B5/iLrGx3VSF7rjL4fo+UQxZp4kfzNVoFvcSkYbP8SnJM3mUvpUNEyalQGaq6Crl7IyZQ== X-Received: by 2002:a1c:3c02:: with SMTP id j2mr3082944wma.72.1552406390797; Tue, 12 Mar 2019 08:59:50 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id o127sm3241450wmo.20.2019.03.12.08.59.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 08:59:49 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 934EE1FF8B; Tue, 12 Mar 2019 15:59:47 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 15:59:29 +0000 Message-Id: <20190312155947.14918-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312155947.14918-1-alex.bennee@linaro.org> References: <20190312155947.14918-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::32a Subject: [Qemu-devel] [PATCH v4 03/21] tests/tcg: add QEMU_OPT option for test runner 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: peter.maydell@linaro.org, famz@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, agraf@suse.de, cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This will allow tests to modify the QEMU invocation with for example different -cpu stazas without having to define a whole new set of runner types. Signed-off-by: Alex Bennée Reviewed-by: Richard Henderson --- v2 - default QEMU_OPTS to --monitor none for system emulation - and --display none --- tests/tcg/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/tcg/Makefile b/tests/tcg/Makefile index 55feab0f67..454d0a4119 100644 --- a/tests/tcg/Makefile +++ b/tests/tcg/Makefile @@ -54,10 +54,13 @@ LDFLAGS= # The QEMU for this TARGET ifdef CONFIG_USER_ONLY QEMU=../qemu-$(TARGET_NAME) +QEMU_OPTS= else QEMU=../qemu-system-$(TARGET_NAME) +QEMU_OPTS=-monitor none -display none endif + # If TCG debugging is enabled things are a lot slower ifeq ($(CONFIG_DEBUG_TCG),y) TIMEOUT=45 @@ -108,7 +111,7 @@ RUN_TESTS=$(patsubst %,run-%, $(TESTS)) RUN_TESTS+=$(EXTRA_RUNS) run-%: % - $(call run-test, $<, $(QEMU) $<, "$< on $(TARGET_NAME)") + $(call run-test, $<, $(QEMU) $(QEMU_OPTS) $<, "$< on $(TARGET_NAME)") .PHONY: run run: $(RUN_TESTS) From patchwork Tue Mar 12 15:59:30 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: 1055514 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="D9e1zhWP"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44Jg6h1zMBz9s5c for ; Wed, 13 Mar 2019 03:15:08 +1100 (AEDT) Received: from localhost ([127.0.0.1]:55135 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3k3W-0001bs-49 for incoming@patchwork.ozlabs.org; Tue, 12 Mar 2019 12:15:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60735) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3jtd-0001np-EC for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:04:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3jom-0000KE-Lf for qemu-devel@nongnu.org; Tue, 12 Mar 2019 11:59:53 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]:55648) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3jom-0000Jc-Df for qemu-devel@nongnu.org; Tue, 12 Mar 2019 11:59:52 -0400 Received: by mail-wm1-x335.google.com with SMTP id 4so3237528wmf.5 for ; Tue, 12 Mar 2019 08:59:52 -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=8tyfGv8A/SPNyaMgqFoHwJAVoiY6Q6h0GkHE8ilAcZY=; b=D9e1zhWPw2BWvi9ZbvCkxbapzHTuPsiZ+upmX5i4CvIchCIB6S3vLmzNur8EveXqP2 ZFyQjbsatzRjzBAzpMcOTukfCaK5Jj5qAxJXcFqCMesAMyIipXEgFL6tb6ILOYo1MFb/ pKdXG/PdXbyks3xf4B3tkaqZVGOvyKC0Z7K6ECtbA2YpYuGyYZhe99T9578mDbLpap1o g5fWQCWJ9mXa7cV3OZ2eS98CPr/GYfWg6LsCZ+BTkdlFqVWk0moF5zi6LrBYP9P9gGp9 IzEpyDh0JRwsE/bXOWawNq5stQxw6jKks9m+5EBTTkfKnNhBWJ6wWTf4dfRsIC5jklS/ U34g== 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=8tyfGv8A/SPNyaMgqFoHwJAVoiY6Q6h0GkHE8ilAcZY=; b=EpqP9VuQk4p5WIea1vduZj2iyxCb9c9zRrgyL6s+yPkfAsadVdLc/BdRBpwmiYe+vf ywHxBgWsvxeCUPX5AR37/ls0bpVqbd3xUY/fwhk+ghNP28zkKw8hvTh4LAvaw6IFZHZd yKbHOFT5lbRHyDx3yZApNO7aGnAyaGok2LeziuXlXNUZIbxdcA8xYaHC2tPWoMvFlRx+ i0RNTY/3Hro0U3oTDI11gV3sgCcPRKoDGN3v1EAbTMdrt+MRhgfEKZkuVpoT0zQZvjB3 LSZAAvHqdYx2GXcT9Bfh+C/Pe8ELHE8FxKVXuiUZ4VIR85UJbKPwEelG92lrRDnirhsr EDYQ== X-Gm-Message-State: APjAAAVmWqbD/1T5RTOrAeuFyYzCbXU5Ndq0uXLtSS1WJzoPlPB7jiJB Wg95xHLsrw6+5rb6m2Sy6X8voA== X-Google-Smtp-Source: APXvYqybphZ+SsHoZ5ZpaWyIGJ9d2+f2jGyCAAVD+ANlngd3OVwVsL9JTcGGytJB7KHNu6HRwAiAAA== X-Received: by 2002:a1c:730d:: with SMTP id d13mr2952233wmb.37.1552406391299; Tue, 12 Mar 2019 08:59:51 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id s127sm2441576wmf.39.2019.03.12.08.59.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 08:59:49 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id ADCF81FF8C; Tue, 12 Mar 2019 15:59:47 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 15:59:30 +0000 Message-Id: <20190312155947.14918-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312155947.14918-1-alex.bennee@linaro.org> References: <20190312155947.14918-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::335 Subject: [Qemu-devel] [PATCH v4 04/21] tests/tcg: split run-test into user and system variants 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: peter.maydell@linaro.org, famz@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, agraf@suse.de, cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" We can't rely on shell redirect magic to get things right so lets setup a common output chardev that is expecting to write to files. As we have split run-test up we might as well move the default monitor bits into the call. Finally a little make sophistry is required to correctly quote $(COMMA) and as we don't inherit common rules we have our own little copy here. Signed-off-by: Alex Bennée --- tests/tcg/Makefile | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/tests/tcg/Makefile b/tests/tcg/Makefile index 454d0a4119..d26a36df61 100644 --- a/tests/tcg/Makefile +++ b/tests/tcg/Makefile @@ -32,10 +32,17 @@ -include ../../config-host.mak -include ../config-target.mak +# for including , in command strings +COMMA := , + quiet-command = $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1, @$1)) # $1 = test name, $2 = cmd, $3 = desc +ifdef CONFIG_USER_ONLY run-test = $(call quiet-command, timeout $(TIMEOUT) $2 > $1.out,"TEST",$3) +else +run-test = $(call quiet-command, timeout $(TIMEOUT) $2,"TEST",$3) +endif # $1 = test name, $2 = reference diff-out = $(call quiet-command, diff -u $1.out $2 | head -n 10,"DIFF","$1.out with $2") @@ -54,11 +61,10 @@ LDFLAGS= # The QEMU for this TARGET ifdef CONFIG_USER_ONLY QEMU=../qemu-$(TARGET_NAME) -QEMU_OPTS= else QEMU=../qemu-system-$(TARGET_NAME) -QEMU_OPTS=-monitor none -display none endif +QEMU_OPTS= # If TCG debugging is enabled things are a lot slower @@ -110,8 +116,17 @@ all: $(TESTS) RUN_TESTS=$(patsubst %,run-%, $(TESTS)) RUN_TESTS+=$(EXTRA_RUNS) +ifdef CONFIG_USER_ONLY run-%: % $(call run-test, $<, $(QEMU) $(QEMU_OPTS) $<, "$< on $(TARGET_NAME)") +else +run-%: % + $(call run-test, $<, \ + $(QEMU) -monitor none -display none \ + -chardev file$(COMMA)path=$<.out$(COMMA)id=output \ + $(QEMU_OPTS) $<, \ + "$< on $(TARGET_NAME)") +endif .PHONY: run run: $(RUN_TESTS) From patchwork Tue Mar 12 15:59:31 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: 1055521 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="aR8455Ip"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44JgKj4wBCz9s70 for ; Wed, 13 Mar 2019 03:24:41 +1100 (AEDT) Received: from localhost ([127.0.0.1]:55294 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3kCl-000171-JJ for incoming@patchwork.ozlabs.org; Tue, 12 Mar 2019 12:24:39 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60777) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3jtb-0001si-HT for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:05:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3jon-0000Ku-Q4 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 11:59:54 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:38089) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3jon-0000KN-IR for qemu-devel@nongnu.org; Tue, 12 Mar 2019 11:59:53 -0400 Received: by mail-wm1-x343.google.com with SMTP id a188so3180099wmf.3 for ; Tue, 12 Mar 2019 08:59:53 -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=lGn0ZRabM+UImFPVriIgQIRk9B5BxKamGmZq2BLqTGM=; b=aR8455Ipysz3uMBSepu7GVseHbgTuJ8UCLjyJobpveoxWid67SkHQ2e2UyIb7nhRXD JnvzgjBkElFysxzo6SC5gw5UWMYfHm8yoFbuw6v0MrgD/f5BxvcaJJw/Qhdtko7YVrj8 WCU9qfmAtSzfjH4cclZXHVQY5yhsfGRlejc+V3lctTWTrF7wME19Cv+BihyjN79nsKsW pqiZVVOaLzBl+OzJe/NjG2cpC2y6c4tkq3Myvn+X7h5E2n5O/v1PtPEbC7ftCsh8Whal ZbHuxneXvRjdLfZhXHDJmVeduuu/vLX5+DHsPf8On64P3Ods92+FsrBDuFUAzu6hsiDd x+jA== 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=lGn0ZRabM+UImFPVriIgQIRk9B5BxKamGmZq2BLqTGM=; b=GHps6yW6zqUziOJWVbD0ko6WooHd8fpeu7RsSTmqDfJnWLdULjpo9DAHeqrvn23qN2 MX23WPzyMFYU0+rAlVqDRjJ57QFRBkHxX3AdhVmdEnwZdX7m1inTGeJQCLRQzSSaaPQ5 r3Of7EbVpniV7W5u7CX1UqRalIeaBYHheT5T0mGq3W2+l4VMNGoj5K8+fgbpZ4LRC3VY 7dKEK7Fai8QH8a4NJ8OpKybZoVfC3I8R1PxQraAIHx88EUfVfKYj8R24VYrJMqzhfN87 isp+yS44A3sqOBItMZPoYZY29z3XVwYsP0NKYEdaTPRdSSa8F5M8ArSbURQMSAKIDCY3 KjjA== X-Gm-Message-State: APjAAAUDR91sSM0+3KR7DXt4+qOBiXtZuMA3gSJBFX0W2DDImRj87jXB SuXtiDMRoZe0iOPpozRgJkO8/w== X-Google-Smtp-Source: APXvYqz1BjFap8wai8+jMDM9zlmMq12JVdh6z63UnZcbbsQL8yV9D8JJimaDdAg8I+zwLedPVVErgQ== X-Received: by 2002:a1c:eb17:: with SMTP id j23mr2867375wmh.86.1552406392387; Tue, 12 Mar 2019 08:59:52 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id z6sm3341500wml.40.2019.03.12.08.59.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 08:59:49 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CA4741FF8D; Tue, 12 Mar 2019 15:59:47 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 15:59:31 +0000 Message-Id: <20190312155947.14918-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312155947.14918-1-alex.bennee@linaro.org> References: <20190312155947.14918-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::343 Subject: [Qemu-devel] [PATCH v4 05/21] tests/tcg: add gdb runner variant 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: peter.maydell@linaro.org, famz@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, agraf@suse.de, cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" With this you can launch a test in gdb with: cd $(BUILD)/tests make -f $(SRC)/tests/tcg/Makefile gdb-$(TEST_NAME) Signed-off-by: Alex Bennée --- tests/tcg/Makefile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/tcg/Makefile b/tests/tcg/Makefile index d26a36df61..8dfd1a76b9 100644 --- a/tests/tcg/Makefile +++ b/tests/tcg/Makefile @@ -128,6 +128,9 @@ run-%: % "$< on $(TARGET_NAME)") endif +gdb-%: % + gdb --args $(QEMU) $(QEMU_OPTS) $< + .PHONY: run run: $(RUN_TESTS) From patchwork Tue Mar 12 15:59:32 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: 1055510 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="jd/pJMmV"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44Jfzs72Rvz9s4V for ; Wed, 13 Mar 2019 03:09:13 +1100 (AEDT) Received: from localhost ([127.0.0.1]:55057 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3jxn-0004vR-Ot for incoming@patchwork.ozlabs.org; Tue, 12 Mar 2019 12:09:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60731) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3jtb-0001nj-J7 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:04:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3joo-0000LB-C8 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 11:59:54 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:43468) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3joo-0000Kb-15 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 11:59:54 -0400 Received: by mail-wr1-x444.google.com with SMTP id d17so3274331wre.10 for ; Tue, 12 Mar 2019 08:59:53 -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=Q3wvM+2npsAP9Qjkt62VE5osetnw17aSf2iSl+MhZ8w=; b=jd/pJMmVUSV8IbsWcTzymhthhxWf+5faxe3wPKIbBzo8Dj1MugQ+e66mKNi9vKftjq Yan9STUlvcwFL+35B+Gy3N96NqYK18AIo4gBMkOzRs130KcTc6tfo//hfBvLC7bNHLVC /bKQpQT3g230QDwY8lcBcqCjWLapI7XvO7QAUCpr8wV9k+TljY6tArSLIX8fXTPxhjpT jQAkdWIROy3MPHXlFu+gUsFKZqtxhY6RVTbHN3yUbmjbSVRUIbHoqQSoGcCI34mGx6VD YSRXrLghLVky4hAE8UaHf05jPwc1AV2MaFIY32IXtU6FRngZAFz2SJ0cjX7tZZA19BwF WNFA== 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=Q3wvM+2npsAP9Qjkt62VE5osetnw17aSf2iSl+MhZ8w=; b=Shthr3+uyHlI/oOWkiJ1bbVlfYCLIdOpLQzBjI7djW8S5ifUVfel9oMSIJ0j2sAhq5 I8e3oNw+mBGCHTmRegZseD/TTPkZdb0Y3wIkGxYr43VUOysQmqTemhWkR7EjBowIjkUC sJt4+ynb1bJeRvZSXm/02osGuDI8/VsrEyMwmc5eIDhN75ltiLpPBGUJ6dPVFuSdm1S9 R/+WTWN6g2BPTXm6XE1xJd9GCav/9T27Flqc96jcUMDZemFjflzwsbX+zqu8si2+KGcY vDQGYR98IBBfUlWRl6hKZmYR3P6zBWJTla26C01C+T+sZOtVmHA+MexR5kjEDPwI5+zO NfWA== X-Gm-Message-State: APjAAAVPmsVvAXvnT71i4el+OZUM0cZht/UVrmIEhgS6gkdpHkHzw8we yUDmjj4TtdgFpffogvCZpugc8A== X-Google-Smtp-Source: APXvYqydRjawqCNo0335UPZSfxdRYUn54axQ3EE+Y49sTT0E5NgnKwIPQ7S60rXzNZhSGRyHetua1A== X-Received: by 2002:a05:6000:1286:: with SMTP id f6mr8283906wrx.35.1552406392951; Tue, 12 Mar 2019 08:59:52 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id e23sm3681125wme.15.2019.03.12.08.59.48 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 08:59:49 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E07481FF8E; Tue, 12 Mar 2019 15:59:47 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 15:59:32 +0000 Message-Id: <20190312155947.14918-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312155947.14918-1-alex.bennee@linaro.org> References: <20190312155947.14918-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::444 Subject: [Qemu-devel] [PATCH v4 06/21] tests/tcg/mips: fix hello-mips compilation 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: peter.maydell@linaro.org, famz@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, agraf@suse.de, cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The compilation flags for proper building are in the source tree. We also fix exit to 0 so the result is counted as a success. Signed-off-by: Alex Bennée --- tests/tcg/mips/Makefile.target | 11 ++++------- tests/tcg/mips/hello-mips.c | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/tests/tcg/mips/Makefile.target b/tests/tcg/mips/Makefile.target index 086625f533..1a994d5525 100644 --- a/tests/tcg/mips/Makefile.target +++ b/tests/tcg/mips/Makefile.target @@ -8,15 +8,12 @@ MIPS_SRC=$(SRC_PATH)/tests/tcg/mips # Set search path for all sources VPATH += $(MIPS_SRC) +# hello-mips is 32 bit only +ifeq ($(findstring 64,$(TARGET_NAME)),) MIPS_TESTS=hello-mips TESTS += $(MIPS_TESTS) -hello-mips: CFLAGS+=-ffreestanding +hello-mips: CFLAGS+=-mno-abicalls -fno-PIC -mabi=32 hello-mips: LDFLAGS+=-nostdlib - -# For MIPS32 and 64 we have a bunch of extra tests in sub-directories -# however they are intended for system tests. - -run-hello-mips: hello-mips - $(call skip-test, $<, "BROKEN") +endif diff --git a/tests/tcg/mips/hello-mips.c b/tests/tcg/mips/hello-mips.c index c7052fdf2e..4e1cf501af 100644 --- a/tests/tcg/mips/hello-mips.c +++ b/tests/tcg/mips/hello-mips.c @@ -60,5 +60,5 @@ static inline int write(int fd, const char *buf, int len) void __start(void) { write (1, "Hello, World!\n", 14); - exit1 (42); + exit1(0); } From patchwork Tue Mar 12 15:59:33 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: 1055518 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="Edjs3XlP"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44JgBG54R3z9s5c for ; Wed, 13 Mar 2019 03:18:14 +1100 (AEDT) Received: from localhost ([127.0.0.1]:55198 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3k6W-0004RM-JK for incoming@patchwork.ozlabs.org; Tue, 12 Mar 2019 12:18:12 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60862) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3jtb-00023a-HC for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:05:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3jop-0000Lx-SQ for qemu-devel@nongnu.org; Tue, 12 Mar 2019 11:59:56 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:42407) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3jop-0000LX-Lg for qemu-devel@nongnu.org; Tue, 12 Mar 2019 11:59:55 -0400 Received: by mail-wr1-x442.google.com with SMTP id o9so3279642wrv.9 for ; Tue, 12 Mar 2019 08:59:55 -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=QXJ3lfkk33PrrjtnU8P/06NiWtLnegdIM7eA8oCO+u4=; b=Edjs3XlPKBWFUgdXbJWFbGYKvlva76a0zOffhRjXwKVAR42nae4PSUr6FRKfoesu/h LqlbYPHtGJozVlstcY/yhG2VpHvlkwQH6tpG3u+EjTeVqbqxFbLHgdZxtJe9Zy0MqYVm ZtaOMQCXdZPMUKCM0IrC9kA1jsREyNA1RQzOxc9H1e/koxxLw2/K9o417cqRQZ5tjCHW NGqM23o/G/2nWRI5GyH+ehLoT+SaXCa6YJuN5pyTtjB+T70124VkGztdl3/7VhU5dKnh VMXcLWu/pYvIdPX5ZJlnUTLDLlVcoUij6FZUPXrkVtEIS19MIq1dtlNh/zU2sUM8oBuU wECQ== 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=QXJ3lfkk33PrrjtnU8P/06NiWtLnegdIM7eA8oCO+u4=; b=WFZ1N8C27YizeDr6F2VEB1PcoALEyiVBFXzpPobtp1/Zy7yT2n/IlM5y/muulexffl 9Accn4OpncCXfFmpIZ4kJK6IYIxWC/RGAJ8eL7PkHqcOJXpLS2Uh0pVK5dP3SZmH5ARG TUs7bhd5DBIZqEvD9T4p6YgUJiT/kMU4z6JZVa4dGHy2slzoow+MWVLXMi+6zyFlfs4l a6e7P3bg+l+WVVV0mMTMhHxBU6adAEmp34q5goa0eR62GAixnymIiB6XelsO7hkOFxui MyVmwluAXiKFqqSIcBaB4Pudhir+1/Z/23jTga3e1DZoU9B+wMTweBHp7AqMfPM/aoxl 2Ivg== X-Gm-Message-State: APjAAAW0/ePjvRYAOjhWuNbS6p31YrKs+Yho+dnwfCv6Z4TS/LpD/lns CEgyFgYEVZxq8MoK9RPGr2sAiw== X-Google-Smtp-Source: APXvYqzDCR+S4DTBEvZ58/zWphKihgbAe+RvDkSbMaMt6AkhQYp7Bs5NJxA0YLxQJLAuRL2Hz15otA== X-Received: by 2002:a5d:5386:: with SMTP id d6mr23228805wrv.104.1552406394537; Tue, 12 Mar 2019 08:59:54 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id d9sm20488422wrn.72.2019.03.12.08.59.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 08:59:51 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id EF3671FF8F; Tue, 12 Mar 2019 15:59:47 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 15:59:33 +0000 Message-Id: <20190312155947.14918-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312155947.14918-1-alex.bennee@linaro.org> References: <20190312155947.14918-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] [PATCH v4 07/21] tests/docker: add debian-xtensa-cross image 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: peter.maydell@linaro.org, famz@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, agraf@suse.de, cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Xtensa cpu supported: - dc232b - dc233c - csp Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée --- v2 - the compiler only works for system tests (no libc) --- .../dockerfiles/debian-xtensa-cross.docker | 31 +++++++++++++++++++ tests/tcg/xtensa/Makefile.include | 11 +++++++ 2 files changed, 42 insertions(+) create mode 100644 tests/docker/dockerfiles/debian-xtensa-cross.docker create mode 100644 tests/tcg/xtensa/Makefile.include diff --git a/tests/docker/dockerfiles/debian-xtensa-cross.docker b/tests/docker/dockerfiles/debian-xtensa-cross.docker new file mode 100644 index 0000000000..afd2ab9163 --- /dev/null +++ b/tests/docker/dockerfiles/debian-xtensa-cross.docker @@ -0,0 +1,31 @@ +# +# Docker cross-compiler target +# +# This docker target builds on the debian stretch base image, +# using a prebuilt toolchains for Xtensa cores from: +# https://github.com/foss-xtensa/toolchain/releases +# +FROM debian:stretch-slim + +RUN apt-get update && \ + DEBIAN_FRONTEND=noninteractive apt install -yy eatmydata +RUN DEBIAN_FRONTEND=noninteractive eatmydata \ + apt-get install -y --no-install-recommends \ + bison \ + build-essential \ + ca-certificates \ + curl \ + flex \ + gettext \ + git \ + python-minimal + +ENV CPU_LIST csp dc232b dc233c +ENV TOOLCHAIN_RELEASE 2018.02 + +RUN for cpu in $CPU_LIST; do \ + curl -#SL http://github.com/foss-xtensa/toolchain/releases/download/$TOOLCHAIN_RELEASE/x86_64-$TOOLCHAIN_RELEASE-xtensa-$cpu-elf.tar.gz \ + | tar -xzC /opt; \ + done + +ENV PATH $PATH:/opt/$TOOLCHAIN_RELEASE/xtensa-dc232b-elf/bin:/opt/$TOOLCHAIN_RELEASE/xtensa-dc233c-elf/bin:/opt/$TOOLCHAIN_RELEASE/xtensa-csp-elf/bin diff --git a/tests/tcg/xtensa/Makefile.include b/tests/tcg/xtensa/Makefile.include new file mode 100644 index 0000000000..423c00a5d3 --- /dev/null +++ b/tests/tcg/xtensa/Makefile.include @@ -0,0 +1,11 @@ +# Makefile.include for xtensa targets +# +# The compilers can only be used for building system tests + +ifeq ($(CONFIG_SOFTMMU),y) +DOCKER_IMAGE=debian-xtensa-cross + +# default to the dc232b cpu +DOCKER_CROSS_COMPILER=/opt/2018.02/xtensa-dc232b-elf/bin/xtensa-dc232b-elf-gcc +DOCKER_CROSS_LINKER=/opt/2018.02/xtensa-dc232b-elf/bin/xtensa-dc232b-elf-ld +endif From patchwork Tue Mar 12 15:59:34 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: 1055512 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="XIOpTeFa"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44Jg3G544Hz9s5c for ; Wed, 13 Mar 2019 03:12:08 +1100 (AEDT) Received: from localhost ([127.0.0.1]:55115 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3k0c-0007Lc-3r for incoming@patchwork.ozlabs.org; Tue, 12 Mar 2019 12:12:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60689) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3jtb-0001lI-HQ for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:04:53 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3joq-0000M7-7i for qemu-devel@nongnu.org; Tue, 12 Mar 2019 11:59:57 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:37598) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3joq-0000Lf-0C for qemu-devel@nongnu.org; Tue, 12 Mar 2019 11:59:56 -0400 Received: by mail-wr1-x444.google.com with SMTP id y15so3303980wro.4 for ; Tue, 12 Mar 2019 08:59:55 -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=RST/eKFcEk8+40q8b1Nxx3oDSPee4weCvEgzIdUEMVE=; b=XIOpTeFapKyTOQ9jIG2NpO2fSaOBVZlHMvdk30i10BbTenPOmuwmzKm0T+Ji5Eb3IL dZlOBLiDch9O5JgzZ812Q0gi5I2F0k0jZlQYSxpzWM7aFSN4/22OYgH0WKmPPIDvEipW vKZQcVhEBF1F8oERqGAsrsxW74B844x1ch3/F7Qzi3SlHCDaf7+/5OvqS3aOL72b0lAR GPwYuXbZkNFfFyzQE8rRSA5PkVgyWVmSM2zNR31/tQJGzlDKSbQwvb8IN8ycTzSh5hsp XB2Hc+hBUZCOzvS7zbuwJ3+vhGL9S+QxdPiQJitnmeTxRfR0i1EVE8O6dlbOryHzYLSl cYFQ== 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=RST/eKFcEk8+40q8b1Nxx3oDSPee4weCvEgzIdUEMVE=; b=c/PnDMdcAMJKaM5lrfkQ+tjMUGjDWyVZ2AXSohmZIo4xq3EL0CzMGO3ZLGFG+aAnYU 6cC6N4OeqBJ2igQv3AVFMfgfYonczaTz0u7VbE5Qmcx2ftucWqEaQ5RNNyI+L++L4j+v t04diVZy1BLVdXs+osOJMXEl91Q/beS0SKAUjsWrX68g9OeiEyi9LPHmNqY11nWrgLSL B2AQigTNWU2VVsJF74NlY3w9lk5xJYFAcoxkNWX37YUD2O3HoKSOG8dcbIcZbXERggyi i77fXCi2BRwg+jGYgUpqK5fWt7+ajcWFPmOAsw0zviFo/uIti9DAHrsFBztuBJKukrUy kAaQ== X-Gm-Message-State: APjAAAXWuLzu+HjkdnfMQuYX2MRhxISAxMBduCebhyJNel3+N7Bb5lkS NUHUjIAQOOv1hBO3J/nWlNYb3A== X-Google-Smtp-Source: APXvYqyJ6WVno3oFN1pwqd0LftdbKP+K2qr7RtQb1MV4vJeGFMtrQ7lAof3c5pty9vk0v5chfU+C5g== X-Received: by 2002:adf:e643:: with SMTP id b3mr4933055wrn.262.1552406395015; Tue, 12 Mar 2019 08:59:55 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id v196sm4469706wmf.15.2019.03.12.08.59.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 08:59:51 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 07D841FF90; Tue, 12 Mar 2019 15:59:48 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 15:59:34 +0000 Message-Id: <20190312155947.14918-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312155947.14918-1-alex.bennee@linaro.org> References: <20190312155947.14918-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::444 Subject: [Qemu-devel] [PATCH v4 08/21] 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: peter.maydell@linaro.org, famz@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, agraf@suse.de, cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.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 | 102 ----------------------- tests/tcg/xtensa/Makefile.softmmu-target | 42 ++++++++++ 2 files changed, 42 insertions(+), 102 deletions(-) delete mode 100644 tests/tcg/xtensa/Makefile create mode 100644 tests/tcg/xtensa/Makefile.softmmu-target diff --git a/tests/tcg/xtensa/Makefile b/tests/tcg/xtensa/Makefile deleted file mode 100644 index 2bd4491769..0000000000 --- a/tests/tcg/xtensa/Makefile +++ /dev/null @@ -1,102 +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 - -ASFLAGS = -Wa,--no-absolute-literals -vectors_ASFLAGS = -mtext-section-literals - -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_flix.tst -TESTCASES += test_fp0_arith.tst -TESTCASES += test_fp0_conv.tst -TESTCASES += test_fp1.tst -TESTCASES += test_fp_cpenable.tst -TESTCASES += test_interrupt.tst -TESTCASES += test_loop.tst -TESTCASES += test_lsc.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) $(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..86bb47db77 --- /dev/null +++ b/tests/tcg/xtensa/Makefile.softmmu-target @@ -0,0 +1,42 @@ +# +# 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)) + +vectors_ASFLAGS = -mtext-section-literals +ASFLAGS = -Wa,--no-absolute-literals +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) $(ASFLAGS) -c $< -o $@ + +%: %.S + $(CC) $(XTENSA_INC) $(ASFLAGS) $< -o $@ $(LDFLAGS) $(NOSTDFLAGS) $(CRT) + +endif From patchwork Tue Mar 12 15:59:35 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: 1055513 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="lrSjL/Y8"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44Jg3G543cz9s4Y for ; Wed, 13 Mar 2019 03:12:07 +1100 (AEDT) Received: from localhost ([127.0.0.1]:55113 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3k0a-0007JV-S9 for incoming@patchwork.ozlabs.org; Tue, 12 Mar 2019 12:12:04 -0400 Received: from eggs.gnu.org ([209.51.188.92]:61000) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3jtb-00024h-FL for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:04:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3jot-0000NS-9H for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:00:00 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:45579) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3jos-0000Mv-Uo for qemu-devel@nongnu.org; Tue, 12 Mar 2019 11:59:59 -0400 Received: by mail-wr1-x441.google.com with SMTP id h99so2288395wrh.12 for ; Tue, 12 Mar 2019 08:59:58 -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=LOsSu8Eq6x2dR75aHJwrZ0rC0QsKzLcjJP/Aa5vKmvA=; b=lrSjL/Y8c6WFNzWdGnnj6NJ1NmGVgaRb7eGqj0dYx5dfqUgrC2qU0jGVT8DncVL/6j MkkJMu5/jg/2FD4+zqqX79cS1L3wUZ2MYX7gBrcEshpZVdR8sD5CCEtjjzQC3x3yqSRV X8J6v07YDvFS7eVonzhBPiy3GNwvWAUzpOBRHrWto7Go58ANMDR+BV1ROwqoJw5xiS4Z c2AliyCE31G2XaKzKXlaxltvUnxHwHFsQ+Ks2wEm9a9JRSSt9OH38jlAAonKBxT5cYCP XHnQJ7v1HAC4/frp3qdyjN0PtPT1QRudO/vIrkovAOzXdremQYe9wzAk361vD7Np6v7z F9qQ== 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=LOsSu8Eq6x2dR75aHJwrZ0rC0QsKzLcjJP/Aa5vKmvA=; b=Bf4Zri8fE3C3LFnUzP5TshhL/YXVNFMyMB+uqe3qhu8CWHQNWzwdBs095iORzkVKM7 Pu/ZJNgDwsx1Oq40fcFyp1Deu1QWnk2QKXpIwpceKd+UtD60eUaSBgu0FGJaCMH0N5AJ g1HGWactzBV7aXVi2w11Qx3s5xRAqf2lYRczZ8ErqhUyrC5QsWuo2UgkmoE8Fq17xZtG lB3Ca1RndpDgu4PZ6y/TwitCo6OUsFgHA6Qadss/E9xHUFi7mCfCG57FT9xBItdi9rAE wiuchB0edjVSxo9dPmFPWCa67Rgne9ierzmis4auI0T8dmBwBUsEb4UQdi+TgePShLH3 qEZQ== X-Gm-Message-State: APjAAAWoPT0asiF2BVlxIMSBfRHkbpPTJv3b1bcfgz822Dqkq98fe1oQ CR/5zCBG4wMFh4R6ymm8XR4Rew== X-Google-Smtp-Source: APXvYqyTkGjEjmK34JIsMcYILUCwC/T1WF/uUizsTQvYbCfkFEd+ibfgHh7iM7TffFfNnu574XF4ow== X-Received: by 2002:adf:c543:: with SMTP id s3mr23081790wrf.192.1552406397650; Tue, 12 Mar 2019 08:59:57 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id t8sm3029176wmi.21.2019.03.12.08.59.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 08:59:53 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 14C081FF91; Tue, 12 Mar 2019 15:59:48 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 15:59:35 +0000 Message-Id: <20190312155947.14918-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312155947.14918-1-alex.bennee@linaro.org> References: <20190312155947.14918-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::441 Subject: [Qemu-devel] [PATCH v4 09/21] tests/tcg/arm: add ARMv6-M UNDEFINED 32-bit instruction test 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: peter.maydell@linaro.org, famz@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, agraf@suse.de, cota@braap.org, Stefan Hajnoczi , aurelien@aurel32.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Stefan Hajnoczi Test that 32-bit instructions declared UNDEFINED in the ARMv6-M Reference Manual really do raise an exception. Also test that the 6 32-bit instructions defined in the ARMv6-M Reference Manual do not raise an exception. Based-on: <20181029194519.15628-1-stefanha@redhat.com> Signed-off-by: Stefan Hajnoczi Message-Id: <20181129185113.30353-1-stefanha@redhat.com> [AJB: integrated into system tests] Signed-off-by: Alex Bennée --- v2 - added to series - used softmmu-target Makefile with single compile/link step - launches with -kernel - drop .hex file --- tests/tcg/arm/Makefile.softmmu-target | 29 +++++ tests/tcg/arm/test-armv6m-undef.S | 154 ++++++++++++++++++++++++++ tests/tcg/arm/test-armv6m-undef.ld | 21 ++++ 3 files changed, 204 insertions(+) create mode 100644 tests/tcg/arm/Makefile.softmmu-target create mode 100644 tests/tcg/arm/test-armv6m-undef.S create mode 100644 tests/tcg/arm/test-armv6m-undef.ld diff --git a/tests/tcg/arm/Makefile.softmmu-target b/tests/tcg/arm/Makefile.softmmu-target new file mode 100644 index 0000000000..49d48d8a1c --- /dev/null +++ b/tests/tcg/arm/Makefile.softmmu-target @@ -0,0 +1,29 @@ +# -*- Mode: makefile -*- +# +# ARM SoftMMU tests - included from tests/tcg/Makefile +# + +ifeq ($(TARGET_ABI_DIR),arm) + +ARM_SRC=$(SRC_PATH)/tests/tcg/arm + +# Set search path for all sources +VPATH += $(ARM_SRC) + +ARM_TESTS=test-armv6m-undef + +TESTS += $(ARM_TESTS) + +CFLAGS+=-Wl,--build-id=none -x assembler-with-cpp +LDFLAGS+=-nostdlib -N -static + +%: %.S %.ld + $(CC) $(CFLAGS) $(ASFLAGS) $< -o $@ $(LDFLAGS) -T $(ARM_SRC)/$@.ld + +# Specific Test Rules + +test-armv6m-undef: EXTRA_CFLAGS+=-mcpu=cortex-m0 + +run-test-armv6m-undef: QEMU_OPTS+=-semihosting -M microbit -kernel + +endif diff --git a/tests/tcg/arm/test-armv6m-undef.S b/tests/tcg/arm/test-armv6m-undef.S new file mode 100644 index 0000000000..d18ca56b4a --- /dev/null +++ b/tests/tcg/arm/test-armv6m-undef.S @@ -0,0 +1,154 @@ +/* + * Test ARMv6-M UNDEFINED 32-bit instructions + * + * Copyright 2018 Red Hat Inc. + * + * This work is licensed under the terms of the GNU GPL, version 2 + * or later. See the COPYING file in the top-level directory. + */ + +/* + * Test that UNDEFINED 32-bit instructions fault as expected. This is an + * interesting test because ARMv6-M shares code with its more fully-featured + * siblings and it's necessary to verify that its limited instruction set is + * emulated correctly. + * + * The emulator must be invoked with -semihosting so that the test case can + * terminate with exit code 0 on success or 1 on failure. + * + * Failures can be debugged with -d in_asm,int,exec,cpu and the + * gdbstub (-S -s). + */ + +.syntax unified +.cpu cortex-m0 +.thumb + +/* + * Memory map + */ +#define SRAM_BASE 0x20000000 +#define SRAM_SIZE (16 * 1024) + +/* + * Semihosting interface on ARM T32 + * See "Semihosting for AArch32 and AArch64 Version 2.0 Documentation" by ARM + */ +#define semihosting_call bkpt 0xab +#define SYS_EXIT 0x18 + +vector_table: + .word SRAM_BASE + SRAM_SIZE /* 0. SP_main */ + .word exc_reset_thumb /* 1. Reset */ + .word 0 /* 2. NMI */ + .word exc_hard_fault_thumb /* 3. HardFault */ + .rept 7 + .word 0 /* 4-10. Reserved */ + .endr + .word 0 /* 11. SVCall */ + .word 0 /* 12. Reserved */ + .word 0 /* 13. Reserved */ + .word 0 /* 14. PendSV */ + .word 0 /* 15. SysTick */ + .rept 32 + .word 0 /* 16-47. External Interrupts */ + .endr + +exc_reset: +.equ exc_reset_thumb, exc_reset + 1 +.global exc_reset_thumb + /* The following 32-bit UNDEFINED instructions are tested by executing + * them. The HardFault exception handler should execute and return to + * the next test case. If no exception is raised the test fails. + */ + + /* Table A5-9 32-bit Thumb encoding */ + .short 0b1110100000000000 + .short 0b0000000000000000 + b not_reached + .short 0b1110100000000000 + .short 0b1000000000000000 + b not_reached + .short 0b1111100000000000 + .short 0b0000000000000000 + b not_reached + .short 0b1111100000000000 + .short 0b1000000000000000 + b not_reached + .short 0b1111000000000000 + .short 0b0000000000000000 + b not_reached + + /* Table A5-10 Branch and miscellaneous control instructions */ + .short 0b1111011111110000 + .short 0b1010000000000000 + b not_reached + + /* The following are valid 32-bit instructions that must not raise a + * HardFault. + */ + + /* B4.2.3 Move to Special Register (moves to IPSR are ignored) */ + msr ipsr, r0 + b 1f + b not_reached +1: + /* B4.2.2 Move from Special Register */ + mrs r0, ipsr + b 1f + b not_reached +1: + /* A6.7.13 Branch with Link (immediate) */ + bl 1f +1: + b 1f + b not_reached +1: + /* A6.7.21 Data Memory Barrier */ + dmb + b 1f + b not_reached +1: + /* A6.7.22 Data Synchronization Barrier */ + dsb + b 1f + b not_reached +1: + /* A6.7.24 Instruction Memory Barrier */ + isb + b 1f + b not_reached +1: + + /* Success! */ + movs r0, 1 + b exit + +not_reached: /* Failure :( */ + movs r0, 0 + b exit + +/* When a HardFault occurs, return to pc+6 (test cases are 3 halfwords long) */ +exc_hard_fault: +.equ exc_hard_fault_thumb, exc_hard_fault + 1 +.global exc_hard_fault_thumb + ldr r0, [sp, 0x18] + adds r0, 6 + str r0, [sp, 0x18] + bx lr + +/* + * exit: Terminate emulator + * @r0: 0 - failure, 1 - success + */ +exit: + movs r1, 0 + cmp r0, 1 + bne 1f + ldr r1, ADP_Stopped_ApplicationExit +1: + movs r0, SYS_EXIT + semihosting_call +.align 2 +ADP_Stopped_ApplicationExit: + .word 0x20026 diff --git a/tests/tcg/arm/test-armv6m-undef.ld b/tests/tcg/arm/test-armv6m-undef.ld new file mode 100644 index 0000000000..43dbbf17d5 --- /dev/null +++ b/tests/tcg/arm/test-armv6m-undef.ld @@ -0,0 +1,21 @@ +ENTRY(exc_reset_thumb) + +SECTIONS +{ + . = 0x0; + .text : { + *(.text) + } + .data : { + *(.data) + } + .rodata : { + *(.rodata) + } + .bss : { + *(.bss) + } + /DISCARD/ : { + *(.ARM.attributes) + } +} From patchwork Tue Mar 12 15:59:36 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: 1055505 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="pLZKFWOA"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44JfwF0GHwz9s4V for ; Wed, 13 Mar 2019 03:06:03 +1100 (AEDT) Received: from localhost ([127.0.0.1]:55003 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3juh-0002Ba-LD for incoming@patchwork.ozlabs.org; Tue, 12 Mar 2019 12:05:59 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60948) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3jtb-00024S-GO for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:04:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3jot-0000Nk-F7 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:00:00 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:53763) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3jot-0000N3-8P for qemu-devel@nongnu.org; Tue, 12 Mar 2019 11:59:59 -0400 Received: by mail-wm1-x342.google.com with SMTP id e74so3242765wmg.3 for ; Tue, 12 Mar 2019 08:59:59 -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=pAjTk7wWyPMv819XInqes+mFXree4x+cfQ6ntOuh1/0=; b=pLZKFWOAf19QDfS+CCe6UP8H+60W9GN0XgzMk16+Y30DjC6VnI1v7Z7wuwngw35IhX 9V/fvjQ4MV2zyrwwV/hhnyp/zNgzGdaFcsuaIIqcbhHeG2r9sEXcEA16YaX2O7eVD3fg Ci2ET0uHv0XD9/I1zRkIAYNwPTHoE+mbpcAQ4bHPjoBqOthcuXGNFCtxI5LZ4EcLSIKU 9XleSsDa7orB8iMD1jn1HDuk3I+iwIJ1K83ZL4hK9yMCd+JdVOEnHjFOb41+Af1Chy0K BpVHGpQi9dAq6ysMMMi6nRRZYj1ZrBzxRWs5ivNISJgpZDMP8Mkk+Bhuw/VLJypnjDso i4CQ== 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=pAjTk7wWyPMv819XInqes+mFXree4x+cfQ6ntOuh1/0=; b=t4S2ZwIkHz4x39amwNrb9vsqiQqvK0u3Hr3KxVqMvFPtjtBVYybOpYj5dvoRjLzU63 7+n5TEwWjknJA5QVQDLZ339tl/wLJ69gxPZ6D48XTadzCsdT2nJDWx3H/m+d1qUY2GiJ Q+Tehd+mvMD79i6MhCFY2jOUO5RZIPRaOgt3eJCslzMc/6cN7IeVBJ1Hw9ofZGUv2okE jy7DaRDNl1XOuqOUxUDe5d7moHGbe0O/ib91wW0cQyAswH4cQB+4hFwpWQ5fKYmg/77V xU3838tpfEtGucpcqOckF5BjHwaLTYYUGD/kwNrRBNgKERiE7MsODfBLMwkB9F3IWKB+ Ufcg== X-Gm-Message-State: APjAAAWXRmjkYAKQrmigHgr1F4EIox472Tt2Aezq4yCd6oY5zs0BcWO9 4UINrNwBoVhOU6mbBPqmRFGs9A== X-Google-Smtp-Source: APXvYqxE6PZGpLtQ60WPJDJX+/POVKHVS2yzimFkPXHxLaXwaAfD9z+BDUtFq9/V0KOjQLIlRaCR3g== X-Received: by 2002:a7b:cbd1:: with SMTP id n17mr2890510wmi.21.1552406398144; Tue, 12 Mar 2019 08:59:58 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id p68sm1855314wme.45.2019.03.12.08.59.50 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 08:59:53 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 220291FF92; Tue, 12 Mar 2019 15:59:48 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 15:59:36 +0000 Message-Id: <20190312155947.14918-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312155947.14918-1-alex.bennee@linaro.org> References: <20190312155947.14918-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::342 Subject: [Qemu-devel] [PATCH v4 10/21] tests/docker: add fedora-cris-cross compilers 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: peter.maydell@linaro.org, famz@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, agraf@suse.de, cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/fedora-cris-cross.docker | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 tests/docker/dockerfiles/fedora-cris-cross.docker diff --git a/tests/docker/dockerfiles/fedora-cris-cross.docker b/tests/docker/dockerfiles/fedora-cris-cross.docker new file mode 100644 index 0000000000..b168ada615 --- /dev/null +++ b/tests/docker/dockerfiles/fedora-cris-cross.docker @@ -0,0 +1,8 @@ +# +# Cross compiler for cris system tests +# + +FROM fedora:latest +ENV PACKAGES gcc-cris-linux-gnu +RUN dnf install -y $PACKAGES +RUN rpm -q $PACKAGES | sort > /packages.txt From patchwork Tue Mar 12 15:59:38 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: 1055519 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="jRChWOov"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44JgG628pHz9s70 for ; Wed, 13 Mar 2019 03:21:34 +1100 (AEDT) Received: from localhost ([127.0.0.1]:55252 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3k9j-00070w-Vz for incoming@patchwork.ozlabs.org; Tue, 12 Mar 2019 12:21:32 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60951) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3jtb-00024T-DT for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:04:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3jov-0000PE-Th for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:00:10 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:50730) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3jov-0000OU-GH for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:00:01 -0400 Received: by mail-wm1-x344.google.com with SMTP id x7so3287726wmj.0 for ; Tue, 12 Mar 2019 09:00:01 -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=/me78ZlaEoKmWEjnUh/M9mm4F+jTh6G1m79BiUp2EZg=; b=jRChWOov+yHVo7dw+S31sPuECeFpU3AlxSDen6AZENgHK+Gr7Hx8o8yzZSA2GVexSd 5rocJFdAZpqtyBD+E0mCv3RlVs4SztEHk/zUWVLfER/YvxPD1NV7PgCvNTd8KmChjGfe 9RtpgRTiYdKs1J/l4PWQ3ENcBOgUuVLTeLu9WJz//EHxgbI/+go/0ifbhDzfZnLyx6dN vvNIxJzln4I/fwB5oyBcWqY6G9/8pzGZeMKYkPc/KyIwBadtd8bzjtfD+X1oCDVZcX8A VBY0VKqJcxfA8HIe9cY8cn8kj9AX81ne0q1UrimGRawwcJfGmWIkhjhaIGKT0/GsbayS qp8g== 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=/me78ZlaEoKmWEjnUh/M9mm4F+jTh6G1m79BiUp2EZg=; b=dEmENEtVpkvw6cLHM19THG7vtdzKIlpO5ylY5oJNSjLc6irNIRVGnt2lLMRDJ+CyNI AIc4LjVIB5w9Hg6WqVgK4Tqkz61lEgQ5Gcaw+FYwxNQ+CfuZzroAEXFSMq6Cc/+MKpPT 54xHKSjqd4uOB8lkEmC+XTJLEjvl8qZEFsm54X5oL4Dl5hItn9VvGM659sM2aO9A9R0C DNjem8d/QXEw8gmu46pPC2GfS/WkS4vdUEiSGY9yE6nZ8ciYYq6vRwFnmibPI9Pmjuta Ivr18p6zYMtIZfME5OYmgPG6j6ZhwCeFLWQMS0V8in31/Blof0RIkybxWw+DdVZbushI pzsw== X-Gm-Message-State: APjAAAV0gQYDSLI5oHe+0d1zBfuvy4HQ9Z6iVJBTr8lMJ6dWlmn8XpCE BC4duCPK9YGP/fdIGgBJXWde0GaIEzY= X-Google-Smtp-Source: APXvYqwSYTTDRNR9cklzxD17eOrfbpqV+XOCwHat37JEKYXDAb+hP1ji10sErbzhT/2sj8hiKMLomg== X-Received: by 2002:a1c:7906:: with SMTP id l6mr2868908wme.83.1552406399999; Tue, 12 Mar 2019 08:59:59 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id q19sm2123650wmq.23.2019.03.12.08.59.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 08:59:53 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 3C06B1FF96; Tue, 12 Mar 2019 15:59:48 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 15:59:38 +0000 Message-Id: <20190312155947.14918-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312155947.14918-1-alex.bennee@linaro.org> References: <20190312155947.14918-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::344 Subject: [Qemu-devel] [PATCH v4 12/21] tests/tcg: split cris tests into bare and libc directories 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: peter.maydell@linaro.org, famz@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, agraf@suse.de, cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Bare tests are standalone assembly tests that don't require linking to any libc and hence can be built with kernel only compilers. The libc tests need a compiler capable of building properly linked userspace binaries. As we don't have such a cross compiler at the moment we won't be building those tests. Signed-off-by: Alex Bennée --- v2 - split between bare/libc instead of system/user --- tests/tcg/cris/{ => bare}/check_addcv17.s | 0 tests/tcg/cris/{ => bare}/check_addi.s | 0 tests/tcg/cris/{ => bare}/check_addiv32.s | 0 tests/tcg/cris/{ => bare}/check_addm.s | 0 tests/tcg/cris/{ => bare}/check_addq.s | 0 tests/tcg/cris/{ => bare}/check_addr.s | 0 tests/tcg/cris/{ => bare}/check_addxc.s | 0 tests/tcg/cris/{ => bare}/check_addxm.s | 0 tests/tcg/cris/{ => bare}/check_addxr.s | 0 tests/tcg/cris/{ => bare}/check_andc.s | 0 tests/tcg/cris/{ => bare}/check_andm.s | 0 tests/tcg/cris/{ => bare}/check_andq.s | 0 tests/tcg/cris/{ => bare}/check_andr.s | 0 tests/tcg/cris/{ => bare}/check_asr.s | 0 tests/tcg/cris/{ => bare}/check_ba.s | 0 tests/tcg/cris/{ => bare}/check_bas.s | 0 tests/tcg/cris/{ => bare}/check_bcc.s | 0 tests/tcg/cris/{ => bare}/check_boundc.s | 0 tests/tcg/cris/{ => bare}/check_boundr.s | 0 tests/tcg/cris/{ => bare}/check_btst.s | 0 tests/tcg/cris/{ => bare}/check_clearfv32.s | 0 tests/tcg/cris/{ => bare}/check_clrjmp1.s | 0 tests/tcg/cris/{ => bare}/check_cmp-2.s | 0 tests/tcg/cris/{ => bare}/check_cmpc.s | 0 tests/tcg/cris/{ => bare}/check_cmpm.s | 0 tests/tcg/cris/{ => bare}/check_cmpq.s | 0 tests/tcg/cris/{ => bare}/check_cmpr.s | 0 tests/tcg/cris/{ => bare}/check_cmpxc.s | 0 tests/tcg/cris/{ => bare}/check_cmpxm.s | 0 tests/tcg/cris/{ => bare}/check_dstep.s | 0 tests/tcg/cris/{ => bare}/check_jsr.s | 0 tests/tcg/cris/{ => bare}/check_lapc.s | 0 tests/tcg/cris/{ => bare}/check_lsl.s | 0 tests/tcg/cris/{ => bare}/check_lsr.s | 0 tests/tcg/cris/{ => bare}/check_mcp.s | 0 tests/tcg/cris/{ => bare}/check_movdelsr1.s | 0 tests/tcg/cris/{ => bare}/check_movecr.s | 0 tests/tcg/cris/{ => bare}/check_movei.s | 0 tests/tcg/cris/{ => bare}/check_movemr.s | 0 tests/tcg/cris/{ => bare}/check_movemrv32.s | 0 tests/tcg/cris/{ => bare}/check_mover.s | 0 tests/tcg/cris/{ => bare}/check_moverm.s | 0 tests/tcg/cris/{ => bare}/check_movmp.s | 0 tests/tcg/cris/{ => bare}/check_movpmv32.s | 0 tests/tcg/cris/{ => bare}/check_movpr.s | 0 tests/tcg/cris/{ => bare}/check_movprv32.s | 0 tests/tcg/cris/{ => bare}/check_movscr.s | 0 tests/tcg/cris/{ => bare}/check_movsm.s | 0 tests/tcg/cris/{ => bare}/check_movsr.s | 0 tests/tcg/cris/{ => bare}/check_movucr.s | 0 tests/tcg/cris/{ => bare}/check_movum.s | 0 tests/tcg/cris/{ => bare}/check_movur.s | 0 tests/tcg/cris/{ => bare}/check_mulv32.s | 0 tests/tcg/cris/{ => bare}/check_mulx.s | 0 tests/tcg/cris/{ => bare}/check_neg.s | 0 tests/tcg/cris/{ => bare}/check_not.s | 0 tests/tcg/cris/{ => bare}/check_orc.s | 0 tests/tcg/cris/{ => bare}/check_orm.s | 0 tests/tcg/cris/{ => bare}/check_orq.s | 0 tests/tcg/cris/{ => bare}/check_orr.s | 0 tests/tcg/cris/{ => bare}/check_ret.s | 0 tests/tcg/cris/{ => bare}/check_scc.s | 0 tests/tcg/cris/{ => bare}/check_subc.s | 0 tests/tcg/cris/{ => bare}/check_subm.s | 0 tests/tcg/cris/{ => bare}/check_subq.s | 0 tests/tcg/cris/{ => bare}/check_subr.s | 0 tests/tcg/cris/{ => bare}/check_xarith.s | 0 tests/tcg/cris/{ => bare}/crt.s | 0 tests/tcg/cris/{ => bare}/sys.c | 0 tests/tcg/cris/{ => bare}/testutils.inc | 0 tests/tcg/cris/{ => libc}/check_abs.c | 0 tests/tcg/cris/{ => libc}/check_addc.c | 0 tests/tcg/cris/{ => libc}/check_addcm.c | 0 tests/tcg/cris/{ => libc}/check_addo.c | 0 tests/tcg/cris/{ => libc}/check_addoq.c | 0 tests/tcg/cris/{ => libc}/check_bound.c | 0 tests/tcg/cris/{ => libc}/check_ftag.c | 0 tests/tcg/cris/{ => libc}/check_gcctorture_pr28634-1.c | 0 tests/tcg/cris/{ => libc}/check_gcctorture_pr28634.c | 0 tests/tcg/cris/{ => libc}/check_glibc_kernelversion.c | 0 tests/tcg/cris/{ => libc}/check_hello.c | 0 tests/tcg/cris/{ => libc}/check_int64.c | 0 tests/tcg/cris/{ => libc}/check_lz.c | 0 tests/tcg/cris/{ => libc}/check_mapbrk.c | 0 tests/tcg/cris/{ => libc}/check_mmap1.c | 0 tests/tcg/cris/{ => libc}/check_mmap2.c | 0 tests/tcg/cris/{ => libc}/check_mmap3.c | 0 tests/tcg/cris/{ => libc}/check_moveq.c | 0 tests/tcg/cris/{ => libc}/check_openpf1.c | 0 tests/tcg/cris/{ => libc}/check_openpf2.c | 0 tests/tcg/cris/{ => libc}/check_openpf3.c | 0 tests/tcg/cris/{ => libc}/check_openpf5.c | 0 tests/tcg/cris/{ => libc}/check_settls1.c | 0 tests/tcg/cris/{ => libc}/check_sigalrm.c | 0 tests/tcg/cris/{ => libc}/check_stat1.c | 0 tests/tcg/cris/{ => libc}/check_stat2.c | 0 tests/tcg/cris/{ => libc}/check_stat3.c | 0 tests/tcg/cris/{ => libc}/check_stat4.c | 0 tests/tcg/cris/{ => libc}/check_swap.c | 0 tests/tcg/cris/{ => libc}/check_time2.c | 0 tests/tcg/cris/{ => libc}/crisutils.h | 0 tests/tcg/cris/{ => libc}/sys.h | 0 102 files changed, 0 insertions(+), 0 deletions(-) rename tests/tcg/cris/{ => bare}/check_addcv17.s (100%) rename tests/tcg/cris/{ => bare}/check_addi.s (100%) rename tests/tcg/cris/{ => bare}/check_addiv32.s (100%) rename tests/tcg/cris/{ => bare}/check_addm.s (100%) rename tests/tcg/cris/{ => bare}/check_addq.s (100%) rename tests/tcg/cris/{ => bare}/check_addr.s (100%) rename tests/tcg/cris/{ => bare}/check_addxc.s (100%) rename tests/tcg/cris/{ => bare}/check_addxm.s (100%) rename tests/tcg/cris/{ => bare}/check_addxr.s (100%) rename tests/tcg/cris/{ => bare}/check_andc.s (100%) rename tests/tcg/cris/{ => bare}/check_andm.s (100%) rename tests/tcg/cris/{ => bare}/check_andq.s (100%) rename tests/tcg/cris/{ => bare}/check_andr.s (100%) rename tests/tcg/cris/{ => bare}/check_asr.s (100%) rename tests/tcg/cris/{ => bare}/check_ba.s (100%) rename tests/tcg/cris/{ => bare}/check_bas.s (100%) rename tests/tcg/cris/{ => bare}/check_bcc.s (100%) rename tests/tcg/cris/{ => bare}/check_boundc.s (100%) rename tests/tcg/cris/{ => bare}/check_boundr.s (100%) rename tests/tcg/cris/{ => bare}/check_btst.s (100%) rename tests/tcg/cris/{ => bare}/check_clearfv32.s (100%) rename tests/tcg/cris/{ => bare}/check_clrjmp1.s (100%) rename tests/tcg/cris/{ => bare}/check_cmp-2.s (100%) rename tests/tcg/cris/{ => bare}/check_cmpc.s (100%) rename tests/tcg/cris/{ => bare}/check_cmpm.s (100%) rename tests/tcg/cris/{ => bare}/check_cmpq.s (100%) rename tests/tcg/cris/{ => bare}/check_cmpr.s (100%) rename tests/tcg/cris/{ => bare}/check_cmpxc.s (100%) rename tests/tcg/cris/{ => bare}/check_cmpxm.s (100%) rename tests/tcg/cris/{ => bare}/check_dstep.s (100%) rename tests/tcg/cris/{ => bare}/check_jsr.s (100%) rename tests/tcg/cris/{ => bare}/check_lapc.s (100%) rename tests/tcg/cris/{ => bare}/check_lsl.s (100%) rename tests/tcg/cris/{ => bare}/check_lsr.s (100%) rename tests/tcg/cris/{ => bare}/check_mcp.s (100%) rename tests/tcg/cris/{ => bare}/check_movdelsr1.s (100%) rename tests/tcg/cris/{ => bare}/check_movecr.s (100%) rename tests/tcg/cris/{ => bare}/check_movei.s (100%) rename tests/tcg/cris/{ => bare}/check_movemr.s (100%) rename tests/tcg/cris/{ => bare}/check_movemrv32.s (100%) rename tests/tcg/cris/{ => bare}/check_mover.s (100%) rename tests/tcg/cris/{ => bare}/check_moverm.s (100%) rename tests/tcg/cris/{ => bare}/check_movmp.s (100%) rename tests/tcg/cris/{ => bare}/check_movpmv32.s (100%) rename tests/tcg/cris/{ => bare}/check_movpr.s (100%) rename tests/tcg/cris/{ => bare}/check_movprv32.s (100%) rename tests/tcg/cris/{ => bare}/check_movscr.s (100%) rename tests/tcg/cris/{ => bare}/check_movsm.s (100%) rename tests/tcg/cris/{ => bare}/check_movsr.s (100%) rename tests/tcg/cris/{ => bare}/check_movucr.s (100%) rename tests/tcg/cris/{ => bare}/check_movum.s (100%) rename tests/tcg/cris/{ => bare}/check_movur.s (100%) rename tests/tcg/cris/{ => bare}/check_mulv32.s (100%) rename tests/tcg/cris/{ => bare}/check_mulx.s (100%) rename tests/tcg/cris/{ => bare}/check_neg.s (100%) rename tests/tcg/cris/{ => bare}/check_not.s (100%) rename tests/tcg/cris/{ => bare}/check_orc.s (100%) rename tests/tcg/cris/{ => bare}/check_orm.s (100%) rename tests/tcg/cris/{ => bare}/check_orq.s (100%) rename tests/tcg/cris/{ => bare}/check_orr.s (100%) rename tests/tcg/cris/{ => bare}/check_ret.s (100%) rename tests/tcg/cris/{ => bare}/check_scc.s (100%) rename tests/tcg/cris/{ => bare}/check_subc.s (100%) rename tests/tcg/cris/{ => bare}/check_subm.s (100%) rename tests/tcg/cris/{ => bare}/check_subq.s (100%) rename tests/tcg/cris/{ => bare}/check_subr.s (100%) rename tests/tcg/cris/{ => bare}/check_xarith.s (100%) rename tests/tcg/cris/{ => bare}/crt.s (100%) rename tests/tcg/cris/{ => bare}/sys.c (100%) rename tests/tcg/cris/{ => bare}/testutils.inc (100%) rename tests/tcg/cris/{ => libc}/check_abs.c (100%) rename tests/tcg/cris/{ => libc}/check_addc.c (100%) rename tests/tcg/cris/{ => libc}/check_addcm.c (100%) rename tests/tcg/cris/{ => libc}/check_addo.c (100%) rename tests/tcg/cris/{ => libc}/check_addoq.c (100%) rename tests/tcg/cris/{ => libc}/check_bound.c (100%) rename tests/tcg/cris/{ => libc}/check_ftag.c (100%) rename tests/tcg/cris/{ => libc}/check_gcctorture_pr28634-1.c (100%) rename tests/tcg/cris/{ => libc}/check_gcctorture_pr28634.c (100%) rename tests/tcg/cris/{ => libc}/check_glibc_kernelversion.c (100%) rename tests/tcg/cris/{ => libc}/check_hello.c (100%) rename tests/tcg/cris/{ => libc}/check_int64.c (100%) rename tests/tcg/cris/{ => libc}/check_lz.c (100%) rename tests/tcg/cris/{ => libc}/check_mapbrk.c (100%) rename tests/tcg/cris/{ => libc}/check_mmap1.c (100%) rename tests/tcg/cris/{ => libc}/check_mmap2.c (100%) rename tests/tcg/cris/{ => libc}/check_mmap3.c (100%) rename tests/tcg/cris/{ => libc}/check_moveq.c (100%) rename tests/tcg/cris/{ => libc}/check_openpf1.c (100%) rename tests/tcg/cris/{ => libc}/check_openpf2.c (100%) rename tests/tcg/cris/{ => libc}/check_openpf3.c (100%) rename tests/tcg/cris/{ => libc}/check_openpf5.c (100%) rename tests/tcg/cris/{ => libc}/check_settls1.c (100%) rename tests/tcg/cris/{ => libc}/check_sigalrm.c (100%) rename tests/tcg/cris/{ => libc}/check_stat1.c (100%) rename tests/tcg/cris/{ => libc}/check_stat2.c (100%) rename tests/tcg/cris/{ => libc}/check_stat3.c (100%) rename tests/tcg/cris/{ => libc}/check_stat4.c (100%) rename tests/tcg/cris/{ => libc}/check_swap.c (100%) rename tests/tcg/cris/{ => libc}/check_time2.c (100%) rename tests/tcg/cris/{ => libc}/crisutils.h (100%) rename tests/tcg/cris/{ => libc}/sys.h (100%) diff --git a/tests/tcg/cris/check_addcv17.s b/tests/tcg/cris/bare/check_addcv17.s similarity index 100% rename from tests/tcg/cris/check_addcv17.s rename to tests/tcg/cris/bare/check_addcv17.s diff --git a/tests/tcg/cris/check_addi.s b/tests/tcg/cris/bare/check_addi.s similarity index 100% rename from tests/tcg/cris/check_addi.s rename to tests/tcg/cris/bare/check_addi.s diff --git a/tests/tcg/cris/check_addiv32.s b/tests/tcg/cris/bare/check_addiv32.s similarity index 100% rename from tests/tcg/cris/check_addiv32.s rename to tests/tcg/cris/bare/check_addiv32.s diff --git a/tests/tcg/cris/check_addm.s b/tests/tcg/cris/bare/check_addm.s similarity index 100% rename from tests/tcg/cris/check_addm.s rename to tests/tcg/cris/bare/check_addm.s diff --git a/tests/tcg/cris/check_addq.s b/tests/tcg/cris/bare/check_addq.s similarity index 100% rename from tests/tcg/cris/check_addq.s rename to tests/tcg/cris/bare/check_addq.s diff --git a/tests/tcg/cris/check_addr.s b/tests/tcg/cris/bare/check_addr.s similarity index 100% rename from tests/tcg/cris/check_addr.s rename to tests/tcg/cris/bare/check_addr.s diff --git a/tests/tcg/cris/check_addxc.s b/tests/tcg/cris/bare/check_addxc.s similarity index 100% rename from tests/tcg/cris/check_addxc.s rename to tests/tcg/cris/bare/check_addxc.s diff --git a/tests/tcg/cris/check_addxm.s b/tests/tcg/cris/bare/check_addxm.s similarity index 100% rename from tests/tcg/cris/check_addxm.s rename to tests/tcg/cris/bare/check_addxm.s diff --git a/tests/tcg/cris/check_addxr.s b/tests/tcg/cris/bare/check_addxr.s similarity index 100% rename from tests/tcg/cris/check_addxr.s rename to tests/tcg/cris/bare/check_addxr.s diff --git a/tests/tcg/cris/check_andc.s b/tests/tcg/cris/bare/check_andc.s similarity index 100% rename from tests/tcg/cris/check_andc.s rename to tests/tcg/cris/bare/check_andc.s diff --git a/tests/tcg/cris/check_andm.s b/tests/tcg/cris/bare/check_andm.s similarity index 100% rename from tests/tcg/cris/check_andm.s rename to tests/tcg/cris/bare/check_andm.s diff --git a/tests/tcg/cris/check_andq.s b/tests/tcg/cris/bare/check_andq.s similarity index 100% rename from tests/tcg/cris/check_andq.s rename to tests/tcg/cris/bare/check_andq.s diff --git a/tests/tcg/cris/check_andr.s b/tests/tcg/cris/bare/check_andr.s similarity index 100% rename from tests/tcg/cris/check_andr.s rename to tests/tcg/cris/bare/check_andr.s diff --git a/tests/tcg/cris/check_asr.s b/tests/tcg/cris/bare/check_asr.s similarity index 100% rename from tests/tcg/cris/check_asr.s rename to tests/tcg/cris/bare/check_asr.s diff --git a/tests/tcg/cris/check_ba.s b/tests/tcg/cris/bare/check_ba.s similarity index 100% rename from tests/tcg/cris/check_ba.s rename to tests/tcg/cris/bare/check_ba.s diff --git a/tests/tcg/cris/check_bas.s b/tests/tcg/cris/bare/check_bas.s similarity index 100% rename from tests/tcg/cris/check_bas.s rename to tests/tcg/cris/bare/check_bas.s diff --git a/tests/tcg/cris/check_bcc.s b/tests/tcg/cris/bare/check_bcc.s similarity index 100% rename from tests/tcg/cris/check_bcc.s rename to tests/tcg/cris/bare/check_bcc.s diff --git a/tests/tcg/cris/check_boundc.s b/tests/tcg/cris/bare/check_boundc.s similarity index 100% rename from tests/tcg/cris/check_boundc.s rename to tests/tcg/cris/bare/check_boundc.s diff --git a/tests/tcg/cris/check_boundr.s b/tests/tcg/cris/bare/check_boundr.s similarity index 100% rename from tests/tcg/cris/check_boundr.s rename to tests/tcg/cris/bare/check_boundr.s diff --git a/tests/tcg/cris/check_btst.s b/tests/tcg/cris/bare/check_btst.s similarity index 100% rename from tests/tcg/cris/check_btst.s rename to tests/tcg/cris/bare/check_btst.s diff --git a/tests/tcg/cris/check_clearfv32.s b/tests/tcg/cris/bare/check_clearfv32.s similarity index 100% rename from tests/tcg/cris/check_clearfv32.s rename to tests/tcg/cris/bare/check_clearfv32.s diff --git a/tests/tcg/cris/check_clrjmp1.s b/tests/tcg/cris/bare/check_clrjmp1.s similarity index 100% rename from tests/tcg/cris/check_clrjmp1.s rename to tests/tcg/cris/bare/check_clrjmp1.s diff --git a/tests/tcg/cris/check_cmp-2.s b/tests/tcg/cris/bare/check_cmp-2.s similarity index 100% rename from tests/tcg/cris/check_cmp-2.s rename to tests/tcg/cris/bare/check_cmp-2.s diff --git a/tests/tcg/cris/check_cmpc.s b/tests/tcg/cris/bare/check_cmpc.s similarity index 100% rename from tests/tcg/cris/check_cmpc.s rename to tests/tcg/cris/bare/check_cmpc.s diff --git a/tests/tcg/cris/check_cmpm.s b/tests/tcg/cris/bare/check_cmpm.s similarity index 100% rename from tests/tcg/cris/check_cmpm.s rename to tests/tcg/cris/bare/check_cmpm.s diff --git a/tests/tcg/cris/check_cmpq.s b/tests/tcg/cris/bare/check_cmpq.s similarity index 100% rename from tests/tcg/cris/check_cmpq.s rename to tests/tcg/cris/bare/check_cmpq.s diff --git a/tests/tcg/cris/check_cmpr.s b/tests/tcg/cris/bare/check_cmpr.s similarity index 100% rename from tests/tcg/cris/check_cmpr.s rename to tests/tcg/cris/bare/check_cmpr.s diff --git a/tests/tcg/cris/check_cmpxc.s b/tests/tcg/cris/bare/check_cmpxc.s similarity index 100% rename from tests/tcg/cris/check_cmpxc.s rename to tests/tcg/cris/bare/check_cmpxc.s diff --git a/tests/tcg/cris/check_cmpxm.s b/tests/tcg/cris/bare/check_cmpxm.s similarity index 100% rename from tests/tcg/cris/check_cmpxm.s rename to tests/tcg/cris/bare/check_cmpxm.s diff --git a/tests/tcg/cris/check_dstep.s b/tests/tcg/cris/bare/check_dstep.s similarity index 100% rename from tests/tcg/cris/check_dstep.s rename to tests/tcg/cris/bare/check_dstep.s diff --git a/tests/tcg/cris/check_jsr.s b/tests/tcg/cris/bare/check_jsr.s similarity index 100% rename from tests/tcg/cris/check_jsr.s rename to tests/tcg/cris/bare/check_jsr.s diff --git a/tests/tcg/cris/check_lapc.s b/tests/tcg/cris/bare/check_lapc.s similarity index 100% rename from tests/tcg/cris/check_lapc.s rename to tests/tcg/cris/bare/check_lapc.s diff --git a/tests/tcg/cris/check_lsl.s b/tests/tcg/cris/bare/check_lsl.s similarity index 100% rename from tests/tcg/cris/check_lsl.s rename to tests/tcg/cris/bare/check_lsl.s diff --git a/tests/tcg/cris/check_lsr.s b/tests/tcg/cris/bare/check_lsr.s similarity index 100% rename from tests/tcg/cris/check_lsr.s rename to tests/tcg/cris/bare/check_lsr.s diff --git a/tests/tcg/cris/check_mcp.s b/tests/tcg/cris/bare/check_mcp.s similarity index 100% rename from tests/tcg/cris/check_mcp.s rename to tests/tcg/cris/bare/check_mcp.s diff --git a/tests/tcg/cris/check_movdelsr1.s b/tests/tcg/cris/bare/check_movdelsr1.s similarity index 100% rename from tests/tcg/cris/check_movdelsr1.s rename to tests/tcg/cris/bare/check_movdelsr1.s diff --git a/tests/tcg/cris/check_movecr.s b/tests/tcg/cris/bare/check_movecr.s similarity index 100% rename from tests/tcg/cris/check_movecr.s rename to tests/tcg/cris/bare/check_movecr.s diff --git a/tests/tcg/cris/check_movei.s b/tests/tcg/cris/bare/check_movei.s similarity index 100% rename from tests/tcg/cris/check_movei.s rename to tests/tcg/cris/bare/check_movei.s diff --git a/tests/tcg/cris/check_movemr.s b/tests/tcg/cris/bare/check_movemr.s similarity index 100% rename from tests/tcg/cris/check_movemr.s rename to tests/tcg/cris/bare/check_movemr.s diff --git a/tests/tcg/cris/check_movemrv32.s b/tests/tcg/cris/bare/check_movemrv32.s similarity index 100% rename from tests/tcg/cris/check_movemrv32.s rename to tests/tcg/cris/bare/check_movemrv32.s diff --git a/tests/tcg/cris/check_mover.s b/tests/tcg/cris/bare/check_mover.s similarity index 100% rename from tests/tcg/cris/check_mover.s rename to tests/tcg/cris/bare/check_mover.s diff --git a/tests/tcg/cris/check_moverm.s b/tests/tcg/cris/bare/check_moverm.s similarity index 100% rename from tests/tcg/cris/check_moverm.s rename to tests/tcg/cris/bare/check_moverm.s diff --git a/tests/tcg/cris/check_movmp.s b/tests/tcg/cris/bare/check_movmp.s similarity index 100% rename from tests/tcg/cris/check_movmp.s rename to tests/tcg/cris/bare/check_movmp.s diff --git a/tests/tcg/cris/check_movpmv32.s b/tests/tcg/cris/bare/check_movpmv32.s similarity index 100% rename from tests/tcg/cris/check_movpmv32.s rename to tests/tcg/cris/bare/check_movpmv32.s diff --git a/tests/tcg/cris/check_movpr.s b/tests/tcg/cris/bare/check_movpr.s similarity index 100% rename from tests/tcg/cris/check_movpr.s rename to tests/tcg/cris/bare/check_movpr.s diff --git a/tests/tcg/cris/check_movprv32.s b/tests/tcg/cris/bare/check_movprv32.s similarity index 100% rename from tests/tcg/cris/check_movprv32.s rename to tests/tcg/cris/bare/check_movprv32.s diff --git a/tests/tcg/cris/check_movscr.s b/tests/tcg/cris/bare/check_movscr.s similarity index 100% rename from tests/tcg/cris/check_movscr.s rename to tests/tcg/cris/bare/check_movscr.s diff --git a/tests/tcg/cris/check_movsm.s b/tests/tcg/cris/bare/check_movsm.s similarity index 100% rename from tests/tcg/cris/check_movsm.s rename to tests/tcg/cris/bare/check_movsm.s diff --git a/tests/tcg/cris/check_movsr.s b/tests/tcg/cris/bare/check_movsr.s similarity index 100% rename from tests/tcg/cris/check_movsr.s rename to tests/tcg/cris/bare/check_movsr.s diff --git a/tests/tcg/cris/check_movucr.s b/tests/tcg/cris/bare/check_movucr.s similarity index 100% rename from tests/tcg/cris/check_movucr.s rename to tests/tcg/cris/bare/check_movucr.s diff --git a/tests/tcg/cris/check_movum.s b/tests/tcg/cris/bare/check_movum.s similarity index 100% rename from tests/tcg/cris/check_movum.s rename to tests/tcg/cris/bare/check_movum.s diff --git a/tests/tcg/cris/check_movur.s b/tests/tcg/cris/bare/check_movur.s similarity index 100% rename from tests/tcg/cris/check_movur.s rename to tests/tcg/cris/bare/check_movur.s diff --git a/tests/tcg/cris/check_mulv32.s b/tests/tcg/cris/bare/check_mulv32.s similarity index 100% rename from tests/tcg/cris/check_mulv32.s rename to tests/tcg/cris/bare/check_mulv32.s diff --git a/tests/tcg/cris/check_mulx.s b/tests/tcg/cris/bare/check_mulx.s similarity index 100% rename from tests/tcg/cris/check_mulx.s rename to tests/tcg/cris/bare/check_mulx.s diff --git a/tests/tcg/cris/check_neg.s b/tests/tcg/cris/bare/check_neg.s similarity index 100% rename from tests/tcg/cris/check_neg.s rename to tests/tcg/cris/bare/check_neg.s diff --git a/tests/tcg/cris/check_not.s b/tests/tcg/cris/bare/check_not.s similarity index 100% rename from tests/tcg/cris/check_not.s rename to tests/tcg/cris/bare/check_not.s diff --git a/tests/tcg/cris/check_orc.s b/tests/tcg/cris/bare/check_orc.s similarity index 100% rename from tests/tcg/cris/check_orc.s rename to tests/tcg/cris/bare/check_orc.s diff --git a/tests/tcg/cris/check_orm.s b/tests/tcg/cris/bare/check_orm.s similarity index 100% rename from tests/tcg/cris/check_orm.s rename to tests/tcg/cris/bare/check_orm.s diff --git a/tests/tcg/cris/check_orq.s b/tests/tcg/cris/bare/check_orq.s similarity index 100% rename from tests/tcg/cris/check_orq.s rename to tests/tcg/cris/bare/check_orq.s diff --git a/tests/tcg/cris/check_orr.s b/tests/tcg/cris/bare/check_orr.s similarity index 100% rename from tests/tcg/cris/check_orr.s rename to tests/tcg/cris/bare/check_orr.s diff --git a/tests/tcg/cris/check_ret.s b/tests/tcg/cris/bare/check_ret.s similarity index 100% rename from tests/tcg/cris/check_ret.s rename to tests/tcg/cris/bare/check_ret.s diff --git a/tests/tcg/cris/check_scc.s b/tests/tcg/cris/bare/check_scc.s similarity index 100% rename from tests/tcg/cris/check_scc.s rename to tests/tcg/cris/bare/check_scc.s diff --git a/tests/tcg/cris/check_subc.s b/tests/tcg/cris/bare/check_subc.s similarity index 100% rename from tests/tcg/cris/check_subc.s rename to tests/tcg/cris/bare/check_subc.s diff --git a/tests/tcg/cris/check_subm.s b/tests/tcg/cris/bare/check_subm.s similarity index 100% rename from tests/tcg/cris/check_subm.s rename to tests/tcg/cris/bare/check_subm.s diff --git a/tests/tcg/cris/check_subq.s b/tests/tcg/cris/bare/check_subq.s similarity index 100% rename from tests/tcg/cris/check_subq.s rename to tests/tcg/cris/bare/check_subq.s diff --git a/tests/tcg/cris/check_subr.s b/tests/tcg/cris/bare/check_subr.s similarity index 100% rename from tests/tcg/cris/check_subr.s rename to tests/tcg/cris/bare/check_subr.s diff --git a/tests/tcg/cris/check_xarith.s b/tests/tcg/cris/bare/check_xarith.s similarity index 100% rename from tests/tcg/cris/check_xarith.s rename to tests/tcg/cris/bare/check_xarith.s diff --git a/tests/tcg/cris/crt.s b/tests/tcg/cris/bare/crt.s similarity index 100% rename from tests/tcg/cris/crt.s rename to tests/tcg/cris/bare/crt.s diff --git a/tests/tcg/cris/sys.c b/tests/tcg/cris/bare/sys.c similarity index 100% rename from tests/tcg/cris/sys.c rename to tests/tcg/cris/bare/sys.c diff --git a/tests/tcg/cris/testutils.inc b/tests/tcg/cris/bare/testutils.inc similarity index 100% rename from tests/tcg/cris/testutils.inc rename to tests/tcg/cris/bare/testutils.inc diff --git a/tests/tcg/cris/check_abs.c b/tests/tcg/cris/libc/check_abs.c similarity index 100% rename from tests/tcg/cris/check_abs.c rename to tests/tcg/cris/libc/check_abs.c diff --git a/tests/tcg/cris/check_addc.c b/tests/tcg/cris/libc/check_addc.c similarity index 100% rename from tests/tcg/cris/check_addc.c rename to tests/tcg/cris/libc/check_addc.c diff --git a/tests/tcg/cris/check_addcm.c b/tests/tcg/cris/libc/check_addcm.c similarity index 100% rename from tests/tcg/cris/check_addcm.c rename to tests/tcg/cris/libc/check_addcm.c diff --git a/tests/tcg/cris/check_addo.c b/tests/tcg/cris/libc/check_addo.c similarity index 100% rename from tests/tcg/cris/check_addo.c rename to tests/tcg/cris/libc/check_addo.c diff --git a/tests/tcg/cris/check_addoq.c b/tests/tcg/cris/libc/check_addoq.c similarity index 100% rename from tests/tcg/cris/check_addoq.c rename to tests/tcg/cris/libc/check_addoq.c diff --git a/tests/tcg/cris/check_bound.c b/tests/tcg/cris/libc/check_bound.c similarity index 100% rename from tests/tcg/cris/check_bound.c rename to tests/tcg/cris/libc/check_bound.c diff --git a/tests/tcg/cris/check_ftag.c b/tests/tcg/cris/libc/check_ftag.c similarity index 100% rename from tests/tcg/cris/check_ftag.c rename to tests/tcg/cris/libc/check_ftag.c diff --git a/tests/tcg/cris/check_gcctorture_pr28634-1.c b/tests/tcg/cris/libc/check_gcctorture_pr28634-1.c similarity index 100% rename from tests/tcg/cris/check_gcctorture_pr28634-1.c rename to tests/tcg/cris/libc/check_gcctorture_pr28634-1.c diff --git a/tests/tcg/cris/check_gcctorture_pr28634.c b/tests/tcg/cris/libc/check_gcctorture_pr28634.c similarity index 100% rename from tests/tcg/cris/check_gcctorture_pr28634.c rename to tests/tcg/cris/libc/check_gcctorture_pr28634.c diff --git a/tests/tcg/cris/check_glibc_kernelversion.c b/tests/tcg/cris/libc/check_glibc_kernelversion.c similarity index 100% rename from tests/tcg/cris/check_glibc_kernelversion.c rename to tests/tcg/cris/libc/check_glibc_kernelversion.c diff --git a/tests/tcg/cris/check_hello.c b/tests/tcg/cris/libc/check_hello.c similarity index 100% rename from tests/tcg/cris/check_hello.c rename to tests/tcg/cris/libc/check_hello.c diff --git a/tests/tcg/cris/check_int64.c b/tests/tcg/cris/libc/check_int64.c similarity index 100% rename from tests/tcg/cris/check_int64.c rename to tests/tcg/cris/libc/check_int64.c diff --git a/tests/tcg/cris/check_lz.c b/tests/tcg/cris/libc/check_lz.c similarity index 100% rename from tests/tcg/cris/check_lz.c rename to tests/tcg/cris/libc/check_lz.c diff --git a/tests/tcg/cris/check_mapbrk.c b/tests/tcg/cris/libc/check_mapbrk.c similarity index 100% rename from tests/tcg/cris/check_mapbrk.c rename to tests/tcg/cris/libc/check_mapbrk.c diff --git a/tests/tcg/cris/check_mmap1.c b/tests/tcg/cris/libc/check_mmap1.c similarity index 100% rename from tests/tcg/cris/check_mmap1.c rename to tests/tcg/cris/libc/check_mmap1.c diff --git a/tests/tcg/cris/check_mmap2.c b/tests/tcg/cris/libc/check_mmap2.c similarity index 100% rename from tests/tcg/cris/check_mmap2.c rename to tests/tcg/cris/libc/check_mmap2.c diff --git a/tests/tcg/cris/check_mmap3.c b/tests/tcg/cris/libc/check_mmap3.c similarity index 100% rename from tests/tcg/cris/check_mmap3.c rename to tests/tcg/cris/libc/check_mmap3.c diff --git a/tests/tcg/cris/check_moveq.c b/tests/tcg/cris/libc/check_moveq.c similarity index 100% rename from tests/tcg/cris/check_moveq.c rename to tests/tcg/cris/libc/check_moveq.c diff --git a/tests/tcg/cris/check_openpf1.c b/tests/tcg/cris/libc/check_openpf1.c similarity index 100% rename from tests/tcg/cris/check_openpf1.c rename to tests/tcg/cris/libc/check_openpf1.c diff --git a/tests/tcg/cris/check_openpf2.c b/tests/tcg/cris/libc/check_openpf2.c similarity index 100% rename from tests/tcg/cris/check_openpf2.c rename to tests/tcg/cris/libc/check_openpf2.c diff --git a/tests/tcg/cris/check_openpf3.c b/tests/tcg/cris/libc/check_openpf3.c similarity index 100% rename from tests/tcg/cris/check_openpf3.c rename to tests/tcg/cris/libc/check_openpf3.c diff --git a/tests/tcg/cris/check_openpf5.c b/tests/tcg/cris/libc/check_openpf5.c similarity index 100% rename from tests/tcg/cris/check_openpf5.c rename to tests/tcg/cris/libc/check_openpf5.c diff --git a/tests/tcg/cris/check_settls1.c b/tests/tcg/cris/libc/check_settls1.c similarity index 100% rename from tests/tcg/cris/check_settls1.c rename to tests/tcg/cris/libc/check_settls1.c diff --git a/tests/tcg/cris/check_sigalrm.c b/tests/tcg/cris/libc/check_sigalrm.c similarity index 100% rename from tests/tcg/cris/check_sigalrm.c rename to tests/tcg/cris/libc/check_sigalrm.c diff --git a/tests/tcg/cris/check_stat1.c b/tests/tcg/cris/libc/check_stat1.c similarity index 100% rename from tests/tcg/cris/check_stat1.c rename to tests/tcg/cris/libc/check_stat1.c diff --git a/tests/tcg/cris/check_stat2.c b/tests/tcg/cris/libc/check_stat2.c similarity index 100% rename from tests/tcg/cris/check_stat2.c rename to tests/tcg/cris/libc/check_stat2.c diff --git a/tests/tcg/cris/check_stat3.c b/tests/tcg/cris/libc/check_stat3.c similarity index 100% rename from tests/tcg/cris/check_stat3.c rename to tests/tcg/cris/libc/check_stat3.c diff --git a/tests/tcg/cris/check_stat4.c b/tests/tcg/cris/libc/check_stat4.c similarity index 100% rename from tests/tcg/cris/check_stat4.c rename to tests/tcg/cris/libc/check_stat4.c diff --git a/tests/tcg/cris/check_swap.c b/tests/tcg/cris/libc/check_swap.c similarity index 100% rename from tests/tcg/cris/check_swap.c rename to tests/tcg/cris/libc/check_swap.c diff --git a/tests/tcg/cris/check_time2.c b/tests/tcg/cris/libc/check_time2.c similarity index 100% rename from tests/tcg/cris/check_time2.c rename to tests/tcg/cris/libc/check_time2.c diff --git a/tests/tcg/cris/crisutils.h b/tests/tcg/cris/libc/crisutils.h similarity index 100% rename from tests/tcg/cris/crisutils.h rename to tests/tcg/cris/libc/crisutils.h diff --git a/tests/tcg/cris/sys.h b/tests/tcg/cris/libc/sys.h similarity index 100% rename from tests/tcg/cris/sys.h rename to tests/tcg/cris/libc/sys.h From patchwork Tue Mar 12 15:59:39 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: 1055509 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="DBdKd4L3"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44Jfzm1slKz9s4Y for ; Wed, 13 Mar 2019 03:09:08 +1100 (AEDT) Received: from localhost ([127.0.0.1]:55053 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3jxi-0004sq-48 for incoming@patchwork.ozlabs.org; Tue, 12 Mar 2019 12:09:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:60735) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3jtb-0001np-E2 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:04:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3jov-0000Ou-PO for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:00:07 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:41622) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3jov-0000Oa-Ip for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:00:01 -0400 Received: by mail-wr1-x442.google.com with SMTP id p1so3290135wrs.8 for ; Tue, 12 Mar 2019 09:00:01 -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=qZ2UmGUg+VEUSmps6F0SarBKmSuXqmswsaB4YDkuNKw=; b=DBdKd4L3IJ8P6CB/VPHxXr/kAQOVymyE/xz4CpynKeiLViVOUtMqpcnYQXyaTIUvPM ldzMjI8d3oaFl3IkljmFhGKtAHvD0P2wP8XYjNGXoczhxDCHyj50mdv313q/wFthF81j GXt0hqFRdia67mQM8Z67IthD28uda9m8ud2V4q3IuvswXgPHRqOBQRd2IjdCpyuLa1cD LxhtDUCHb3i+RjgVQoRBsYt/b/QYpomI/okxuKNgxjDIEP3W+wTJpar8Z8sDLONCXJfC QL7C4tI2OQWr6vk89oFYtKSexihxGGsXpcZGiffKgdcY8CJdhNYnwsNpba9tw8dg/rhn yGJw== 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=qZ2UmGUg+VEUSmps6F0SarBKmSuXqmswsaB4YDkuNKw=; b=V89kEhnU22iZkHhLvMdqiiWK2j9RGvLs7Mh79eqVY+xEBDz+whKSCHby6GMPDoFAqT 1KrTn1L/dhGduBJkHwBX0NVa95l0/6EFq8/2Xh+NAAMJi1+jSzQuKUbYxz07QMQDXPXN 3Cxde7bqS5TgQP7Q0LmTWRmTxz/9Ww+IjCqudjGnDGO6Fzse2tWmvQkcfGLNWyvXq4Qo BqG0X3z8rgT9KRBgoTERrr/WnGrStBS+/66SRh+Gnp0pgCW6rzCnB7yx9ND7w+UwDkoA kLq3u2B0/MYdnCSCswS/nyYJ0T/tQd5HHQghYpBTf9rNaXfGQ2GwBXZf8J72nGp822n3 aAuA== X-Gm-Message-State: APjAAAXHv5yPjMFPPKlF5YxV3LF43t2trm5KuDWcepyozdgW0fsuU/49 e2DwnyBk1nD1jS9uu4QwRVDy8g== X-Google-Smtp-Source: APXvYqzW7mYyi+LxEWcg0T0df21bO0A+n5zMgfH0SPTcxTm8Wissf8RkrdOF1vwelWtjYwX8ClYK0w== X-Received: by 2002:adf:e988:: with SMTP id h8mr10244190wrm.260.1552406400606; Tue, 12 Mar 2019 09:00:00 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id n189sm2775056wmb.28.2019.03.12.08.59.51 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 08:59:55 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 493DA1FF98; Tue, 12 Mar 2019 15:59:48 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 15:59:39 +0000 Message-Id: <20190312155947.14918-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312155947.14918-1-alex.bennee@linaro.org> References: <20190312155947.14918-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] [PATCH v4 13/21] tests/tcg/cris: comment out the ccs test 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: peter.maydell@linaro.org, famz@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, agraf@suse.de, cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Evidently upstream gcc doesn't like this opcode. Signed-off-by: Alex Bennée --- tests/tcg/cris/bare/check_btst.s | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/tcg/cris/bare/check_btst.s b/tests/tcg/cris/bare/check_btst.s index e39fc8f4d6..485deb2006 100644 --- a/tests/tcg/cris/bare/check_btst.s +++ b/tests/tcg/cris/bare/check_btst.s @@ -85,12 +85,12 @@ checkr3 1111 ; check that X gets cleared and that only the NZ flags are touched. - move.d 0xff, $r0 - move $r0, $ccs - btst r3,r3 - move $ccs, $r0 - and.d 0xff, $r0 - cmp.d 0xe3, $r0 - test_cc 0 1 0 0 + ;; move.d 0xff, $r0 + ;; move $r0, $ccs + ;; btst r3,r3 + ;; move $ccs, $r0 + ;; and.d 0xff, $r0 + ;; cmp.d 0xe3, $r0 + ;; test_cc 0 1 0 0 quit From patchwork Tue Mar 12 15:59:40 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: 1055522 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="mg72y1GV"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44JgLQ02Vqz9s7h for ; Wed, 13 Mar 2019 03:25:18 +1100 (AEDT) Received: from localhost ([127.0.0.1]:55303 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3kDM-0001hU-15 for incoming@patchwork.ozlabs.org; Tue, 12 Mar 2019 12:25:16 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33205) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3ju4-0002Y8-89 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:05:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3ju2-000389-AY for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:05:20 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:44344) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3ju1-00033b-J5 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:05:18 -0400 Received: by mail-wr1-x444.google.com with SMTP id w2so3290267wrt.11 for ; Tue, 12 Mar 2019 09:05:12 -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=wY2lUNdgGIgvYY1zuQQVz86aNMRCsik3LN1nFzvi7z4=; b=mg72y1GVlGjiUSO//JvQPeCJ7zJ8ZIPB4u3iYpgjlvX1UaJ067WO5Ea9IqYoMizxNJ s3Qj4aXAZSdpGp72CDLBtf6nSRr1ssjY0rdxbLnRTtR0ZkYZbfXAvRA9+CTAZEBXydgB XqjfHhT+GKtVEMRov6cFmnRO78PDYFBlWhlWhjll6JliNInCamZC7rNK3MxfKpDP6R03 U7K6o6a4JTW0xlNJwAYfBrqt0LUuxLuDzzw/l6o7LuR8ISb9zVq9ztIH6MiUZdcr4b58 VMDoKcuugRdtR2FJrnKJd8jpMUf0G8dVRVUj1HkwByhTog98RHCLTgPHlMKJkSJT3lfT UohA== 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=wY2lUNdgGIgvYY1zuQQVz86aNMRCsik3LN1nFzvi7z4=; b=EKlTpgkgnrZDEOlZUzohVGN6LZ96dS7aGotFpV8151at4W2mBdRoY2y/YeJrb4VkSF HVoyzR65ltGnoGbOla3aoTkoBxoYZGzkRQm/0wpF3ffD3gGH45+d2t+dyVjG7/k/3utx 730sq3Iuyh0HcwBtkoKh3aNixuINAbmva575d1P39yCPTQzgBXuwEe7erGWC+MTrHy1w O5BoH5OSDpC/+uUEfWnTh41DkY5XSsAI+PAOOx8iBpBmvz2W78Jh8YxtyZJqgHFtlkZx kOPFaA0PIFqhEcUCkmkg6qaYeXnhKH6gPnJZYJ2dHJK2qzLA+DrOY33i+oJg8K8kVh49 pvMw== X-Gm-Message-State: APjAAAVhFB4DrAsHnedIYklxtypdehBNpo4dw7xhlnlhFZs21k50njh6 bazOY0IeKCu07xF/oOYWMkHCtA== X-Google-Smtp-Source: APXvYqwYrm9lCbrES+3knLu88kUJarndbeY0rzMd+Hqu8Q2OHiy2jLou/5eKCxwwqfEwlVz3O3chsA== X-Received: by 2002:adf:fa51:: with SMTP id y17mr25708566wrr.233.1552406711224; Tue, 12 Mar 2019 09:05:11 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id u17sm29869337wrg.71.2019.03.12.09.05.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 09:05:09 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 55C541FF99; Tue, 12 Mar 2019 15:59:48 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 15:59:40 +0000 Message-Id: <20190312155947.14918-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312155947.14918-1-alex.bennee@linaro.org> References: <20190312155947.14918-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::444 Subject: [Qemu-devel] [PATCH v4 14/21] tests/tcg/cris: align mul operations 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: peter.maydell@linaro.org, famz@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, agraf@suse.de, cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" To avoid: Error: dangerous MULS/MULU location; give it higher alignment Signed-off-by: Alex Bennée --- tests/tcg/cris/bare/check_mulx.s | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/tests/tcg/cris/bare/check_mulx.s b/tests/tcg/cris/bare/check_mulx.s index d43241a6f5..a7a1f82a82 100644 --- a/tests/tcg/cris/bare/check_mulx.s +++ b/tests/tcg/cris/bare/check_mulx.s @@ -3,6 +3,8 @@ .include "testutils.inc" start + + .align 4 moveq -1,r3 moveq 2,r4 muls.d r4,r3 @@ -11,6 +13,7 @@ move mof,r3 checkr3 ffffffff + .align 4 moveq -1,r3 moveq 2,r4 mulu.d r4,r3 @@ -19,6 +22,7 @@ move mof,r3 checkr3 1 + .align 4 moveq 2,r3 moveq -1,r4 muls.d r4,r3 @@ -27,6 +31,7 @@ move mof,r3 checkr3 ffffffff + .align 4 moveq 2,r3 moveq -1,r4 mulu.d r4,r3 @@ -98,6 +103,7 @@ checkr3 1fffe move mof,r3 checkr3 0 + nop moveq 2,r3 move.d 0xffff,r4 @@ -138,6 +144,7 @@ checkr3 fdbdade2 move mof,r3 checkr3 ffffffff + nop move.d 0x5432f789,r4 move.d 0x78134452,r3 @@ -146,6 +153,7 @@ checkr3 420fade2 move mof,r3 checkr3 0 + nop move.d 0xff,r3 moveq 2,r4 @@ -186,6 +194,7 @@ checkr3 1 move mof,r3 checkr3 0 + nop moveq -1,r4 move.d r4,r3 @@ -194,6 +203,7 @@ checkr3 fe01 move mof,r3 checkr3 0 + nop move.d 0xfeda49ff,r4 move.d r4,r3 @@ -202,6 +212,7 @@ checkr3 1 move mof,r3 checkr3 0 + nop move.d 0xfeda49ff,r4 move.d r4,r3 From patchwork Tue Mar 12 15:59:41 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: 1055538 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="Kd8JVLxf"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44JgfW3Xjkz9s6w for ; Wed, 13 Mar 2019 03:39:15 +1100 (AEDT) Received: from localhost ([127.0.0.1]:55535 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3kQr-00058p-Dd for incoming@patchwork.ozlabs.org; Tue, 12 Mar 2019 12:39:13 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33251) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3ju5-0002ZU-N7 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:05:24 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3ju1-00037m-Vt for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:05:21 -0400 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:38962) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3ju1-00034W-BD for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:05:17 -0400 Received: by mail-wr1-x444.google.com with SMTP id p8so3315654wrq.6 for ; Tue, 12 Mar 2019 09:05:14 -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=tjLSIWJEgeVweWOD3dvO1il0QaXnyiXHZBI5XL4xPeE=; b=Kd8JVLxf1eZNN1lfzIE2XIc+L/Pi5+U3M0YIIsHVuZ33CAejknfybTpLr7V744lTK6 53bvbtATqw0sZB9kcW116LH6zqyBgRLVMei7mdfqaxBX1lKAJ4osbfmg2gtfDX3YnSqr CSNT6YmJSOvWn+uyh61PQwAhYPDn7lTbPLeh2V2sNEP+/XnWlR9V0foUMr115hWRiyaW ZbJl+v89JqOQk2gWYehtLFLzryT2rL91C5KxB1DoaFeJbARzm1y8MvlFgOyOL1tjfaSQ 8ZUywKwiS+64UXXdK4cHnRoR9sMu+WjZYJEcofI0MDph5RTkKTFbGhtS18H0ncSwE72o nBQg== 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=tjLSIWJEgeVweWOD3dvO1il0QaXnyiXHZBI5XL4xPeE=; b=sHtqILzrJDwZpB93QtcA6/oLUak9y0gCf7DAW6Ih/G9RxpUc6zNpugOp1Hc5npFl6E Xy1mAQzOCr+swXzECyYo9c3r/Uvg5Qq0+bFPeu3OUpGmCEfb6KdM1j0Hqc4jJo8XePj1 kxXQHLtfDGYtfsFIp2c0wxi6N5Z4HTSbUtc6x0b9b9h0gS0MHFriC4fkdey0arjRdBOX TcnQmaqcOvOgNGOmdokyDflgOA38LmsoOa00FjGakyfxjaEHiE6nHtB6NgntQZPX0yx+ NmY0sfogmpOACMxKNm5HPBaOdJTZOHyrb17u+IimVk0/ksHOcjy5f2wzH3gok1ePexyz +eIw== X-Gm-Message-State: APjAAAWs8+Edq+oUv96hLTxNb+bXA2RCBc81sjKiHoRsiQX+CMpt+hEf APcBcIEbh51odPUjveMO2zINUA== X-Google-Smtp-Source: APXvYqyPrcp33WJQYQtd6Nqc37VcyVhvDuT9pwq3KadEtAafT/JHbkpx6p9BSd2JvH3dhFAUDQX3bw== X-Received: by 2002:a5d:40c5:: with SMTP id b5mr24943424wrq.107.1552406712996; Tue, 12 Mar 2019 09:05:12 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id q10sm9265752wrr.75.2019.03.12.09.05.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 09:05:10 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 629D51FF9A; Tue, 12 Mar 2019 15:59:48 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 15:59:41 +0000 Message-Id: <20190312155947.14918-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312155947.14918-1-alex.bennee@linaro.org> References: <20190312155947.14918-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::444 Subject: [Qemu-devel] [PATCH v4 15/21] tests/tcg: enable cris base user-mode 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: peter.maydell@linaro.org, famz@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, agraf@suse.de, cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This converts the existing Makefile into a Makefile.target and updates it so it can be called by the tcg build system. The original Makefile didn't set -cpu except for the v17 tests however that has broken (I assume because linux-user is a "max" cpu) so here I force it to be crisv17. I've also replicated the GNU simulator targets (run-FOO-on-sim). Signed-off-by: Alex Bennée --- tests/docker/Makefile.include | 1 + tests/tcg/cris/Makefile | 168 -------------------------------- tests/tcg/cris/Makefile.include | 6 ++ tests/tcg/cris/Makefile.target | 58 +++++++++++ 4 files changed, 65 insertions(+), 168 deletions(-) delete mode 100644 tests/tcg/cris/Makefile create mode 100644 tests/tcg/cris/Makefile.include create mode 100644 tests/tcg/cris/Makefile.target diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 83d43c50e4..60314d293a 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -116,6 +116,7 @@ docker-image-tricore-cross: docker-image-debian9 DOCKER_PARTIAL_IMAGES += debian-alpha-cross debian-hppa-cross debian-m68k-cross debian-sh4-cross DOCKER_PARTIAL_IMAGES += debian-sparc64-cross debian-mips64-cross debian-riscv64-cross DOCKER_PARTIAL_IMAGES += debian-tricore-cross debian-powerpc-cross fedora-i386-cross +DOCKER_PARTIAL_IMAGES += fedora-cris-cross # Rules for building linux-user powered images # diff --git a/tests/tcg/cris/Makefile b/tests/tcg/cris/Makefile deleted file mode 100644 index 664b30ce81..0000000000 --- a/tests/tcg/cris/Makefile +++ /dev/null @@ -1,168 +0,0 @@ --include ../../../config-host.mak - -CROSS=crisv32-axis-linux-gnu- -SIM=../../../cris-linux-user/qemu-cris -L ./ -SIMG=cris-axis-linux-gnu-run --sysroot=./ - -CC = $(CROSS)gcc -#AS = $(CROSS)as -AS = $(CC) -x assembler-with-cpp -SIZE = $(CROSS)size -LD = $(CC) -OBJCOPY = $(CROSS)objcopy - -# we rely on GCC inline:ing the stuff we tell it to in many places here. -CFLAGS = -Winline -Wall -g -O2 -static -NOSTDFLAGS = -nostartfiles -nostdlib -ASFLAGS += -g -Wa,-I,$(SRC_PATH)/tests/tcg/cris/ -LDLIBS = -NOSTDLIBS = -lgcc - -CRT = crt.o -SYS = sys.o -TESTCASES += check_abs.tst -TESTCASES += check_addc.tst -TESTCASES += check_addcm.tst -TESTCASES += check_addcv17.tst -TESTCASES += check_addo.tst -TESTCASES += check_addoq.tst -TESTCASES += check_addi.tst -TESTCASES += check_addiv32.tst -TESTCASES += check_addm.tst -TESTCASES += check_addr.tst -TESTCASES += check_addq.tst -TESTCASES += check_addxc.tst -TESTCASES += check_addxm.tst -TESTCASES += check_addxr.tst -TESTCASES += check_andc.tst -TESTCASES += check_andm.tst -TESTCASES += check_andr.tst -TESTCASES += check_andq.tst -TESTCASES += check_asr.tst -TESTCASES += check_ba.tst -TESTCASES += check_bas.tst -TESTCASES += check_bcc.tst -TESTCASES += check_bound.tst -TESTCASES += check_boundc.tst -TESTCASES += check_boundr.tst -TESTCASES += check_btst.tst -TESTCASES += check_clearfv32.tst -TESTCASES += check_cmpc.tst -TESTCASES += check_cmpr.tst -TESTCASES += check_cmpq.tst -TESTCASES += check_cmpm.tst -TESTCASES += check_cmpxc.tst -TESTCASES += check_cmpxm.tst -TESTCASES += check_cmp-2.tst -TESTCASES += check_clrjmp1.tst -TESTCASES += check_dstep.tst -TESTCASES += check_ftag.tst -TESTCASES += check_int64.tst -# check_jsr is broken. -#TESTCASES += check_jsr.tst -TESTCASES += check_mcp.tst -TESTCASES += check_movei.tst -TESTCASES += check_mover.tst -TESTCASES += check_moverm.tst -TESTCASES += check_moveq.tst -TESTCASES += check_movemr.tst -TESTCASES += check_movemrv32.tst -TESTCASES += check_movecr.tst -TESTCASES += check_movmp.tst -TESTCASES += check_movpr.tst -TESTCASES += check_movprv32.tst -TESTCASES += check_movdelsr1.tst -TESTCASES += check_movpmv32.tst -TESTCASES += check_movsr.tst -TESTCASES += check_movsm.tst -TESTCASES += check_movscr.tst -TESTCASES += check_movur.tst -TESTCASES += check_movum.tst -TESTCASES += check_movucr.tst -TESTCASES += check_mulx.tst -TESTCASES += check_mulv32.tst -TESTCASES += check_neg.tst -TESTCASES += check_not.tst -TESTCASES += check_lz.tst -TESTCASES += check_lapc.tst -TESTCASES += check_lsl.tst -TESTCASES += check_lsr.tst -TESTCASES += check_orc.tst -TESTCASES += check_orm.tst -TESTCASES += check_orr.tst -TESTCASES += check_orq.tst -TESTCASES += check_ret.tst -TESTCASES += check_swap.tst -TESTCASES += check_scc.tst -TESTCASES += check_subc.tst -TESTCASES += check_subq.tst -TESTCASES += check_subr.tst -TESTCASES += check_subm.tst -TESTCASES += check_glibc_kernelversion.tst -TESTCASES += check_xarith.tst - -TESTCASES += check_hello.ctst -TESTCASES += check_stat1.ctst -TESTCASES += check_stat2.ctst -TESTCASES += check_stat3.ctst -TESTCASES += check_stat4.ctst -TESTCASES += check_openpf1.ctst -TESTCASES += check_openpf2.ctst -TESTCASES += check_openpf3.ctst -TESTCASES += check_openpf5.ctst -TESTCASES += check_mapbrk.ctst -TESTCASES += check_mmap1.ctst -TESTCASES += check_mmap2.ctst -TESTCASES += check_mmap3.ctst -TESTCASES += check_sigalrm.ctst -TESTCASES += check_time2.ctst -TESTCASES += check_settls1.ctst - -TESTCASES += check_gcctorture_pr28634-1.ctst -#TESTCASES += check_gcctorture_pr28634.ctst - -all: build - -%.o: $(SRC_PATH)/tests/tcg/cris/%.c - $(CC) $(CFLAGS) -c $< -o $@ - -%.o: $(SRC_PATH)/tests/tcg/cris/%.s - $(AS) $(ASFLAGS) -c $< -o $@ - -%.tst: %.o - $(CC) $(CFLAGS) $(NOSTDFLAGS) $(LDLIBS) $(NOSTDLIBS) $(CRT) $< $(SYS) -o $@ - -%.ctst: %.o - $(CC) $(CFLAGS) $(LDLIBS) $< -o $@ - - -sysv10.o: sys.c - $(CC) $(CFLAGS) -mcpu=v10 -c $< -o $@ - -crtv10.o: crt.s - $(AS) $(ASFLAGS) -mcpu=v10 -c $< -o $@ - -check_addcv17.tst: ASFLAGS += -mcpu=v10 -check_addcv17.tst: CRT := crtv10.o -check_addcv17.tst: SYS := sysv10.o -check_addcv17.tst: crtv10.o sysv10.o - -build: $(CRT) $(SYS) $(TESTCASES) - -check: $(CRT) $(SYS) $(TESTCASES) - @printf "\nQEMU simulator.\n" - for case in $(TESTCASES); do \ - printf %s "$$case "; \ - SIMARGS=; \ - case $$case in *v17*) SIMARGS="-cpu crisv17";; esac; \ - $(SIM) $$SIMARGS ./$$case; \ - done -check-g: $(CRT) $(SYS) $(TESTCASES) - @printf "\nGDB simulator.\n" - @for case in $(TESTCASES); do \ - printf %s "$$case "; \ - $(SIMG) $$case; \ - done - -clean: - $(RM) -fr $(TESTCASES) *.o diff --git a/tests/tcg/cris/Makefile.include b/tests/tcg/cris/Makefile.include new file mode 100644 index 0000000000..1c037824bf --- /dev/null +++ b/tests/tcg/cris/Makefile.include @@ -0,0 +1,6 @@ +# +# Makefile.include for all CRIS targets +# + +DOCKER_IMAGE=fedora-cris-cross +DOCKER_CROSS_COMPILER=cris-linux-gnu-gcc diff --git a/tests/tcg/cris/Makefile.target b/tests/tcg/cris/Makefile.target new file mode 100644 index 0000000000..c1173ead42 --- /dev/null +++ b/tests/tcg/cris/Makefile.target @@ -0,0 +1,58 @@ +# -*- Mode: makefile -*- +# +# Cris tests +# +# Currently we can only build the "bare" tests with the docker +# supplied cross-compiler. +# + +CRIS_SRC = $(SRC_PATH)/tests/tcg/cris/bare +CRIS_ALL = $(wildcard $(CRIS_SRC)/*.s) +CRIS_TESTS = $(patsubst $(CRIS_SRC)/%.s, %, $(CRIS_ALL)) +# Filter out common blobs and broken tests +CRIS_BROKEN_TESTS = crt check_jsr +# upstream GCC doesn't support v32 +CRIS_BROKEN_TESTS += check_mcp check_mulv32 check_addiv32 check_movpmv32 +CRIS_BROKEN_TESTS += check_movprv32 check_clearfv32 check_movemrv32 check_bas +CRIS_BROKEN_TESTS += check_lapc check_movei +# no sure why +CRIS_BROKEN_TESTS += check_scc check_xarith + +CRIS_USABLE_TESTS = $(filter-out $(CRIS_BROKEN_TESTS), $(CRIS_TESTS)) +CRIS_RUNS = $(patsubst %, run-%, $(CRIS_USABLE_TESTS)) + +# override the list of tests, as we can't build the multiarch tests +TESTS = $(CRIS_USABLE_TESTS) +VPATH = $(CRIS_SRC) + +AS = $(CC) -x assembler-with-cpp +LD = $(CC) + +# we rely on GCC inline:ing the stuff we tell it to in many places here. +CFLAGS = -Winline -Wall -g -O2 -static +NOSTDFLAGS = -nostartfiles -nostdlib +ASFLAGS += -mcpu=v10 -g -Wa,-I,$(SRC_PATH)/tests/tcg/cris/bare +CRT_FILES = crt.o sys.o + +# stop make deleting crt files if build fails +.PRECIOUS: $(CRT_FILES) + +%.o: %.c + $(CC) -c $< -o $@ + +%.o: %.s + $(AS) $(ASFLAGS) -c $< -o $@ + +%: %.s $(CRT_FILES) + $(CC) $(ASFLAGS) $< -o $@ $(LDFLAGS) $(NOSTDFLAGS) $(CRT_FILES) + +# The default CPU breaks (possibly as it's max?) so force crisv17 +$(CRIS_RUNS): QEMU_OPTS=-cpu crisv17 + +# Additional runners to run under GNU SIM +CRIS_RUNS_ON_SIM=$(patsubst %, %-on-sim, $(CRIS_RUNS)) +SIMG:=cris-axis-linux-gnu-run + +# e.g.: make -f ../../tests/tcg/Makefile run-check_orm-on-sim +run-%-on-sim: + $(call run-test, $<, $(SIMG) $<, "$< on $(TARGET_NAME) with SIM") From patchwork Tue Mar 12 15:59:42 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: 1055524 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="YOt+LJQ3"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44JgPn19PWz9s70 for ; Wed, 13 Mar 2019 03:28:08 +1100 (AEDT) Received: from localhost ([127.0.0.1]:55357 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3kG6-0004Au-Jh for incoming@patchwork.ozlabs.org; Tue, 12 Mar 2019 12:28:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33369) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3juA-0002g6-Ul for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:05:28 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3ju2-00038W-Fl for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:05:26 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:34442) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3ju1-00035b-O1 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:05:18 -0400 Received: by mail-wr1-x441.google.com with SMTP id f14so3353575wrg.1 for ; Tue, 12 Mar 2019 09:05:16 -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=6VTpvpflyxrs0T6NZ6pI1Yml153QbLMkxw1sb4Y2pUY=; b=YOt+LJQ3/ABBp/cLMdon4Ubl9c7kZLWmwZWdNUnqQMlzm0u8ZdL4pfygefzjxSbnvN NtiN5bJXZNfJKdERk4ccFIVbnhloxCEE/Arxgf86EHdp9hV0PN9O96wew/+iGJTIYOHV Nc25aK1b7rSYesa/v6NmP1dAkvqqfmdF91/wfDi6mpnvUOgoLTGvChrcaZ5AuKXi6W2G IKkwrkZ3H7HM3m4PbVP9fq/Lm7hIUW0YuhuiZWh+ul8A7e3MZUSqGBS4NcC8FCUqwSLN 7/6W3osnmab7JxG7bw0hzrEyfHO+IGgPJXrGoIU7jGFY3Kfd9b59Zi6/eXfJUEiMlLkN xu7g== 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=6VTpvpflyxrs0T6NZ6pI1Yml153QbLMkxw1sb4Y2pUY=; b=iIIl/GhCE/38JV/scCXjUg9ps2RXrR8bjD4ldfORqChYjj81naScp5mhRM/1vamiWD jTdCa1q1+mqSanchUu4KHhzhbRNNVSIX1ByZ810RCq/78AKaBSU9Pi7BozMzY8G8nYs8 O1fmf0wgn7OmwWgAQtvJ2F6THxHhlR/Es4h8zkYjiBp3bYNaErCCOl40SBuZGQWmG2Bj xBei1lzNnzGFjdYT7/pCZ7cLYEoKqD47OSnhnW4fUgs7pzZjLF/4sIZosHbi9A/Ocibp MOoISrE/9N6HgBNK+GqGerQhBJis9R0/G5VIaDzP2UaTAmpijvdnwe4Cw98+mUsRNlyi BcRQ== X-Gm-Message-State: APjAAAUU+v7tATVtivgpcHYyUSJu2cJiDqGMNbXyAMG7gw4MRBXHQrEM l2gzEmnNdiDdOVCw8UXJiclVkQ== X-Google-Smtp-Source: APXvYqxRgmdPs0tbUXdGDM04yiEqjNKu1cSpCO3ukQ5CPq7IDcDnYrMXgL9jfbLovvULBzL4r6v7KQ== X-Received: by 2002:adf:c54d:: with SMTP id s13mr23641039wrf.169.1552406715643; Tue, 12 Mar 2019 09:05:15 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id g15sm3949739wmg.16.2019.03.12.09.05.10 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 09:05:13 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7AEBD1FF87; Tue, 12 Mar 2019 15:59:48 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 15:59:42 +0000 Message-Id: <20190312155947.14918-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312155947.14918-1-alex.bennee@linaro.org> References: <20190312155947.14918-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::441 Subject: [Qemu-devel] [PATCH v4 16/21] tests/tcg: provide a minilib for 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: Kevin Wolf , peter.maydell@linaro.org, famz@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, agraf@suse.de, cota@braap.org, Alexander Spyridakis , aurelien@aurel32.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" We will likely want a few common functions to make up for the fact we don't have a libc and we don't want to feel like we are programming by banging rocks together. I've purloined the printf function from: https://git.virtualopensystems.com/dev/tcg_baremetal_tests Although I have tweaked the names to avoid confusing GCC about clashing with builtins. Cc: Alexander Spyridakis Cc: Kevin Wolf Signed-off-by: Alex Bennée --- tests/tcg/Makefile | 1 + tests/tcg/minilib/Makefile.target | 21 +++++ tests/tcg/minilib/minilib.h | 25 ++++++ tests/tcg/minilib/printf.c | 133 ++++++++++++++++++++++++++++++ 4 files changed, 180 insertions(+) create mode 100644 tests/tcg/minilib/Makefile.target create mode 100644 tests/tcg/minilib/minilib.h create mode 100644 tests/tcg/minilib/printf.c diff --git a/tests/tcg/Makefile b/tests/tcg/Makefile index 8dfd1a76b9..1cdd628e96 100644 --- a/tests/tcg/Makefile +++ b/tests/tcg/Makefile @@ -95,6 +95,7 @@ else # For softmmu targets we include a different Makefile fragement as the # build options for bare programs are usually pretty different. They # are expected to provide their own build recipes. +-include $(SRC_PATH)/tests/tcg/minilib/Makefile.target -include $(SRC_PATH)/tests/tcg/$(TARGET_BASE_ARCH)/Makefile.softmmu-target ifneq ($(TARGET_BASE_ARCH),$(TARGET_NAME)) -include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.softmmu-target diff --git a/tests/tcg/minilib/Makefile.target b/tests/tcg/minilib/Makefile.target new file mode 100644 index 0000000000..3ed8077d0f --- /dev/null +++ b/tests/tcg/minilib/Makefile.target @@ -0,0 +1,21 @@ +# +# System test minilib objects +# +# The system tests are very constrained in terms of the library they +# support but we are not savages. We provide a few helpful routines +# that can be shared with the tests for basic I/O. +# +# They assume each arch has provided a putc function. +# + +SYSTEM_MINILIB_SRC=$(SRC_PATH)/tests/tcg/minilib +MINILIB_SRCS=$(wildcard $(SYSTEM_MINILIB_SRC)/*.c) +MINILIB_OBJS=$(patsubst $(SYSTEM_MINILIB_SRC)/%.c, %.o, $(MINILIB_SRCS)) + +MINILIB_CFLAGS+=-nostdlib -ggdb -O0 +MINILIB_INC=-isystem $(SYSTEM_MINILIB_SRC) + +.PRECIOUS: $(MINILIB_OBJS) + +%.o: $(SYSTEM_MINILIB_SRC)/%.c + $(CC) $(CFLAGS) -c $< -o $@ diff --git a/tests/tcg/minilib/minilib.h b/tests/tcg/minilib/minilib.h new file mode 100644 index 0000000000..e23361380a --- /dev/null +++ b/tests/tcg/minilib/minilib.h @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2015 Virtual Open Systems SAS + * Author: Alexander Spyridakis + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * SPDX-License-Identifier: GPL-2.0-only + */ + +#ifndef _MINILIB_H_ +#define _MINILIB_H_ + +/* + * Provided by the individual arch + */ +extern void __sys_outc(char c); + +/* + * Provided by the common minilib + */ +void ml_printf(const char *fmt, ...); + +#endif /* _MINILIB_H_ */ diff --git a/tests/tcg/minilib/printf.c b/tests/tcg/minilib/printf.c new file mode 100644 index 0000000000..121620cb16 --- /dev/null +++ b/tests/tcg/minilib/printf.c @@ -0,0 +1,133 @@ +/* + * Copyright (C) 2015 Virtual Open Systems SAS + * Author: Alexander Spyridakis + * + * printf based on implementation by Kevin Wolf + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * SPDX-License-Identifier: GPL-2.0-only + */ + +#include "minilib.h" + +typedef __builtin_va_list va_list; +#define va_start(ap, X) __builtin_va_start(ap, X) +#define va_arg(ap, type) __builtin_va_arg(ap, type) +#define va_end(ap) __builtin_va_end(ap) + +static void print_str(char *s) +{ + while (*s) { + __sys_outc(*s++); + } +} + +static void print_num(unsigned long long value, int base) +{ + char digits[] = "0123456789abcdef"; + char buf[32]; + int i = sizeof(buf) - 2, j; + + /* Set the buffer to 0. See problem of before. */ + for (j = 0; j < 32; j++) { + buf[j] = 0; + } + + do { + buf[i--] = digits[value % base]; + value /= base; + } while (value); + + print_str(&buf[i + 1]); +} + +void ml_printf(const char *fmt, ...) +{ + va_list ap; + char *str; + int base; + int has_long; + int alt_form; + unsigned long long val; + + va_start(ap, fmt); + + for (; *fmt; fmt++) { + if (*fmt != '%') { + __sys_outc(*fmt); + continue; + } + fmt++; + + if (*fmt == '#') { + fmt++; + alt_form = 1; + } else { + alt_form = 0; + } + + if (*fmt == 'l') { + fmt++; + if (*fmt == 'l') { + fmt++; + has_long = 2; + } else { + has_long = 1; + } + } else { + has_long = 0; + } + + switch (*fmt) { + case 'x': + case 'p': + base = 16; + goto convert_number; + case 'd': + case 'i': + case 'u': + base = 10; + goto convert_number; + case 'o': + base = 8; + goto convert_number; + + convert_number: + switch (has_long) { + case 0: + val = va_arg(ap, unsigned int); + break; + case 1: + val = va_arg(ap, unsigned long); + break; + case 2: + val = va_arg(ap, unsigned long long); + break; + } + + if (alt_form && base == 16) { + print_str("0x"); + } + + print_num(val, base); + break; + + case 's': + str = va_arg(ap, char*); + print_str(str); + break; + case '%': + __sys_outc(*fmt); + break; + default: + __sys_outc('%'); + __sys_outc(*fmt); + break; + } + } + + va_end(ap); +} From patchwork Tue Mar 12 15:59:43 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: 1055546 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="mUudDngt"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44Jgqy0Pyyz9s5c for ; Wed, 13 Mar 2019 03:47:26 +1100 (AEDT) Received: from localhost ([127.0.0.1]:55708 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3kYm-0004cq-2Q for incoming@patchwork.ozlabs.org; Tue, 12 Mar 2019 12:47:24 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33283) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3ju7-0002bi-J3 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:05:31 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3ju2-00038K-AO for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:05:23 -0400 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:38118) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3ju1-00033G-Fh for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:05:18 -0400 Received: by mail-wm1-x342.google.com with SMTP id a188so3200759wmf.3 for ; Tue, 12 Mar 2019 09:05:11 -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=xmNTpaCEZ4i+4lmkayGfgy7YQIg/Oty8Wv4jSq4T3+c=; b=mUudDngtY8Km5aawpnIKmSL5cpGTCj2qIFZR1UmjKPrpZNloAINUpa+6XOKfLX9WPk vR4E8fF8evFHdK2n0XGCP5iZpmYB+Un2lhi3toETNtXuYT0BgT577oAn7sfE+KjKbZ44 Zq7iff7lHWboGYOsfEvFm9kgHKNEy+C79yntoaFDkKoWpG8atP0DKtgXmx+k/Xl+96Gp GzFCD/mcybC0B4U9Z3N7PQawRV6FhDZDFWbR+Zo0TUHdXqaQIIjMHtavKv2n+zeifR+m 2KUPqzzZzG6aanMNDo0nLmbwhtcLIaYxS4SmzWX0tvRvMDewnxyN41a3YKu1Ej2ZbSz3 G/yA== 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=xmNTpaCEZ4i+4lmkayGfgy7YQIg/Oty8Wv4jSq4T3+c=; b=J1F5uBgXljy6rxUE5dcBRfmi/uRC8lCBcFaGzFulg4Es00ff/dxDd6Bifvro9l3p3l QTqnFVpPIoOz4/x3icW6PDF0Jz+qGZcF2+1DRTOvZQOnwpmu0EhmS9REr7KcLbS55guR 2RZCfjNyeZxb0fxXxHbCiAmQZ3qj8VYYGeIC1/XREWsZgrUcpNAcEjgwBDUjntl6s/IN kHrSR8WvhjYt4N9Qw77RHuNQMJK+7hFvMZqBeyiAx80uANjtXyX9WIwdoXrGOOOG+CWb CwII7uqNQGcOjR4BCsyYrER1EwDTckFQSvN69cNdnLXfgft/njLPpX2llOpUtJrUbJyQ A3SQ== X-Gm-Message-State: APjAAAVPd67JIPJYe+6uNEyQ70VbdG3tTFvavOwNX5DHU5O4sRyc3cIp S0+qwaishxjY9M4jtCls8JsTOA== X-Google-Smtp-Source: APXvYqyUQT+vmcrd/pEhG2UHa8WgbBMQ5ef1gOFXKywpLKHq/fTAqfowFNBatzDVEfeTyHKQ4Xc0xA== X-Received: by 2002:a1c:e1c4:: with SMTP id y187mr3093933wmg.50.1552406710245; Tue, 12 Mar 2019 09:05:10 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id z9sm10915088wrv.59.2019.03.12.09.05.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 09:05:09 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 91C081FF9B; Tue, 12 Mar 2019 15:59:48 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 15:59:43 +0000 Message-Id: <20190312155947.14918-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312155947.14918-1-alex.bennee@linaro.org> References: <20190312155947.14918-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::342 Subject: [Qemu-devel] [PATCH v4 17/21] tests/tcg/i386: add system mode Hello World test 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: peter.maydell@linaro.org, famz@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, agraf@suse.de, cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This introduces the build framework for simple i386 system tests. The first test is the eponymous "Hello World" which simply outputs the text on the serial port and then exits. I've included the framework for x86_64 but it is not in this series as it is a work in progress. Signed-off-by: Alex Bennée --- tests/tcg/i386/Makefile.softmmu-target | 46 +++++++ tests/tcg/i386/system/boot.S | 172 +++++++++++++++++++++++++ tests/tcg/i386/system/hello.c | 14 ++ tests/tcg/i386/system/kernel.ld | 23 ++++ 4 files changed, 255 insertions(+) create mode 100644 tests/tcg/i386/Makefile.softmmu-target create mode 100644 tests/tcg/i386/system/boot.S create mode 100644 tests/tcg/i386/system/hello.c create mode 100644 tests/tcg/i386/system/kernel.ld diff --git a/tests/tcg/i386/Makefile.softmmu-target b/tests/tcg/i386/Makefile.softmmu-target new file mode 100644 index 0000000000..53c9c5ece0 --- /dev/null +++ b/tests/tcg/i386/Makefile.softmmu-target @@ -0,0 +1,46 @@ +# +# x86 system tests +# +# This currently builds only for i386. The common C code is built +# with standard compiler flags however so we can support both by +# adding additional boot files for x86_64. +# + +I386_SYSTEM_SRC=$(SRC_PATH)/tests/tcg/i386/system +X64_SYSTEM_SRC=$(SRC_PATH)/tests/tcg/x86_64/system +# Set search path for all sources +VPATH+=$(I386_SYSTEM_SRC) + +# These objects provide the basic boot code and helper functions for all tests +CRT_OBJS=boot.o + +X86_TEST_SRCS=$(wildcard $(I386_SYSTEM_SRC)/*.c) +X86_TESTS = $(patsubst $(I386_SYSTEM_SRC)/%.c, %, $(X86_TEST_SRCS)) + +ifeq ($(TARGET_X86_64), y) +CRT_PATH=$(X64_SYSTEM_SRC) +LINK_SCRIPT=$(X64_SYSTEM_SRC)/kernel.ld +LDFLAGS=-Wl,-T$(LINK_SCRIPT) -Wl,-melf_x86_64 +else +CRT_PATH=$(I386_SYSTEM_SRC) +CFLAGS+=-m32 +LINK_SCRIPT=$(I386_SYSTEM_SRC)/kernel.ld +LDFLAGS=-Wl,-T$(LINK_SCRIPT) -Wl,-melf_i386 +# FIXME: move to common once x86_64 is bootstrapped +TESTS+=$(X86_TESTS) +endif +CFLAGS+=-nostdlib -ggdb -O0 $(MINILIB_INC) +LDFLAGS+=-static -nostdlib $(CRT_OBJS) $(MINILIB_OBJS) -lgcc + +# building head blobs +.PRECIOUS: $(CRT_OBJS) + +%.o: $(CRT_PATH)/%.S + $(CC) $(CFLAGS) -c $< -o $@ + +# Build and link the tests +%: %.c $(LINK_SCRIPT) $(CRT_OBJS) $(MINILIB_OBJS) + $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS) + +# Running +QEMU_OPTS+=-device isa-debugcon,chardev=output -device isa-debug-exit,iobase=0xf4,iosize=0x4 -kernel diff --git a/tests/tcg/i386/system/boot.S b/tests/tcg/i386/system/boot.S new file mode 100644 index 0000000000..90aa174908 --- /dev/null +++ b/tests/tcg/i386/system/boot.S @@ -0,0 +1,172 @@ +/* + * i386 boot code, based on qemu-bmibug. + * + * Copyright 2019 Doug Gale + * Copyright 2019 Linaro + * + * This work is licensed under the terms of the GNU GPL, version 3 or later. + * See the COPYING file in the top-level directory. + * + * SPDX-License-Identifier: GPL-3.0-or-later + */ + + .section .head + + /* Multi-boot header */ +multiboot_st: + .int 0x1BADB002 + .int 0x10000 + .int -(0x10000+0x1BADB002) + // Load address + .int __load_st + .int __load_st + .int __load_en + .int __bss_en + .int _start + // mode + .int 0 + // width + .int 0 + // height + .int 0 + // depth + .int 0 + + .code32 + .section .text + + /* Kernel Entry Point */ +.global _start +_start: + // Setup stack ASAP + mov $stack_end,%esp + + // Load GDT ASAP + lgdt gdtr + ljmp $0x8,$.Lloadcs +.Lloadcs: + mov $0x10,%eax + mov %eax,%ds + mov %eax,%es + mov %eax,%fs + mov %eax,%gs + mov %eax,%ss + + // Fixup the IDT to the ridiculous i386 layout + xor %ebx,%ebx +.Lnextidt: + mov idt_00(,%ebx,8),%eax + shr $16,%eax + movw $0x8,idt_00+2(,%ebx,8) + movw $0x8E00,idt_00+4(,%ebx,8) + movw %ax,idt_00+6(,%ebx,8) + add $1,%ebx + cmp $32,%ebx + jl .Lnextidt + + // Load IDTR + push $idt_00 + push $((32 * 8 - 1) << 16) + lidt 2(%esp) + add $8,%esp + + /* + * Don't worry about stack frame, assume everthing + * is garbage when we return, we won't need it. + */ + call main + + /* output any non-zero result in eax to isa-debug-exit device */ + test %al, %al + jz 1f + out %ax, $0xf4 + +1: /* QEMU ACPI poweroff */ + mov $0x604,%edx + mov $0x2000,%eax + out %ax,%dx + hlt + jmp 1b + + /* + * Helper Functions + */ + + /* Output a single character to serial port */ + .global __sys_outc +__sys_outc: + pushl %ebp + movl %esp, %ebp + out %al,$0xE9 + movl %ebp, %esp + popl %ebp + ret + + + /* Interrupt Descriptor Table */ + + .section .data + .align 16 + +idt_00: .int 0, 0 +idt_01: .int 0, 0 +idt_02: .int 0, 0 +idt_03: .int 0, 0 +idt_04: .int 0, 0 +idt_05: .int 0, 0 +idt_06: .int 0, 0 /* intr_6_opcode, Invalid Opcode */ +idt_07: .int 0, 0 +idt_08: .int 0, 0 +idt_09: .int 0, 0 +idt_0A: .int 0, 0 +idt_0B: .int 0, 0 +idt_0C: .int 0, 0 +idt_0D: .int 0, 0 +idt_0E: .int 0, 0 +idt_0F: .int 0, 0 +idt_10: .int 0, 0 +idt_11: .int 0, 0 +idt_12: .int 0, 0 +idt_13: .int 0, 0 +idt_14: .int 0, 0 +idt_15: .int 0, 0 +idt_16: .int 0, 0 +idt_17: .int 0, 0 +idt_18: .int 0, 0 +idt_19: .int 0, 0 +idt_1A: .int 0, 0 +idt_1B: .int 0, 0 +idt_1C: .int 0, 0 +idt_1D: .int 0, 0 +idt_1E: .int 0, 0 +idt_1F: .int 0, 0 + +gdt: + .short 0 +gdtr: + .short gdt_en - gdt - 1 + .int gdt + + // Code + .short 0xFFFF + .short 0 + .byte 0 + .byte 0x9b + .byte 0xCF + .byte 0 + + // Data + .short 0xFFFF + .short 0 + .byte 0 + .byte 0x93 + .byte 0xCF + .byte 0 + +gdt_en: + + .section .bss + .align 16 + +stack: .space 65536 +stack_end: diff --git a/tests/tcg/i386/system/hello.c b/tests/tcg/i386/system/hello.c new file mode 100644 index 0000000000..821dc0ef09 --- /dev/null +++ b/tests/tcg/i386/system/hello.c @@ -0,0 +1,14 @@ +/* + * Hello World, system test version + * + * We don't have the benefit of libc, just builtin C primitives and + * whatever is in minilib. + */ + +#include + +int main(void) +{ + ml_printf("Hello World\n"); + return 0; +} diff --git a/tests/tcg/i386/system/kernel.ld b/tests/tcg/i386/system/kernel.ld new file mode 100644 index 0000000000..92de525e93 --- /dev/null +++ b/tests/tcg/i386/system/kernel.ld @@ -0,0 +1,23 @@ +SECTIONS { + . = 0x100000; + + .text : { + __load_st = .; + *(.head) + *(.text) + } + + .rodata : { + *(.rodata) + } + + .data : { + *(.data) + __load_en = .; + } + + .bss : { + *(.bss) + __bss_en = .; + } +} From patchwork Tue Mar 12 15:59:44 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: 1055535 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="CS/2qp00"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44Jgb12mdkz9s70 for ; Wed, 13 Mar 2019 03:36:13 +1100 (AEDT) Received: from localhost ([127.0.0.1]:55495 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3kNv-0002cw-5x for incoming@patchwork.ozlabs.org; Tue, 12 Mar 2019 12:36:11 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33214) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3ju4-0002YW-Kh for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:05:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3ju1-00037g-Sw for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:05:20 -0400 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:35599) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3ju1-00031a-7l for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:05:17 -0400 Received: by mail-wr1-x442.google.com with SMTP id t18so3336902wrx.2 for ; Tue, 12 Mar 2019 09:05:10 -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=Cz2tKdSyxnqqt8wMVGvROwJ8Tc7g4IuH5oTOYIKht/g=; b=CS/2qp00wB0/uFAIKoyT0O+2wQTT5O2De8HD2QNG8SpjWtMfkx1rX5uIxjSPNvO/RA TwxLQq+/wv9SeORIJR5etJNl6nHDi+J1FXIFngCawuyVBeby5cVDAJVoGarpCzIErSKO qV2/ccFo3RUEcyzZIfS1VKw1mHfxISKjxfzBkbkagVb5uZ1KrAgHCgGYclCDpwTPgEvB 0llSvtbiEB1vG9ztyGBnNom80NeeoHTFBVliLBIUqNwpHCGkBTwtCImRZEXnGr2ZVtBh nnCHin9lJ8uE9DXkPMnl1PMc0k/vyUYsMhsy2u+O5R+A9xLUVyP4Rn3NukEYnmJFQYk7 hguw== 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=Cz2tKdSyxnqqt8wMVGvROwJ8Tc7g4IuH5oTOYIKht/g=; b=GLajY1DBKc9azGQOKjpcNq7G0xJexWJlzdSvunMtye7ACfJoXuObY0Y82O1RWLAIRG V9OlT0qeD2gV+vksM6m/uuuYvR7kXMoh3sAsrVuqyBDmpm5mXVJN8AgPrTu2a7TDdFUQ c0CO3uRfmIP6oEcMaeQDoMSAp+PeEv3UMZL73DvNlZD7m06xZDJn6NwV1W1AhMintfCZ 0xaL/kUvbjBDjAq/v7x9IG6vlpdCYZaH5LQBQ5u4cgreqcJ/iQNwF35RNkZNGT158mGp Y0cE4wh/U5Y0oH4GiAnnLsP/6lNxDlr5bSHNDCIicQ/5jf3Izk/AduJWmbcjfevnl9mV Y76A== X-Gm-Message-State: APjAAAUKHFq45BJY6IhzbBlzMosea+5Tw7Vswok2lUhalcEfYOX97H6i SELQKAPSAL/72k1ErXw5qrfs4A== X-Google-Smtp-Source: APXvYqxTAySYyHjKMOQ5DEgrt4tDARRS384SMX+miA01xNwfJVLvrr0V9sLys7NJvMYVi42rpaSoHw== X-Received: by 2002:adf:ef11:: with SMTP id e17mr1358795wro.93.1552406709659; Tue, 12 Mar 2019 09:05:09 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id f196sm6084662wme.36.2019.03.12.09.05.08 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 09:05:09 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9E6FA1FF9C; Tue, 12 Mar 2019 15:59:48 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 15:59:44 +0000 Message-Id: <20190312155947.14918-19-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312155947.14918-1-alex.bennee@linaro.org> References: <20190312155947.14918-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] [PATCH v4 18/21] tests/tcg/i386: add memory test to exercise softmmu 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: peter.maydell@linaro.org, famz@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, agraf@suse.de, cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" This is a simple test to check various access patterns to memory including unaligned access. Signed-off-by: Alex Bennée --- tests/tcg/i386/system/memory.c | 243 +++++++++++++++++++++++++++++++++ 1 file changed, 243 insertions(+) create mode 100644 tests/tcg/i386/system/memory.c diff --git a/tests/tcg/i386/system/memory.c b/tests/tcg/i386/system/memory.c new file mode 100644 index 0000000000..a7a0a8e978 --- /dev/null +++ b/tests/tcg/i386/system/memory.c @@ -0,0 +1,243 @@ +/* + * Memory Test + * + * This is intended to test the softmmu code and ensure we properly + * behave across normal and unaligned accesses across several pages. + * We are not replicating memory tests for stuck bits and other + * hardware level failures but looking for issues with different size + * accesses when: + + * + */ + +#include +#include + +#define TEST_SIZE (4096 * 4) /* 4 pages */ + +static uint8_t test_data[TEST_SIZE]; + +static void pdot(int count) +{ + if (count % 128 == 0) { + ml_printf("."); + } +} + + +/* + * Fill the data with ascending value bytes. As x86 is a LE machine we + * write in ascending order and then read and high byte should either + * be zero or higher than the lower bytes. + */ + +static void init_test_data_u8(void) +{ + uint8_t count = 0, *ptr = &test_data[0]; + int i; + + ml_printf("Filling test area with u8:"); + for (i = 0; i < TEST_SIZE; i++) { + *ptr++ = count++; + pdot(i); + } + ml_printf("done\n"); +} + +static void init_test_data_u16(int offset) +{ + uint8_t count = 0; + uint16_t word, *ptr = (uint16_t *) &test_data[0]; + const int max = (TEST_SIZE - offset) / sizeof(word); + int i; + + ml_printf("Filling test area with u16 (offset %d):", offset); + + /* Leading zeros */ + for (i = 0; i < offset; i++) { + *ptr = 0; + } + + ptr = (uint16_t *) &test_data[offset]; + for (i = 0; i < max; i++) { + uint8_t high, low; + low = count++; + high = count++; + word = (high << 8) | low; + *ptr++ = word; + pdot(i); + } + ml_printf("done\n"); +} + +static void init_test_data_u32(int offset) +{ + uint8_t count = 0; + uint32_t word, *ptr = (uint32_t *) &test_data[0]; + const int max = (TEST_SIZE - offset) / sizeof(word); + int i; + + ml_printf("Filling test area with u32 (offset %d):", offset); + + /* Leading zeros */ + for (i = 0; i < offset; i++) { + *ptr = 0; + } + + ptr = (uint32_t *) &test_data[offset]; + for (i = 0; i < max; i++) { + uint8_t b1, b2, b3, b4; + b4 = count++; + b3 = count++; + b2 = count++; + b1 = count++; + word = (b1 << 24) | (b2 << 16) | (b3 << 8) | b4; + *ptr++ = word; + pdot(i); + } + ml_printf("done\n"); +} + + +static int read_test_data_u16(int offset) +{ + uint16_t word, *ptr = (uint16_t *)&test_data[offset]; + int i; + const int max = (TEST_SIZE - offset) / sizeof(word); + + ml_printf("Reading u16 from %#lx (offset %d):", ptr, offset); + + for (i = 0; i < max; i++) { + uint8_t high, low; + word = *ptr++; + high = (word >> 8) & 0xff; + low = word & 0xff; + if (high < low && high != 0) { + ml_printf("Error %d < %d\n", high, low); + return 1; + } else { + pdot(i); + } + + } + ml_printf("done\n"); + return 0; +} + +static int read_test_data_u32(int offset) +{ + uint32_t word, *ptr = (uint32_t *)&test_data[offset]; + int i; + const int max = (TEST_SIZE - offset) / sizeof(word); + + ml_printf("Reading u32 from %#lx (offset %d):", ptr, offset); + + for (i = 0; i < max; i++) { + uint8_t b1, b2, b3, b4; + word = *ptr++; + + b1 = word >> 24 & 0xff; + b2 = word >> 16 & 0xff; + b3 = word >> 8 & 0xff; + b4 = word & 0xff; + + if ((b1 < b2 && b1 != 0) || + (b2 < b3 && b2 != 0) || + (b3 < b4 && b3 != 0)) { + ml_printf("Error %d, %d, %d, %d", b1, b2, b3, b4); + return 2; + } else { + pdot(i); + } + } + ml_printf("done\n"); + return 0; +} + +static int read_test_data_u64(int offset) +{ + uint64_t word, *ptr = (uint64_t *)&test_data[offset]; + int i; + const int max = (TEST_SIZE - offset) / sizeof(word); + + ml_printf("Reading u64 from %#lx (offset %d):", ptr, offset); + + for (i = 0; i < max; i++) { + uint8_t b1, b2, b3, b4, b5, b6, b7, b8; + word = *ptr++; + + b1 = ((uint64_t) (word >> 56)) & 0xff; + b2 = ((uint64_t) (word >> 48)) & 0xff; + b3 = ((uint64_t) (word >> 40)) & 0xff; + b4 = (word >> 32) & 0xff; + b5 = (word >> 24) & 0xff; + b6 = (word >> 16) & 0xff; + b7 = (word >> 8) & 0xff; + b8 = (word >> 0) & 0xff; + + if ((b1 < b2 && b1 != 0) || + (b2 < b3 && b2 != 0) || + (b3 < b4 && b3 != 0) || + (b4 < b5 && b4 != 0) || + (b5 < b6 && b5 != 0) || + (b6 < b7 && b6 != 0) || + (b7 < b8 && b7 != 0)) { + ml_printf("Error %d, %d, %d, %d, %d, %d, %d, %d", + b1, b2, b3, b4, b5, b6, b7, b8); + return 2; + } else { + pdot(i); + } + } + ml_printf("done\n"); + return 0; +} + +/* Read the test data and verify at various offsets */ +int do_reads(void) +{ + int r = 0; + int off = 0; + + while (r == 0 && off < 8) { + r = read_test_data_u16(off); + r |= read_test_data_u32(off); + r |= read_test_data_u64(off); + off++; + } + + return r; +} + +int main(void) +{ + int i, r = 0; + + + init_test_data_u8(); + r = do_reads(); + if (r) { + return r; + } + + for (i = 0; i < 8; i++) { + init_test_data_u16(i); + + r = do_reads(); + if (r) { + return r; + } + } + + for (i = 0; i < 8; i++) { + init_test_data_u32(i); + + r = do_reads(); + if (r) { + return r; + } + } + + ml_printf("Test complete: %s\n", r == 0 ? "PASSED" : "FAILED"); + return r; +} From patchwork Tue Mar 12 15:59:45 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: 1055540 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="uxyALgzf"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44JgkF1bdfz9s55 for ; Wed, 13 Mar 2019 03:42:29 +1100 (AEDT) Received: from localhost ([127.0.0.1]:55619 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3kTz-0008Mp-54 for incoming@patchwork.ozlabs.org; Tue, 12 Mar 2019 12:42:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33323) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3ju9-0002dp-72 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:05:27 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3ju2-000382-8P for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:05:25 -0400 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]:35469) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3ju1-00033z-HD for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:05:18 -0400 Received: by mail-wr1-x434.google.com with SMTP id t18so3337051wrx.2 for ; Tue, 12 Mar 2019 09:05:13 -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=IT6IQrPa2AyFdTkPjqWXoE9OsPUlkc9GeYuoBKZPqBs=; b=uxyALgzf4h8ixSlSNmDep3ptoWYsTJ9WL3PqVQl5g++PYvw8Aru+au/PVVQLmXpih/ LZIftnMEvpaeS8lzPD9iSTab1DAERSfa30w263KUCwN50kA6VEkdUVPnrw/mGeR5yDuZ wb9a3/483z4mzpc3qqVH5g+tZyas2ZIYhKy8M7zeZ1x4hrSVEkmAxfFxl6EuDrOsvhby srIOhJ0tUiyoV8w2mc5svF9ke1ae3ljZX2R7JykUeWXIpOK5XYmdQbeIWKPlEh5D3Bwk xcuOSTKSm5y7wJlyIOQDzaNoYFWuBbizbOhUsNDe0rc8of+gYNhpxlHr4Bsph8ttZk75 oY0A== 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=IT6IQrPa2AyFdTkPjqWXoE9OsPUlkc9GeYuoBKZPqBs=; b=ocSCJ+wjlEvrvMarcmSScXghr25IkBjOy3L68rCh32UY4o//utqVFQKp7uTk8h6lDd L5mXVxpKgnGEqXmk97mYgIo90GeNzK2sqiH/l1rLOm8uQ+pAhVeruvFT59pLjvEojWuv tlPtK9MidTso3PPDm7m3jE5sb9DP7zJQmMQExd63IA8UlM898C1fkhEp58f4ZdzRpv8g MslUwffbp/SPzG6zFfPr9ACFcj/xA2HSbQiOK4I6gtKnXITXzHBP6fzF4pR5uc4RR+ZG zk3cgfwanzPXOy3ovretS7ZHXFEW5C7DfpnCbTNAJRQ9NZLMdxphOnJ+b2Rxdq3Vy8Yw oqkw== X-Gm-Message-State: APjAAAWF/EHHqwaAWjWx3UqcVKd9zWf7q/SEtV56/F5M1YVaigetcVB1 1V+q7yBANQdjRlqWZOWmqnEaDA== X-Google-Smtp-Source: APXvYqz1C+yn7pNdWMY7CcXmB0sIn9ZV7C/SoyxvzTD0vhcHPZRcnr2LhBunQcHejlhsa4X4qgI27Q== X-Received: by 2002:adf:fd46:: with SMTP id h6mr23979252wrs.170.1552406712064; Tue, 12 Mar 2019 09:05:12 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id d2sm10586222wrq.94.2019.03.12.09.05.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 09:05:09 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AC2501FF9D; Tue, 12 Mar 2019 15:59:48 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 15:59:45 +0000 Message-Id: <20190312155947.14918-20-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312155947.14918-1-alex.bennee@linaro.org> References: <20190312155947.14918-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::434 Subject: [Qemu-devel] [PATCH v4 19/21] tests/tcg/arm: account for pauth randomness 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: peter.maydell@linaro.org, famz@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, agraf@suse.de, cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Pointer authentication isn't guaranteed to always detect a clash between different keys. Take this into account in the test by running several times and checking the percentage hit rate of the test. Cc: Richard Henderson Signed-off-by: Alex Bennée --- tests/tcg/aarch64/pauth-1.c | 26 ++++++++++++++++++++------ 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/tests/tcg/aarch64/pauth-1.c b/tests/tcg/aarch64/pauth-1.c index ae6dc05c2b..a3c1443cd0 100644 --- a/tests/tcg/aarch64/pauth-1.c +++ b/tests/tcg/aarch64/pauth-1.c @@ -1,5 +1,6 @@ #include #include +#include asm(".arch armv8.4-a"); @@ -8,16 +9,29 @@ asm(".arch armv8.4-a"); #define PR_PAC_APDAKEY (1 << 2) #endif +#define TESTS 1000 + int main() { - int x; + int x, i, count = 0; void *p0 = &x, *p1, *p2; + float perc; + + for (i = 0; i < TESTS; i++) { + asm volatile("pacdza %0" : "=r"(p1) : "0"(p0)); + prctl(PR_PAC_RESET_KEYS, PR_PAC_APDAKEY, 0, 0, 0); + asm volatile("pacdza %0" : "=r"(p2) : "0"(p0)); - asm volatile("pacdza %0" : "=r"(p1) : "0"(p0)); - prctl(PR_PAC_RESET_KEYS, PR_PAC_APDAKEY, 0, 0, 0); - asm volatile("pacdza %0" : "=r"(p2) : "0"(p0)); + if (p1 != p0) { + count++; + } + if (p1 != p2) { + count++; + } + } - assert(p1 != p0); - assert(p1 != p2); + perc = (float) count / (float) (TESTS * 2); + printf("Ptr Check: %0.2f%%", perc * 100.0); + assert(perc > 0.95); return 0; } From patchwork Tue Mar 12 15:59:46 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: 1055534 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="F1QA4oDJ"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44JgWq68kWz9s70 for ; Wed, 13 Mar 2019 03:33:26 +1100 (AEDT) Received: from localhost ([127.0.0.1]:55431 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3kLE-0000Fo-MA for incoming@patchwork.ozlabs.org; Tue, 12 Mar 2019 12:33:24 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33250) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3ju5-0002ZS-N5 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:05:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3ju2-00038C-AB for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:05:21 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:37631) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3ju1-00035D-6h for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:05:18 -0400 Received: by mail-wr1-x441.google.com with SMTP id y15so3325378wro.4 for ; Tue, 12 Mar 2019 09:05:15 -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=QAe8M9B6oZuyiWkHfyhef632FG9TeZFnRT6BrZNjWtA=; b=F1QA4oDJD55gdAxd17TfvMRAMuCpLOxnyZoOmBlz2o9nKHs9MrgCZbz+diO7U5wj+Q BgKiRlQF6/oHXvzm9YiIEDTZv2QBPUUfKKS6vjJnk3jg2KszTOGnjxbPRbOpFuxVio7I NqLLr/2mYcNsnU89T8ZxpLaF7nIUX0TXVDpKU2+4c3Pv7XMf5WTgOhBC8HHDLdQqqltD QtZ5SHhO6DNh0YALVvVvge6zW+0xEK+kafeoFhdgm0xwRm6LU1G+t8Us22gmpr+ZuzyA AEMo0LmMf0fKaCw1u0CHmN5aPeX9i1H3BySJP4Mvs8h+F+PLTWOa3HhDbhPE/V1IlMWK 1qvg== 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=QAe8M9B6oZuyiWkHfyhef632FG9TeZFnRT6BrZNjWtA=; b=a2EKuel9YOxjK+a8e2aZIVLvASycjvqJoXZj3yFyPo6kuH+byOad66pd+dDYm8G9cz 9BiK4GoMbeNUFvGuU8CGWUroGSY0XfU7jsE3EIGJdckJlFmeGKf1FKAVotvwHKLz/O+C dKWyMQfEzhJ60g2zExdxxLNNB5Tj9thIhDpxMxTca6hRbADP1wpW27j6N6h0BCxhqPZA eH1Lcw045PMED8XNooptTypsTBHirNIrDPp8okrYKbxzBRmHSCay8+/xpxTBt6w8l84L F/ZfaJJS5SCatstsyLB5zGdtWQixu72yRKy5mJT0hPAuHb0EboWCZ6LLKJKekwRqB96D GkyA== X-Gm-Message-State: APjAAAUfw1MFklhCoy5G2iwhjccew4aThn8NAMuNPRLyrhLUjT3y6oOs D9uZcy2JHoWe0IqCcQMaZOI4uQ== X-Google-Smtp-Source: APXvYqx0C6QQbt5albseBCoF3zqPHlBbbOjuMZ2I0VTR8NYfjtdiZYfBCMAzVw3S3ZOfmS4lWHpuUw== X-Received: by 2002:adf:b7c1:: with SMTP id t1mr23681115wre.248.1552406714695; Tue, 12 Mar 2019 09:05:14 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id k12sm3139266wrl.65.2019.03.12.09.05.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 09:05:12 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B9C141FF9E; Tue, 12 Mar 2019 15:59:48 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 15:59:46 +0000 Message-Id: <20190312155947.14918-21-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312155947.14918-1-alex.bennee@linaro.org> References: <20190312155947.14918-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::441 Subject: [Qemu-devel] [PATCH v4 20/21] .travis.yml: separate softfloat from check-tcg 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: peter.maydell@linaro.org, famz@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, agraf@suse.de, cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" While used by TCG it is not explicitly part of TCG and the tests can be run standalone in a minimal build. Signed-off-by: Alex Bennée --- .travis.yml | 6 ++++++ tests/Makefile.include | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index d5c9bbf1b2..b02e7318c1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -85,6 +85,12 @@ matrix: - CONFIG="--disable-user" + # Just build tools and run minimal unit and softfloat checks + - env: + - BASE_CONFIG="--enable-tools" + - CONFIG="--disable-user --disable-system" + - TEST_CMD="make check-unit check-softfloat -j3" + - env: - CONFIG="--enable-debug --enable-debug-tcg --disable-user" diff --git a/tests/Makefile.include b/tests/Makefile.include index 75b682cbe8..852f17b8c7 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -1090,7 +1090,7 @@ clean-tcg-tests-%: build-tcg: $(BUILD_TCG_TARGET_RULES) .PHONY: check-tcg -check-tcg: check-softfloat $(RUN_TCG_TARGET_RULES) +check-tcg: $(RUN_TCG_TARGET_RULES) .PHONY: clean-tcg clean-tcg: $(CLEAN_TCG_TARGET_RULES) From patchwork Tue Mar 12 15:59:47 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: 1055516 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="S/N3fGpy"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44Jg8F2dXJz9s5c for ; Wed, 13 Mar 2019 03:16:29 +1100 (AEDT) Received: from localhost ([127.0.0.1]:55180 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3k4p-00035d-5r for incoming@patchwork.ozlabs.org; Tue, 12 Mar 2019 12:16:27 -0400 Received: from eggs.gnu.org ([209.51.188.92]:33186) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1h3ju3-0002XS-IV for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:05:21 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1h3ju1-00037X-Q8 for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:05:19 -0400 Received: from mail-wm1-x332.google.com ([2a00:1450:4864:20::332]:33807) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1h3ju1-00034q-AC for qemu-devel@nongnu.org; Tue, 12 Mar 2019 12:05:17 -0400 Received: by mail-wm1-x332.google.com with SMTP id o10so2477757wmc.1 for ; Tue, 12 Mar 2019 09:05:15 -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=eqFd1wf06d+Omm2/pV0WgK1r8+0ERbhgODtMiF78JiE=; b=S/N3fGpymHqpGwuWr8BMFM19X/Tlj36GBIW5Ccdzss11AAECsA0vPUJjhoFAsUYEdL oqcsgrESX7mF2m3vXb1EYdcBsld3N4vovuFNeRbhRPFIo7SJqklj5ozeVzrmqlWgjhHR C73ywVgM/dQrrn2l2iTuT0BTL3AMss6ang2dFAJnl4YGFPdi9zi+6Je0xo0B5DDRBOaQ yXFSc6gWG2TiBpL6DpVfg3jRmOos7h2VAdfs+jpRLeN1uBMAmS8fc2uEm925ngWw7b83 DpN75PfNVspf/1/xEg01iqOemxXl6t8PMYyWSP0YByw6k81Ojl3d62/SJW6wWudP4RP7 zkCw== 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=eqFd1wf06d+Omm2/pV0WgK1r8+0ERbhgODtMiF78JiE=; b=JEqxKDujX7emTminSkoMioWwYK/BqhJnmQIxUdrbdbLf+RabLz/sUKTEsAdM70nxl/ 0YV/wx/gQEzvKALPvEFuzLCtfKHKZuuhT0MtCep2vg+UOtPutacWMFTBo74+f0iPDcqS i/8QL+rOn1TVJ5xX5sHjSlpsCwcVIIlUiN2fDT8FpPUx6YEZeoYf8Vl0RC+jOaAJ1Y4j ydaefATWKE0YfZOH4jg+iBdcv/LageP4GieTJvpADn680G9Y9f76Jdr7TZikA4rD5MWl yhxuhLey7tzqKlSCZwyrIxCxZTNo2tXg9TcY4KC+WYSUu2Lo42rf8IwkfNawEweMwnLG Qkdw== X-Gm-Message-State: APjAAAV4NUad7l6hKSSU/UxmAP8s88NKOfBnbbhY5dOMkDmtXDHd7WuK 7kVwmHC9a80FPaJ3BuCzv7waGw== X-Google-Smtp-Source: APXvYqxXxFay5uoKwDqJyOboVZbNbVsWg0MhvGqKgqKcz8esQGCon9pvDc834SLb4g7wp58W+CHX8A== X-Received: by 2002:a1c:b783:: with SMTP id h125mr2822633wmf.119.1552406714097; Tue, 12 Mar 2019 09:05:14 -0700 (PDT) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id t18sm2279302wmt.8.2019.03.12.09.05.09 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Mar 2019 09:05:12 -0700 (PDT) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C737C1FF9F; Tue, 12 Mar 2019 15:59:48 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Tue, 12 Mar 2019 15:59:47 +0000 Message-Id: <20190312155947.14918-22-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190312155947.14918-1-alex.bennee@linaro.org> References: <20190312155947.14918-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::332 Subject: [Qemu-devel] [PATCH v4 21/21] .travis.yml: add softmmu check-tcg 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: peter.maydell@linaro.org, famz@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, agraf@suse.de, cota@braap.org, aurelien@aurel32.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index b02e7318c1..980fc5c1eb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -265,6 +265,12 @@ matrix: - ./configure ${CONFIG} --extra-cflags="-g3 -O0 -fsanitize=thread -fuse-ld=gold" || { cat config.log && exit 1; } + # Run check-tcg against linux-user - env: - CONFIG="--disable-system" - TEST_CMD="make -j3 check-tcg V=1" + + # Run check-tcg against softmmu targets + - env: + - CONFIG="--target-list=xtensa-softmmu,arm-softmmu" + - TEST_CMD="make -j3 check-tcg V=1"