From patchwork Thu Feb 28 20:25:22 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: 10833671 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id EAC4317E9 for ; Thu, 28 Feb 2019 20:27:22 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D359E2F4CF for ; Thu, 28 Feb 2019 20:27:22 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C6ECF2F8DA; Thu, 28 Feb 2019 20:27:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5BE292F4CF for ; Thu, 28 Feb 2019 20:27:22 +0000 (UTC) Received: from localhost ([127.0.0.1]:45989 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSH3-0001ic-4Q for patchwork-qemu-devel@patchwork.kernel.org; Thu, 28 Feb 2019 15:27:21 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42480) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSFR-0000QH-Ux for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:42 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzSFR-00077u-49 for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:41 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:42250) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzSFQ-000753-T6 for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:41 -0500 Received: by mail-wr1-x444.google.com with SMTP id r5so23418855wrg.9 for ; Thu, 28 Feb 2019 12:25:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=L/z9MUE3cOCWWFeNa1MNv0jMC1VzRLWSs++imNZ+SgY=; b=VSILV4X+ptYsYQRPok9hn3I5BYN5GCJTag/FZhROolS9/FbcaHrD0usvZlAjrX+Jr7 SESQ8sTDiy+C+3Pr6f2KDmPgis5TKABsFqt19PH0Itb5+4xRdrzCEr81zzIICEO+Yrw3 GXl95bQPlvYL5+mRKFo8+zsx5PmIfYEL37oVE4/HE0/wawuFF/2D7FtPJTJtYYd1Ez91 xX3uHUuP05i0QWvKDOPDEGhcDFAhzyGEQ1IFNLePPC5C1C+HmHc8xMQEI4nVEkb5LKey uXj6vz84YCGI/n2j0GOfHU2YKRaVKvoencYSF9vHsZY8bqYMWrttNyf0IfDLxeKg71Km 66mw== 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=G/tNRQIsSEmoU3JvN1iI1SuTqZ5mHkGCchfyxGtDoPLUr/onGUpWNBQB4rTsyIIQnO hQ1DaJU1MgTDcnoajC4/cz0+LqtcoSMbjCg/plZkbul8T9lyRPN+WaQbdtZuqWs6V4Vy 3HsAy1ZNwFm5A0wbSkwdEslZ3pPQkaJdBl4GEUtUJIaz/Ib//zKy0eQr94hbpr0eO5js rPRSqx+WzZgI+ubtMKT2aws2On/HWV01HMhG50icws5p0F/8t2besWuJifiTU5E7lZcH TXaI9PAtS2VF+ggqU2lW2UcuWu8U4BpCk1bQBMuOVVmCmKBSS9DxFIhfrn360KrKDOdC nskA== X-Gm-Message-State: APjAAAUQTGFLsStp7/rbLrir7N1MkeyZ2VqSSw8Yj9SDbSU7zxsrQzoQ h65upP7tdTZCqnhHu1TbFbc6so2aCwU= X-Google-Smtp-Source: APXvYqw2A6ey6lNdlQZghWdRIdCKikRSxC/GC4mGpG0rYF0Ex0bf0U2Rgk78Osy+rOv3mV2Mx6Z8bg== X-Received: by 2002:a5d:5504:: with SMTP id b4mr791414wrv.291.1551385539352; Thu, 28 Feb 2019 12:25:39 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id m189sm6380630wmf.7.2019.02.28.12.25.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Feb 2019 12:25:37 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 6E9F61FF82; Thu, 28 Feb 2019 20:25:37 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 28 Feb 2019 20:25:22 +0000 Message-Id: <20190228202537.4638-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190228202537.4638-1-alex.bennee@linaro.org> References: <20190228202537.4638-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH v2 01/16] 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: edgar.iglesias@gmail.com, Richard Henderson , qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , jcmvbkbc@gmail.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 Thu Feb 28 20:25:23 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: 10833675 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 3263717E9 for ; Thu, 28 Feb 2019 20:27:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 231CF2F4CF for ; Thu, 28 Feb 2019 20:27:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 167DD2F90F; Thu, 28 Feb 2019 20:27:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id AFBE82F4CF for ; Thu, 28 Feb 2019 20:27:41 +0000 (UTC) Received: from localhost ([127.0.0.1]:45993 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSHM-0001zO-Sv for patchwork-qemu-devel@patchwork.kernel.org; Thu, 28 Feb 2019 15:27:40 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42506) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSFS-0000QK-O5 for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzSFR-00078v-Tr for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:42 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:36152) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzSFR-00077j-Nm for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:41 -0500 Received: by mail-wr1-x441.google.com with SMTP id o17so23460336wrw.3 for ; Thu, 28 Feb 2019 12:25:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=jyK9HUdzswcVQLUnL71MTps5arRDVT8LtZeB5tqZdno=; b=OhZbpGGQGtHV/BR+N+DFg0wSpALc8F8N3D7L/9OYSLjUomueJrm5utZaT62JR2MaMo qmDuidzy/aA0rQm1LZHnL3p2EjeHVBaqW/Vdh17rxTtvMlV6y1BR0sIuxuXW+Wesh307 9N7do8K05cNBLMGxbWEg2ErR+HwIlGYUE0Nb3DRkvoQskTuMDfAMDYrSP5ClbldHBabz th13MdZT6dtHbG7A2z86MoPfAHVUJTDubFB+eDtaAeefB/JA/h/SffvMygCch406HjKD KIxFMmVXOuw6m6RmzF+p2QvJ1ipqDlNQ3i9W14+Fgp1WC68ToUnd4ifGkREqtBT4d4U1 qHBg== 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=jyK9HUdzswcVQLUnL71MTps5arRDVT8LtZeB5tqZdno=; b=rRNsCBXJ8e9pJTSsaNv6ybGcoikyOsWN29QvzHuGWWUHMjkaUaOpUEVM6Awg7xa71O KPlBlXrJ1nJYjgGu3HVS6pRyTT91JtaQ7UAhBh6bFTEaggDT/pagbJPp6aYb6jzs/kRC /GQAibY+cEAj2NeyMO33e2eyo3LXxpILIx2GO5h1iggqnS8Redy0uAShBQqBC0F2fLIZ w9YUmn6s+4akq9dFLwNPcHPEShk6nH/K6PgYhd//zgpSWbN7gm54nS+0WNdVPBdqMcSC 1G+dFj7vZ9MwvuC76WYdoZ8VYvBzpuEapfD9Het/OxiSJpGY+r3rMv+l68IP/j6LjFnw XJ2w== X-Gm-Message-State: APjAAAWeuGqOkoPpGYgxpgg2RtMejkwlW8d+PHl9EVk0jnEORzQQbkG1 TIugWmc0SHLXt6ugNmmE0lXtiQ== X-Google-Smtp-Source: APXvYqwjkwAVj5wngROXTSZJfq6f/D/JyWTw3QeSu5BldzrfPYPVB+LUnii8ArbdNT2yqtgEB+zFYA== X-Received: by 2002:adf:f80e:: with SMTP id s14mr833042wrp.327.1551385540538; Thu, 28 Feb 2019 12:25:40 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c67sm51267wmd.47.2019.02.28.12.25.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Feb 2019 12:25:37 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 7AAA01FF83; Thu, 28 Feb 2019 20:25:37 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 28 Feb 2019 20:25:23 +0000 Message-Id: <20190228202537.4638-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190228202537.4638-1-alex.bennee@linaro.org> References: <20190228202537.4638-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PATCH v2 02/16] 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: edgar.iglesias@gmail.com, Richard Henderson , qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , jcmvbkbc@gmail.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 3b79e7074c..61b8be31a2 100644 --- a/Makefile.target +++ b/Makefile.target @@ -37,9 +37,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 2187b0c5aa..f39b96e250 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -1030,10 +1030,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 Thu Feb 28 20:25:24 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: 10833683 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B135C1399 for ; Thu, 28 Feb 2019 20:30:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 94C0F2FB47 for ; Thu, 28 Feb 2019 20:30:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 910992FADC; Thu, 28 Feb 2019 20:30:47 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 294DB2FADC for ; Thu, 28 Feb 2019 20:30:39 +0000 (UTC) Received: from localhost ([127.0.0.1]:46056 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSKE-0004RD-AM for patchwork-qemu-devel@patchwork.kernel.org; Thu, 28 Feb 2019 15:30:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42537) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSFT-0000QU-CZ for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzSFS-0007AA-JZ for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:43 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:50441) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzSFS-00078e-BE for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:42 -0500 Received: by mail-wm1-x341.google.com with SMTP id x7so10442235wmj.0 for ; Thu, 28 Feb 2019 12:25:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=5ANdAooO0oWTrix1+yXw8Jckjx/jPmpVf8YWjwuP8hM=; b=VloVgnWNIOWDh1kNWPUGI9o8ikXeUqzhxpQb4dJL4YXex9/ynJQncAnjX7AoZjhfwc vZMULJPALFvFqxmGKsVKWIX8Z1ISzGj+XObjQu6ezTkurI1xnk1fsiYv38NlbdXpYv++ VNeBNDUcp38W9dk/qu0MxtWlANu+TOJO5lhLdZ3DTfMj8VsZ23ieomMHuGJOPal/FqHU kt05dpNqH5eRHINYzvnv1nOIY1SOS6d5czQCTzkq9ZdThwIjnHhTEepJPOuGw/R+ZsLr tnRiiOhUX/aUxae8weWd0WBje4hQt02206CYUl+nizL9D+Tmzgpy5O2tj2Gpmy9nJ48n +VWg== 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=5ANdAooO0oWTrix1+yXw8Jckjx/jPmpVf8YWjwuP8hM=; b=m7UzorYj56YHWZebocVWTzjyCdjlYRhs22vLB9CcFRhc3Bs+H4LpCxpwedgFuRHKoo RKusxFb/tCDGN/bnoTLEEzbZ+roN6/Ko4/9nGff0VPmw2gH1JycxUKogo8FskdRig3m9 fvY8KD4XXs/QoHEDlTshR3hZ8zN+jLn3zWis5y4nZ/XNeJ8DG+3QHSjO+3wTFtnrYWIp AtgXrHhP/eJ4XjdH7BF97o4xGg+MpSGEsFNQaFTf+jWQQ44v0v6HzryaSDELRXiH3UaH hJO7kmLIDyZ7a5ulz5yXNbHsJxWz4l8YtjvRGCZKCzpLky8vuOvVrO0cuvlw8cPgsjZV yXCw== X-Gm-Message-State: AHQUAuaB95O1mrnVZLn4CrVEJIsXIjfkN8bagmklpMazGRQTW1vl7E89 3T97oa+qIw9VXypWDlwt1W228g== X-Google-Smtp-Source: AHgI3Ib7mIYORwdh3XPiRWkhgjDfolr0XMeYA6Q85gRmDdTbcY76XoYI6sqfI2ZZbm00XGVm9OG5Jg== X-Received: by 2002:a1c:eb19:: with SMTP id j25mr883821wmh.123.1551385541190; Thu, 28 Feb 2019 12:25:41 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id 65sm24507366wrb.62.2019.02.28.12.25.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Feb 2019 12:25:39 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 86D111FF86; Thu, 28 Feb 2019 20:25:37 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 28 Feb 2019 20:25:24 +0000 Message-Id: <20190228202537.4638-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190228202537.4638-1-alex.bennee@linaro.org> References: <20190228202537.4638-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [PATCH v2 03/16] 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: edgar.iglesias@gmail.com, Richard Henderson , qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , jcmvbkbc@gmail.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 --- tests/tcg/Makefile | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/tcg/Makefile b/tests/tcg/Makefile index 55feab0f67..097e6374ea 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 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 Thu Feb 28 20:25:25 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: 10833689 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 7FF2813B5 for ; Thu, 28 Feb 2019 20:34:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 720D520453 for ; Thu, 28 Feb 2019 20:34:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 661052EF6D; Thu, 28 Feb 2019 20:34:24 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2008C20453 for ; Thu, 28 Feb 2019 20:34:24 +0000 (UTC) Received: from localhost ([127.0.0.1]:46089 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSNr-0007AI-8P for patchwork-qemu-devel@patchwork.kernel.org; Thu, 28 Feb 2019 15:34:23 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42566) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSFU-0000Ql-9a for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzSFT-0007DE-EJ for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:44 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:41553) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzSFT-00079o-5v for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:43 -0500 Received: by mail-wr1-x441.google.com with SMTP id n2so23420507wrw.8 for ; Thu, 28 Feb 2019 12:25:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=6Iwg8gBxmNX74lrd9FLXQo+bpVujW4RDOBT9zcDiXUI=; b=nc17BE5VJymlmV+mE+IljEUZoEjqL99lINGs1LL1tb57OAIBsNzduUiJ9fEI9QgymH r6CXIjz+qfMVeyKlwKjEjUys2nuBYlX0ggmTBa2LQV7UvquSLdE1IiJjklMukiDcWzpO HlWbF6m2pKd7Emg5X6Q3BhhFEn1Tu2Q83u3kRfGD4LkLFqb6zaPyIYyU8RzkImTxsxMB qXSFSwYFZi8ktZVMwL16G6/PUwmprlxP5c9Fx6rj7b0J1/WTm7GgoCFN9ca0V+U3coLN 4FPE6bB1SopQRR/NisEvOV/MTr2FbDHaiwfQa2XgYdB1yGp6/DkOdQKlFeHxezgc5D5n pXPw== 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=6Iwg8gBxmNX74lrd9FLXQo+bpVujW4RDOBT9zcDiXUI=; b=N0bqWhZusLWKV2W9dS3Az23EkZBcR9VAeEDUhFrGINCRb5fsEW6QvQ/KGJzxuurxt2 T0EeF5KNvfguktf4Kj3A2vppYRDaB8uFuPkRpn2CmmCCC9/ArMJgan6bEqx+jGgDUFoU RDUbADNKqJccahtgFFraqHXu1XLjqFCJYNt+cmH3KTrRVWm9VqIBLKSUZyicFw/VhnFd da7+aeS6JWttaWjYLjg8zXkN62bLoIQNPDkcHLSYf1aTcGJeDUvfVb8Bz9l7daPaJjZt W7uMW2/mGWIGIhyd0/k44k2osOnnYwk8rI82G5bGuTpupjYNUVxMATwseb64n+9vVdXr sPZQ== X-Gm-Message-State: APjAAAUj3ARI2D/WgH+7cyCj8OyhsbE/8ooPAQm9OViEPfuCvt6H5Uux Gy3qo55aF/mgq6fV5Ykq2HVnbw== X-Google-Smtp-Source: APXvYqxaKxNDCSoQSaLSnmuJn9bnaHyuG6h4jj8dMDbF6NqrKYzC7AUeUOxuKHVVkzu67jAst/ifgA== X-Received: by 2002:a5d:500e:: with SMTP id e14mr798230wrt.219.1551385542035; Thu, 28 Feb 2019 12:25:42 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id e193sm11768176wmg.18.2019.02.28.12.25.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Feb 2019 12:25:40 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9286A1FF87; Thu, 28 Feb 2019 20:25:37 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 28 Feb 2019 20:25:25 +0000 Message-Id: <20190228202537.4638-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190228202537.4638-1-alex.bennee@linaro.org> References: <20190228202537.4638-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PATCH v2 04/16] 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: edgar.iglesias@gmail.com, qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , jcmvbkbc@gmail.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 097e6374ea..47f4298e68 100644 --- a/tests/tcg/Makefile +++ b/tests/tcg/Makefile @@ -113,6 +113,9 @@ RUN_TESTS+=$(EXTRA_RUNS) run-%: % $(call run-test, $<, $(QEMU) $(QEMU_OPTS) $<, "$< on $(TARGET_NAME)") +gdb-%: % + gdb --args $(QEMU) $(QEMU_OPTS) $< + .PHONY: run run: $(RUN_TESTS) From patchwork Thu Feb 28 20:25:26 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: 10833687 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id BA6961399 for ; Thu, 28 Feb 2019 20:33:48 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A13522FB13 for ; Thu, 28 Feb 2019 20:33:48 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 93A082FB1B; Thu, 28 Feb 2019 20:33:48 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 2C8C42FB13 for ; Thu, 28 Feb 2019 20:33:47 +0000 (UTC) Received: from localhost ([127.0.0.1]:46085 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSNG-0006ha-OM for patchwork-qemu-devel@patchwork.kernel.org; Thu, 28 Feb 2019 15:33:46 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42589) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSFV-0000RR-4v for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzSFU-0007H1-BI for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:45 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:54223) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzSFU-0007Cw-2W for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:44 -0500 Received: by mail-wm1-x342.google.com with SMTP id e74so10415264wmg.3 for ; Thu, 28 Feb 2019 12:25:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Q3wvM+2npsAP9Qjkt62VE5osetnw17aSf2iSl+MhZ8w=; b=TtIiZ7Vd0UsTQ8lM8nRje0ndk6AVsk/KfW7Scjva7JiqSc4YAipELfAb5121SzRJFW KeHEUdrLeIDyZySrdUzeXHZ6qD9TFEuThQ9Lppo6axoRTLmXrKg+J8oKRQC0spsVRWN/ IS9ESynrIAD9dsHTnD2fdgRX6CELgAZa6Bal+4Fg1Rb+Iv/7d596rwk4/K696YhN/qRP 9rP2goxeZuCN27DfhHtQ4LoAoBkFU/se14+103aNR2bCxhbn26kVJg1VbdcH0q7cjZh5 6iC1hb5rhhQptXk8j7wXaAQXzmsYpXVknA7mA3Uy2W5q1yjUT5t5+KvDJ+AhpkjR1++A XAOA== 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=dE2x+xxFXGRy/NVzTlCsGbNKsCZnmQRZRQdHgU2Pl4juvmtj/8cEw1EYxurgb6r9bh 7skt7Qda+oKS0sZT19TxAgzDiyrQw++3C1MavhXTxTG5UCgtkMgNC9ZUBuz/IFDc3+E7 VjV5+DDwNsiWJkIo9E/O+lS0H2dctLghD3H9Z51GpS1LHLmOTi1ekE+yzfJ49u4YbW1q u3SGI6evx6BSgXQFBpfpP9Xqr4lDaZqc9wAyDEVU/x6pO4lItQhSxNKeQnhYw06pKLU9 Mj+c6lL5b3EjytdqwWyc2zFrOWtrZfEio+pNNbfnxIQJlWXAo84USdmLxFqwNQdqftPZ F7ug== X-Gm-Message-State: APjAAAU+b3RmGKdxp/fCq1fH8VuU0IXeE7I/+tZodesnmtk0v2d7VKKj SGBvGXiG55e4pIW108+/+TH1gg== X-Google-Smtp-Source: AHgI3Ibk9XOPjGy8tU5lQ0SPiVD3gpO2iYqSspktz2UE2xARWlefdMh9nsD6fGv9cokYTxqC2fntwQ== X-Received: by 2002:a1c:480a:: with SMTP id v10mr886806wma.57.1551385542864; Thu, 28 Feb 2019 12:25:42 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id w24sm3971010wmi.40.2019.02.28.12.25.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Feb 2019 12:25:40 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 9E9D11FF88; Thu, 28 Feb 2019 20:25:37 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 28 Feb 2019 20:25:26 +0000 Message-Id: <20190228202537.4638-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190228202537.4638-1-alex.bennee@linaro.org> References: <20190228202537.4638-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH v2 05/16] 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: edgar.iglesias@gmail.com, qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , jcmvbkbc@gmail.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 Thu Feb 28 20:25: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: 10833681 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AE29A1399 for ; Thu, 28 Feb 2019 20:30:33 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8C02E2F9A2 for ; Thu, 28 Feb 2019 20:30:33 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 648102F936; Thu, 28 Feb 2019 20:30:33 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 453762F993 for ; Thu, 28 Feb 2019 20:30:23 +0000 (UTC) Received: from localhost ([127.0.0.1]:46051 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSJy-0004A2-D1 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 28 Feb 2019 15:30:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42610) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSFV-0000RS-TU for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzSFU-0007Hn-W6 for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:45 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:34041) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzSFU-0007GG-OG for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:44 -0500 Received: by mail-wr1-x444.google.com with SMTP id f14so23462233wrg.1 for ; Thu, 28 Feb 2019 12:25:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=QXJ3lfkk33PrrjtnU8P/06NiWtLnegdIM7eA8oCO+u4=; b=mQF2hdLBO4Wt/DTB/whPToYkTvWiCE7uOplf1EJdh8x5GnyUB0JPiXMRwNuD4ZpIZR bo2v2HZ4PjVLz/HKAZ3pTh5pgv0KRdV/UGM8dZhyGVPfUUi37XGgQ//GqydK/3oByYyQ vI0BesLynQCvzadY3DX/+Y/+jSZeupioeojSrJWp3pobpjEqVWA+FnkcW9x1xfMXoTLM 1U3vEJcJGHy+beKVxHfd43mEOXgvY0aY2PMbBaZKEotG23XiVzy+n7cnaRid3B4I202/ SYA2Z4P5IlE7Z0DuyDQN2bcu0IOLBQiAZ7xgaleVj9/+dvfe9MqmuznY1Y4Exhp1NE+b fqmA== 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=ECIDeawVo8LRBmc8CJo3nU/iuyaVaTLtTXXINakc0dy0D4idArHoWcc4aJ/+4OnlHw wAk0G9Pp+TaxJwQDVYOMqf9+2kPe1tyYKsOv4BkYVtdBsU4qGG4M3J4SCZeFdzUkr/LZ 3tqYH2IF1imG9J4Ida7Nr4NUB1zfIAm4zqX23oX/pQDq6+l8uRuKe3cqmNi3B1SxL8Vu bQCBfQ3f879IzVqD5M0GjxXkzRSUIFKCgi9oaP5CvNSfXuaZvQNiyVDdzFF5sQoWDeBZ Jf21gWcqNjnZJxXg9Szp676XKyERCyML6XaLazCJsrEfhdx42lIjRANAZAT1YZfFD94g uZ4g== X-Gm-Message-State: APjAAAX0zZQ+7kOIQNsvNihOPZxkRr0fqXnX+Ob6lKsv6QvsUHJqTbJa kPgZudrgHF7XIT2Iby7aVmQxUg== X-Google-Smtp-Source: APXvYqx3yTKVH6FQme3T66GMb4NLXqx6QKDm6DCaXMMNRVTlWsmvoYrolYY7CCMjt8Ult4fBTSt+0A== X-Received: by 2002:adf:f103:: with SMTP id r3mr951571wro.50.1551385543760; Thu, 28 Feb 2019 12:25:43 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id o18sm54598841wrg.40.2019.02.28.12.25.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Feb 2019 12:25:40 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id AA12B1FF89; Thu, 28 Feb 2019 20:25:37 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 28 Feb 2019 20:25:27 +0000 Message-Id: <20190228202537.4638-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190228202537.4638-1-alex.bennee@linaro.org> References: <20190228202537.4638-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [PATCH v2 06/16] 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: edgar.iglesias@gmail.com, qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , =?utf-8?q?Philippe_Mathieu-Daud?= =?utf-8?q?=C3=A9?= , jcmvbkbc@gmail.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 Thu Feb 28 20:25:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 10833685 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5F2B913B5 for ; Thu, 28 Feb 2019 20:31:44 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4EB132F8FA for ; Thu, 28 Feb 2019 20:31:44 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 433D72FB42; Thu, 28 Feb 2019 20:31:44 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id B05DE2F906 for ; Thu, 28 Feb 2019 20:31:43 +0000 (UTC) Received: from localhost ([127.0.0.1]:46028 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSLG-0003ud-OU for patchwork-qemu-devel@patchwork.kernel.org; Thu, 28 Feb 2019 15:31:42 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42653) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSFX-0000RW-98 for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzSFW-0007MD-8k for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:47 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:43115) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzSFW-0007K2-1v for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:46 -0500 Received: by mail-wr1-x443.google.com with SMTP id d17so23389347wre.10 for ; Thu, 28 Feb 2019 12:25:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=3TSOdPIlax1RuD630cCZAnT/ylBHj/DkmzxzTatxKBc=; b=bsR2XAnmtFXSsP+mpQ33I1EWYRp379YPzAZnoGX0gv6AhZsx9+yr8Nl1+ga6H51ekh ZEDMZO95Aaf0p+YBtXsr5U5KrS2ZkZy/zkWT/bxqp3c0xtu7C5hyKf+fQL8jVKzFKInw ItYELfEs7sVDgCOZimsGvAkMQwea1I16zCW+kpdiUNavZDNS59Wnc5Cj6NUBBjo8vmy7 JJTP+NjFO9tx9mb+znJcNtqnlAxTKEqWEtwb/P2v6xO2UND4/L8qJdrlrYYUT5qpIjWK PmSxDNU9G+GCExo0v+wI65SEyrUTVAHmTfZlIVtOlElNHEXZl95SbLStDhYSKLhH2BBA +F7w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=3TSOdPIlax1RuD630cCZAnT/ylBHj/DkmzxzTatxKBc=; b=MJ43+/MxivXL+I0LWBK9YZKgO5a+Lsm3UkCwsJGmB3IgRH5aKQIol6OrJCTUUrwKXt iD3I8bhtEbqSjqZuC90rg19w61Rc1IuC9FPx2pA4zorNMrofH6YPMlupnCkRDq3gYdt7 z1/K5ICJmXX1VXFZn3My5HJi3izSpoXLu2TN0AHHo7kF46sa/MCFY8WzRb8SR/i+XIqD RzE0ue897NTBNLV1ZGV88hFiw1TvfgS9Q7LyU0sXyLZuFgvNQclPT5uCqARhhjpTgG/x IJjG7YMFA8yIUyTmGMuLykdkSLFybPHxWahXH1DGM/IyLGlsWoXFLrk6Qm7uP4TWYiRd e8bw== X-Gm-Message-State: APjAAAXx0TUZkQBY1FEBkVwUwXY5Ytgs5CIDLQ04iIHNoGuFKbAuY1UK xQKjTIYuLzpP5T3QAJ6rAARjUQ== X-Google-Smtp-Source: APXvYqzTFbrS/5Bye2P2GNzKQ6eZ0tCnQtbiUwCv/ou2W0dmPfo9sQQAsmk7TLPG2d7csPV2ySxCdQ== X-Received: by 2002:a5d:4903:: with SMTP id x3mr852221wrq.151.1551385545036; Thu, 28 Feb 2019 12:25:45 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id v4sm4672711wmg.1.2019.02.28.12.25.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Feb 2019 12:25:41 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id B62F11FF8A; Thu, 28 Feb 2019 20:25:37 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 28 Feb 2019 20:25:28 +0000 Message-Id: <20190228202537.4638-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190228202537.4638-1-alex.bennee@linaro.org> References: <20190228202537.4638-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH v2 07/16] tests/tcg/xtensa: enable system tests X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: edgar.iglesias@gmail.com, qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , jcmvbkbc@gmail.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Alex Bennée --- v2 - use cross CC for linker - fix up test selection to skip linker.ld.S --- tests/tcg/xtensa/Makefile | 93 ------------------------ tests/tcg/xtensa/Makefile.softmmu-target | 40 ++++++++++ 2 files changed, 40 insertions(+), 93 deletions(-) delete mode 100644 tests/tcg/xtensa/Makefile create mode 100644 tests/tcg/xtensa/Makefile.softmmu-target diff --git a/tests/tcg/xtensa/Makefile b/tests/tcg/xtensa/Makefile deleted file mode 100644 index 2f5691f75b..0000000000 --- a/tests/tcg/xtensa/Makefile +++ /dev/null @@ -1,93 +0,0 @@ --include ../../../config-host.mak - -CORE=dc232b -CROSS=xtensa-$(CORE)-elf- - -ifndef XT -SIM = ../../../xtensa-softmmu/qemu-system-xtensa -SIMFLAGS = -M sim -cpu $(CORE) -nographic -semihosting -icount 6 $(EXTFLAGS) -kernel -SIMDEBUG = -s -S -else -SIM = xt-run -SIMFLAGS = --xtensa-core=DC_B_232L --exit_with_target_code $(EXTFLAGS) -SIMDEBUG = --gdbserve=0 -endif - -HOST_CC = gcc -CC = $(CROSS)gcc -AS = $(CROSS)gcc -x assembler-with-cpp -LD = $(CROSS)ld - -XTENSA_SRC_PATH = $(SRC_PATH)/tests/tcg/xtensa -INCLUDE_DIRS = $(XTENSA_SRC_PATH) $(SRC_PATH)/target/xtensa/core-$(CORE) -XTENSA_INC = $(addprefix -I,$(INCLUDE_DIRS)) - -LDFLAGS = -Tlinker.ld - -CRT = crt.o vectors.o - -TESTCASES += test_b.tst -TESTCASES += test_bi.tst -#TESTCASES += test_boolean.tst -TESTCASES += test_break.tst -TESTCASES += test_bz.tst -TESTCASES += test_cache.tst -TESTCASES += test_clamps.tst -TESTCASES += test_extui.tst -TESTCASES += test_fail.tst -TESTCASES += test_interrupt.tst -TESTCASES += test_loop.tst -TESTCASES += test_mac16.tst -TESTCASES += test_max.tst -TESTCASES += test_min.tst -TESTCASES += test_mmu.tst -TESTCASES += test_mul16.tst -TESTCASES += test_mul32.tst -TESTCASES += test_nsa.tst -TESTCASES += test_phys_mem.tst -ifdef XT -TESTCASES += test_pipeline.tst -endif -TESTCASES += test_quo.tst -TESTCASES += test_rem.tst -TESTCASES += test_rst0.tst -TESTCASES += test_s32c1i.tst -TESTCASES += test_sar.tst -TESTCASES += test_sext.tst -TESTCASES += test_shift.tst -TESTCASES += test_sr.tst -TESTCASES += test_timer.tst -TESTCASES += test_windowed.tst - -all: build - -linker.ld: $(XTENSA_SRC_PATH)/linker.ld.S - $(HOST_CC) $(XTENSA_INC) -E -P $< -o $@ - -%.o: $(XTENSA_SRC_PATH)/%.c - $(CC) $(XTENSA_INC) $(CFLAGS) -c $< -o $@ - -%.o: $(XTENSA_SRC_PATH)/%.S - $(CC) $(XTENSA_INC) $(ASFLAGS) -c $< -o $@ - -%.tst: %.o linker.ld $(XTENSA_SRC_PATH)/macros.inc $(CRT) Makefile - $(LD) $(LDFLAGS) $(NOSTDFLAGS) $(CRT) $< -o $@ - -build: $(TESTCASES) - -check: $(addprefix run-, $(TESTCASES)) - -run-%.tst: %.tst - $(SIM) $(SIMFLAGS) ./$< - -run-test_fail.tst: test_fail.tst - ! $(SIM) $(SIMFLAGS) ./$< - -debug-%.tst: %.tst - $(SIM) $(SIMDEBUG) $(SIMFLAGS) ./$< - -host-debug-%.tst: %.tst - gdb --args $(SIM) $(SIMFLAGS) ./$< - -clean: - $(RM) -fr $(TESTCASES) $(CRT) linker.ld diff --git a/tests/tcg/xtensa/Makefile.softmmu-target b/tests/tcg/xtensa/Makefile.softmmu-target new file mode 100644 index 0000000000..1a4014506f --- /dev/null +++ b/tests/tcg/xtensa/Makefile.softmmu-target @@ -0,0 +1,40 @@ +# +# Xtensa softmmu tests +# + +ifneq ($(TARGET_WORDS_BIGENDIAN),y) + +XTENSA_SRC = $(SRC_PATH)/tests/tcg/xtensa +XTENSA_ALL = $(filter-out $(XTENSA_SRC)/linker.ld.S,$(wildcard $(XTENSA_SRC)/*.S)) +XTENSA_TESTS = $(patsubst $(XTENSA_SRC)/%.S, %, $(XTENSA_ALL)) +# Filter out common blobs and broken tests +XTENSA_BROKEN_TESTS = crt vectors test_boolean test_pipeline test_fail +XTENSA_USABLE_TESTS = $(filter-out $(XTENSA_BROKEN_TESTS), $(XTENSA_TESTS)) + +# add to the list of tests +TESTS += $(XTENSA_USABLE_TESTS) +VPATH += $(XTENSA_SRC) + +CORE=dc232b +QEMU_OPTS+=-M sim -cpu $(CORE) -nographic -semihosting -icount 6 $(EXTFLAGS) -kernel + +INCLUDE_DIRS = $(SRC_PATH)/target/xtensa/core-$(CORE) +XTENSA_INC = $(addprefix -I,$(INCLUDE_DIRS)) + +LDFLAGS = -Tlinker.ld -nostartfiles -nostdlib + +CRT = crt.o vectors.o + +linker.ld: linker.ld.S + $(CC) $(XTENSA_INC) -E -P $< -o $@ + +$(XTENSA_USABLE_TESTS): linker.ld macros.inc $(CRT) Makefile.softmmu-target + +# special rule for common blobs +%.o: %.S + $(CC) $(XTENSA_INC) $(ASFLAGS) -c $< -o $@ + +%: %.S + $(CC) $(XTENSA_INC) $(ASFLAGS) $< -o $@ $(LDFLAGS) $(NOSTDFLAGS) $(CRT) + +endif From patchwork Thu Feb 28 20:25: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: 10833703 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2195213B5 for ; Thu, 28 Feb 2019 20:37:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0C3A12F89A for ; Thu, 28 Feb 2019 20:37:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id F19732F984; Thu, 28 Feb 2019 20:37:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 50B502F89A for ; Thu, 28 Feb 2019 20:37:17 +0000 (UTC) Received: from localhost ([127.0.0.1]:46151 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSQe-00013R-Jg for patchwork-qemu-devel@patchwork.kernel.org; Thu, 28 Feb 2019 15:37:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42676) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSFY-0000Rf-6U for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:49 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzSFW-0007Ml-Uo for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:48 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:54225) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzSFW-0007M3-LY for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:46 -0500 Received: by mail-wm1-x344.google.com with SMTP id e74so10415384wmg.3 for ; Thu, 28 Feb 2019 12:25:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LOsSu8Eq6x2dR75aHJwrZ0rC0QsKzLcjJP/Aa5vKmvA=; b=VDw+NH4ic/19NGaqLC8VDVdOSp56nRzTKAuabRUq3uz0EWhSJvOTGzw86nilzBaEpi U6cgYxFmRSeQGOOAF8ke7q215bWJAvYEDDcFy26AYfjmS/qL2H4k7Q3PAHrVYECbjKO5 LS5VI2fjDWRAUPVpAXRZVMROAC2REcVIJmPzu6cknTaqfJYm1ns40QdLyPvNmPMGct3Z vEStKmIJ7Q6oo4JMtHuVNczfooXUkTNTOXLCIy7Daabel9Q80di1YPPFqYz0D7Lk3brt aVOP7LvVjii3dxIoGy0frzZgl27gxlcbxgyMsGMpKAmz6l0SjvVImdL1BY7wd5WCNwLA pqQQ== 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=biShVnftfLWRzLBvzj1W2nhqbRwoWlBIRr8PtxGfVlXjT3aoOs4S2C3x9cJcPm7Nwl 3i1bDxlbHJ5JcFuAw9Vh4n8XanetjkOEKgcIRymqIXgyN5sf6p8hqRJyVlaLdsLAE40K EgjnpPyULCKB+hUWQbX2V0PA+TtoDGg/uVnPdsls6nazGPtsDVKEQoHG2Hpw2jDqiC/F Wa7+TYsiY8YTOB516xVeDY9KWsBgue4nlJVy8QDwgwzprLC2m8G2xUfxDzWjCg1JXP/M sF7QAQBHIThTZLFdbFK5be2Rzen2alPBvlawT2DgPhHfNxorL0Tu7qXK9ZX2+1GR9F0O iKkg== X-Gm-Message-State: AHQUAubAtGPAyHoGGAswM1+dv3ioS5s4resel1JfU8zO+JBmxuf707UK kl8LQVKWFfrOef0f1aUOKkEqpg== X-Google-Smtp-Source: AHgI3IYSW8Ytl8YZqLa3dzb0e8epWdrY2I0qOrOtI/3WFeF2MlM02v+C3Hn1DMkb+RSw3lpF7RxEMQ== X-Received: by 2002:a1c:2545:: with SMTP id l66mr883568wml.96.1551385545545; Thu, 28 Feb 2019 12:25:45 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c18sm5162234wre.88.2019.02.28.12.25.39 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Feb 2019 12:25:41 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id C17881FF8B; Thu, 28 Feb 2019 20:25:37 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 28 Feb 2019 20:25:29 +0000 Message-Id: <20190228202537.4638-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190228202537.4638-1-alex.bennee@linaro.org> References: <20190228202537.4638-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PATCH v2 08/16] 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: edgar.iglesias@gmail.com, qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , Stefan Hajnoczi , jcmvbkbc@gmail.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 Thu Feb 28 20:25: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: 10833679 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4223D17E9 for ; Thu, 28 Feb 2019 20:28:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3546C2F4CF for ; Thu, 28 Feb 2019 20:28:17 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 294F92F8DA; Thu, 28 Feb 2019 20:28:17 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id C6B2E2F4CF for ; Thu, 28 Feb 2019 20:28:16 +0000 (UTC) Received: from localhost ([127.0.0.1]:45987 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSHw-0001Ip-21 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 28 Feb 2019 15:28:16 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42721) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSFa-0000UF-CV for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzSFZ-0007Oj-Lx for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:50 -0500 Received: from mail-wm1-x32c.google.com ([2a00:1450:4864:20::32c]:40717) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzSFZ-0007O2-GJ for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:49 -0500 Received: by mail-wm1-x32c.google.com with SMTP id g20so9427895wmh.5 for ; Thu, 28 Feb 2019 12:25:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=pAjTk7wWyPMv819XInqes+mFXree4x+cfQ6ntOuh1/0=; b=X//2/5nb7AlhdZmR9l4LwAVl7QlIwYdih5JsAsbSKVwHp3q9tZfiPSHUYrclsBMj64 Q8boDyU6Q2eEckriYpnY53r6xvTUMR9bsd688HKtxZ1/AoqVB/Ae3qKPkm+Jw/ZpVDBe 6VGFvjyA+e7zJq15wH8sSm0kRe4Hu2MPjUGJtBRVUf1zVpWSbURQy+tOsmPT/ZbZ2t0j /7QHQHgvZckftjEYdFzogJqiz77qXJi8IRqsJea00ZDvL+Zf+ZpphW6zQUW8AQE8E3O1 2tDzz9LL6wmgHyESczsp+97vTVOSRFk1vAZyvoZ/pvuB4J4pM6jgU3nBUJRJTe9ONndz yAwg== 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=cUuE3MfzaTECeMYSzfgStLHCdOM9+exRTxQsaJd5q+VjGU086SFkrPjBxM6QC0NpbK oTrShy2N+RN0xhW2bEbdbLa+TX0DH2eZgxHUuTHiPnj/BenvsLe3x4ABTTLox7bCKIur /ozWzMQAYpsfGa0mnz/IsmCLN54OA9WBbZYS0USrXZX3RTK5Lb/jsZ721/kbgG3BbSA1 mo9vC7O1hRK/v+edo9EwulT9b8YLUY1h4fhu19UPp+BwBWhUqXkjZMTbdEgK8VIqfRJ6 Y/IdE5TkBB37uvu2uF2OyD+yH/dCKnCEGx21fdT9jMujxZ7u/mb/7iik99WjxKfyjoyc 6MJA== X-Gm-Message-State: AHQUAubM8AOr/+Ms8ZjPtKdBUIpEWgO4oTnLiorliLSepME7MwAKv1k8 Tvh+ByC/YRgmenpYGsMcl1u7XQ== X-Google-Smtp-Source: AHgI3IbbUMvbG7AgAZ+OIBU2LRJ33f2Kco6st6WFIX6leIJwtiXB6XUagn8/VPQQOxstDmvpSdo0DQ== X-Received: by 2002:a1c:d147:: with SMTP id i68mr971959wmg.41.1551385547948; Thu, 28 Feb 2019 12:25:47 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id d21sm54907067wrc.44.2019.02.28.12.25.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Feb 2019 12:25:44 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id CD1E91FF8C; Thu, 28 Feb 2019 20:25:37 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 28 Feb 2019 20:25:30 +0000 Message-Id: <20190228202537.4638-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190228202537.4638-1-alex.bennee@linaro.org> References: <20190228202537.4638-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::32c Subject: [Qemu-devel] [PATCH v2 09/16] 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: edgar.iglesias@gmail.com, qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , jcmvbkbc@gmail.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 Thu Feb 28 20:25: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: 10833707 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9D8651575 for ; Thu, 28 Feb 2019 20:40:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8D0F72F9B4 for ; Thu, 28 Feb 2019 20:40:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 817DD2F99B; Thu, 28 Feb 2019 20:40:30 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 390E92F9B4 for ; Thu, 28 Feb 2019 20:40:27 +0000 (UTC) Received: from localhost ([127.0.0.1]:46217 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSTi-0003PB-A0 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 28 Feb 2019 15:40:26 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42817) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSFh-0000eA-0h for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:26:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzSFc-0007Qo-0c for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:56 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:43114) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzSFb-0007Q0-Hq for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:51 -0500 Received: by mail-wr1-x441.google.com with SMTP id d17so23389617wre.10 for ; Thu, 28 Feb 2019 12:25:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=1NT8wLYrOo4YLp0/p2Wevas7OSKsfTh86H7g/dcsnjo=; b=fvhsWR8KvotYj6Z53Y1nWM5o5PwB1AXO0HyJh/+IotKEMcmPnjCUhLUC34rD1Sa2WC NQL4iLld+jut5Tasw/JhWpR8nuVsRZ0w5eVKnr9gGz5Gs1bf/L3xkWENlTjG658PdkcY vsEI9+hsk3eWpnmzqpccoY8DzZMHUlck+EKG3+g+U4QGGtQbbyNqrl6+cc5W31kkMY1M zgoWYqZRowz7FEpeKguSssJuoEIAvXYzhYOrvELBkEzmir3iBX/jHgO0WLfRbwoTOZC9 QlOvx6v2x4R8OXDNw0CoQgACAO2hOafOUxIWsqW/TddvnXlM5OzMtnynuS84ZGn4sEiv OIZA== 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=1NT8wLYrOo4YLp0/p2Wevas7OSKsfTh86H7g/dcsnjo=; b=izOtHbbXyyUmncT5G6OGMXL+rSalGreib4q38vW6e+B93pOrUkcx0ffAP5tb4llhxH lpVyFDJielQBuYzJzf0+5O8jEfY3p8Nr6VKrwZpAXg9oUi8fF7rcAyCqpFK/NaxymVo5 lWGeibX8tB6vNEeY8M8wdNjnMATkDCKJuYZSEgXqTxg2+YFQcTSTy2Yidx5jvr9WiCBQ 4gJFXL0uswHOzIt/ot7WZUybs7CNOJYN0iPXoLss6qUl+NxWTOQiha3HVK5DZhBSNMcG nTSZyp9FxS86itkzqyaBHhNQ0yaE4iIJrZeD+x7hMhd2kJLkyndajDqnelDM64f+/KnR h+sA== X-Gm-Message-State: APjAAAV8IeYWetw6nJjkV/pKPmGF0RvjXKs2hMbNjxlJNvESuYvnOypV EyFtStJ6w2LJO7AvWWo+Tno67Q== X-Google-Smtp-Source: APXvYqzL7e8v6z5BYvaYLTKq3a7YgV92wo2V2Y/SwZobTj0CNHFgjT8NTl92yD+XZdiAH4Agx2dGWw== X-Received: by 2002:adf:f487:: with SMTP id l7mr821849wro.86.1551385550161; Thu, 28 Feb 2019 12:25:50 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id i12sm30997071wrq.21.2019.02.28.12.25.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Feb 2019 12:25:44 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D90091FF8D; Thu, 28 Feb 2019 20:25:37 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 28 Feb 2019 20:25:31 +0000 Message-Id: <20190228202537.4638-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190228202537.4638-1-alex.bennee@linaro.org> References: <20190228202537.4638-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PATCH v2 10/16] 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: edgar.iglesias@gmail.com, qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , jcmvbkbc@gmail.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 .../{ => libc}/check_gcctorture_pr28634-1.c | 0 .../{ => libc}/check_gcctorture_pr28634.c | 0 .../{ => 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.c | 58 +++++++++++++++++++ tests/tcg/cris/{ => libc}/sys.h | 0 103 files changed, 58 insertions(+) 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%) create mode 100644 tests/tcg/cris/libc/sys.c 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/libc/sys.c b/tests/tcg/cris/libc/sys.c new file mode 100644 index 0000000000..b8e759eee3 --- /dev/null +++ b/tests/tcg/cris/libc/sys.c @@ -0,0 +1,58 @@ +/* + * Minilib helpers functions for system test + */ + + +void exit (int status) { + register unsigned int callno asm ("r9") = 1; /* NR_exit */ + asm volatile ("break 13\n" + : + : "r" (callno) + : "memory" ); + while(1); +} + +ssize_t write (int fd, const void *buf, size_t count) { + register unsigned int callno asm ("r9") = 4; /* NR_write */ + register unsigned int r10 asm ("r10") = fd; + register const void *r11 asm ("r11") = buf; + register size_t r12 asm ("r12") = count; + register unsigned int r asm ("r10"); + + asm volatile ("break 13\n" + : "=r" (r) + : "r" (callno), "0" (r10), "r" (r11), "r" (r12) + : "memory"); + + return r; +} + +static inline int mystrlen(char *s) { + int i = 0; + while (s[i]) + i++; + return i; +} + +void pass(void) { + char s[] = "passed.\n"; + write (1, s, sizeof (s) - 1); + exit (0); +} + +void _fail(char *reason) { + char s[] = "\nfailed: "; + int len = mystrlen(reason); + write (1, s, sizeof (s) - 1); + write (1, reason, len); + write (1, "\n", 1); +// exit (1); +} + +void *memset (void *s, int c, size_t n) { + char *p = s; + int i; + for (i = 0; i < n; i++) + p[i] = c; + return p; +} 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 Thu Feb 28 20:25: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: 10833693 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1804013B5 for ; Thu, 28 Feb 2019 20:35:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 020292F7FA for ; Thu, 28 Feb 2019 20:35:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E70232F984; Thu, 28 Feb 2019 20:35:35 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 50B822F7FA for ; Thu, 28 Feb 2019 20:35:35 +0000 (UTC) Received: from localhost ([127.0.0.1]:46131 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSP0-00089I-Ju for patchwork-qemu-devel@patchwork.kernel.org; Thu, 28 Feb 2019 15:35:34 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42748) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSFb-0000VS-CG for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:52 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzSFa-0007PO-Bj for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:51 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:44118) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzSFa-0007Oe-31 for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:50 -0500 Received: by mail-wr1-x443.google.com with SMTP id w2so23414163wrt.11 for ; Thu, 28 Feb 2019 12:25:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IhmDA8Paz4xh5btvDJbvSxpnzxmgwJBv6Kvn01RZQX4=; b=MjRKO5wQFy1j2r9a3RgaJnu11c4bG1dcQi6FDMqTJOIMwaPypVh6UOFBfbRQmC4glI 8DdtC3Eh7P9v+EzNvVDuDgGN0PCPZEfwdeGqUNBYk6B4L5w4Yb6AxYvEjpMhbP/Slq/S dkD0K+P73bn/CSUOCQKZwzPJTdp/120HMqY9+sR+DOgYpmF/764OwELczSLXYZTdY0c0 3aVZrRVZrVs/Z2xKbDRjYjtCWS4CKQPK17KElbCwP84pevQhpx2WlkJruK2Syg4YoDto xMdRmOmPPkg/HCJh29rucka9oMI5hqS94pmf8g674/0dtoKCRtSlvo3EwBSceN9tHH+D P0Zw== 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=IhmDA8Paz4xh5btvDJbvSxpnzxmgwJBv6Kvn01RZQX4=; b=QsofyXcEKfBYrsBrpJ0MY0B8FA6+DJoRPr2GcV/WJJWSlhFMcm214nNWYSuSX3zNF+ BeH7Sd69jPRaEPW8kvH9/WnzRlPSKz0FIixGLjsCW7n0/wQmdtDeV6pIufkibpK/HXtL L7PGD5KOkO+L+e2euBoDGkk0B0NPmak4BlZrUP4o/baC7bwMNMq0mZoPk1x031WYcB6H r6NiapSz2n4hu6E3wkISViQYGdsyf9RF0YHqrX/naFvrmb1uhYch5OU38WxBMidwRBfh l0UpNsAaYdvDUCJUpHsjZnxt8wtvd0V3eBnrsqYgB8LzZyqc099ECocZc5x2dUK7Nel1 NziA== X-Gm-Message-State: APjAAAXN1IVON2jaoMNo+h2lrRKpxTEjCypcL3RPpAEskHEMmUtcLyCH +TWwgULJgXbtqacOQ6PFqJyyew== X-Google-Smtp-Source: APXvYqzFueHOX+pc4F22w0XZbqznzUh/rJXwIxTkx453hupmTN+QgryFLYNsPSEmo4CA/heD8guI1g== X-Received: by 2002:a5d:4945:: with SMTP id r5mr779762wrs.295.1551385549123; Thu, 28 Feb 2019 12:25:49 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id a8sm7401392wmh.26.2019.02.28.12.25.41 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Feb 2019 12:25:45 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E47681FF8E; Thu, 28 Feb 2019 20:25:37 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 28 Feb 2019 20:25:32 +0000 Message-Id: <20190228202537.4638-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190228202537.4638-1-alex.bennee@linaro.org> References: <20190228202537.4638-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [PATCH v2 11/16] tests/tcg/cris: cleanup sys.c X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: edgar.iglesias@gmail.com, qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , jcmvbkbc@gmail.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP This is a mini library which provides helper functions to the tests which are all currently written in assembly. A bunch of minor changes: - removed libc related headers (fedora-cris-cross is a system compiler) - re-organised the functions to avoid forward declarations - cleaned up brace usage - restored exit for _fail case - removed tabs and fixed indentation Signed-off-by: Alex Bennée --- tests/tcg/cris/bare/sys.c | 96 +++++++++++++++++++-------------------- tests/tcg/cris/libc/sys.c | 23 ++++++---- 2 files changed, 62 insertions(+), 57 deletions(-) diff --git a/tests/tcg/cris/bare/sys.c b/tests/tcg/cris/bare/sys.c index 21f08c0747..aa342335d6 100644 --- a/tests/tcg/cris/bare/sys.c +++ b/tests/tcg/cris/bare/sys.c @@ -1,59 +1,59 @@ -#include -#include -#include - -static inline int mystrlen(char *s) { - int i = 0; - while (s[i]) - i++; - return i; +/* + * Helper functions for CRIS system tests + * + * There is no libc and only a limited set of headers. + */ + +#include + +void exit(int status) +{ + register unsigned int callno asm ("r9") = 1; /* NR_exit */ + + asm volatile ("break 13\n" + : /* no outputs */ + : "r" (callno) + : "memory" ); + while(1); } -void pass(void) { - char s[] = "passed.\n"; - write (1, s, sizeof (s) - 1); - exit (0); -} +size_t write(int fd, const void *buf, size_t count) +{ + register unsigned int callno asm ("r9") = 4; /* NR_write */ + register unsigned int r10 asm ("r10") = fd; + register const void *r11 asm ("r11") = buf; + register size_t r12 asm ("r12") = count; + register unsigned int r asm ("r10"); -void _fail(char *reason) { - char s[] = "\nfailed: "; - int len = mystrlen(reason); - write (1, s, sizeof (s) - 1); - write (1, reason, len); - write (1, "\n", 1); -// exit (1); -} + asm volatile ("break 13\n" + : "=r" (r) + : "r" (callno), "0" (r10), "r" (r11), "r" (r12) + : "memory"); -void *memset (void *s, int c, size_t n) { - char *p = s; - int i; - for (i = 0; i < n; i++) - p[i] = c; - return p; + return r; } -void exit (int status) { - register unsigned int callno asm ("r9") = 1; /* NR_exit */ - - asm volatile ("break 13\n" - : - : "r" (callno) - : "memory" ); - while(1) - ; +static inline int mystrlen(char *s) +{ + int i = 0; + while (s[i]) { + i++; + } + return i; } -ssize_t write (int fd, const void *buf, size_t count) { - register unsigned int callno asm ("r9") = 4; /* NR_write */ - register unsigned int r10 asm ("r10") = fd; - register const void *r11 asm ("r11") = buf; - register size_t r12 asm ("r12") = count; - register unsigned int r asm ("r10"); - asm volatile ("break 13\n" - : "=r" (r) - : "r" (callno), "0" (r10), "r" (r11), "r" (r12) - : "memory"); +void pass(void) { + char s[] = "passed.\n"; + write(1, s, sizeof (s) - 1); + exit(0); +} - return r; +void _fail(char *reason) { + char s[] = "\nfailed: "; + int len = mystrlen(reason); + write(1, s, sizeof (s) - 1); + write(1, reason, len); + write(1, "\n", 1); + exit(1); } diff --git a/tests/tcg/cris/libc/sys.c b/tests/tcg/cris/libc/sys.c index b8e759eee3..6ec4e77b22 100644 --- a/tests/tcg/cris/libc/sys.c +++ b/tests/tcg/cris/libc/sys.c @@ -3,16 +3,18 @@ */ -void exit (int status) { +void exit(int status) +{ register unsigned int callno asm ("r9") = 1; /* NR_exit */ asm volatile ("break 13\n" : : "r" (callno) - : "memory" ); + : "memory"); while(1); } -ssize_t write (int fd, const void *buf, size_t count) { +ssize_t write(int fd, const void *buf, size_t count) +{ register unsigned int callno asm ("r9") = 4; /* NR_write */ register unsigned int r10 asm ("r10") = fd; register const void *r11 asm ("r11") = buf; @@ -27,29 +29,32 @@ ssize_t write (int fd, const void *buf, size_t count) { return r; } -static inline int mystrlen(char *s) { +static inline int mystrlen(char *s) +{ int i = 0; while (s[i]) i++; return i; } -void pass(void) { +void pass(void) +{ char s[] = "passed.\n"; - write (1, s, sizeof (s) - 1); + write (1, s, sizeof(s) - 1); exit (0); } -void _fail(char *reason) { +void _fail(char *reason) +{ char s[] = "\nfailed: "; int len = mystrlen(reason); write (1, s, sizeof (s) - 1); write (1, reason, len); write (1, "\n", 1); -// exit (1); } -void *memset (void *s, int c, size_t n) { +void *memset(void *s, int c, size_t n) +{ char *p = s; int i; for (i = 0; i < n; i++) From patchwork Thu Feb 28 20:25: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: 10833705 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 5998A13B5 for ; Thu, 28 Feb 2019 20:38:12 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4A6622F89A for ; Thu, 28 Feb 2019 20:38:12 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3EBA52F990; Thu, 28 Feb 2019 20:38:12 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DB5A72F89A for ; Thu, 28 Feb 2019 20:38:11 +0000 (UTC) Received: from localhost ([127.0.0.1]:46153 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSRX-0001fO-5Z for patchwork-qemu-devel@patchwork.kernel.org; Thu, 28 Feb 2019 15:38:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42779) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSFc-0000YB-Pk for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:53 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzSFc-0007R1-2J for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:52 -0500 Received: from mail-wm1-x330.google.com ([2a00:1450:4864:20::330]:51096) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzSFb-0007Q9-Sp for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:52 -0500 Received: by mail-wm1-x330.google.com with SMTP id x7so10442601wmj.0 for ; Thu, 28 Feb 2019 12:25:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qZ2UmGUg+VEUSmps6F0SarBKmSuXqmswsaB4YDkuNKw=; b=eZdUn3F0MVXokp+QLK+5WrolcbY4ccXrOtUCaHLtUV2hCiUZpuyL7RJJLqZwpOfYiX 7G1BnUqJ2YSHC1rXeG3yvYcMyFhmwjR1mkYoUm+qd4IRPW7sCJxoq/uarU05pR7/P0ik D5NsTDkKJpjEftd8JG6CqePRcGKF4eMhQ6gaPYJLKwjC3ggPW4LodmzVwcitYB61pJe7 winpmZ+/G2B0yduoLKTDy6j50lgDwryGNY+tWRar4SzzuDN2PCsYtbAvxvFAQiA+OMlE L2exS4VWCluRBg5i1Knyd9QMrzYewWuLIqDUIsbOfdDKArBQ4+kvv110NAjo3qU0iA6q MPmw== 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=NB2Q1IZgC8WrdMjyZvRQWJBzBUI8q7FQ2CaIFD89kM09U9lfbk9FVuPsc2OT3krHtQ 9fxlA208CWbx//n8YthOaB0ROEjh+8iV5qirrIPD4Ez3XgK7C9mZDg7X1Q+8UYNpFZo0 5SNYvudTathqeOFzLcRSnU06/2WivNKGfu1bWKp2qGBGEPLVzyWvWNKYr8STSaLF7qVY VJPN2VWlCpXkLd1Lpckjb4oiRCzggdNRyvUz+xdF3ndOxIH8Dcziyj7ARW9vfeer/E08 IIaF6FdzjL/Aq8OW2YfPxvDHKQdJXZPOwlxxCZGStWVfwn45aNjhK7iO8s8Vmtqm9yUu Sv3w== X-Gm-Message-State: AHQUAuYE2OVsUm9QgwZKKybF5H+lWz/PCAj9TAxEpFO8ZSPnzJ7sN3Xo FS1r+pSloXyaPmkNr9um5aPgEQ== X-Google-Smtp-Source: AHgI3IbcFqmh8dBpG61WrLPCqUivt6wPDrWsL1mUC5WZFWkB+OWQnPMh1Z14aW/JnKpjggm+rTm9Ew== X-Received: by 2002:a1c:4d17:: with SMTP id o23mr957801wmh.53.1551385550677; Thu, 28 Feb 2019 12:25:50 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id m15sm15509956wrx.30.2019.02.28.12.25.41 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Feb 2019 12:25:45 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id F016D1FF8F; Thu, 28 Feb 2019 20:25:37 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 28 Feb 2019 20:25:33 +0000 Message-Id: <20190228202537.4638-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190228202537.4638-1-alex.bennee@linaro.org> References: <20190228202537.4638-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::330 Subject: [Qemu-devel] [PATCH v2 12/16] 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: edgar.iglesias@gmail.com, qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , jcmvbkbc@gmail.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 Thu Feb 28 20:25: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: 10833691 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C088513B5 for ; Thu, 28 Feb 2019 20:34:25 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B2F4B20453 for ; Thu, 28 Feb 2019 20:34:25 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id A794F2EF6D; Thu, 28 Feb 2019 20:34:25 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5524F20453 for ; Thu, 28 Feb 2019 20:34:25 +0000 (UTC) Received: from localhost ([127.0.0.1]:46092 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSNs-0007BN-JL for patchwork-qemu-devel@patchwork.kernel.org; Thu, 28 Feb 2019 15:34:24 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44102) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSKj-0004mT-0C for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:31:09 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzSKh-0002Fs-3n for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:31:08 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:46050) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzSKd-00029D-EP for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:31:05 -0500 Received: by mail-wr1-x442.google.com with SMTP id w17so23426211wrn.12 for ; Thu, 28 Feb 2019 12:31:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wY2lUNdgGIgvYY1zuQQVz86aNMRCsik3LN1nFzvi7z4=; b=w8pQhjk642zepCCh7ELezllJ+Rs1J1klUdjBfnZFe1VG0gMVu9LL8JVrkJaWSirQFK Pbok14rPnEK1VGRqOuFQXxXQjeN1aNsuX9iXkP///+QaVqRMeLIZ4g4YkTsLRb6Go08L GdhV/OGyIURZasqqmHWumceaGsGb/JA4SJ9LMIAdsbWl4yY8jhOAEfcF3pQYDmlicYOJ bwXPjxyfT9WlFkr5vmCyHsl6dr48F3wzkOr80fiZC2U3GMHPYYFuG3HFk2Oio4cWAPwV BRYYKQJJwlTUfBLBvZl6r95CLQVhcTsySqj/Jh4NX4GU0rN6YJaNf+E3ABeDEyqNsTTh OPRw== 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=RLAo37U4lHRuuqSLB0SrrIFgNpT5TTcw+Dm4cwMQelsU8Xl9O8juC5bCFtFhpu23wM aMRnRkl/Y9Gi40gANV6lxN7mdhDMqS0oEhzyiAQy5VLFL7Z1/5Z+zyDiumzdjkwPNp7c W9+55QWSwotuBm6q+BWuKwZ/8bSqH12ZTW6nFji6ZzlnYnM9VQmZGKH2WjXnaEFdOSMz 1AOIsGbJfU1JxNkbF0QVgPLjL2gLaOrH2/dtWUVxVqBiPe1Wi/55tTnwBkEoD4Bb5rNt h6jK9qw4xPksm6yM7toJ8bcJ7pr81PVOePNtCg9Vwx9jjWONPbfLYJcI+8PuI/nJa6FV Ee4g== X-Gm-Message-State: APjAAAVMyXoolW/C/I3jHmy1iKPHhqEVglU29pnk4K2v9sG9URZLfghO +DOIoe+TeF3inCx3p6LrqTMpbg== X-Google-Smtp-Source: APXvYqwTKZ2CdVj8LKQVpV05NU2eSx4MIxhv25pEIizslmUozjaXVvIiRLC0qykkjvPYsFihBF2K0A== X-Received: by 2002:a5d:680d:: with SMTP id w13mr822029wru.196.1551385862240; Thu, 28 Feb 2019 12:31:02 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id m189sm6397662wmf.7.2019.02.28.12.31.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Feb 2019 12:31:01 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 07C561FF90; Thu, 28 Feb 2019 20:25:38 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 28 Feb 2019 20:25:34 +0000 Message-Id: <20190228202537.4638-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190228202537.4638-1-alex.bennee@linaro.org> References: <20190228202537.4638-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [PATCH v2 13/16] 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: edgar.iglesias@gmail.com, qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , jcmvbkbc@gmail.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 Thu Feb 28 20:25: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: 10833709 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9112B13B5 for ; Thu, 28 Feb 2019 20:41:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7EA4F2FB6D for ; Thu, 28 Feb 2019 20:41:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7AE5A2FB7F; Thu, 28 Feb 2019 20:41:32 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 956222FB75 for ; Thu, 28 Feb 2019 20:41:31 +0000 (UTC) Received: from localhost ([127.0.0.1]:46238 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSUk-0004EU-R7 for patchwork-qemu-devel@patchwork.kernel.org; Thu, 28 Feb 2019 15:41:30 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44106) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSKj-0004mW-0i for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:31:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzSKh-0002Fi-3M for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:31:08 -0500 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:35587) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzSKd-00027i-ER for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:31:05 -0500 Received: by mail-wr1-x441.google.com with SMTP id t18so23463963wrx.2 for ; Thu, 28 Feb 2019 12:31:03 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=tjLSIWJEgeVweWOD3dvO1il0QaXnyiXHZBI5XL4xPeE=; b=iwzz0PtNgoipvE/jx+KbXSTYYZWim1YS4eNGQOwMStLhB3mIx900kqpMOvm8Ns6jDU cqkcAT5s39rI2aA5O5WUOR3JuEwAEPePVQrdVtsa4gbkAl6OYY0tl2248CrzedK7DeoU 9aIEEMg0K0jFSas3hHZuFMXfpH5qm5PrBqpDNBvamR1xPq5/Lskf0eCjJ/AblCKD1TeP ce0capIo1VpYIYBQKZRgIKEnPJScpoahNsvWy+EgsV48qzSaGNc4/7HyTMB5tyoBrWck hIciT7ejDdK9pYmmqyb+jEqKXl/E438MFZy2gxev+rRub06ABKxwC4dT95rxGRn9YgEL Vr0g== 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=p2HPed3XPLBE7SSZ8h6+Wg3YtAcesCLCUYEjmKjZGeKGUZHgvRUTvB9HuWuXBZw7y9 c+UQP4puccy7BzUDVDpwS3rhL1BWp7gF1eVxi6Tn7iSuyg4Iirr03XfmIxK31fALN4xH f/CrIwKEnaGTpMZnYcAEkdkDpliEcEp0hz55iZ6LymPGFp0Jgh7THmHS92SZ6nMhw/Ld a+FRD71eE2t/rqEVCxhKL3w/bAPh7Oae2fy4GmKyFPh1eSEcXungNbimHoPp4ZEDCMrt kEhGLd102kUSpbWImqVG2xQL3DulDXHHkeVHZSM9GcWlMrlExOk0ccH5B2j/le1jI5MD iLHA== X-Gm-Message-State: APjAAAUmZK8Itol9Fksa7iK9N00dTxI6qoXE5ZYrnlWRQCAY4gUOmpkp PyaHl+S8QrF3wgTBvztYCsD0yw== X-Google-Smtp-Source: APXvYqwRgM+5SVvQbj1ZJpWC5ZGTQgwtJwRgPTROHf8T239nszR2+OgcelBkU58eYj8W9vGw1dZV5Q== X-Received: by 2002:adf:ba84:: with SMTP id p4mr882316wrg.156.1551385861754; Thu, 28 Feb 2019 12:31:01 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id n189sm9744379wmb.28.2019.02.28.12.31.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Feb 2019 12:31:01 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 139691FF91; Thu, 28 Feb 2019 20:25:38 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 28 Feb 2019 20:25:35 +0000 Message-Id: <20190228202537.4638-15-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190228202537.4638-1-alex.bennee@linaro.org> References: <20190228202537.4638-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PATCH v2 14/16] 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: edgar.iglesias@gmail.com, qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , jcmvbkbc@gmail.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 Thu Feb 28 20:25: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: 10833701 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id B7C6013B5 for ; Thu, 28 Feb 2019 20:37:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id A9A9E2F89A for ; Thu, 28 Feb 2019 20:37:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 9DD6F2F984; Thu, 28 Feb 2019 20:37:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 4EADB2F8B0 for ; Thu, 28 Feb 2019 20:37:09 +0000 (UTC) Received: from localhost ([127.0.0.1]:46149 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSQW-0000uI-Jy for patchwork-qemu-devel@patchwork.kernel.org; Thu, 28 Feb 2019 15:37:08 -0500 Received: from eggs.gnu.org ([209.51.188.92]:42725) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSFa-0000UN-FG for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:51 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzSFZ-0007Or-O5 for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:50 -0500 Received: from mail-wm1-x342.google.com ([2a00:1450:4864:20::342]:54224) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzSFZ-0007OB-Gm for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:25:49 -0500 Received: by mail-wm1-x342.google.com with SMTP id e74so10415498wmg.3 for ; Thu, 28 Feb 2019 12:25:49 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=j1PoM12DkCkdwbwa8wT9LXFg02nFB0Ll69glN7DKjyU=; b=VCUW4gyeFyp18EHcwmaFxVZnMHOB8c0SkTuSKuggl02Ym1lUb7+k5HPui0ZsfKtfXu mypKPi+B7B0o127KDHRRESRWmRtcUFok7Jett0lb6hZs5qjefYmg/HlxlKDvm8jaWQkG YNnmvwgNn9sZsFWTvjzatiIXEx4o/KVTpwhU2ICf88+H0/A5Ntv+LZJ4LSy/vuQWpXKu a+LfN8vGRNvQIBpKSAKqe0NC7QbyORWeooCUk5XnV9Sti06dnTIq9tiPmiCjQJiyWxWL DMfL0jJ+vFzIcX4hjXYi/p3nMr1pLUpxkxr/qgM6mI0vW5xNism374mWYJs68KBgKIQ7 f8og== 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=j1PoM12DkCkdwbwa8wT9LXFg02nFB0Ll69glN7DKjyU=; b=mKmkoFU06nZcSMKGv044cKvlk0P8hbwFjrkgbNu7g+jDkTUmIaPkBVSCFwlVBhdhIx Q9lZrr756DEY6w9gj7Xi0DilhFBqHfevF5UGgm/nwe5wRWLPGs7dFAjjm2Le2RBAOuMK 9tHAlaR7iFTVlESlWoo7HWUd3twG1vg+2uQrzQ8PRmcq7sTa7Tv5jRXW+cRo55z9o4aX 6Pn7Ntvjk1mru8P1K37Vdcn+ZxYeZdlW+JBfsTIdwo6+rs5W8s/JWGuTcxY/T1QSiWvx aLyzWubgmSfOdfm/MDbssxZtkQdACFL0ciFS75De/0uR589q8zoU5om95GyTioi0jjXe zeUg== X-Gm-Message-State: AHQUAua98oLHY2kr5R9Kck18HbJhyefLBRsugfvIU5RCI7wsuw84PP8U S29nqQKfPnRPzEO5Si8ABnhAJA== X-Google-Smtp-Source: APXvYqwP2H8+EDRDymQZmfQcqGnNafSg/lUoIhr/0S6LHFJZZUq+xXFsqk4fq0OvXmW0WRvVAOWwwg== X-Received: by 2002:a7b:c756:: with SMTP id w22mr956464wmk.12.1551385548486; Thu, 28 Feb 2019 12:25:48 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id c15sm13469153wrv.69.2019.02.28.12.25.42 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Feb 2019 12:25:45 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 1F4431FF92; Thu, 28 Feb 2019 20:25:38 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 28 Feb 2019 20:25:36 +0000 Message-Id: <20190228202537.4638-16-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190228202537.4638-1-alex.bennee@linaro.org> References: <20190228202537.4638-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::342 Subject: [Qemu-devel] [PATCH v2 15/16] .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: edgar.iglesias@gmail.com, qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , jcmvbkbc@gmail.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP 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 cca57f4314..71b3c4a7a3 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 f39b96e250..fb31cc5edf 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -1059,7 +1059,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 Thu Feb 28 20:25:37 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: 10833711 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id DA0D01575 for ; Thu, 28 Feb 2019 20:43:23 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C9BA52FB6A for ; Thu, 28 Feb 2019 20:43:23 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BE20A2FB76; Thu, 28 Feb 2019 20:43:23 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.7 required=2.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5F4BB2FB6A for ; Thu, 28 Feb 2019 20:43:23 +0000 (UTC) Received: from localhost ([127.0.0.1]:46263 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSWY-0005LT-Gu for patchwork-qemu-devel@patchwork.kernel.org; Thu, 28 Feb 2019 15:43:22 -0500 Received: from eggs.gnu.org ([209.51.188.92]:44140) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gzSKl-0004oo-1D for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:31:12 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gzSKj-0002Kc-WC for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:31:10 -0500 Received: from mail-wm1-x334.google.com ([2a00:1450:4864:20::334]:52948) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gzSKh-0002An-20 for qemu-devel@nongnu.org; Thu, 28 Feb 2019 15:31:08 -0500 Received: by mail-wm1-x334.google.com with SMTP id m1so10555419wml.2 for ; Thu, 28 Feb 2019 12:31:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=EllpME65K52Vk9BWpXumC4auuC12FJg9WHV6mNAEGpM=; b=vHNXwHb7VR6QdDgXPBwTdYfght4gwRZ8yh1oAxTfmF5wXXhKpYfZBtk30ZR1/BFpuf +MCgnwQp9eVMB81I+38k3UyeZXqdcszVwLqpi2OLQ+wxzjzvfPdbCzoKxaDatayHDHdT ThFiToMs3nZoWFUzrZuDX3j/DstzpztHdXgz2QNhcIhxAwJ4i5W7i5gIXHh5LbgzIh2W h4M8w/rp9VOBXkQ6Xh68SeI6UYWyLYHkEnipu4TjzE5dzekbEATE/3jGjJSKazDDoZKs QEg0Ly3SzJfFavC1yvoPXgWkfINAMxOAaxtoJCqaTFfGh8x4ayzPfaAv0kVKHdog2Uvo QzVg== 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=EllpME65K52Vk9BWpXumC4auuC12FJg9WHV6mNAEGpM=; b=QjUkntXb9hdEXleU9QVcdVBD8TBQYres9l73js8f+3LTjDnqvgOaizgYS2llNNx6Dg iIOArRWalvgG3F1LxfwLyzj4SIjxHpBzUiMfBiz+nEVxWt65uo2IRawrej+WBtaIyov3 tpuLl/f9ojyYyD+4uov39G/uNH7lamCSwCKot5GDYPBZmhrKqJKLpgtbNPK5Cx60aDiR PbBx29M0ucSGnKdvAvR7DBxb/Q3kK/QTaEodjVreUbeRrKtq7jTvlt8K0T94xs+lSqsu VQZtnmfv6e+gco0TbApCmpMY3Fr4N7ZKaKkpphyzKwMv6zcjGSnWZy+V60cwrlj48rRY VciQ== X-Gm-Message-State: AHQUAubqzNvT8/ZC16RUuCc/1b+NzZh37qcH6Z9ZQs/lGgJQSb1HcobO BiPGEPFjx3b2JyKyPGMv8l/76A== X-Google-Smtp-Source: AHgI3IZUtmi4zg1ZcrjKqzuir2a6WA3rAVzeNXEZJ+eNpXFa1S8KyyTx35m3zbwSwRKA7zGlGnrIvw== X-Received: by 2002:a1c:5f86:: with SMTP id t128mr921767wmb.87.1551385863640; Thu, 28 Feb 2019 12:31:03 -0800 (PST) Received: from zen.linaroharston ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id p6sm58490357wre.63.2019.02.28.12.31.01 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 28 Feb 2019 12:31:01 -0800 (PST) Received: from zen.linaroharston. (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 2B7C81FF93; Thu, 28 Feb 2019 20:25:38 +0000 (UTC) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Thu, 28 Feb 2019 20:25:37 +0000 Message-Id: <20190228202537.4638-17-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190228202537.4638-1-alex.bennee@linaro.org> References: <20190228202537.4638-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::334 Subject: [Qemu-devel] [PATCH v2 16/16] .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: edgar.iglesias@gmail.com, qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , jcmvbkbc@gmail.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Signed-off-by: Alex Bennée --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index 71b3c4a7a3..90c5908ae1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -255,6 +255,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"