From patchwork Mon Dec 10 15:28:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 153277 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3687506ljp; Mon, 10 Dec 2018 07:31:22 -0800 (PST) X-Google-Smtp-Source: AFSGD/VjvJU3FnKsBPBBHEteJkPxSz9mryJAH8BJG4Df8Dg2Sgz3pNq4+XD8SB8YB7HuOk0B9y9q X-Received: by 2002:aed:3b25:: with SMTP id p34mr12223630qte.310.1544455882572; Mon, 10 Dec 2018 07:31:22 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544455882; cv=none; d=google.com; s=arc-20160816; b=d5yNsr8+LcgO6BxPev82g26UA3rBESODfjhOo1y/XiZvdF7jjMsqy1zaUksZPfEOdC MUcy952aShNdzaX4B80YuhBHy9+7B2Fa6/Pwwxir9Wmbll5TJv3NZpmLpbre+KEPPGMW ziWR1YECUHYPkvCeC4IrqnOQpNIDyb4GCNYii7LB3sXhsnpzTi29oSa42rxx699i2Z5u /4lbcBNXd7TwDVcj/eS2T1prfdEjrrASBcawFTWIbOKm40oN+LsKl/dVXDCOAwHl4iY/ tY4JH7DvfLd8JR9CPS7G0XHDOD4xng5dqcMqZLPtuVaz2T6TLi9UiFZ6zZPlWYBk5hfK LzcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=Vsx0jO1mCGik2DFwM4+5uQ3LUPH/aVuR7GzWYdPcUDs=; b=adYxZ94K8NzBBJDfCD9mgKtCNRmfl24oYisYOA/jbdS2pNi3VHNTRRNEVjFXp8thYG 9pHAKFZvsdOM/KMshxcObU7zEATu55ojDljBYU36EXjYeGyh40hWwjv9YJRA0ISE0J3I IhUIAMUfMDwA/cAqQmwxvdnefOsHsqscESOKiReQ0f3yMIgCdZTbrAEPrx2Ss/aAz+7A u9Rn9O8wW3iiU/gACP0h76UZNsxENCoRIASWH5mYcNAVlYAEOydaszavO0vajhTyH7fo G7rfmlXcxb1Fxm83Ht2kEASxFzoB/uPTMt/+CX9xyzT7aocV/7Uz0PRsvfj6PLTl3ztE vQiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=U6E+M+RU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id u24si6837509qtc.86.2018.12.10.07.31.22 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 10 Dec 2018 07:31:22 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=U6E+M+RU; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33335 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWNWj-0000ws-RP for patch@linaro.org; Mon, 10 Dec 2018 10:31:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43240) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWNU3-000858-Q9 for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWNU2-0000UL-Ct for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:35 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:51365) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gWNU2-0000UB-6J for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:34 -0500 Received: by mail-wm1-x341.google.com with SMTP id s14so11410756wmh.1 for ; Mon, 10 Dec 2018 07:28:34 -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=Vsx0jO1mCGik2DFwM4+5uQ3LUPH/aVuR7GzWYdPcUDs=; b=U6E+M+RUiVVdAFrQWz83RBmzJUzpZOnA+cuTy3zSbSytZj+AeMERX6rLuMZTd7z1zj xslHanfDYbV3n/OjrujFhKNmkamg4k3ZJFcy0jFefKejWyZjI2ocLpAZubsuGAFn/Qm4 fZfSJiIZoGM9N8u4VoPLU6ZgbU0jzSUfq68ZI= 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=Vsx0jO1mCGik2DFwM4+5uQ3LUPH/aVuR7GzWYdPcUDs=; b=U4P7X1MO4eczVzWSptuWc9QBUO+lltgD0qm44veuXjJgQ8VEnCr6KhFl5lh34Ai7S0 4hqDtdRsUsCuooJc4oz/HGVVjZArSBft18XbHDcQ2eeHVtBRUV1akf8Sppt+GBPUfRqP bOwSy6gvFSrQhXnX6iQ1FwfbfAbOh3X5YX69uK+nTJHcgsn+G9fD+4pmv6RbSCeu1Por iidIqdS0FZ1pQTynPH+S8K9E1l7wcbQmcTKuHtWoqMNB0GNKQUHvPbeoHJ+O+9088EpP NsKXS8uuzeiEgKojHle+wHmNHm0cGcjoWs3lO50MJF6pjQTlhzZ/rx4rGI63izaCTqZV Nvhg== X-Gm-Message-State: AA+aEWaCSeXlIQ5KrkSEO/m9lqrq69ziUamU3EyJZpIBaueiyqFtoTuI NcutQ86qKt1OD+umWnjkT2t+9g== X-Received: by 2002:a1c:30b:: with SMTP id 11mr5214998wmd.110.1544455713161; Mon, 10 Dec 2018 07:28:33 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id p5sm9692759wmh.16.2018.12.10.07.28.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Dec 2018 07:28:31 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id DF7023E0568; Mon, 10 Dec 2018 15:28:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Mon, 10 Dec 2018 15:28:17 +0000 Message-Id: <20181210152829.29271-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181210152829.29271-1-alex.bennee@linaro.org> References: <20181210152829.29271-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [RFC PATCH 01/13] 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: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , jcmvbkbc@gmail.com, michael@walle.cc, amarkovic@wavecomp.com, edgar.iglesias@gmail.com, shorne@gmail.com, =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée --- tests/tcg/Makefile | 17 ++++++++++++++++- tests/tcg/Makefile.include | 2 +- 2 files changed, 17 insertions(+), 2 deletions(-) -- 2.17.1 Reviewed-by: Richard Henderson diff --git a/tests/tcg/Makefile b/tests/tcg/Makefile index bf06415390..d6a7fee2e7 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 inculde 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 Mon Dec 10 15:28:18 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 153276 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3685145ljp; Mon, 10 Dec 2018 07:29:03 -0800 (PST) X-Google-Smtp-Source: AFSGD/U2ztGY6IwRb0rCP9KLxGkSN2vQ8V7GqQvGs56whevxQWQMmCUNA2YPk/uSkRG1ufxCydTq X-Received: by 2002:ac8:1b82:: with SMTP id z2mr12553300qtj.321.1544455743234; Mon, 10 Dec 2018 07:29:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544455743; cv=none; d=google.com; s=arc-20160816; b=KRc0rgJ2lakcYfYRsKchxbWNHFDAY85wYXWEUK4Fs3tNC0baJV8AjLKKMDp4eQsZ30 BQpjOMOZWpVgIysdtQ5RlqX2RZo0cJsKF5vVE5JgfbSIUp8e9dpKijVnLvnTjpqWEGco x3+i/AeIOXTSwJPuV+6RWAbW97/MDCfxmlYh6ZUg6dc2M3o9VTdRytQ0yCvZkdnhhIzB tKrjLBLMgp77qgOB4lduVvEt+QCbugiXWVxJHabpEdA8k4BvC6IRw8Hl30EPdTpPwLj9 pz3Hq75/hma8NGIc5j/qk4pcVzs1Yafo6qvVg1MT5c7PJbacsKeSTpML1hb5PNshkCGM gh+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=D686IEMzWWp1mzkLaScIkdUCXrQ8119rMMtZV4y2aZA=; b=HWpFYh1m/rvMEBb8XKHgN7g0XUSu5zRupxohMgvzg5jyw05SnE8kDvaz7pggDKqDUL flOoaCK9eTDE94cQZHXhaFpxhTWdLSWyibCU02zsuoRaKsC9bqZlWgoinDAJG9sVlIUm Mm/UHaDuhumuZ9eK3hujLMGbH31iKLBkkbcbezfavhNpLT+IHaCW5J+e0nQzx62FRFmD 1AXIZPj7ikvjWxvYhMaBD9ayOpGuvoJwvv95ngKn17oiA6fc387wqjJAmL03FlqTR7s0 he+abaK/l6RaWq0CotlhXE479Yl9upMqAtkWklQAgpCFXhiHncO7k3JmMjChlg1gOxua hC2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="CfnaO/Ag"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 73si2949044qtg.288.2018.12.10.07.29.03 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 10 Dec 2018 07:29:03 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="CfnaO/Ag"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33333 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWNUU-00087b-Mc for patch@linaro.org; Mon, 10 Dec 2018 10:29:02 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43241) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWNU3-000859-QB for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWNU0-0000TR-H0 for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:35 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:39905) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gWNU0-0000Sj-AK for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:32 -0500 Received: by mail-wr1-x442.google.com with SMTP id t27so10896021wra.6 for ; Mon, 10 Dec 2018 07:28:32 -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=D686IEMzWWp1mzkLaScIkdUCXrQ8119rMMtZV4y2aZA=; b=CfnaO/Ag6JL4c7pK1txYRSaa8U7bJeM27ikxcIn1XI0UwJHA0vlOk8iN9MTSRVZ3VV 3NxJ8OGP83IJqgrO8l5gLm2fv6VZRgtEouo8x/lWkzBsiD56zbO67LKgPkcPbvWAQUPk q+UTurWBObjr+ZAgPqVG59Gx+d9owria+lOTU= 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=D686IEMzWWp1mzkLaScIkdUCXrQ8119rMMtZV4y2aZA=; b=VXu2W1Ov4xthRt9ORhkhDWlHsmag8btDpKWRwn51YLsB1RnmulzD+fa3MRb9dfa2Or osVq6oyOikeM36oFIw3cma47iDOugok4KBHMliBmpxJjxy2XJPP2nApraxS55/o3dNwV Pjv7hVQaqGkUrYsS8Zd7ZiY4vdEKB5d9l0zFA1KPVSIYJ6llLgw1oPJxvJiEpFrSvjJY hLtZj8XGCUjhCe51tn19Puh+xSvDKz/uuPD4YOJvV9eSnhcJRRohVdziqVArTFLSp7Mn cm2JJtU0jc+vz3FbrPtm0wJJh493DuLrnezr/RVmTYrr4ARjWKGdCuSzujvywyoPatOO z2xA== X-Gm-Message-State: AA+aEWZkOLjjtvriegXy8VwDNVGUiRaiJj3pLZ1bNCT4NWnXfzHlIytM laiTr5+KfWUfS3d4tXPKuRMB3Q== X-Received: by 2002:adf:94e4:: with SMTP id 91mr10832723wrr.322.1544455711025; Mon, 10 Dec 2018 07:28:31 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id r12sm9505728wrq.3.2018.12.10.07.28.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Dec 2018 07:28:30 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id F3EAA3E056A; Mon, 10 Dec 2018 15:28:29 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Mon, 10 Dec 2018 15:28:18 +0000 Message-Id: <20181210152829.29271-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181210152829.29271-1-alex.bennee@linaro.org> References: <20181210152829.29271-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [RFC PATCH 02/13] tests: 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: jcmvbkbc@gmail.com, michael@walle.cc, amarkovic@wavecomp.com, edgar.iglesias@gmail.com, shorne@gmail.com, =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée --- Makefile.target | 2 -- tests/Makefile.include | 7 +++---- 2 files changed, 3 insertions(+), 6 deletions(-) -- 2.17.1 Reviewed-by: Richard Henderson diff --git a/Makefile.target b/Makefile.target index 4d56298bbf..a0fe085bae 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 fb0b449c02..7dd9ecc2be 100644 --- a/tests/Makefile.include +++ b/tests/Makefile.include @@ -837,10 +837,9 @@ check-report.html: check-report.xml # 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 Mon Dec 10 15:28:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 153278 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3687549ljp; Mon, 10 Dec 2018 07:31:24 -0800 (PST) X-Google-Smtp-Source: AFSGD/WLh81rhbFHilCz7cNy6N8Yek4ftRUXOl2FkxeoqFcVOvBoGgThj64yucK5Jy1fL07lMGma X-Received: by 2002:ac8:75cc:: with SMTP id z12mr12106733qtq.249.1544455884686; Mon, 10 Dec 2018 07:31:24 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544455884; cv=none; d=google.com; s=arc-20160816; b=xxqNU3ZpkzUeIcWJL+SeMh/6qcSxON/acHuiOLfmDWPeNjAIkpyGlA/TXNJgSqIjfa PLasKHVXC1z2VmSIUG68Vhn6cd8jx6FQlJN73TYSe/8GMIouTQWEdYT1vhiodZqRb16m gDtZJIaXMBxlxfHi8/1dSwnUDlsW+sUgovQ/+y6G0cojrthxzfQghdUwLfHPIrppgYwo 9WKHXx9iiRjVrs6Qzbe4ndci/yYwhtNR8eqxaQ/9kXlzHbeJjalAy9Ha25xNSMSmq2pG 4rlg2qdc2uriyL2jnkMHQBsuJV1tXabbJ7m1c3F47IYZnbIURd/gMECqBn2w+8VE0um8 QBvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=P0exuSaVI7jjbsnt9Cl1TV+MXR0/nI+qHjw4yAEUzEE=; b=hzy0WBldQJTH8mNzAWlKhEp2jUddHrfrna+qzbODjjmvYELff5tzH12I2j7h05pQNF UvQSXbCFq/Yy3L/on8eKAr3k1DdwNjMWVAApFaV5c1ameDWOnhP6SlndvyY3RPaN9Unk 8seU3JJYVlLNgvIQ/Icc8fa2Bm5nuX8lDSMvX+LdrV/qLTto147yOZ8+cun3ofQT2xDy SvOnVJ3yaWY6rTDPrzgRWUSZ04vZcIWiQNCuF2GUWBiY+8pKDLKO3slf/po5n65BOSZR XGBzfteKiClSzTKys+/8an7fuYj5NhOm+dchDAGHbdlQFfig/HIgbqq/KayGZUwpns+x 19qQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LaqTh4q4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id j126si4437535qka.14.2018.12.10.07.31.24 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 10 Dec 2018 07:31:24 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=LaqTh4q4; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33336 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWNWm-0000ys-1L for patch@linaro.org; Mon, 10 Dec 2018 10:31:24 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43246) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWNU3-00085B-Rw for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:36 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWNU1-0000U1-G3 for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:35 -0500 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:51367) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gWNU1-0000TX-8D for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:33 -0500 Received: by mail-wm1-x344.google.com with SMTP id s14so11410689wmh.1 for ; Mon, 10 Dec 2018 07:28:33 -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=P0exuSaVI7jjbsnt9Cl1TV+MXR0/nI+qHjw4yAEUzEE=; b=LaqTh4q4gyuW9upYU3xQDG2JKKG48KCUyj/1ZxKWyWmPyAlJBIAwfDi7EEghRYC0or LBCCkWfexAenWgJiB17zilvJioOsPitMzXaMash2TzDPZlMCHLqU5BoGK3fbicXfSNMB 6fz+jKeTUOjPTghrvOZaszzCyOcXbchcsrZB4= 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=P0exuSaVI7jjbsnt9Cl1TV+MXR0/nI+qHjw4yAEUzEE=; b=t+teyY/acpGuBCzfnsFNZS8i+pcKyWEHMhl5ZDfFRDQyO3emeETpMt4hCHC+rbruA+ wjWjYpWR49qMPB1gvF/ZXZkkHXU64Oo3snv4+tHEomjuc1A5iVYcTNDBigN65zhq9USf fjZMob1C/CzQsr4HmScr2aRqRHd2j6Y+fDx6q4Q6Qmr5lQrKzhWARqtpoAuA5ko3V5Ui vFcSAFihWdiH9l6igYct+bZtJdG13nJBzy2OBGiZDKEDPsfVXpeK/VJ5btO6oCloNCoe YXlJg3TmKnfzIDuqV6mQB71vvyxDsiwCTsQV+DBQLJfkWpSiAYmw9SiFPykZwoflyB1r SImA== X-Gm-Message-State: AA+aEWbM6m9qOuJaYihCZ83iS3Oh/cexH8YS63ijYN7Opfx/cFkk02Tv WseomTkqlPJ2PCqlc5yehWpABg== X-Received: by 2002:a1c:8fc2:: with SMTP id r185mr10892866wmd.54.1544455712167; Mon, 10 Dec 2018 07:28:32 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id i13sm9770237wrw.32.2018.12.10.07.28.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Dec 2018 07:28:31 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 12C0D3E0575; Mon, 10 Dec 2018 15:28:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Mon, 10 Dec 2018 15:28:19 +0000 Message-Id: <20181210152829.29271-4-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181210152829.29271-1-alex.bennee@linaro.org> References: <20181210152829.29271-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [RFC PATCH 03/13] 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: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , jcmvbkbc@gmail.com, michael@walle.cc, amarkovic@wavecomp.com, edgar.iglesias@gmail.com, shorne@gmail.com, =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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 --- tests/tcg/Makefile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) -- 2.17.1 Reviewed-by: Richard Henderson diff --git a/tests/tcg/Makefile b/tests/tcg/Makefile index d6a7fee2e7..e7215e8455 100644 --- a/tests/tcg/Makefile +++ b/tests/tcg/Makefile @@ -58,6 +58,8 @@ else QEMU=../qemu-system-$(TARGET_NAME) endif +QEMU_OPTS= + # If TCG debugging is enabled things are a lot slower ifeq ($(CONFIG_DEBUG_TCG),y) TIMEOUT=45 @@ -108,7 +110,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) $(QEMU_OPTS)") .PHONY: run run: $(RUN_TESTS) From patchwork Mon Dec 10 15:28:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 153279 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3687658ljp; Mon, 10 Dec 2018 07:31:31 -0800 (PST) X-Google-Smtp-Source: AFSGD/Uj3Z4C0RCpqbmtsKVGqM34Iod7BCfNLGebyyYCrZMthEjt4q3GbOEHY/7wkeVe4Z8mkV2O X-Received: by 2002:ac8:4405:: with SMTP id j5mr12196636qtn.295.1544455891310; Mon, 10 Dec 2018 07:31:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544455891; cv=none; d=google.com; s=arc-20160816; b=J1Q2YqxwDxT90C0R3iaAdYHzBLW2rIz17SE6bRUG28BZuwntoLUAewfDieN+KNsMHy UW7wit0Y+DlvSi8NOVrhpgHAYKgqQPQqnWpKpk9r4JW2Zh2yi99xtFqvTKycZWrIy0X4 B8sYuR+NAuiwo3KGRSd3TEiz2RS7j0r9f9eQjgYCnFRbxSXNehIIPSu2S3gbhNH54z3B tRDws/yiLoZVF7a2cJwZyo7BtIxuMf5+gY4HAZzp2MqG0+xOC4JVbyjKH90+3mTHhVDR LlfjWEOLHYIuPRRJC1rz8LskDFKxR2ljT6N8rbWIpBA6xByXtNoFSz8dHgknmHow9m0/ pQ6g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=cD8W6reEAqa+g1EaKCD1dA3RfOfbD9C74YDPW4uxkqA=; b=IfdrrqHzjPwPN/bQSw2KvgZACVPe1Tc/J0XN9clFR4pFlG7LiSDrf5nhb1lHKE0M9/ D3DVw1C008SU/RBHIDpPb/cdQbF9SHuD5x0D/IwTIyDeCWQynUWvOTfYG+JMXxDbiUHV 9oUFosBnU0Fuu/lvjZdaVRj/+MGi+sTltYscMX1X/inXEEfiGBHpn1TM84ULUdXPoFDB cPMfKvjRggvLPVl0s0b4ZFaRQCpfBJU60JPAXJ7IJXcaQJl8QoO545TTAo0YmjSDeMxX j4q4rHFvAoP8hi2QQki5Y1UKYoZQlGt/Z90DPX7L34W2iELpHv2xGXDfa23XVO2G9LSM ydgA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SCQWrBzY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id 3si1377427qtp.70.2018.12.10.07.31.30 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 10 Dec 2018 07:31:31 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SCQWrBzY; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33338 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWNWs-00012Y-1d for patch@linaro.org; Mon, 10 Dec 2018 10:31:30 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43272) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWNU5-00085R-3w for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWNU3-0000Ue-6g for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:36 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:37431) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gWNU2-0000UG-Rp for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:35 -0500 Received: by mail-wm1-x341.google.com with SMTP id g67so11642428wmd.2 for ; Mon, 10 Dec 2018 07:28:34 -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=cD8W6reEAqa+g1EaKCD1dA3RfOfbD9C74YDPW4uxkqA=; b=SCQWrBzYsJSoR6kI5pyY3ZTQXXIrtlClDKKgdILMxm1iFnA4u2bxR2SpjRm7YNA2Rr DcyBO+gcPId0iQy9oDqgdELV4dO6f89BFPZxfujTcdNKJJjzo+lhKjNaxyVxRTe0Q0N1 ptZHgH0+3MheYOD1LWu0ERAypNI1eof7jPzlk= 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=cD8W6reEAqa+g1EaKCD1dA3RfOfbD9C74YDPW4uxkqA=; b=N/dkCTjAQJzG6DApfSUxgu97RXV69yK72nqjt+y2CURmWwu5H3VhWMweJ5pFgA9g96 C7nVoBXSmrxBQVX+nSc5NrWb12ume5EG2vh/uBlbmuKMU6i/8Qs29AvojMUzXKqNcBW8 TdD7fy8VeATxd7Vji17JRwzfDIf2uDyZ4Jl/MmHiYhImVBSh3uzSNs2xkRYJ0R/905Hm TcRXPmO6KoSU/be8frIWrYIlL3CK5v4ri/zV5pw+PvMh7Vybnj6Wa//AhqHvrPKhTU7h DJXW69pwf6CwuJiPg8MD8PhUmHvT4m1XX1Tpi8DTQFijQ95tGnC12PvRI9AcgTKYNrzG 4eWQ== X-Gm-Message-State: AA+aEWZXppuX/Ul1/EJc3MDfbtnn7AvovzP03FP1ICNzEe2cM3/eM9bD apF1uUSpqeuPJYNWz0JlF19RFg== X-Received: by 2002:a1c:6a09:: with SMTP id f9mr11561621wmc.150.1544455713820; Mon, 10 Dec 2018 07:28:33 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id v5sm12828771wrn.71.2018.12.10.07.28.30 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Dec 2018 07:28:31 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 2A7D63E0593; Mon, 10 Dec 2018 15:28:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Mon, 10 Dec 2018 15:28:20 +0000 Message-Id: <20181210152829.29271-5-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181210152829.29271-1-alex.bennee@linaro.org> References: <20181210152829.29271-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [RFC PATCH 04/13] tests/tcg/mips: enable mips32-dsp/mips32-dspr2/mipsr5900 linux-user (WIP) 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: Stefan Markovic , jcmvbkbc@gmail.com, michael@walle.cc, amarkovic@wavecomp.com, edgar.iglesias@gmail.com, shorne@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Convert the existing tests to use our common cross build infrastructure. [WIP: mips32r2 disabled to avoid name clash] [WIP: mipsr5900 disabled due to clashing build flags] Signed-off-by: Alex Bennée --- tests/tcg/mips/Makefile.target | 15 ++- tests/tcg/mips/mips32-dsp/Makefile | 166 +++++---------------------- tests/tcg/mips/mips32-dspr2/Makefile | 83 +++----------- tests/tcg/mips/mipsr5900/Makefile | 40 +++---- 4 files changed, 75 insertions(+), 229 deletions(-) -- 2.17.1 diff --git a/tests/tcg/mips/Makefile.target b/tests/tcg/mips/Makefile.target index 086625f533..33bb25bf8d 100644 --- a/tests/tcg/mips/Makefile.target +++ b/tests/tcg/mips/Makefile.target @@ -15,8 +15,17 @@ TESTS += $(MIPS_TESTS) hello-mips: CFLAGS+=-ffreestanding 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") + +# For MIPS32 and mipsr5900 we have a bunch of extra tests in sub-directories + +ifeq ($(TARGET_NAME),mipsel) +-include $(MIPS_SRC)/mips32-dsp/Makefile + +# FIXME: doesn't build - names clash with mips32-dsp +#-include $(MIPS_SRC)/mips32-dspr2/Makefile + +# FIXME: the docker compiler can't build the binaries +#-include $(MIPS_SRC)/mipsr5900/Makefile +endif diff --git a/tests/tcg/mips/mips32-dsp/Makefile b/tests/tcg/mips/mips32-dsp/Makefile index c3a0a00944..df2dddceaa 100644 --- a/tests/tcg/mips/mips32-dsp/Makefile +++ b/tests/tcg/mips/mips32-dsp/Makefile @@ -1,136 +1,30 @@ --include ../../config-host.mak - -CROSS=mips64el-unknown-linux-gnu- - -SIM=qemu-mipsel -SIM_FLAGS=-cpu 74Kf - -CC = $(CROSS)gcc -CFLAGS = -mabi=32 -march=mips32r2 -mgp32 -mdsp -static - -TESTCASES = absq_s_ph.tst -TESTCASES += absq_s_w.tst -TESTCASES += addq_ph.tst -TESTCASES += addq_s_ph.tst -TESTCASES += addq_s_w.tst -TESTCASES += addsc.tst -TESTCASES += addu_qb.tst -TESTCASES += addu_s_qb.tst -TESTCASES += addwc.tst -TESTCASES += bitrev.tst -TESTCASES += bposge32.tst -TESTCASES += cmp_eq_ph.tst -TESTCASES += cmpgu_eq_qb.tst -TESTCASES += cmpgu_le_qb.tst -TESTCASES += cmpgu_lt_qb.tst -TESTCASES += cmp_le_ph.tst -TESTCASES += cmp_lt_ph.tst -TESTCASES += cmpu_eq_qb.tst -TESTCASES += cmpu_le_qb.tst -TESTCASES += cmpu_lt_qb.tst -TESTCASES += dpaq_sa_l_w.tst -TESTCASES += dpaq_s_w_ph.tst -TESTCASES += dpau_h_qbl.tst -TESTCASES += dpau_h_qbr.tst -TESTCASES += dpsq_sa_l_w.tst -TESTCASES += dpsq_s_w_ph.tst -TESTCASES += dpsu_h_qbl.tst -TESTCASES += dpsu_h_qbr.tst -TESTCASES += extp.tst -TESTCASES += extpdp.tst -TESTCASES += extpdpv.tst -TESTCASES += extpv.tst -TESTCASES += extr_rs_w.tst -TESTCASES += extr_r_w.tst -TESTCASES += extr_s_h.tst -TESTCASES += extrv_rs_w.tst -TESTCASES += extrv_r_w.tst -TESTCASES += extrv_s_h.tst -TESTCASES += extrv_w.tst -TESTCASES += extr_w.tst -TESTCASES += insv.tst -TESTCASES += lbux.tst -TESTCASES += lhx.tst -TESTCASES += lwx.tst -TESTCASES += madd.tst -TESTCASES += maddu.tst -TESTCASES += maq_sa_w_phl.tst -TESTCASES += maq_sa_w_phr.tst -TESTCASES += maq_s_w_phl.tst -TESTCASES += maq_s_w_phr.tst -TESTCASES += mfhi.tst -TESTCASES += mflo.tst -TESTCASES += modsub.tst -TESTCASES += msub.tst -TESTCASES += msubu.tst -TESTCASES += mthi.tst -TESTCASES += mthlip.tst -TESTCASES += mtlo.tst -TESTCASES += muleq_s_w_phl.tst -TESTCASES += muleq_s_w_phr.tst -TESTCASES += muleu_s_ph_qbl.tst -TESTCASES += muleu_s_ph_qbr.tst -TESTCASES += mulq_rs_ph.tst -TESTCASES += mult.tst -TESTCASES += multu.tst -TESTCASES += packrl_ph.tst -TESTCASES += pick_ph.tst -TESTCASES += pick_qb.tst -TESTCASES += precequ_ph_qbla.tst -TESTCASES += precequ_ph_qbl.tst -TESTCASES += precequ_ph_qbra.tst -TESTCASES += precequ_ph_qbr.tst -TESTCASES += preceq_w_phl.tst -TESTCASES += preceq_w_phr.tst -TESTCASES += preceu_ph_qbla.tst -TESTCASES += preceu_ph_qbl.tst -TESTCASES += preceu_ph_qbra.tst -TESTCASES += preceu_ph_qbr.tst -TESTCASES += precrq_ph_w.tst -TESTCASES += precrq_qb_ph.tst -TESTCASES += precrq_rs_ph_w.tst -TESTCASES += precrqu_s_qb_ph.tst -TESTCASES += raddu_w_qb.tst -TESTCASES += rddsp.tst -TESTCASES += repl_ph.tst -TESTCASES += repl_qb.tst -TESTCASES += replv_ph.tst -TESTCASES += replv_qb.tst -TESTCASES += shilo.tst -TESTCASES += shilov.tst -TESTCASES += shll_ph.tst -TESTCASES += shll_qb.tst -TESTCASES += shll_s_ph.tst -TESTCASES += shll_s_w.tst -TESTCASES += shllv_ph.tst -TESTCASES += shllv_qb.tst -TESTCASES += shllv_s_ph.tst -TESTCASES += shllv_s_w.tst -TESTCASES += shra_ph.tst -TESTCASES += shra_r_ph.tst -TESTCASES += shra_r_w.tst -TESTCASES += shrav_ph.tst -TESTCASES += shrav_r_ph.tst -TESTCASES += shrav_r_w.tst -TESTCASES += shrl_qb.tst -TESTCASES += shrlv_qb.tst -TESTCASES += subq_ph.tst -TESTCASES += subq_s_ph.tst -TESTCASES += subq_s_w.tst -TESTCASES += subu_qb.tst -TESTCASES += subu_s_qb.tst -TESTCASES += wrdsp.tst - -all: $(TESTCASES) - -%.tst: %.c - $(CC) $(CFLAGS) $< -o $@ - -check: $(TESTCASES) - @for case in $(TESTCASES); do \ - echo $(SIM) $(SIM_FLAGS) ./$$case;\ - $(SIM) $(SIM_FLAGS) ./$$case; \ - done - -clean: - $(RM) -rf $(TESTCASES) +# +# MIPS32-DSP linux-user tests +# +# We don't set the VPATH for these tests as we re-use the VPATH from +# ../Makefile and add explicit paths for the source to avoid name clashes +# between the various sub-dirs. +# + +MIPS32DSP_SRC = $(SRC_PATH)/tests/tcg/mips/mips32-dsp +MIPS32DSP_ALL = $(wildcard $(MIPS32DSP_SRC)/*.c) +MIPS32DSP_TESTS = $(patsubst $(MIPS32DSP_SRC)/%.c, mips32-dsp/%, $(MIPS32DSP_ALL)) +MIPS32DSP_RUNS = $(patsubst %, run-%, $(MIPS32DSP_TESTS)) + +# add to the list of tests +TESTS += $(MIPS32DSP_TESTS) + +# We need a rule to ensure we create a sub-directory to build in +# It is a PHONY target to prevent confusion with MIPS32DSP_SRC +.PHONY: mips32-dsp.build +mips32-dsp.build: + mkdir -p mips32-dsp + +$(MIPS32DSP_TESTS): | mips32-dsp.build +$(MIPS32DSP_TESTS): CFLAGS+=-mabi=32 -march=mips32r2 -mgp32 -mdsp + +$(MIPS32DSP_RUNS): QEMU_OPTS=-cpu 74Kf + +# FIXME: I don't know why the general rule in tests/tcg/Makefile isn't enough +run-mips32-dsp/%: mips32-dsp/% + $(call run-test, $<, $(QEMU) $(QEMU_OPTS) $<, "$< on $(TARGET_NAME) $(QEMU_OPTS)") diff --git a/tests/tcg/mips/mips32-dspr2/Makefile b/tests/tcg/mips/mips32-dspr2/Makefile index ed19581c7e..6da966abb6 100644 --- a/tests/tcg/mips/mips32-dspr2/Makefile +++ b/tests/tcg/mips/mips32-dspr2/Makefile @@ -1,71 +1,24 @@ --include ../../config-host.mak +# +# MIPS32-DSPR2 linux-user tests +# -CROSS=mips64el-unknown-linux-gnu- +MIPS32_DSPR2_SRC = $(SRC_PATH)/tests/tcg/mips/mips32-dsp +MIPS32_DSPR2_ALL = $(wildcard $(MIPS32_DSPR2_SRC)/*.c) +MIPS32_DSPR2_TESTS = $(patsubst $(MIPS32_DSPR2_SRC)/%.c, mips32-dspr2/%, $(MIPS32_DSPR2_ALL)) +MIPS32_DSPR2_RUNS = $(patsubst %, run-%, $(MIPS32_DSPR2_TESTS)) -SIM=qemu-mipsel -SIM_FLAGS=-cpu 74Kf +# add to the list of tests +TESTS += $(MIPS32_DSPR2_TESTS) -CC = $(CROSS)gcc -CFLAGS = -mabi=32 -march=mips32r2 -mgp32 -mdspr2 -static +.PHONY: mips32-dspr2.build +mips32-dspr2.build: + mkdir -p mips32-dspr2 -TESTCASES = absq_s_qb.tst -TESTCASES += addqh_ph.tst -TESTCASES += addqh_r_ph.tst -TESTCASES += addqh_r_w.tst -TESTCASES += addqh_w.tst -TESTCASES += adduh_qb.tst -TESTCASES += adduh_r_qb.tst -TESTCASES += addu_ph.tst -TESTCASES += addu_s_ph.tst -TESTCASES += append.tst -TESTCASES += balign.tst -TESTCASES += cmpgdu_eq_qb.tst -TESTCASES += cmpgdu_le_qb.tst -TESTCASES += cmpgdu_lt_qb.tst -TESTCASES += dpaqx_sa_w_ph.tst -TESTCASES += dpa_w_ph.tst -TESTCASES += dpax_w_ph.tst -TESTCASES += dpaqx_s_w_ph.tst -TESTCASES += dpsqx_sa_w_ph.tst -TESTCASES += dpsqx_s_w_ph.tst -TESTCASES += dps_w_ph.tst -TESTCASES += dpsx_w_ph.tst -TESTCASES += mul_ph.tst -TESTCASES += mulq_rs_w.tst -TESTCASES += mulq_s_ph.tst -TESTCASES += mulq_s_w.tst -TESTCASES += mulsaq_s_w_ph.tst -TESTCASES += mulsa_w_ph.tst -TESTCASES += mul_s_ph.tst -TESTCASES += precr_qb_ph.tst -TESTCASES += precr_sra_ph_w.tst -TESTCASES += precr_sra_r_ph_w.tst -TESTCASES += prepend.tst -TESTCASES += shra_qb.tst -TESTCASES += shra_r_qb.tst -TESTCASES += shrav_qb.tst -TESTCASES += shrav_r_qb.tst -TESTCASES += shrl_ph.tst -TESTCASES += shrlv_ph.tst -TESTCASES += subqh_ph.tst -TESTCASES += subqh_r_ph.tst -TESTCASES += subqh_r_w.tst -TESTCASES += subqh_w.tst -TESTCASES += subuh_qb.tst -TESTCASES += subuh_r_qb.tst -TESTCASES += subu_ph.tst -TESTCASES += subu_s_ph.tst +$(MIPS32_DSPR2_TESTS): | mips32-dspr2.build +$(MIPS32_DSPR2_TESTS): CFLAGS+=-mabi=32 -march=mips32r2 -mgp32 -mdspr2 -all: $(TESTCASES) +$(MIPS32_DSPR2_RUNS): QEMU_OPTS=-cpu 74Kf -%.tst: %.c - $(CC) $(CFLAGS) $< -o $@ - -check: $(TESTCASES) - @for case in $(TESTCASES); do \ - echo $(SIM) $(SIM_FLAGS) ./$$case;\ - $(SIM) $(SIM_FLAGS) ./$$case; \ - done - -clean: - $(RM) -rf $(TESTCASES) +# FIXME: I don't know why the general rule in tests/tcg/Makefile isn't enough +run-mips32-dspr2/%: mips32-dspr2/% + $(call run-test, $<, $(QEMU) $(QEMU_OPTS) $<, "$< on $(TARGET_NAME) $(QEMU_OPTS)") diff --git a/tests/tcg/mips/mipsr5900/Makefile b/tests/tcg/mips/mipsr5900/Makefile index a1c388bc3c..7880e76986 100644 --- a/tests/tcg/mips/mipsr5900/Makefile +++ b/tests/tcg/mips/mipsr5900/Makefile @@ -1,30 +1,20 @@ --include ../../config-host.mak +# +# MIPSR5900 linux-user tests +# -CROSS=mipsr5900el-unknown-linux-gnu- +MIPSR5900_SRC = $(SRC_PATH)/tests/tcg/mips/mipsr5900 +MIPSR5900_ALL = $(wildcard $(MIPSR5900_SRC)/*.c) +MIPSR5900_TESTS = $(patsubst $(MIPSR5900_SRC)/%.c, %, $(MIPSR5900_ALL)) +MIPSR5900_RUNS = $(patsubst %, run-%, $(MIPSR5900_TESTS)) -SIM=qemu-mipsel -SIM_FLAGS=-cpu R5900 +# add to the list of tests +TESTS += $(MIPSR5900_TESTS) -CC = $(CROSS)gcc -CFLAGS = -Wall -mabi=32 -march=r5900 -static +.PHONY: mipsr5900.build +mipsr5900.build: + mkdir -p mipsr5900 -TESTCASES = div1.tst -TESTCASES += divu1.tst -TESTCASES += mflohi1.tst -TESTCASES += mtlohi1.tst -TESTCASES += mult.tst -TESTCASES += multu.tst +$(MIPS32DSP_TESTS): | mipsr5900.build +$(MIPSR5900_TESTS): CFLAGS+=-mabi=32 -march=r5900 -msingle-float -all: $(TESTCASES) - -%.tst: %.c - $(CC) $(CFLAGS) $< -o $@ - -check: $(TESTCASES) - @for case in $(TESTCASES); do \ - echo $(SIM) $(SIM_FLAGS) ./$$case;\ - $(SIM) $(SIM_FLAGS) ./$$case; \ - done - -clean: - $(RM) -rf $(TESTCASES) +$(MIPSR5900_RUNS): QEMU_OPTS=-cpu R5900 From patchwork Mon Dec 10 15:28:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 153283 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3691177ljp; Mon, 10 Dec 2018 07:34:44 -0800 (PST) X-Google-Smtp-Source: AFSGD/WBnjXqjjJgp/lz5YUAbtpXhmVJGs2v8ed2l5T2k7L3J1vSjOx6mnu21IweFPriTOdavol0 X-Received: by 2002:a37:2808:: with SMTP id o8mr11093940qkh.14.1544456084239; Mon, 10 Dec 2018 07:34:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544456084; cv=none; d=google.com; s=arc-20160816; b=Dg7LSYYrqOx/ZmFtUaJz1Eo0Mpqb5PCK2qo8+cNpMVVulryhHF/mgrY41iNa5TdqqD YglaFDt/WQs7oyEl4m1DHVv/hezOkCL0a6Gsw/DaXpKrUU8ipKKoA0eNz3yDmxFY2Ipb BhN7a1hE1+r+Hilq529gyX44hzR1dvbO2utEMrBRbXLCsqoztggtEd2aNk2fb1rFEYEI i4W52Ci1sKjt8clvFU1jb9sCdxJ1Vc4BcKCMC3SQjNFwxKGwn8CniJ8W+gHhrSYQ6YCw 46fhaUtUym4cxwzR8hpHeNJDWJHrQIuNkYADBv/cPvb8GkY0G/pBcHwAHsaPztp3VelL /ZIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=STDK5Wg3WVtNMlneX8YnmoHX7VBhJdtTVlYI7mEXVSo=; b=aEZHJpW/kS9qccRSvlTN4tJzZ/9uYABrogiErredeUYLoH32+vpi11bg6unOWN6F8X 2TzqLXjrLTmawPhIr/HQAJqCBOfPWolOQojFbsKbbQ53oG7waRnmRlFxaH7j5iAbLjMD ysJkIjiIwXJ50noZwN01/+nQArclx/E/jjL1e5Umv10lOY7z09/diXvrNUPRm+9ECtc1 USioj/bzmmIBq5JeB9lnTINlGB34oqPWxDoWXjV3q0wkNqagJbg9Hx1+vy9rMYJNXvzE DefM8qBsfxCdvcE8BuAGFxBD0MCWqOHqBK2gWD3mLccQeqdDbEQFZSPySiNZTVLsZCLb BFXA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fQYAqBd2; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id b2si2849166qti.171.2018.12.10.07.34.43 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 10 Dec 2018 07:34:44 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=fQYAqBd2; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33361 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWNZy-0004qw-TP for patch@linaro.org; Mon, 10 Dec 2018 10:34:42 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43296) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWNU6-00086F-Fa for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWNU4-0000VQ-DT for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:38 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:45987) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gWNU4-0000Uq-3f for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:36 -0500 Received: by mail-wr1-x443.google.com with SMTP id b14so10888130wru.12 for ; Mon, 10 Dec 2018 07:28:36 -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=STDK5Wg3WVtNMlneX8YnmoHX7VBhJdtTVlYI7mEXVSo=; b=fQYAqBd2QdWy4O0lyh0z9TPeFV0tfP5A2sZLpQn3R8KVa2BncaODg1SLDeHrXJCRBb RbrJZQdUX/RjEiNgHqlqFhD1G9Q/cqKUtPfX2zKvjzFhDMRwqIVtXLOO1aeBAbSkyR+H rCBJNSUHZrWjT95R+8NnwQq22LlaD6w6BFJ2M= 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=STDK5Wg3WVtNMlneX8YnmoHX7VBhJdtTVlYI7mEXVSo=; b=qR/foE4ePStuBYyuXnHlHwHp9KP3evOFabKOiLy86V/DOreOyB7A2t+LSU7PXFKKaq 9SETxGSn0tmwRp5oEtIlxnXfNkYGJfQ4X5pHuLJ2/eOcTfx7vpAkNGfWwB8jj2AdEUH2 4GsugfAAESbtT+AqYMRqVLiOQqUqoKs/o9CGWsaOPPkkM7ww3gdd+3FOTqtwWi1dUbq0 UnbxjJaDyuCR68YNotHMcf07UzA69jB8hn/EnXtltvLnVjQvAj6zJsC4iUJX1SxowKS0 AeHcyxDz3htEh8Y1/OU4KkOUUtpx4lKsaN3VO0raeimhCWUYwt1RB6cu7a23asehkqKe CY/g== X-Gm-Message-State: AA+aEWbNkyVYn5rl2xY4mzMSQ4WLhpF/DDhmFyXgx/9bZ5R1m8qWHpug NJIoYqyAeCGcMA7SDnxP307j8A== X-Received: by 2002:adf:8001:: with SMTP id 1mr9771257wrk.23.1544455714967; Mon, 10 Dec 2018 07:28:34 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id l197sm37598535wma.44.2018.12.10.07.28.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Dec 2018 07:28:33 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 409D53E059D; Mon, 10 Dec 2018 15:28:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Mon, 10 Dec 2018 15:28:21 +0000 Message-Id: <20181210152829.29271-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181210152829.29271-1-alex.bennee@linaro.org> References: <20181210152829.29271-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [RFC PATCH 05/13] tests/tcg/mips: enable mips64 system tests (WIP) 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: Stefan Markovic , jcmvbkbc@gmail.com, michael@walle.cc, amarkovic@wavecomp.com, edgar.iglesias@gmail.com, shorne@gmail.com, =?utf-8?q?Alex_Benn=C3=A9e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" The mips64-dsp and mips64-dspr2 tests are softmmu tests. Tweaks the makefiles to use the tcg tests build system. [WIP: currently won't link but the flags for HEAD vs CFLAGS seem odd] Signed-off-by: Alex Bennée --- tests/tcg/mips/Makefile.softmmu-target | 20 ++ tests/tcg/mips/mips64-dsp/Makefile | 336 ++++--------------------- 2 files changed, 64 insertions(+), 292 deletions(-) create mode 100644 tests/tcg/mips/Makefile.softmmu-target -- 2.17.1 diff --git a/tests/tcg/mips/Makefile.softmmu-target b/tests/tcg/mips/Makefile.softmmu-target new file mode 100644 index 0000000000..79781ae03c --- /dev/null +++ b/tests/tcg/mips/Makefile.softmmu-target @@ -0,0 +1,20 @@ +# -*- Mode: makefile -*- +# +# MIPS Softmmu Targets - included from tests/tcg/Makefile.target +# +# The system tests for mips cover a number of different devices and +# softmmu builds so we include only the one appropriate for the +# current target. +# + +# Set search path for all sources. As there are clashing files in both +# the mips64-dsp and mips64-dspr2 directories we build the rules +# explicitly including the directory so VPATH only needs to be the top +# of the MIPS tests. +MIPS_SRC = $(SRC_PATH)/tests/tcg/mips +VPATH += $(MIPS_SRC) + +ifeq ($(TARGET_NAME),mips64el) +-include $(MIPS_SRC)/mips64-dsp/Makefile +#-include $(MIPS_SRC)/mips64-dspr2/Makefile +endif diff --git a/tests/tcg/mips/mips64-dsp/Makefile b/tests/tcg/mips/mips64-dsp/Makefile index b2ac6b3ffd..55198f3cc9 100644 --- a/tests/tcg/mips/mips64-dsp/Makefile +++ b/tests/tcg/mips/mips64-dsp/Makefile @@ -1,306 +1,58 @@ - -CROSS_COMPILE ?= mips64el-unknown-linux-gnu- - -SIM = qemu-system-mips64el -SIMFLAGS = -nographic -cpu mips64dspr2 -kernel - -AS = $(CROSS_COMPILE)as -LD = $(CROSS_COMPILE)ld -CC = $(CROSS_COMPILE)gcc -AR = $(CROSS_COMPILE)ar -NM = $(CROSS_COMPILE)nm -STRIP = $(CROSS_COMPILE)strip -RANLIB = $(CROSS_COMPILE)ranlib -OBJCOPY = $(CROSS_COMPILE)objcopy -OBJDUMP = $(CROSS_COMPILE)objdump - -VECTORS_OBJ ?= ./head.o ./printf.o - -HEAD_FLAGS ?= -nostdinc -mabi=64 -G 0 -mno-abicalls -fno-pic -pipe \ - -msoft-float -march=mips64 -Wa,-mips64 -Wa,--trap \ - -msym32 -DKBUILD_64BIT_SYM32 -I./ - -CFLAGS ?= -nostdinc -mabi=64 -G 0 -mno-abicalls -fno-pic -fno-builtin \ +# +# MIPS64-DSP softmmu tests +# + +MIPS64_DSP_SRC = $(SRC_PATH)/tests/tcg/mips/mips64-dsp +MIPS64_DSP_ALL = $(wildcard $(MIPS64_DSP_SRC)/*.c) +MIPS64_DSP_TESTS = $(patsubst $(MIPS64_DSP_SRC)/%.c, %, $(MIPS64_DSP_ALL)) +# for now filter out these +MIPS64_DSP_BROKEN_TESTS = dappend preceq_l_pwl preceq_l_pwr precequ_qh_obla precequ_qh_obl +MIPS64_DSP_BROKEN_TESTS += precequ_qh_obra precequ_qh_obr precr_ob_qh precr_sra_qh_pw +MIPS64_DSP_BROKEN_TESTS += precr_sra_r_qh_pw prependd prependw raddu_l_ob +MIPS64_DSP_BROKEN_TESTS += shra_ob shra_r_ob shrl_qh shrlv_qh +MIPS64_DSP_USABLE_TESTS = $(patsubst %,mips64-dsp/%, $(filter-out $(MIPS64_DSP_BROKEN_TESTS), $(MIPS64_DSP_TESTS))) +MIPS64_DSP_RUNS = $(patsubst %, run-%, $(MIPS64_DSP_USABLE_TESTS)) + +# add to the list of tests +TESTS += $(MIPS64_DSP_USABLE_TESTS) + +.PHONY: mips64-dsp.build +mips64-dsp.build: + mkdir -p mips64-dsp + +# head objects (linked into other binaries) +VECTORS_OBJ = mips64-dsp/head.o mips64-dsp/printf.o +.PRECIOUS: $(VECTOR_OBJS) + +HEAD_FLAGS = -nostdinc -mabi=64 -G 0 -mno-abicalls -fno-pic -pipe \ + -msoft-float -march=mips64 -Wa,-mips64 -Wa,--trap \ + -msym32 -DKBUILD_64BIT_SYM32 -I./ + +CFLAGS = -nostdinc -mabi=64 -G 0 -mno-abicalls -fno-pic -fno-builtin \ -pipe -march=mips64r2 -mgp64 -mdsp -static -Wa,--trap -msym32 \ -DKBUILD_64BIT_SYM32 -I./ -LDFLAGS = -T./mips_boot.lds -L./ +LDFLAGS = -T$(MIPS64_DSP_SRC)/mips_boot.lds -L./mips64-dsp FLAGS = -nostdlib -mabi=64 -march=mips64r2 -mgp64 -mdsp +mips64-dsp/head.o: mips64-dsp/head.S | mips64-dsp.build + $(CC) $(HEAD_FLAGS) -D"STACK_TOP=0xffffffff80200000" -c $< -o $@ -#TESTCASES = absq_s_ob.tst -TESTCASES = absq_s_ph.tst -TESTCASES += absq_s_pw.tst -TESTCASES += absq_s_qh.tst -TESTCASES += absq_s_w.tst -TESTCASES += addq_ph.tst -TESTCASES += addq_pw.tst -TESTCASES += addq_qh.tst -TESTCASES += addq_s_ph.tst -TESTCASES += addq_s_pw.tst -TESTCASES += addq_s_qh.tst -TESTCASES += addq_s_w.tst -TESTCASES += addsc.tst -TESTCASES += addu_ob.tst -TESTCASES += addu_qb.tst -TESTCASES += addu_s_ob.tst -TESTCASES += addu_s_qb.tst -TESTCASES += addwc.tst -TESTCASES += bitrev.tst -TESTCASES += bposge32.tst -TESTCASES += bposge64.tst -TESTCASES += cmp_eq_ph.tst -TESTCASES += cmp_eq_pw.tst -TESTCASES += cmp_eq_qh.tst -TESTCASES += cmpgu_eq_ob.tst -TESTCASES += cmpgu_eq_qb.tst -TESTCASES += cmpgu_le_ob.tst -TESTCASES += cmpgu_le_qb.tst -TESTCASES += cmpgu_lt_ob.tst -TESTCASES += cmpgu_lt_qb.tst -TESTCASES += cmp_le_ph.tst -TESTCASES += cmp_le_pw.tst -TESTCASES += cmp_le_qh.tst -TESTCASES += cmp_lt_ph.tst -TESTCASES += cmp_lt_pw.tst -TESTCASES += cmp_lt_qh.tst -TESTCASES += cmpu_eq_ob.tst -TESTCASES += cmpu_eq_qb.tst -TESTCASES += cmpu_le_ob.tst -TESTCASES += cmpu_le_qb.tst -TESTCASES += cmpu_lt_ob.tst -TESTCASES += cmpu_lt_qb.tst -#TESTCASES += dappend.tst -TESTCASES += dextp.tst -TESTCASES += dextpdp.tst -TESTCASES += dextpdpv.tst -TESTCASES += dextpv.tst -TESTCASES += dextr_l.tst -TESTCASES += dextr_r_l.tst -TESTCASES += dextr_rs_l.tst -TESTCASES += dextr_rs_w.tst -TESTCASES += dextr_r_w.tst -TESTCASES += dextr_s_h.tst -TESTCASES += dextrv_l.tst -TESTCASES += dextrv_r_l.tst -TESTCASES += dextrv_rs_l.tst -TESTCASES += dextrv_rs_w.tst -TESTCASES += dextrv_r_w.tst -TESTCASES += dextrv_s_h.tst -TESTCASES += dextrv_w.tst -TESTCASES += dextr_w.tst -TESTCASES += dinsv.tst -TESTCASES += dmadd.tst -TESTCASES += dmaddu.tst -TESTCASES += dmsub.tst -TESTCASES += dmsubu.tst -TESTCASES += dmthlip.tst -TESTCASES += dpaq_sa_l_pw.tst -TESTCASES += dpaq_sa_l_w.tst -TESTCASES += dpaq_s_w_ph.tst -TESTCASES += dpaq_s_w_qh.tst -TESTCASES += dpau_h_obl.tst -TESTCASES += dpau_h_obr.tst -TESTCASES += dpau_h_qbl.tst -TESTCASES += dpau_h_qbr.tst -TESTCASES += dpsq_sa_l_pw.tst -TESTCASES += dpsq_sa_l_w.tst -TESTCASES += dpsq_s_w_ph.tst -TESTCASES += dpsq_s_w_qh.tst -TESTCASES += dpsu_h_obl.tst -TESTCASES += dpsu_h_obr.tst -TESTCASES += dpsu_h_qbl.tst -TESTCASES += dpsu_h_qbr.tst -TESTCASES += dshilo.tst -TESTCASES += dshilov.tst -TESTCASES += extp.tst -TESTCASES += extpdp.tst -TESTCASES += extpdpv.tst -TESTCASES += extpv.tst -TESTCASES += extr_rs_w.tst -TESTCASES += extr_r_w.tst -TESTCASES += extr_s_h.tst -TESTCASES += extrv_rs_w.tst -TESTCASES += extrv_r_w.tst -TESTCASES += extrv_s_h.tst -TESTCASES += extrv_w.tst -TESTCASES += extr_w.tst -TESTCASES += insv.tst -TESTCASES += lbux.tst -TESTCASES += lhx.tst -TESTCASES += lwx.tst -TESTCASES += ldx.tst -TESTCASES += madd.tst -TESTCASES += maddu.tst -TESTCASES += maq_sa_w_phl.tst -TESTCASES += maq_sa_w_phr.tst -TESTCASES += maq_sa_w_qhll.tst -TESTCASES += maq_sa_w_qhlr.tst -TESTCASES += maq_sa_w_qhrl.tst -TESTCASES += maq_sa_w_qhrr.tst -TESTCASES += maq_s_l_pwl.tst -TESTCASES += maq_s_l_pwr.tst -TESTCASES += maq_s_w_phl.tst -TESTCASES += maq_s_w_phr.tst -TESTCASES += maq_s_w_qhll.tst -TESTCASES += maq_s_w_qhlr.tst -TESTCASES += maq_s_w_qhrl.tst -TESTCASES += maq_s_w_qhrr.tst -TESTCASES += mfhi.tst -TESTCASES += mflo.tst -TESTCASES += modsub.tst -TESTCASES += msub.tst -TESTCASES += msubu.tst -TESTCASES += mthi.tst -TESTCASES += mthlip.tst -TESTCASES += mtlo.tst -TESTCASES += muleq_s_pw_qhl.tst -TESTCASES += muleq_s_pw_qhr.tst -TESTCASES += muleq_s_w_phl.tst -TESTCASES += muleq_s_w_phr.tst -TESTCASES += muleu_s_ph_qbl.tst -TESTCASES += muleu_s_ph_qbr.tst -TESTCASES += muleu_s_qh_obl.tst -TESTCASES += muleu_s_qh_obr.tst -TESTCASES += mulq_rs_ph.tst -TESTCASES += mulq_rs_qh.tst -TESTCASES += mulsaq_s_l_pw.tst -TESTCASES += mulsaq_s_w_qh.tst -TESTCASES += mult.tst -TESTCASES += multu.tst -TESTCASES += packrl_ph.tst -TESTCASES += packrl_pw.tst -TESTCASES += pick_ob.tst -TESTCASES += pick_ph.tst -TESTCASES += pick_pw.tst -TESTCASES += pick_qb.tst -TESTCASES += pick_qh.tst -#TESTCASES += preceq_l_pwl.tst -#TESTCASES += preceq_l_pwr.tst -TESTCASES += preceq_pw_qhla.tst -TESTCASES += preceq_pw_qhl.tst -TESTCASES += preceq_pw_qhra.tst -TESTCASES += preceq_pw_qhr.tst -TESTCASES += precequ_ph_qbla.tst -TESTCASES += precequ_ph_qbl.tst -TESTCASES += precequ_ph_qbra.tst -TESTCASES += precequ_ph_qbr.tst -#TESTCASES += precequ_qh_obla.tst -#TESTCASES += precequ_qh_obl.tst -#TESTCASES += precequ_qh_obra.tst -#TESTCASES += precequ_qh_obr.tst -TESTCASES += preceq_w_phl.tst -TESTCASES += preceq_w_phr.tst -TESTCASES += preceu_ph_qbla.tst -TESTCASES += preceu_ph_qbl.tst -TESTCASES += preceu_ph_qbra.tst -TESTCASES += preceu_ph_qbr.tst -TESTCASES += preceu_qh_obla.tst -TESTCASES += preceu_qh_obl.tst -TESTCASES += preceu_qh_obra.tst -TESTCASES += preceu_qh_obr.tst -#TESTCASES += precr_ob_qh.tst -TESTCASES += precrq_ob_qh.tst -TESTCASES += precrq_ph_w.tst -TESTCASES += precrq_pw_l.tst -TESTCASES += precrq_qb_ph.tst -TESTCASES += precrq_qh_pw.tst -TESTCASES += precrq_rs_ph_w.tst -TESTCASES += precrq_rs_qh_pw.tst -TESTCASES += precrqu_s_ob_qh.tst -TESTCASES += precrqu_s_qb_ph.tst -#TESTCASES += precr_sra_qh_pw.tst -#TESTCASES += precr_sra_r_qh_pw.tst -#TESTCASES += prependd.tst -#TESTCASES += prependw.tst -#TESTCASES += raddu_l_ob.tst -TESTCASES += raddu_w_qb.tst -TESTCASES += rddsp.tst -TESTCASES += repl_ob.tst -TESTCASES += repl_ph.tst -TESTCASES += repl_pw.tst -TESTCASES += repl_qb.tst -TESTCASES += repl_qh.tst -TESTCASES += replv_ob.tst -TESTCASES += replv_ph.tst -TESTCASES += replv_pw.tst -TESTCASES += replv_qb.tst -TESTCASES += shilo.tst -TESTCASES += shilov.tst -TESTCASES += shll_ob.tst -TESTCASES += shll_ph.tst -TESTCASES += shll_pw.tst -TESTCASES += shll_qb.tst -TESTCASES += shll_qh.tst -TESTCASES += shll_s_ph.tst -TESTCASES += shll_s_pw.tst -TESTCASES += shll_s_qh.tst -TESTCASES += shll_s_w.tst -TESTCASES += shllv_ob.tst -TESTCASES += shllv_ph.tst -TESTCASES += shllv_pw.tst -TESTCASES += shllv_qb.tst -TESTCASES += shllv_qh.tst -TESTCASES += shllv_s_ph.tst -TESTCASES += shllv_s_pw.tst -TESTCASES += shllv_s_qh.tst -TESTCASES += shllv_s_w.tst -#TESTCASES += shra_ob.tst -TESTCASES += shra_ph.tst -TESTCASES += shra_pw.tst -TESTCASES += shra_qh.tst -#TESTCASES += shra_r_ob.tst -TESTCASES += shra_r_ph.tst -TESTCASES += shra_r_pw.tst -TESTCASES += shra_r_qh.tst -TESTCASES += shra_r_w.tst -TESTCASES += shrav_ph.tst -TESTCASES += shrav_pw.tst -TESTCASES += shrav_qh.tst -TESTCASES += shrav_r_ph.tst -TESTCASES += shrav_r_pw.tst -TESTCASES += shrav_r_qh.tst -TESTCASES += shrav_r_w.tst -TESTCASES += shrl_ob.tst -TESTCASES += shrl_qb.tst -#TESTCASES += shrl_qh.tst -TESTCASES += shrlv_ob.tst -TESTCASES += shrlv_qb.tst -#TESTCASES += shrlv_qh.tst -TESTCASES += subq_ph.tst -TESTCASES += subq_pw.tst -TESTCASES += subq_qh.tst -TESTCASES += subq_s_ph.tst -TESTCASES += subq_s_pw.tst -TESTCASES += subq_s_qh.tst -TESTCASES += subq_s_w.tst -TESTCASES += subu_ob.tst -TESTCASES += subu_qb.tst -TESTCASES += subu_s_ob.tst -TESTCASES += subu_s_qb.tst -TESTCASES += wrdsp.tst - -all: build - -head.o : head.S - $(Q)$(CC) $(HEAD_FLAGS) -D"STACK_TOP=0xffffffff80200000" -c $< -o $@ - -%.o : %.S +mips64-dsp/%.o: mips64-dsp/%.S | mips64-dsp.build $(CC) $(CFLAGS) -c $< -o $@ -%.o : %.c +mips64-dsp/%.o: mips64-dsp/%.c | mips64-dsp.build $(CC) $(CFLAGS) -c $< -o $@ -%.tst: %.o $(VECTORS_OBJ) +mips64-dsp/%: mips64-dsp/%.o $(VECTORS_OBJ) $(CC) $(VECTORS_OBJ) $(FLAGS) $(LDFLAGS) $< -o $@ -build: $(VECTORS_OBJ) $(MIPSSOC_LIB) $(TESTCASES) +# +# Runners +# -check: $(VECTORS_OBJ) $(MIPSSOC_LIB) $(TESTCASES) - @for case in $(TESTCASES); do \ - echo $(SIM) $(SIMFLAGS) ./$$case; \ - $(SIM) $(SIMFLAGS) ./$$case & (sleep 1; killall $(SIM)); \ - done +$(MIPS64_DSP_RUNS): QEMU_OPTS=-nographic -cpu mips64dspr2 -kernel -clean: - $(Q)rm -f *.o *.tst *.a +# FIXME: I don't know why the general rule in tests/tcg/Makefile isn't enough +run-mips64-dsp/%: mips64-dsp/% + $(call run-test, $<, $(QEMU) $(QEMU_OPTS) $<, "$< on $(TARGET_NAME) $(QEMU_OPTS)") From patchwork Mon Dec 10 15:28:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 153282 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3690692ljp; Mon, 10 Dec 2018 07:34:17 -0800 (PST) X-Google-Smtp-Source: AFSGD/Xa+gS5FHNIPRXEXHz+oX7/Pfw1TjxvB7BVVcs7Po66mKUCK06MTC8a2J1R5F63TTWznUDX X-Received: by 2002:a0c:e010:: with SMTP id j16mr11852093qvk.111.1544456057847; Mon, 10 Dec 2018 07:34:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544456057; cv=none; d=google.com; s=arc-20160816; b=A/lyjlXOXXjo3vHXqSTkpI8eV9cnREJUc67Se7C8AcYXASFeJykD4zh8xHvncbBdUK Wb9YrP9tNM09lTZJWUJDbvTotrncUU8rH0a/1hb49ofgjP17GwaMm1sZnnzPW/HvWz2d O0AroJLZQh/qd9Lg1cAPtyYQIyXwg3AVmNovDtpw/JjqbDdV01agpzgPwRx7lIYFkUFK JXUR47JBG/Vxh7BPumZe3/bL2yyQicM/yX3qg6k/O2RBIfimHbNDHrSb81lp5eaNDcQN 8WyA5K4GHzCSYq5Ta5PtUY9Y03unS8AMMLyvxSwvnDZYry8z2BPZiPSpMBqna12wqo5l NDHw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=oIed5FkJBThXsijJuwY5wCl98rYz5EslSUBLC37qyKU=; b=FPFehMyRDuCSPuQ9tTzUNTW70mH9jRBo43uc1AhDY0KaZZ5fozq0hil9vQr7R9++tD jyyY5KiRuesYqiLnd7Z3qBsTKCwTB19k7MRIqcIu8zsEGKjcs1OyUhHUzFnWZjbqv7cJ Z1d1/BxhtVwlS1kU4lMeHjyNxQYRC50C1iGN3SLf2LtxqEPImbcGh2zb+voG3GvUKbfG AzMwpNxGWIw0/Qvby9/9xgQgkmbqhY0vaf75aKBKyO7Sdfq0I7VeYtPEF8DRHxSZGKkj +3QRN0EGkeIdSB0k06PwPDwr9Esz90Kz3S9bqNbH3ZobFdPKGrzAOA5veQlIuFwQGL9n wgqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=N0RsZ8uD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id b8si200231qvl.144.2018.12.10.07.34.17 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 10 Dec 2018 07:34:17 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=N0RsZ8uD; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33356 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWNZZ-0003k9-AG for patch@linaro.org; Mon, 10 Dec 2018 10:34:17 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43284) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWNU5-00085m-V6 for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWNU4-0000Vn-Rv for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:37 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:42327) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gWNU4-0000VD-Io for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:36 -0500 Received: by mail-wr1-x444.google.com with SMTP id q18so10897773wrx.9 for ; Mon, 10 Dec 2018 07:28:36 -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=oIed5FkJBThXsijJuwY5wCl98rYz5EslSUBLC37qyKU=; b=N0RsZ8uDNM9ISGofpSysXi9yKwbkiUpmW7i1ImjkPhsisA7os8JZFGmSrrc8D1uXKA IVbXcG6FSkalzeubSro3Y88xMg+ABIjnMlXqXuVExqRlSXYR3/r+n+MzovVgaqJMfaXZ 52gWsyJErhCHD88ZfEZ/j2a6JCo5y4xVgQuDM= 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=oIed5FkJBThXsijJuwY5wCl98rYz5EslSUBLC37qyKU=; b=FYlYiEagu2dXcyt7RxqtL4mrpM4D6hV9BjJvxU4o1ghdtZwfXVKmAp34LMQ3PVPxRE JkwH6IwO1xVzJnUAlwjTCBS4xeCUPtH/9tbo4VmC0EmphKTGZDTwnbc9C1yDA16ZmhWU s0iVCG3SgsTsUcTz3N9xDg+HvXUwaJRKVIOdD3e2PviTErqba4CFn5+EWCKVUwKPc+KG oN0mnjrF3i6Q2ZPWR+B9fdZYa4cIWU/Y2GvoQllxjYWDUxqb79b7LQlEmBAHsqb/S8uD QeNDyl/mBi3iYgO3JMjhnejyAh3sJsuFH+MJ4Hq+4EmnndxY9lztYKjISvioUDGpbmwh yQBw== X-Gm-Message-State: AA+aEWbYAQS/lN+T0ETgi7YBw+wkH8til83wpB/+9Z+c2OyPrmD3Oywb aOXoQ4oirhdGES3g/EjiU/Yk0Q== X-Received: by 2002:a05:6000:1189:: with SMTP id g9mr11017804wrx.221.1544455715475; Mon, 10 Dec 2018 07:28:35 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id j202sm31100691wmf.15.2018.12.10.07.28.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Dec 2018 07:28:33 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 554BF3E05EF; Mon, 10 Dec 2018 15:28:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Mon, 10 Dec 2018 15:28:22 +0000 Message-Id: <20181210152829.29271-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181210152829.29271-1-alex.bennee@linaro.org> References: <20181210152829.29271-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [RFC PATCH 06/13] 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: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , jcmvbkbc@gmail.com, michael@walle.cc, amarkovic@wavecomp.com, edgar.iglesias@gmail.com, shorne@gmail.com, =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" From: Philippe Mathieu-Daudé Xtensa cpu supported: - dc232b - dc233c - csp Signed-off-by: Philippe Mathieu-Daudé Signed-off-by: Alex Bennée --- .../dockerfiles/debian-xtensa-cross.docker | 31 +++++++++++++++++++ tests/tcg/xtensa/Makefile.include | 7 +++++ 2 files changed, 38 insertions(+) create mode 100644 tests/docker/dockerfiles/debian-xtensa-cross.docker create mode 100644 tests/tcg/xtensa/Makefile.include -- 2.17.1 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..1454e7e821 --- /dev/null +++ b/tests/tcg/xtensa/Makefile.include @@ -0,0 +1,7 @@ +# Makefile.include for xtensa targets + +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 From patchwork Mon Dec 10 15:28:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 153280 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3690560ljp; Mon, 10 Dec 2018 07:34:10 -0800 (PST) X-Google-Smtp-Source: AFSGD/Xr6s/YFEbwYKGyFxroY9xfcMqdM2fenHLbjbSZFEAoAmmt2A9NgfCgoyRbcwr9qGNZWtOV X-Received: by 2002:a0c:c60b:: with SMTP id v11mr11872171qvi.198.1544456050756; Mon, 10 Dec 2018 07:34:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544456050; cv=none; d=google.com; s=arc-20160816; b=jovwrVorM36UKTOOosEIErimFXY1e63MS8F+JaVgr10ErqJufF7pye2SRG/hGBNAbv NgjBdLTwv2FvQST4+inn9GNzyDDvjX/oCRf5xWQl8cq7PYNhi8ztODAcWL6eN3Gny0CC ZL//29FQOednwaOVlBA9qTq5UlhUhoNEbgdFtYzuRXjzm1n1G0zMIrBPwbZZSpsdWQ5x pZOLG0+oFMr1e95R2+dKYZg46f0vO1vYWrpqDBjiLlWr5imEEqDoD3EQ+HuH1DLTPidu rXHQwc2p3WLAm4YTwP+81bALF5FrHwxvfhEQw8MUbGyWIAt6Rw09rZxghX+i53kiaeCJ 2mcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=wBfEKZgCTRTaf+EwSeQtsSLmWyNxlaEzsSzX6DZl3EU=; b=kky2ezKO/rRAciu6IOWf0d5RMg6C3vPWReZMKHyeJ+atOYq1p0tS/gEZYEjMSMI99U q9nVl4oq7qU0YxXmVNdJiVyrYi8brUxDcA9isbnWCwR8pa8SA6B/puQfWtg0fGwTaEno RKCjaKWxa/moW410asw7Xwl4RaZJ+ELYDq0iTES+v+zjx51E4xdEZCa1nHjA+CnDpUUs GAVHgi4cTBUrP5TDWuD6OYIJFdJySM7PUpJHpUMdprHeAdwexy1NHF8VBz/kgldET+QF +tv6tmFzAOk1zT6pmxCTX3Ff0T0NC38nAHsZ0iwCEHOHXsPGU5hyEB86LefLAiwHSqNq 5tog== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KhRfoAY2; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id q15si1259086qti.20.2018.12.10.07.34.10 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 10 Dec 2018 07:34:10 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=KhRfoAY2; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33355 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWNZR-0003RM-NB for patch@linaro.org; Mon, 10 Dec 2018 10:34:09 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43313) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWNU7-00086s-6P for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWNU6-0000Wb-6f for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:39 -0500 Received: from mail-wr1-x442.google.com ([2a00:1450:4864:20::442]:35522) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gWNU5-0000W3-VA for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:38 -0500 Received: by mail-wr1-x442.google.com with SMTP id 96so10928354wrb.2 for ; Mon, 10 Dec 2018 07:28:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=wBfEKZgCTRTaf+EwSeQtsSLmWyNxlaEzsSzX6DZl3EU=; b=KhRfoAY2nHKZSIWqDKDamVkMs82FmIlFp2b6EPXdaTWas6b4+lBktEe4fMVKhuPVN9 snmf6xNjaBtVJh4ORQs5oG5XZ002oPqIheZkKPHf2uS+y1O0Lw2iAU3BExjwR1LIp1mh gsCcjG4mvXE277kSvP/RBN1O+pOPwfmJKkwv4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=wBfEKZgCTRTaf+EwSeQtsSLmWyNxlaEzsSzX6DZl3EU=; b=epYFuv/4epjERE2VVphvJvYB5pcN7xZ88OGbAaQjkmg9XeTk74oVSCdX8c7rZEWXNK +1QSwCTKj6iDjX23np0x6Ma5Ljn6C1TfzW9qiCGb71YMrh+ZU4GjKufKRaoSKskoRyHR QfSU0a7pIuHRNMuzy9XkZTf83KopX79SdMGjBrydOxt5R7HiO+MnOCDhTFBy/DJuQVp3 yydyy8ER5TnAFJxnxBV49P1OUJEPtBTsCX7G6NN92x2Dem/Zqvrx5JgMf4QAWVlm0zMM sZFlMMFL0swVg7MnCJoEvrwJuiGVp5bjBDVmyEr8wBJzePObnxJaUsgKE6CD9fSoUer2 X3ZQ== X-Gm-Message-State: AA+aEWaVJ8UNYxP5hWOR6nj8JZ9OALRGiJ/Dj3zBKbhd4BziRgnXYlMv m4ye2N7/1egsE8t0Bniuh/cWSA== X-Received: by 2002:adf:8068:: with SMTP id 95mr10215707wrk.181.1544455716959; Mon, 10 Dec 2018 07:28:36 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id x20sm23704773wme.6.2018.12.10.07.28.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Dec 2018 07:28:33 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 693F43E05F2; Mon, 10 Dec 2018 15:28:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Mon, 10 Dec 2018 15:28:23 +0000 Message-Id: <20181210152829.29271-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181210152829.29271-1-alex.bennee@linaro.org> References: <20181210152829.29271-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::442 Subject: [Qemu-devel] [RFC PATCH 07/13] tests/tcg/xtensa: enable system tests X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jcmvbkbc@gmail.com, michael@walle.cc, amarkovic@wavecomp.com, edgar.iglesias@gmail.com, shorne@gmail.com, =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée --- tests/tcg/xtensa/Makefile | 93 ------------------------ tests/tcg/xtensa/Makefile.softmmu-target | 43 +++++++++++ 2 files changed, 43 insertions(+), 93 deletions(-) delete mode 100644 tests/tcg/xtensa/Makefile create mode 100644 tests/tcg/xtensa/Makefile.softmmu-target -- 2.17.1 diff --git a/tests/tcg/xtensa/Makefile b/tests/tcg/xtensa/Makefile deleted file mode 100644 index 2f5691f75b..0000000000 --- a/tests/tcg/xtensa/Makefile +++ /dev/null @@ -1,93 +0,0 @@ --include ../../../config-host.mak - -CORE=dc232b -CROSS=xtensa-$(CORE)-elf- - -ifndef XT -SIM = ../../../xtensa-softmmu/qemu-system-xtensa -SIMFLAGS = -M sim -cpu $(CORE) -nographic -semihosting -icount 6 $(EXTFLAGS) -kernel -SIMDEBUG = -s -S -else -SIM = xt-run -SIMFLAGS = --xtensa-core=DC_B_232L --exit_with_target_code $(EXTFLAGS) -SIMDEBUG = --gdbserve=0 -endif - -HOST_CC = gcc -CC = $(CROSS)gcc -AS = $(CROSS)gcc -x assembler-with-cpp -LD = $(CROSS)ld - -XTENSA_SRC_PATH = $(SRC_PATH)/tests/tcg/xtensa -INCLUDE_DIRS = $(XTENSA_SRC_PATH) $(SRC_PATH)/target/xtensa/core-$(CORE) -XTENSA_INC = $(addprefix -I,$(INCLUDE_DIRS)) - -LDFLAGS = -Tlinker.ld - -CRT = crt.o vectors.o - -TESTCASES += test_b.tst -TESTCASES += test_bi.tst -#TESTCASES += test_boolean.tst -TESTCASES += test_break.tst -TESTCASES += test_bz.tst -TESTCASES += test_cache.tst -TESTCASES += test_clamps.tst -TESTCASES += test_extui.tst -TESTCASES += test_fail.tst -TESTCASES += test_interrupt.tst -TESTCASES += test_loop.tst -TESTCASES += test_mac16.tst -TESTCASES += test_max.tst -TESTCASES += test_min.tst -TESTCASES += test_mmu.tst -TESTCASES += test_mul16.tst -TESTCASES += test_mul32.tst -TESTCASES += test_nsa.tst -TESTCASES += test_phys_mem.tst -ifdef XT -TESTCASES += test_pipeline.tst -endif -TESTCASES += test_quo.tst -TESTCASES += test_rem.tst -TESTCASES += test_rst0.tst -TESTCASES += test_s32c1i.tst -TESTCASES += test_sar.tst -TESTCASES += test_sext.tst -TESTCASES += test_shift.tst -TESTCASES += test_sr.tst -TESTCASES += test_timer.tst -TESTCASES += test_windowed.tst - -all: build - -linker.ld: $(XTENSA_SRC_PATH)/linker.ld.S - $(HOST_CC) $(XTENSA_INC) -E -P $< -o $@ - -%.o: $(XTENSA_SRC_PATH)/%.c - $(CC) $(XTENSA_INC) $(CFLAGS) -c $< -o $@ - -%.o: $(XTENSA_SRC_PATH)/%.S - $(CC) $(XTENSA_INC) $(ASFLAGS) -c $< -o $@ - -%.tst: %.o linker.ld $(XTENSA_SRC_PATH)/macros.inc $(CRT) Makefile - $(LD) $(LDFLAGS) $(NOSTDFLAGS) $(CRT) $< -o $@ - -build: $(TESTCASES) - -check: $(addprefix run-, $(TESTCASES)) - -run-%.tst: %.tst - $(SIM) $(SIMFLAGS) ./$< - -run-test_fail.tst: test_fail.tst - ! $(SIM) $(SIMFLAGS) ./$< - -debug-%.tst: %.tst - $(SIM) $(SIMDEBUG) $(SIMFLAGS) ./$< - -host-debug-%.tst: %.tst - gdb --args $(SIM) $(SIMFLAGS) ./$< - -clean: - $(RM) -fr $(TESTCASES) $(CRT) linker.ld diff --git a/tests/tcg/xtensa/Makefile.softmmu-target b/tests/tcg/xtensa/Makefile.softmmu-target new file mode 100644 index 0000000000..e9d6939990 --- /dev/null +++ b/tests/tcg/xtensa/Makefile.softmmu-target @@ -0,0 +1,43 @@ +# +# Xtensa softmmu tests +# + +XTENSA_SRC = $(SRC_PATH)/tests/tcg/xtensa +XTENSA_ALL = $(wildcard $(XTENSA_SRC)/*.S) +XTENSA_TESTS = $(patsubst $(XTENSA_SRC)/%.S, %, $(XTENSA_ALL)) +# Filter out common blobs and broken tests +XTENSA_BROKEN_TESTS = crt vectors test_boolean test_pipeline +XTENSA_USABLE_TESTS = $(filter-out $(XTENSA_BROKEN_TESTS), $(XTENSA_TESTS)) +XTENSA_RUNS = $(patsubst %, run-%, $(XTENSA_USABLE_TESTS)) + +# add to the list of tests +TESTS += $(XTENSA_USABLE_TESTS) +VPATH += $(XTENSA_SRC) + +CORE=dc232b +QEMU_OPTS = -M sim -cpu $(CORE) -nographic -semihosting -icount 6 $(EXTFLAGS) -kernel + +INCLUDE_DIRS = $(SRC_PATH)/target/xtensa/core-$(CORE) +XTENSA_INC = $(addprefix -I,$(INCLUDE_DIRS)) + +LDFLAGS = -Tlinker.ld -nostartfiles -nostdlib + +CRT = crt.o vectors.o + +linker.ld: linker.ld.S + $(HOST_CC) $(XTENSA_INC) -E -P $< -o $@ + +$(XTENSA_USABLE_TESTS): linker.ld macros.inc $(CRT) Makefile.softmmu-target + +# special rule for common blobs +%.o: %.S + $(CC) $(XTENSA_INC) $(ASFLAGS) -c $< -o $@ + +%: %.S + $(CC) $(XTENSA_INC) $(ASFLAGS) $< -o $@ $(LDFLAGS) $(NOSTDFLAGS) $(CRT) + +# Special runner +$(XTENSA_RUNS): $(XTENSA_USABLE_TESTS) + $(call quiet-command, \ + timeout $(TIMEOUT) $(QEMU) $(QEMU_OPTS) $<, \ + "TEST","$< on $(TARGET_NAME) $(QEMU_OPTS)") From patchwork Mon Dec 10 15:28:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 153284 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3691286ljp; Mon, 10 Dec 2018 07:34:51 -0800 (PST) X-Google-Smtp-Source: AFSGD/UiOriTLUPi67skSplKwYpKZZVfKssLJ5fxQI6bPy7k1eRo+TkU1lPMmmSqd5jhNCllBemw X-Received: by 2002:aed:2539:: with SMTP id v54mr12275137qtc.211.1544456091022; Mon, 10 Dec 2018 07:34:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544456091; cv=none; d=google.com; s=arc-20160816; b=V/YS9Q4xVjIAVpyYDrCDXagpElg9uI92u1wZs3BNDowpExF0lFC/Ckpgd+dZEr+FD6 61S88vWl9mZCo7VD1qewhqFv1iCDkEDi2NQeu/4y/rpdctPdG632v1nnf42EfbBew707 5M0uFE5SVyuPyV1WjIDxfTCK0yf/WR4uJhJ3/acgK25myBiaRG6vw84RBEmYr40T9ene DrKbDDUAV3+SSgViQVbeIuqjvUZtpGO1MVEeSgvo7I9vPfW64eXiBZ7T5x+XggoBQOFs CG5Duhcaot5F4WszXTto4EnG/+e97A0gzSroWDtto8vjOkVL5jc0vSzMC2O2xV/Vf2at UZCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=KJrLRC9fDjV6kPkKjemUzToVt4xQjcuniZhQIzS6PPA=; b=sgnLOJ3q3LGimfn1O7jhCGSmCZv5s+jfBxjEdUbbyXt6fJHyGpF+2qdUGh+mwy4883 8hMz8mdCoE45jvT/stdU3xSBwMKHfxTULst/XepUZDRs7HSSKxEUewXhSprhRIAiUdiP kV29fJsnBUZ9VZNhVRlul7Wbz25fHpZ4ThhqojaQ+/tYWoVcoVGS4BiexjngdO0yEfKm 5uJy2dH2MnudCOA3n6r2K6rofBJc/Sj2CCX6wcoHMCOo28fFBmLUG90UKkmatsApxdps ZecCZDKsrvqdPX9xgx/RHdYURfgw+IIXEOkMg+G5My1gVvH/G3lIlsUf/RYIScO8Duej 3xjw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=W9tIJPZv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id o14si62458qtb.200.2018.12.10.07.34.50 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 10 Dec 2018 07:34:51 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=W9tIJPZv; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33363 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWNa6-0004x2-0j for patch@linaro.org; Mon, 10 Dec 2018 10:34:50 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43317) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWNU7-00087L-Jy for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:40 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWNU6-0000Wu-Ok for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:39 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:54069) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gWNU6-0000WM-Hj for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:38 -0500 Received: by mail-wm1-x343.google.com with SMTP id y1so11318571wmi.3 for ; Mon, 10 Dec 2018 07:28:38 -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=KJrLRC9fDjV6kPkKjemUzToVt4xQjcuniZhQIzS6PPA=; b=W9tIJPZvwaTELKF7T3LPiSMR/sazRG/QIgrwAy+vcgur7wArUCsQQyjlq1SVxP1V56 /+3Byawy/Yi5H7ThV0qFnZ3lrZ77XuzSowOECRKn1jV9HCsB27gkjzPwMYS0cBn3/rNd DUIXnRETfQ3HzpNjn3YRivY77HK37PHqdQF4k= 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=KJrLRC9fDjV6kPkKjemUzToVt4xQjcuniZhQIzS6PPA=; b=tUlDQ5Xo0RSna4r9p/GHuOEkmBRN4DLo/rHKgWX60MHU4Hg72wk1nTedmdz4yF0l+0 2Ukgnw7MMXMk68+EGMoWndlS0AXu5/deovGWVoLQZvPsVzStMG82bAfADYyImMdnEmBM OO09FzS94P/TfLqpOxZnGijL2cGYEhlXm8NBzn0TozfBbsqs6X4X4/j2O4QBhVrRU++2 7HsAXaIFS+TmKpgNGx8+CmuPsHOGO0Rg/f16lK6OTqA6LIRKbmkGyIJge0KScjftetGu y7+uz9xUBcuUSVvhDn7Yu+oqifh9CamXiIDNpSoWdX1eKm6FeJk9pWrn0RDFHV1d0Ehb XEVg== X-Gm-Message-State: AA+aEWZNp6GOuk47mYUNe/pWsxyvg4DcGtaRw/uCo4xhVm77OLGmy5Il EqAI664IqiDCC8q7nI7Fd80i5w== X-Received: by 2002:a1c:c70f:: with SMTP id x15mr11100897wmf.130.1544455717531; Mon, 10 Dec 2018 07:28:37 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id y9sm8685010wrq.55.2018.12.10.07.28.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Dec 2018 07:28:34 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 7DBC33E0619; Mon, 10 Dec 2018 15:28:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Mon, 10 Dec 2018 15:28:24 +0000 Message-Id: <20181210152829.29271-9-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181210152829.29271-1-alex.bennee@linaro.org> References: <20181210152829.29271-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [RFC PATCH 08/13] 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: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , jcmvbkbc@gmail.com, michael@walle.cc, amarkovic@wavecomp.com, edgar.iglesias@gmail.com, shorne@gmail.com, =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Signed-off-by: Alex Bennée --- tests/docker/dockerfiles/fedora-cris-cross.docker | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 tests/docker/dockerfiles/fedora-cris-cross.docker -- 2.17.1 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 Mon Dec 10 15:28:25 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 153285 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3694031ljp; Mon, 10 Dec 2018 07:37:27 -0800 (PST) X-Google-Smtp-Source: AFSGD/ViRTmH0hGnIGtjxG4uIKbflMZ0yScqJd68TCLFGeY3npIl9l8hB60iEpA6wtj/ZR5EjsoF X-Received: by 2002:aed:2e63:: with SMTP id j90mr12666336qtd.35.1544456247213; Mon, 10 Dec 2018 07:37:27 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544456247; cv=none; d=google.com; s=arc-20160816; b=as5Elk91fOjEmolpimocFftrhoRPCdk+vToAfmaJjC90TKE/ReewmwufZUU2vCkVrn 44bvEohwM+7+YNhiapy7JrIW5IU3RUgTKC5zfJ44EPRi3EOLtWyNPBRMOcD6Gu/W8qFC c11fYbWhRaenckqeofmszhdlHrn8wp0r+mHGOW6Vdjf4yzIsIL8gReeqDgGEHuo3OMaM BClHhlvRX+EUlQlOSX4OubXyvrrnTj8LCdwgmeBPp8lIVxjMsV1Blgp1qhNO7Nq04JxS 9znbMD3axizH6Zo2B8dJqkNMkyiCjzUltoli7/T5BRa3CwD5l0yXQ30Sm9AHuAA803kU QCEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=2jAinw4vRL8c6b2cMfxv9SmucHtkNFVd98sPP76SZlk=; b=ZOBCCx9rpVVHPapmxnrG3xWlGfT2Ws5ju8KEjVKxzBPqm6pLgDmpSIjxUBTAaNkCVA dJWGfHZ69i+wv4NHY14R6aHKQwdKdnCJkA2WY8toVOGuq9hqAm2bolwMzNTYeZqCBKt9 omf4zvKYFCVfYpmXzZRIiFvtR+pdZA9suW/xxMJclHJDndPx8kxenypA+uUwsHt9g9rY LdXuYPLYuPmeCT2TlxIrNS/mp4u6+vS56gDjWTlGhQD30s/liVUe1yrAvd4UD08jyNDF d0DfKQp4/eKylGYIqMqk6I2ojvadPeZry6JxRaA3lJlPGZ6H/yuByfHiKXA+Q2Y9be5f t04A== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Ur7D4t5D; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id x8si5007919qtm.5.2018.12.10.07.37.26 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 10 Dec 2018 07:37:27 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=Ur7D4t5D; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33373 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWNcc-00066T-3u for patch@linaro.org; Mon, 10 Dec 2018 10:37:26 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43371) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWNUD-0008IU-A2 for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWNU9-0000Y7-QF for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:45 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:35524) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gWNU9-0000Xj-89 for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:41 -0500 Received: by mail-wr1-x444.google.com with SMTP id 96so10928614wrb.2 for ; Mon, 10 Dec 2018 07:28: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=2jAinw4vRL8c6b2cMfxv9SmucHtkNFVd98sPP76SZlk=; b=Ur7D4t5D+yWGHmccmqornRkbruqaefbbH8zI1UmtPgkq5fDHD4n5RDTfXXURF6DIWY qqkYHZQxrEIetOXIS1j8fQZckHs2Lg/UkXMwHc7OHb1WbzeUDEjdQA7mUEEhALw0z7kJ J6cnTIckuHNRHn9lbWkMLkiH+cyHtjVInbDbU= 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=2jAinw4vRL8c6b2cMfxv9SmucHtkNFVd98sPP76SZlk=; b=b/N63pJpylFUGJP1OzXg4XWwBTGCrkZuDp97diWk62yYUqUhLgUVyHGR0YCtq0MyDg tlZHn+VZ2+9p7C/AhkeWkIvObYd+1kgANIVNm36FqELG3kHvM3lwgl8TJJka+7S+QGkQ O84rpbPRrSdL8YwO+5GIm5D2YvKDKGyVcM9k7ZZ9TOyPbsv5ZAlMrf2YZfrACI1TTEqV X0EQ7kKLuY0nN5l+lflgQS0uqObA35My+aZjFPRObymrrh3cB2qhFgzIpkaPqrjKuSEd 2nolosjx2Ei0F3pQIbpePpIaN4rcQn5jVzUtG/0uywV/dUYsczgwK6yYwhXJZtZQ8tu+ pffQ== X-Gm-Message-State: AA+aEWb35JQjMYhLQpHj0O5s+MODbM9m3S9+L3k4+ET9oL/Rbmly8blb 8gqHt9WbyrlUr6DICvTIsdnVXA== X-Received: by 2002:adf:ed92:: with SMTP id c18mr10435255wro.194.1544455719833; Mon, 10 Dec 2018 07:28:39 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id o64sm21335131wmo.47.2018.12.10.07.28.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Dec 2018 07:28:34 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id 9111B3E0629; Mon, 10 Dec 2018 15:28:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Mon, 10 Dec 2018 15:28:25 +0000 Message-Id: <20181210152829.29271-10-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181210152829.29271-1-alex.bennee@linaro.org> References: <20181210152829.29271-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [RFC PATCH 09/13] tests/tcg: split cris tests into system and user mode X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: jcmvbkbc@gmail.com, michael@walle.cc, amarkovic@wavecomp.com, edgar.iglesias@gmail.com, shorne@gmail.com, =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" This will help with the make system as we build a different set of tests for each qemu binary. Signed-off-by: Alex Bennée --- tests/tcg/cris/{ => system}/check_addcv17.s | 0 tests/tcg/cris/{ => system}/check_addi.s | 0 tests/tcg/cris/{ => system}/check_addiv32.s | 0 tests/tcg/cris/{ => system}/check_addm.s | 0 tests/tcg/cris/{ => system}/check_addq.s | 0 tests/tcg/cris/{ => system}/check_addr.s | 0 tests/tcg/cris/{ => system}/check_addxc.s | 0 tests/tcg/cris/{ => system}/check_addxm.s | 0 tests/tcg/cris/{ => system}/check_addxr.s | 0 tests/tcg/cris/{ => system}/check_andc.s | 0 tests/tcg/cris/{ => system}/check_andm.s | 0 tests/tcg/cris/{ => system}/check_andq.s | 0 tests/tcg/cris/{ => system}/check_andr.s | 0 tests/tcg/cris/{ => system}/check_asr.s | 0 tests/tcg/cris/{ => system}/check_ba.s | 0 tests/tcg/cris/{ => system}/check_bas.s | 0 tests/tcg/cris/{ => system}/check_bcc.s | 0 tests/tcg/cris/{ => system}/check_boundc.s | 0 tests/tcg/cris/{ => system}/check_boundr.s | 0 tests/tcg/cris/{ => system}/check_btst.s | 0 tests/tcg/cris/{ => system}/check_clearfv32.s | 0 tests/tcg/cris/{ => system}/check_clrjmp1.s | 0 tests/tcg/cris/{ => system}/check_cmp-2.s | 0 tests/tcg/cris/{ => system}/check_cmpc.s | 0 tests/tcg/cris/{ => system}/check_cmpm.s | 0 tests/tcg/cris/{ => system}/check_cmpq.s | 0 tests/tcg/cris/{ => system}/check_cmpr.s | 0 tests/tcg/cris/{ => system}/check_cmpxc.s | 0 tests/tcg/cris/{ => system}/check_cmpxm.s | 0 tests/tcg/cris/{ => system}/check_dstep.s | 0 tests/tcg/cris/{ => system}/check_jsr.s | 0 tests/tcg/cris/{ => system}/check_lapc.s | 0 tests/tcg/cris/{ => system}/check_lsl.s | 0 tests/tcg/cris/{ => system}/check_lsr.s | 0 tests/tcg/cris/{ => system}/check_mcp.s | 0 tests/tcg/cris/{ => system}/check_movdelsr1.s | 0 tests/tcg/cris/{ => system}/check_movecr.s | 0 tests/tcg/cris/{ => system}/check_movei.s | 0 tests/tcg/cris/{ => system}/check_movemr.s | 0 tests/tcg/cris/{ => system}/check_movemrv32.s | 0 tests/tcg/cris/{ => system}/check_mover.s | 0 tests/tcg/cris/{ => system}/check_moverm.s | 0 tests/tcg/cris/{ => system}/check_movmp.s | 0 tests/tcg/cris/{ => system}/check_movpmv32.s | 0 tests/tcg/cris/{ => system}/check_movpr.s | 0 tests/tcg/cris/{ => system}/check_movprv32.s | 0 tests/tcg/cris/{ => system}/check_movscr.s | 0 tests/tcg/cris/{ => system}/check_movsm.s | 0 tests/tcg/cris/{ => system}/check_movsr.s | 0 tests/tcg/cris/{ => system}/check_movucr.s | 0 tests/tcg/cris/{ => system}/check_movum.s | 0 tests/tcg/cris/{ => system}/check_movur.s | 0 tests/tcg/cris/{ => system}/check_mulv32.s | 0 tests/tcg/cris/{ => system}/check_mulx.s | 0 tests/tcg/cris/{ => system}/check_neg.s | 0 tests/tcg/cris/{ => system}/check_not.s | 0 tests/tcg/cris/{ => system}/check_orc.s | 0 tests/tcg/cris/{ => system}/check_orm.s | 0 tests/tcg/cris/{ => system}/check_orq.s | 0 tests/tcg/cris/{ => system}/check_orr.s | 0 tests/tcg/cris/{ => system}/check_ret.s | 0 tests/tcg/cris/{ => system}/check_scc.s | 0 tests/tcg/cris/{ => system}/check_subc.s | 0 tests/tcg/cris/{ => system}/check_subm.s | 0 tests/tcg/cris/{ => system}/check_subq.s | 0 tests/tcg/cris/{ => system}/check_subr.s | 0 tests/tcg/cris/{ => system}/check_xarith.s | 0 tests/tcg/cris/{ => system}/crt.s | 0 tests/tcg/cris/{ => system}/sys.c | 0 tests/tcg/cris/{ => system}/testutils.inc | 0 tests/tcg/cris/{ => user}/check_abs.c | 0 tests/tcg/cris/{ => user}/check_addc.c | 0 tests/tcg/cris/{ => user}/check_addcm.c | 0 tests/tcg/cris/{ => user}/check_addo.c | 0 tests/tcg/cris/{ => user}/check_addoq.c | 0 tests/tcg/cris/{ => user}/check_bound.c | 0 tests/tcg/cris/{ => user}/check_ftag.c | 0 tests/tcg/cris/{ => user}/check_glibc_kernelversion.c | 0 tests/tcg/cris/{ => user}/check_hello.c | 0 tests/tcg/cris/{ => user}/check_int64.c | 0 tests/tcg/cris/{ => user}/check_lz.c | 0 tests/tcg/cris/{ => user}/check_mapbrk.c | 0 tests/tcg/cris/{ => user}/check_mmap1.c | 0 tests/tcg/cris/{ => user}/check_mmap2.c | 0 tests/tcg/cris/{ => user}/check_mmap3.c | 0 tests/tcg/cris/{ => user}/check_moveq.c | 0 tests/tcg/cris/{ => user}/check_openpf1.c | 0 tests/tcg/cris/{ => user}/check_openpf2.c | 0 tests/tcg/cris/{ => user}/check_openpf3.c | 0 tests/tcg/cris/{ => user}/check_openpf5.c | 0 tests/tcg/cris/{ => user}/check_settls1.c | 0 tests/tcg/cris/{ => user}/check_sigalrm.c | 0 tests/tcg/cris/{ => user}/check_stat1.c | 0 tests/tcg/cris/{ => user}/check_stat2.c | 0 tests/tcg/cris/{ => user}/check_stat3.c | 0 tests/tcg/cris/{ => user}/check_stat4.c | 0 tests/tcg/cris/{ => user}/check_swap.c | 0 tests/tcg/cris/{ => user}/check_time2.c | 0 tests/tcg/cris/{ => user}/crisutils.h | 0 tests/tcg/cris/{ => user}/sys.h | 0 100 files changed, 0 insertions(+), 0 deletions(-) rename tests/tcg/cris/{ => system}/check_addcv17.s (100%) rename tests/tcg/cris/{ => system}/check_addi.s (100%) rename tests/tcg/cris/{ => system}/check_addiv32.s (100%) rename tests/tcg/cris/{ => system}/check_addm.s (100%) rename tests/tcg/cris/{ => system}/check_addq.s (100%) rename tests/tcg/cris/{ => system}/check_addr.s (100%) rename tests/tcg/cris/{ => system}/check_addxc.s (100%) rename tests/tcg/cris/{ => system}/check_addxm.s (100%) rename tests/tcg/cris/{ => system}/check_addxr.s (100%) rename tests/tcg/cris/{ => system}/check_andc.s (100%) rename tests/tcg/cris/{ => system}/check_andm.s (100%) rename tests/tcg/cris/{ => system}/check_andq.s (100%) rename tests/tcg/cris/{ => system}/check_andr.s (100%) rename tests/tcg/cris/{ => system}/check_asr.s (100%) rename tests/tcg/cris/{ => system}/check_ba.s (100%) rename tests/tcg/cris/{ => system}/check_bas.s (100%) rename tests/tcg/cris/{ => system}/check_bcc.s (100%) rename tests/tcg/cris/{ => system}/check_boundc.s (100%) rename tests/tcg/cris/{ => system}/check_boundr.s (100%) rename tests/tcg/cris/{ => system}/check_btst.s (100%) rename tests/tcg/cris/{ => system}/check_clearfv32.s (100%) rename tests/tcg/cris/{ => system}/check_clrjmp1.s (100%) rename tests/tcg/cris/{ => system}/check_cmp-2.s (100%) rename tests/tcg/cris/{ => system}/check_cmpc.s (100%) rename tests/tcg/cris/{ => system}/check_cmpm.s (100%) rename tests/tcg/cris/{ => system}/check_cmpq.s (100%) rename tests/tcg/cris/{ => system}/check_cmpr.s (100%) rename tests/tcg/cris/{ => system}/check_cmpxc.s (100%) rename tests/tcg/cris/{ => system}/check_cmpxm.s (100%) rename tests/tcg/cris/{ => system}/check_dstep.s (100%) rename tests/tcg/cris/{ => system}/check_jsr.s (100%) rename tests/tcg/cris/{ => system}/check_lapc.s (100%) rename tests/tcg/cris/{ => system}/check_lsl.s (100%) rename tests/tcg/cris/{ => system}/check_lsr.s (100%) rename tests/tcg/cris/{ => system}/check_mcp.s (100%) rename tests/tcg/cris/{ => system}/check_movdelsr1.s (100%) rename tests/tcg/cris/{ => system}/check_movecr.s (100%) rename tests/tcg/cris/{ => system}/check_movei.s (100%) rename tests/tcg/cris/{ => system}/check_movemr.s (100%) rename tests/tcg/cris/{ => system}/check_movemrv32.s (100%) rename tests/tcg/cris/{ => system}/check_mover.s (100%) rename tests/tcg/cris/{ => system}/check_moverm.s (100%) rename tests/tcg/cris/{ => system}/check_movmp.s (100%) rename tests/tcg/cris/{ => system}/check_movpmv32.s (100%) rename tests/tcg/cris/{ => system}/check_movpr.s (100%) rename tests/tcg/cris/{ => system}/check_movprv32.s (100%) rename tests/tcg/cris/{ => system}/check_movscr.s (100%) rename tests/tcg/cris/{ => system}/check_movsm.s (100%) rename tests/tcg/cris/{ => system}/check_movsr.s (100%) rename tests/tcg/cris/{ => system}/check_movucr.s (100%) rename tests/tcg/cris/{ => system}/check_movum.s (100%) rename tests/tcg/cris/{ => system}/check_movur.s (100%) rename tests/tcg/cris/{ => system}/check_mulv32.s (100%) rename tests/tcg/cris/{ => system}/check_mulx.s (100%) rename tests/tcg/cris/{ => system}/check_neg.s (100%) rename tests/tcg/cris/{ => system}/check_not.s (100%) rename tests/tcg/cris/{ => system}/check_orc.s (100%) rename tests/tcg/cris/{ => system}/check_orm.s (100%) rename tests/tcg/cris/{ => system}/check_orq.s (100%) rename tests/tcg/cris/{ => system}/check_orr.s (100%) rename tests/tcg/cris/{ => system}/check_ret.s (100%) rename tests/tcg/cris/{ => system}/check_scc.s (100%) rename tests/tcg/cris/{ => system}/check_subc.s (100%) rename tests/tcg/cris/{ => system}/check_subm.s (100%) rename tests/tcg/cris/{ => system}/check_subq.s (100%) rename tests/tcg/cris/{ => system}/check_subr.s (100%) rename tests/tcg/cris/{ => system}/check_xarith.s (100%) rename tests/tcg/cris/{ => system}/crt.s (100%) rename tests/tcg/cris/{ => system}/sys.c (100%) rename tests/tcg/cris/{ => system}/testutils.inc (100%) rename tests/tcg/cris/{ => user}/check_abs.c (100%) rename tests/tcg/cris/{ => user}/check_addc.c (100%) rename tests/tcg/cris/{ => user}/check_addcm.c (100%) rename tests/tcg/cris/{ => user}/check_addo.c (100%) rename tests/tcg/cris/{ => user}/check_addoq.c (100%) rename tests/tcg/cris/{ => user}/check_bound.c (100%) rename tests/tcg/cris/{ => user}/check_ftag.c (100%) rename tests/tcg/cris/{ => user}/check_glibc_kernelversion.c (100%) rename tests/tcg/cris/{ => user}/check_hello.c (100%) rename tests/tcg/cris/{ => user}/check_int64.c (100%) rename tests/tcg/cris/{ => user}/check_lz.c (100%) rename tests/tcg/cris/{ => user}/check_mapbrk.c (100%) rename tests/tcg/cris/{ => user}/check_mmap1.c (100%) rename tests/tcg/cris/{ => user}/check_mmap2.c (100%) rename tests/tcg/cris/{ => user}/check_mmap3.c (100%) rename tests/tcg/cris/{ => user}/check_moveq.c (100%) rename tests/tcg/cris/{ => user}/check_openpf1.c (100%) rename tests/tcg/cris/{ => user}/check_openpf2.c (100%) rename tests/tcg/cris/{ => user}/check_openpf3.c (100%) rename tests/tcg/cris/{ => user}/check_openpf5.c (100%) rename tests/tcg/cris/{ => user}/check_settls1.c (100%) rename tests/tcg/cris/{ => user}/check_sigalrm.c (100%) rename tests/tcg/cris/{ => user}/check_stat1.c (100%) rename tests/tcg/cris/{ => user}/check_stat2.c (100%) rename tests/tcg/cris/{ => user}/check_stat3.c (100%) rename tests/tcg/cris/{ => user}/check_stat4.c (100%) rename tests/tcg/cris/{ => user}/check_swap.c (100%) rename tests/tcg/cris/{ => user}/check_time2.c (100%) rename tests/tcg/cris/{ => user}/crisutils.h (100%) rename tests/tcg/cris/{ => user}/sys.h (100%) -- 2.17.1 diff --git a/tests/tcg/cris/check_addcv17.s b/tests/tcg/cris/system/check_addcv17.s similarity index 100% rename from tests/tcg/cris/check_addcv17.s rename to tests/tcg/cris/system/check_addcv17.s diff --git a/tests/tcg/cris/check_addi.s b/tests/tcg/cris/system/check_addi.s similarity index 100% rename from tests/tcg/cris/check_addi.s rename to tests/tcg/cris/system/check_addi.s diff --git a/tests/tcg/cris/check_addiv32.s b/tests/tcg/cris/system/check_addiv32.s similarity index 100% rename from tests/tcg/cris/check_addiv32.s rename to tests/tcg/cris/system/check_addiv32.s diff --git a/tests/tcg/cris/check_addm.s b/tests/tcg/cris/system/check_addm.s similarity index 100% rename from tests/tcg/cris/check_addm.s rename to tests/tcg/cris/system/check_addm.s diff --git a/tests/tcg/cris/check_addq.s b/tests/tcg/cris/system/check_addq.s similarity index 100% rename from tests/tcg/cris/check_addq.s rename to tests/tcg/cris/system/check_addq.s diff --git a/tests/tcg/cris/check_addr.s b/tests/tcg/cris/system/check_addr.s similarity index 100% rename from tests/tcg/cris/check_addr.s rename to tests/tcg/cris/system/check_addr.s diff --git a/tests/tcg/cris/check_addxc.s b/tests/tcg/cris/system/check_addxc.s similarity index 100% rename from tests/tcg/cris/check_addxc.s rename to tests/tcg/cris/system/check_addxc.s diff --git a/tests/tcg/cris/check_addxm.s b/tests/tcg/cris/system/check_addxm.s similarity index 100% rename from tests/tcg/cris/check_addxm.s rename to tests/tcg/cris/system/check_addxm.s diff --git a/tests/tcg/cris/check_addxr.s b/tests/tcg/cris/system/check_addxr.s similarity index 100% rename from tests/tcg/cris/check_addxr.s rename to tests/tcg/cris/system/check_addxr.s diff --git a/tests/tcg/cris/check_andc.s b/tests/tcg/cris/system/check_andc.s similarity index 100% rename from tests/tcg/cris/check_andc.s rename to tests/tcg/cris/system/check_andc.s diff --git a/tests/tcg/cris/check_andm.s b/tests/tcg/cris/system/check_andm.s similarity index 100% rename from tests/tcg/cris/check_andm.s rename to tests/tcg/cris/system/check_andm.s diff --git a/tests/tcg/cris/check_andq.s b/tests/tcg/cris/system/check_andq.s similarity index 100% rename from tests/tcg/cris/check_andq.s rename to tests/tcg/cris/system/check_andq.s diff --git a/tests/tcg/cris/check_andr.s b/tests/tcg/cris/system/check_andr.s similarity index 100% rename from tests/tcg/cris/check_andr.s rename to tests/tcg/cris/system/check_andr.s diff --git a/tests/tcg/cris/check_asr.s b/tests/tcg/cris/system/check_asr.s similarity index 100% rename from tests/tcg/cris/check_asr.s rename to tests/tcg/cris/system/check_asr.s diff --git a/tests/tcg/cris/check_ba.s b/tests/tcg/cris/system/check_ba.s similarity index 100% rename from tests/tcg/cris/check_ba.s rename to tests/tcg/cris/system/check_ba.s diff --git a/tests/tcg/cris/check_bas.s b/tests/tcg/cris/system/check_bas.s similarity index 100% rename from tests/tcg/cris/check_bas.s rename to tests/tcg/cris/system/check_bas.s diff --git a/tests/tcg/cris/check_bcc.s b/tests/tcg/cris/system/check_bcc.s similarity index 100% rename from tests/tcg/cris/check_bcc.s rename to tests/tcg/cris/system/check_bcc.s diff --git a/tests/tcg/cris/check_boundc.s b/tests/tcg/cris/system/check_boundc.s similarity index 100% rename from tests/tcg/cris/check_boundc.s rename to tests/tcg/cris/system/check_boundc.s diff --git a/tests/tcg/cris/check_boundr.s b/tests/tcg/cris/system/check_boundr.s similarity index 100% rename from tests/tcg/cris/check_boundr.s rename to tests/tcg/cris/system/check_boundr.s diff --git a/tests/tcg/cris/check_btst.s b/tests/tcg/cris/system/check_btst.s similarity index 100% rename from tests/tcg/cris/check_btst.s rename to tests/tcg/cris/system/check_btst.s diff --git a/tests/tcg/cris/check_clearfv32.s b/tests/tcg/cris/system/check_clearfv32.s similarity index 100% rename from tests/tcg/cris/check_clearfv32.s rename to tests/tcg/cris/system/check_clearfv32.s diff --git a/tests/tcg/cris/check_clrjmp1.s b/tests/tcg/cris/system/check_clrjmp1.s similarity index 100% rename from tests/tcg/cris/check_clrjmp1.s rename to tests/tcg/cris/system/check_clrjmp1.s diff --git a/tests/tcg/cris/check_cmp-2.s b/tests/tcg/cris/system/check_cmp-2.s similarity index 100% rename from tests/tcg/cris/check_cmp-2.s rename to tests/tcg/cris/system/check_cmp-2.s diff --git a/tests/tcg/cris/check_cmpc.s b/tests/tcg/cris/system/check_cmpc.s similarity index 100% rename from tests/tcg/cris/check_cmpc.s rename to tests/tcg/cris/system/check_cmpc.s diff --git a/tests/tcg/cris/check_cmpm.s b/tests/tcg/cris/system/check_cmpm.s similarity index 100% rename from tests/tcg/cris/check_cmpm.s rename to tests/tcg/cris/system/check_cmpm.s diff --git a/tests/tcg/cris/check_cmpq.s b/tests/tcg/cris/system/check_cmpq.s similarity index 100% rename from tests/tcg/cris/check_cmpq.s rename to tests/tcg/cris/system/check_cmpq.s diff --git a/tests/tcg/cris/check_cmpr.s b/tests/tcg/cris/system/check_cmpr.s similarity index 100% rename from tests/tcg/cris/check_cmpr.s rename to tests/tcg/cris/system/check_cmpr.s diff --git a/tests/tcg/cris/check_cmpxc.s b/tests/tcg/cris/system/check_cmpxc.s similarity index 100% rename from tests/tcg/cris/check_cmpxc.s rename to tests/tcg/cris/system/check_cmpxc.s diff --git a/tests/tcg/cris/check_cmpxm.s b/tests/tcg/cris/system/check_cmpxm.s similarity index 100% rename from tests/tcg/cris/check_cmpxm.s rename to tests/tcg/cris/system/check_cmpxm.s diff --git a/tests/tcg/cris/check_dstep.s b/tests/tcg/cris/system/check_dstep.s similarity index 100% rename from tests/tcg/cris/check_dstep.s rename to tests/tcg/cris/system/check_dstep.s diff --git a/tests/tcg/cris/check_jsr.s b/tests/tcg/cris/system/check_jsr.s similarity index 100% rename from tests/tcg/cris/check_jsr.s rename to tests/tcg/cris/system/check_jsr.s diff --git a/tests/tcg/cris/check_lapc.s b/tests/tcg/cris/system/check_lapc.s similarity index 100% rename from tests/tcg/cris/check_lapc.s rename to tests/tcg/cris/system/check_lapc.s diff --git a/tests/tcg/cris/check_lsl.s b/tests/tcg/cris/system/check_lsl.s similarity index 100% rename from tests/tcg/cris/check_lsl.s rename to tests/tcg/cris/system/check_lsl.s diff --git a/tests/tcg/cris/check_lsr.s b/tests/tcg/cris/system/check_lsr.s similarity index 100% rename from tests/tcg/cris/check_lsr.s rename to tests/tcg/cris/system/check_lsr.s diff --git a/tests/tcg/cris/check_mcp.s b/tests/tcg/cris/system/check_mcp.s similarity index 100% rename from tests/tcg/cris/check_mcp.s rename to tests/tcg/cris/system/check_mcp.s diff --git a/tests/tcg/cris/check_movdelsr1.s b/tests/tcg/cris/system/check_movdelsr1.s similarity index 100% rename from tests/tcg/cris/check_movdelsr1.s rename to tests/tcg/cris/system/check_movdelsr1.s diff --git a/tests/tcg/cris/check_movecr.s b/tests/tcg/cris/system/check_movecr.s similarity index 100% rename from tests/tcg/cris/check_movecr.s rename to tests/tcg/cris/system/check_movecr.s diff --git a/tests/tcg/cris/check_movei.s b/tests/tcg/cris/system/check_movei.s similarity index 100% rename from tests/tcg/cris/check_movei.s rename to tests/tcg/cris/system/check_movei.s diff --git a/tests/tcg/cris/check_movemr.s b/tests/tcg/cris/system/check_movemr.s similarity index 100% rename from tests/tcg/cris/check_movemr.s rename to tests/tcg/cris/system/check_movemr.s diff --git a/tests/tcg/cris/check_movemrv32.s b/tests/tcg/cris/system/check_movemrv32.s similarity index 100% rename from tests/tcg/cris/check_movemrv32.s rename to tests/tcg/cris/system/check_movemrv32.s diff --git a/tests/tcg/cris/check_mover.s b/tests/tcg/cris/system/check_mover.s similarity index 100% rename from tests/tcg/cris/check_mover.s rename to tests/tcg/cris/system/check_mover.s diff --git a/tests/tcg/cris/check_moverm.s b/tests/tcg/cris/system/check_moverm.s similarity index 100% rename from tests/tcg/cris/check_moverm.s rename to tests/tcg/cris/system/check_moverm.s diff --git a/tests/tcg/cris/check_movmp.s b/tests/tcg/cris/system/check_movmp.s similarity index 100% rename from tests/tcg/cris/check_movmp.s rename to tests/tcg/cris/system/check_movmp.s diff --git a/tests/tcg/cris/check_movpmv32.s b/tests/tcg/cris/system/check_movpmv32.s similarity index 100% rename from tests/tcg/cris/check_movpmv32.s rename to tests/tcg/cris/system/check_movpmv32.s diff --git a/tests/tcg/cris/check_movpr.s b/tests/tcg/cris/system/check_movpr.s similarity index 100% rename from tests/tcg/cris/check_movpr.s rename to tests/tcg/cris/system/check_movpr.s diff --git a/tests/tcg/cris/check_movprv32.s b/tests/tcg/cris/system/check_movprv32.s similarity index 100% rename from tests/tcg/cris/check_movprv32.s rename to tests/tcg/cris/system/check_movprv32.s diff --git a/tests/tcg/cris/check_movscr.s b/tests/tcg/cris/system/check_movscr.s similarity index 100% rename from tests/tcg/cris/check_movscr.s rename to tests/tcg/cris/system/check_movscr.s diff --git a/tests/tcg/cris/check_movsm.s b/tests/tcg/cris/system/check_movsm.s similarity index 100% rename from tests/tcg/cris/check_movsm.s rename to tests/tcg/cris/system/check_movsm.s diff --git a/tests/tcg/cris/check_movsr.s b/tests/tcg/cris/system/check_movsr.s similarity index 100% rename from tests/tcg/cris/check_movsr.s rename to tests/tcg/cris/system/check_movsr.s diff --git a/tests/tcg/cris/check_movucr.s b/tests/tcg/cris/system/check_movucr.s similarity index 100% rename from tests/tcg/cris/check_movucr.s rename to tests/tcg/cris/system/check_movucr.s diff --git a/tests/tcg/cris/check_movum.s b/tests/tcg/cris/system/check_movum.s similarity index 100% rename from tests/tcg/cris/check_movum.s rename to tests/tcg/cris/system/check_movum.s diff --git a/tests/tcg/cris/check_movur.s b/tests/tcg/cris/system/check_movur.s similarity index 100% rename from tests/tcg/cris/check_movur.s rename to tests/tcg/cris/system/check_movur.s diff --git a/tests/tcg/cris/check_mulv32.s b/tests/tcg/cris/system/check_mulv32.s similarity index 100% rename from tests/tcg/cris/check_mulv32.s rename to tests/tcg/cris/system/check_mulv32.s diff --git a/tests/tcg/cris/check_mulx.s b/tests/tcg/cris/system/check_mulx.s similarity index 100% rename from tests/tcg/cris/check_mulx.s rename to tests/tcg/cris/system/check_mulx.s diff --git a/tests/tcg/cris/check_neg.s b/tests/tcg/cris/system/check_neg.s similarity index 100% rename from tests/tcg/cris/check_neg.s rename to tests/tcg/cris/system/check_neg.s diff --git a/tests/tcg/cris/check_not.s b/tests/tcg/cris/system/check_not.s similarity index 100% rename from tests/tcg/cris/check_not.s rename to tests/tcg/cris/system/check_not.s diff --git a/tests/tcg/cris/check_orc.s b/tests/tcg/cris/system/check_orc.s similarity index 100% rename from tests/tcg/cris/check_orc.s rename to tests/tcg/cris/system/check_orc.s diff --git a/tests/tcg/cris/check_orm.s b/tests/tcg/cris/system/check_orm.s similarity index 100% rename from tests/tcg/cris/check_orm.s rename to tests/tcg/cris/system/check_orm.s diff --git a/tests/tcg/cris/check_orq.s b/tests/tcg/cris/system/check_orq.s similarity index 100% rename from tests/tcg/cris/check_orq.s rename to tests/tcg/cris/system/check_orq.s diff --git a/tests/tcg/cris/check_orr.s b/tests/tcg/cris/system/check_orr.s similarity index 100% rename from tests/tcg/cris/check_orr.s rename to tests/tcg/cris/system/check_orr.s diff --git a/tests/tcg/cris/check_ret.s b/tests/tcg/cris/system/check_ret.s similarity index 100% rename from tests/tcg/cris/check_ret.s rename to tests/tcg/cris/system/check_ret.s diff --git a/tests/tcg/cris/check_scc.s b/tests/tcg/cris/system/check_scc.s similarity index 100% rename from tests/tcg/cris/check_scc.s rename to tests/tcg/cris/system/check_scc.s diff --git a/tests/tcg/cris/check_subc.s b/tests/tcg/cris/system/check_subc.s similarity index 100% rename from tests/tcg/cris/check_subc.s rename to tests/tcg/cris/system/check_subc.s diff --git a/tests/tcg/cris/check_subm.s b/tests/tcg/cris/system/check_subm.s similarity index 100% rename from tests/tcg/cris/check_subm.s rename to tests/tcg/cris/system/check_subm.s diff --git a/tests/tcg/cris/check_subq.s b/tests/tcg/cris/system/check_subq.s similarity index 100% rename from tests/tcg/cris/check_subq.s rename to tests/tcg/cris/system/check_subq.s diff --git a/tests/tcg/cris/check_subr.s b/tests/tcg/cris/system/check_subr.s similarity index 100% rename from tests/tcg/cris/check_subr.s rename to tests/tcg/cris/system/check_subr.s diff --git a/tests/tcg/cris/check_xarith.s b/tests/tcg/cris/system/check_xarith.s similarity index 100% rename from tests/tcg/cris/check_xarith.s rename to tests/tcg/cris/system/check_xarith.s diff --git a/tests/tcg/cris/crt.s b/tests/tcg/cris/system/crt.s similarity index 100% rename from tests/tcg/cris/crt.s rename to tests/tcg/cris/system/crt.s diff --git a/tests/tcg/cris/sys.c b/tests/tcg/cris/system/sys.c similarity index 100% rename from tests/tcg/cris/sys.c rename to tests/tcg/cris/system/sys.c diff --git a/tests/tcg/cris/testutils.inc b/tests/tcg/cris/system/testutils.inc similarity index 100% rename from tests/tcg/cris/testutils.inc rename to tests/tcg/cris/system/testutils.inc diff --git a/tests/tcg/cris/check_abs.c b/tests/tcg/cris/user/check_abs.c similarity index 100% rename from tests/tcg/cris/check_abs.c rename to tests/tcg/cris/user/check_abs.c diff --git a/tests/tcg/cris/check_addc.c b/tests/tcg/cris/user/check_addc.c similarity index 100% rename from tests/tcg/cris/check_addc.c rename to tests/tcg/cris/user/check_addc.c diff --git a/tests/tcg/cris/check_addcm.c b/tests/tcg/cris/user/check_addcm.c similarity index 100% rename from tests/tcg/cris/check_addcm.c rename to tests/tcg/cris/user/check_addcm.c diff --git a/tests/tcg/cris/check_addo.c b/tests/tcg/cris/user/check_addo.c similarity index 100% rename from tests/tcg/cris/check_addo.c rename to tests/tcg/cris/user/check_addo.c diff --git a/tests/tcg/cris/check_addoq.c b/tests/tcg/cris/user/check_addoq.c similarity index 100% rename from tests/tcg/cris/check_addoq.c rename to tests/tcg/cris/user/check_addoq.c diff --git a/tests/tcg/cris/check_bound.c b/tests/tcg/cris/user/check_bound.c similarity index 100% rename from tests/tcg/cris/check_bound.c rename to tests/tcg/cris/user/check_bound.c diff --git a/tests/tcg/cris/check_ftag.c b/tests/tcg/cris/user/check_ftag.c similarity index 100% rename from tests/tcg/cris/check_ftag.c rename to tests/tcg/cris/user/check_ftag.c diff --git a/tests/tcg/cris/check_glibc_kernelversion.c b/tests/tcg/cris/user/check_glibc_kernelversion.c similarity index 100% rename from tests/tcg/cris/check_glibc_kernelversion.c rename to tests/tcg/cris/user/check_glibc_kernelversion.c diff --git a/tests/tcg/cris/check_hello.c b/tests/tcg/cris/user/check_hello.c similarity index 100% rename from tests/tcg/cris/check_hello.c rename to tests/tcg/cris/user/check_hello.c diff --git a/tests/tcg/cris/check_int64.c b/tests/tcg/cris/user/check_int64.c similarity index 100% rename from tests/tcg/cris/check_int64.c rename to tests/tcg/cris/user/check_int64.c diff --git a/tests/tcg/cris/check_lz.c b/tests/tcg/cris/user/check_lz.c similarity index 100% rename from tests/tcg/cris/check_lz.c rename to tests/tcg/cris/user/check_lz.c diff --git a/tests/tcg/cris/check_mapbrk.c b/tests/tcg/cris/user/check_mapbrk.c similarity index 100% rename from tests/tcg/cris/check_mapbrk.c rename to tests/tcg/cris/user/check_mapbrk.c diff --git a/tests/tcg/cris/check_mmap1.c b/tests/tcg/cris/user/check_mmap1.c similarity index 100% rename from tests/tcg/cris/check_mmap1.c rename to tests/tcg/cris/user/check_mmap1.c diff --git a/tests/tcg/cris/check_mmap2.c b/tests/tcg/cris/user/check_mmap2.c similarity index 100% rename from tests/tcg/cris/check_mmap2.c rename to tests/tcg/cris/user/check_mmap2.c diff --git a/tests/tcg/cris/check_mmap3.c b/tests/tcg/cris/user/check_mmap3.c similarity index 100% rename from tests/tcg/cris/check_mmap3.c rename to tests/tcg/cris/user/check_mmap3.c diff --git a/tests/tcg/cris/check_moveq.c b/tests/tcg/cris/user/check_moveq.c similarity index 100% rename from tests/tcg/cris/check_moveq.c rename to tests/tcg/cris/user/check_moveq.c diff --git a/tests/tcg/cris/check_openpf1.c b/tests/tcg/cris/user/check_openpf1.c similarity index 100% rename from tests/tcg/cris/check_openpf1.c rename to tests/tcg/cris/user/check_openpf1.c diff --git a/tests/tcg/cris/check_openpf2.c b/tests/tcg/cris/user/check_openpf2.c similarity index 100% rename from tests/tcg/cris/check_openpf2.c rename to tests/tcg/cris/user/check_openpf2.c diff --git a/tests/tcg/cris/check_openpf3.c b/tests/tcg/cris/user/check_openpf3.c similarity index 100% rename from tests/tcg/cris/check_openpf3.c rename to tests/tcg/cris/user/check_openpf3.c diff --git a/tests/tcg/cris/check_openpf5.c b/tests/tcg/cris/user/check_openpf5.c similarity index 100% rename from tests/tcg/cris/check_openpf5.c rename to tests/tcg/cris/user/check_openpf5.c diff --git a/tests/tcg/cris/check_settls1.c b/tests/tcg/cris/user/check_settls1.c similarity index 100% rename from tests/tcg/cris/check_settls1.c rename to tests/tcg/cris/user/check_settls1.c diff --git a/tests/tcg/cris/check_sigalrm.c b/tests/tcg/cris/user/check_sigalrm.c similarity index 100% rename from tests/tcg/cris/check_sigalrm.c rename to tests/tcg/cris/user/check_sigalrm.c diff --git a/tests/tcg/cris/check_stat1.c b/tests/tcg/cris/user/check_stat1.c similarity index 100% rename from tests/tcg/cris/check_stat1.c rename to tests/tcg/cris/user/check_stat1.c diff --git a/tests/tcg/cris/check_stat2.c b/tests/tcg/cris/user/check_stat2.c similarity index 100% rename from tests/tcg/cris/check_stat2.c rename to tests/tcg/cris/user/check_stat2.c diff --git a/tests/tcg/cris/check_stat3.c b/tests/tcg/cris/user/check_stat3.c similarity index 100% rename from tests/tcg/cris/check_stat3.c rename to tests/tcg/cris/user/check_stat3.c diff --git a/tests/tcg/cris/check_stat4.c b/tests/tcg/cris/user/check_stat4.c similarity index 100% rename from tests/tcg/cris/check_stat4.c rename to tests/tcg/cris/user/check_stat4.c diff --git a/tests/tcg/cris/check_swap.c b/tests/tcg/cris/user/check_swap.c similarity index 100% rename from tests/tcg/cris/check_swap.c rename to tests/tcg/cris/user/check_swap.c diff --git a/tests/tcg/cris/check_time2.c b/tests/tcg/cris/user/check_time2.c similarity index 100% rename from tests/tcg/cris/check_time2.c rename to tests/tcg/cris/user/check_time2.c diff --git a/tests/tcg/cris/crisutils.h b/tests/tcg/cris/user/crisutils.h similarity index 100% rename from tests/tcg/cris/crisutils.h rename to tests/tcg/cris/user/crisutils.h diff --git a/tests/tcg/cris/sys.h b/tests/tcg/cris/user/sys.h similarity index 100% rename from tests/tcg/cris/sys.h rename to tests/tcg/cris/user/sys.h From patchwork Mon Dec 10 15:28:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 153289 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3698409ljp; Mon, 10 Dec 2018 07:41:57 -0800 (PST) X-Google-Smtp-Source: AFSGD/XaXgVH/UQWzjG662Ejk5v6Ug9dTbtHHJyBWm1YfOa0Z9/6Kf+U5TZcK6kEjB4E1BahZgWd X-Received: by 2002:a0c:ad16:: with SMTP id u22mr12095052qvc.240.1544456517357; Mon, 10 Dec 2018 07:41:57 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544456517; cv=none; d=google.com; s=arc-20160816; b=CE/imIL7xJN8RmTxDnl9ea4vkukQr6E+CKIjI/5AfIH5eCdkGSRqYwKUOfhIVgDRcn njc/nYHehaJ0gju3++GvwVJsDk48U1L6yqnte5sMdGP+MpkbMGQ7trkDUH7oooDLXPzJ Jz8eQhJrDU6Tt4Bo4UIqSV/zHRXTCEL7YbJxuycXxH0U41qGuGnScFI03Rv/PI1gym1M wGadW7ol7TDTGtinXCYjib+f91BYClh0WaSAQ2XuSCy1cGbLvu+51layhjoUwHVoCo14 N+LSymtK5eVods+1ddvVSc/G1IzJ2U0if9CFaS1WFsYRoKO1UJOi/shhiU0Ix2EuBCHY 5OiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=/U1pyU+stUfvYOAsG/d5zAnLuBxRcYUDLgZPKFsVVuE=; b=tXNiith9yRe7DJCrsQOMO7R/Tl3rw0VDD3h+yY7GRp9Ft5ePWeLuYHAl7QTURAasdI 74tQ0UUYG6DZgQ2hENFHerfO4bzi+TD8vNX2uUmPHZ9uPp4HO64m7sUrPaaTuhI/EzQp FWYrW7g6t+nr777jMMJFGAaC6is4LADXB0aj+C1TUHVQ1kTCLsZw2Uil3nDHXW4yxtbW GT2v5e8jJoy56x9pNiCtsGIV7OoZGU9X2zL7mYV0ePMaYgPX3TF8RbaAZPI1LODVbhqh pYXbNxJ8OvBPL1SqI7ZssPXePXnqJUv8Q45bdnYyq5WkjYMED/9bt5AS4y8wRfFvvejH m0Rw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=FQ0WyCul; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id i8si6249310qvp.40.2018.12.10.07.41.57 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 10 Dec 2018 07:41:57 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=FQ0WyCul; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33404 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWNgy-000279-PB for patch@linaro.org; Mon, 10 Dec 2018 10:41:56 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43353) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWNU9-00089R-S0 for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:44 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWNU8-0000Xd-DW for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:41 -0500 Received: from mail-wr1-x444.google.com ([2a00:1450:4864:20::444]:40912) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gWNU8-0000XE-45 for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:40 -0500 Received: by mail-wr1-x444.google.com with SMTP id p4so10896736wrt.7 for ; Mon, 10 Dec 2018 07:28: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=/U1pyU+stUfvYOAsG/d5zAnLuBxRcYUDLgZPKFsVVuE=; b=FQ0WyCulaRM/4qSsbOKUoGrN6RS2W7kfQtLRvDC95FojmanAUmrhSRpxcKFA96514y B3tx4NcEsBYz9NdxIB4t3vqGelCUxptxUIOcsl9H8n+doHQ40eq5hR7SNLYNWAhXqZ9Q h7Df3G3n1dnoe3Lh+uH+jIPOFn1Jjhvu4ufmY= 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=/U1pyU+stUfvYOAsG/d5zAnLuBxRcYUDLgZPKFsVVuE=; b=J29lGt+QuGO+vPhSQhw26LoJbus8tDPwp28EqL4Cy9ImAWgHUmrJXhc5pBbYE2ET2I qD+NrGI3TjCUkWCjXGO9i45wB38SH0CTnrctq7S5Y5SzK/6OCh390tJl1Ouj9m5tlEg/ qtloRyETVXGdZsV/fx0Sbpn7e/WwbkDWxsGwcYi4eaJbY2HTIr9rFM4O35wruBOaBOgS 3Bh0IxfWCfoXeteq4yLb3M4QUc6igqo1YkBKtD8EPFtatzQ1mTEbZUVepWdNTPtUyu4R xIKS/kJemYffmqEgowk3dJkAA6seUJm8pT5zofEO0uQt8Vx28rWSA7dJogSp6leUXmkC 3EFw== X-Gm-Message-State: AA+aEWZrl70xUt1xRLXequs4Ipni41SDd1/XXpsz33/jtg5Sf1di753m QjZYfTtOwVAYzue1P+zELy32xg== X-Received: by 2002:adf:f8d2:: with SMTP id f18mr10319637wrq.265.1544455719029; Mon, 10 Dec 2018 07:28:39 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id b131sm12508911wma.21.2018.12.10.07.28.32 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Dec 2018 07:28:34 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id A42473E06D8; Mon, 10 Dec 2018 15:28:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Mon, 10 Dec 2018 15:28:26 +0000 Message-Id: <20181210152829.29271-11-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181210152829.29271-1-alex.bennee@linaro.org> References: <20181210152829.29271-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::444 Subject: [Qemu-devel] [RFC PATCH 10/13] 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: jcmvbkbc@gmail.com, michael@walle.cc, amarkovic@wavecomp.com, edgar.iglesias@gmail.com, shorne@gmail.com, =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" 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/system/sys.c | 96 ++++++++++++++++++------------------- 1 file changed, 48 insertions(+), 48 deletions(-) -- 2.17.1 diff --git a/tests/tcg/cris/system/sys.c b/tests/tcg/cris/system/sys.c index 21f08c0747..aa342335d6 100644 --- a/tests/tcg/cris/system/sys.c +++ b/tests/tcg/cris/system/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); } From patchwork Mon Dec 10 15:28:27 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 153288 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3696448ljp; Mon, 10 Dec 2018 07:39:56 -0800 (PST) X-Google-Smtp-Source: AFSGD/WRRtTLJJd3NefLbDBw6KAiLAgfiM0TF6j8wnQb7DRVo6oBcLmynSZPeaYCVi+1H0D1JSOe X-Received: by 2002:a0c:98ca:: with SMTP id g10mr12032675qvd.13.1544456396066; Mon, 10 Dec 2018 07:39:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544456396; cv=none; d=google.com; s=arc-20160816; b=qb7SwL2WLLmzNoqGWbRmbpTUfUjx1nyHcqhYvTxCWUXXsybXiXTk9D1r/+aaCY2tBn Nk44VbOCWllqMQWmZgr72VRxTusNLNtLD9LFjMCv6cJ+mxvTBULM/KcWoA8l48vWejAk 1i0KlQlC5ePIRfW7mFBQ31af4zPe0RWYx5dN/iyNoQBkCamY9v16XzdkI8kLx3LsyYIV +8u1rm0tg+BJw1U5C6mtuVWY2faV/lADQepLGL9744L+EL24cR8gD0rTsMPr3BOMD5Nl D8otp9dMiza4odB0tu7cnstezru5JUNyJeKkFRW9fSXfH45/R7STVXZw9kJIrTZdgkaN PAXA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=KC3c3LJrQAgMlatKGL1mrN6pmty5FaWgmNspQd4nMi0=; b=yqcxUbI9EBSUfFQr2fPf6WKs9OteXe8lAQdi+TIPO/H1xwADSzqXv90/+RxZYzcNH8 6Pj+JXQfRlwR716ne5eyYEmitKJhWsUJ1rrhwlrgteaZ0qSZACf5YH1YIOS7Vsf6eauu uRlF8m+VOmCmQk56wXTPIdalxxTcHl1dB/jMhXjVKOA0Vk/4+NJhluiFQXr8b2AwTcfJ cYpXguiEkpgpN6Q91wFTYbSvKe+5iWSjrI4Oa0MJ8+5QykdcVYEVrA5BRaOCnZXYasOR /uFAv8lWwqfOrnq3GOo6djFghz5EWZ+AFiX138EN5131PQ9lTjchrvKIxgvRXDPYpsRx BcOg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="B2C/4ODf"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id v184si1232791qki.208.2018.12.10.07.39.55 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 10 Dec 2018 07:39:56 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="B2C/4ODf"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33385 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWNf0-0000KK-Vl for patch@linaro.org; Mon, 10 Dec 2018 10:39:55 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43340) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWNU8-00088Y-Rd for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:41 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWNU7-0000XH-FO for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:40 -0500 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:33757) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gWNU7-0000Wp-7t for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:39 -0500 Received: by mail-wm1-x343.google.com with SMTP id r24so6887369wmh.0 for ; Mon, 10 Dec 2018 07:28:39 -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=KC3c3LJrQAgMlatKGL1mrN6pmty5FaWgmNspQd4nMi0=; b=B2C/4ODf9Sg2Lw11COpBq8kgV0VegMu0MC1Teg7vHBbKGdMh6ZPEilMQw+a8n/VSTW q+3ow6LDKLTnIztXM/f9Q3jeX4VxB43ViOEZhSRYx4eejlnse4evlx6425OXCap5pajD zjnKArDWi1u9J/vp8x8nHrCtkviyyPJCROYRA= 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=KC3c3LJrQAgMlatKGL1mrN6pmty5FaWgmNspQd4nMi0=; b=gFw3Rqzp48W/1E9EJUq+1c3u4Q0XDZ3dVHeVoy1PC5ND+4UNXqPzZY2wlHEO0SfOqq EImkOrPax4RwUlZIIB05T9eJFfF8hVGKtAVkjjjAasqoX1IGPLkt/70Ti3g4VwoxzrJB UFcDRy9RaAR0C428DmN+H0S6UqV1ovW4TlZ1nNOVkN8OBxwr8NhOa8KAwjxeN1ySv18J KUXgBbvF0xDZCCSjysIL5jtnXlKLUoezyNPMaJq9YPaLb7Cm68BhxeOpsag+ciyJPL78 fKa109B0sUIekans54/3rhM1//g6l2+1hew2blCgxdhd7BTke6UP9/+DzECrYQhce/5D Cbzw== X-Gm-Message-State: AA+aEWYEUHqKs6rS6f0GIlc80SfpxAZGKrfczi2CEQDd0NEGEutL8FW4 gQ68M9aHUqNKb8CxzR1nFlniTQ== X-Received: by 2002:a1c:4906:: with SMTP id w6mr10529142wma.62.1544455718304; Mon, 10 Dec 2018 07:28:38 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id a6sm11794160wmh.10.2018.12.10.07.28.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Dec 2018 07:28:35 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id B7C073E075D; Mon, 10 Dec 2018 15:28:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Mon, 10 Dec 2018 15:28:27 +0000 Message-Id: <20181210152829.29271-12-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181210152829.29271-1-alex.bennee@linaro.org> References: <20181210152829.29271-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::343 Subject: [Qemu-devel] [RFC PATCH 11/13] 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: jcmvbkbc@gmail.com, michael@walle.cc, amarkovic@wavecomp.com, edgar.iglesias@gmail.com, shorne@gmail.com, =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Evidently upstream gcc doesn't like this opcode. Signed-off-by: Alex Bennée --- tests/tcg/cris/system/check_btst.s | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) -- 2.17.1 diff --git a/tests/tcg/cris/system/check_btst.s b/tests/tcg/cris/system/check_btst.s index e39fc8f4d6..485deb2006 100644 --- a/tests/tcg/cris/system/check_btst.s +++ b/tests/tcg/cris/system/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 Mon Dec 10 15:28:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 153290 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3698791ljp; Mon, 10 Dec 2018 07:42:21 -0800 (PST) X-Google-Smtp-Source: AFSGD/XVl/u4aOpMpj1oF33WRyje5scKOfh8QQGI9qzPD0hPCWk81iE9deTJ7ywo02ZRfdsLtzci X-Received: by 2002:a0c:8b64:: with SMTP id d36mr11710606qvc.233.1544456541407; Mon, 10 Dec 2018 07:42:21 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544456541; cv=none; d=google.com; s=arc-20160816; b=tIS25dIfappM3DStHd4kYFt854O6Ic1ZI25Vn84juesPmIoUH3rhYo3ZNc1l+L2yt0 +TB17+ogKvKhbWS41H5FsPD20af9yPzAcAOt7Du40UuUem9qBH7eAJqxcNdb1l6RYrty K2YkO4IrGOUnwmCxIgADtDeqcfnQs1YpKcrWs5BNmetUGzp6kWQ27TBSTcz/cK46W+Jl L+Wah2oB/KcVXlc6urLdqXoE9PUEWaiVnnGcVoh9J5rs80hL3Qh9aVhPQCzRKYlUv3VP eWfxBy5JIkOP1XeU96bVmxcQSGMTCbSWsFmOa4FhIrU5Fsde1C5OS/uu2hobMPUp42gz DkeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=CmGxMMj4n7P8z00qm9m+o/OQTypuNm6+ORePh/Wno3E=; b=KPvdLIE2EBYYAQzcXheWrv4AHyxv5LNePhU0LEjzqRa5vU+/PDYWrNEpmBhw/D7o0F wJ6lH1nr7R6xu7kuHyvPJvJjXaJb33logTxzOA5FDCWqCrIuvGq6pOGurLYq1OsNtStO zDVkCBNBRhwj+3svzIGOkb3zI4emPsUhPpRh4MAEz16wH7q26AFUb0WQzcq7Ej0/E0bs ri+qMasQDnb4Fhuxk4WOfZERI+9E/YjL0WBlMC7k4oh7lj/EsQLFEmF6tsPbZE6xFFwu n2G2s7PMusASPPOS5aYvvhBvBLWP8bTUHrGdntlVWO4gPoZ/MxRikOMzxG8Ir1f9SUFX 7uTg== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RtwY0nLE; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id g34si2645612qte.104.2018.12.10.07.42.21 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 10 Dec 2018 07:42:21 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RtwY0nLE; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33407 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWNhM-0002NX-Qk for patch@linaro.org; Mon, 10 Dec 2018 10:42:20 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:45125) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWNa9-0005M6-Lj for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:34:54 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWNa4-0005NU-M0 for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:34:53 -0500 Received: from mail-wm1-x341.google.com ([2a00:1450:4864:20::341]:34976) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gWNa4-0005Mt-8T for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:34:48 -0500 Received: by mail-wm1-x341.google.com with SMTP id c126so11687959wmh.0 for ; Mon, 10 Dec 2018 07:34:48 -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=CmGxMMj4n7P8z00qm9m+o/OQTypuNm6+ORePh/Wno3E=; b=RtwY0nLEcfUBjBP08XSQ2e6Dk9001c6S6P9Rsp6Epv8x5bqzLn/0Q4BGTYi92HKKvN 6pu8ZOTBhTgVConWwt9dq+PLwTaSHJf0WFUO/48bTHFpSzeorFGHPLQf+oidAdT+jGt4 fQr0sXfGwau5fUlQRml2o0qOraOt5GxpmH9s0= 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=CmGxMMj4n7P8z00qm9m+o/OQTypuNm6+ORePh/Wno3E=; b=QprSoa8wJPCac2Zc+XScBX0tsPDgdI/7p32kKdIZHNDu0z3cGaAohDMPqHRrKwmtNz dHIX0fXODAmGnBlDu82e/aLnKFiJjsndtUrugULP3aG9ghTtQ0GXvT42sYrPTFxFdeQM Vv9vS99P1/BZIfIqo5JpA0Dj4nd4i9r59vvfahgU/AmQ6aXJ7O0OTfkne/RIHFzbOjot 6BT+zyJjM9WiMy9IPHmR3nRJAAYJNPfFJP7OlkxtfaVzOEUt2c+0oEUmshLUTRnPimr1 +4xu1UTIGZJuNzF2xp7eeLrLKkumOUzte4l6cXh5LgXlk2BjZroutEOCYvSEH/xlSrEH TD2Q== X-Gm-Message-State: AA+aEWbTjPJTgAnLoXfRYsIPTkAOrxATDq7F+3Fdb5qAlnbWla2vYMBS F07a2oGjPDrdS0erQX0jb2GaSA== X-Received: by 2002:a7b:ce84:: with SMTP id q4mr11663034wmj.105.1544456086743; Mon, 10 Dec 2018 07:34:46 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id j33sm23529334wre.91.2018.12.10.07.34.46 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Dec 2018 07:34:46 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id CAD9B3E0790; Mon, 10 Dec 2018 15:28:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Mon, 10 Dec 2018 15:28:28 +0000 Message-Id: <20181210152829.29271-13-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181210152829.29271-1-alex.bennee@linaro.org> References: <20181210152829.29271-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::341 Subject: [Qemu-devel] [RFC PATCH 12/13] 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: jcmvbkbc@gmail.com, michael@walle.cc, amarkovic@wavecomp.com, edgar.iglesias@gmail.com, shorne@gmail.com, =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" To avoid: Error: dangerous MULS/MULU location; give it higher alignment Signed-off-by: Alex Bennée --- tests/tcg/cris/system/check_mulx.s | 11 +++++++++++ 1 file changed, 11 insertions(+) -- 2.17.1 diff --git a/tests/tcg/cris/system/check_mulx.s b/tests/tcg/cris/system/check_mulx.s index d43241a6f5..a7a1f82a82 100644 --- a/tests/tcg/cris/system/check_mulx.s +++ b/tests/tcg/cris/system/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 Mon Dec 10 15:28:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 153287 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp3696423ljp; Mon, 10 Dec 2018 07:39:54 -0800 (PST) X-Google-Smtp-Source: AFSGD/UTiNgpG7fdTBO90kr4CzHI+Kaw9BCf+Y7rj5qaafKokwavOnJTTU9jaOefYjKCJR8bRHfM X-Received: by 2002:ac8:160b:: with SMTP id p11mr12295753qtj.113.1544456394537; Mon, 10 Dec 2018 07:39:54 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544456394; cv=none; d=google.com; s=arc-20160816; b=Tn8ZSxVWDq4cfq3S8fZ15/iNDd154aaxzirQqfv4bx7fmRszHxHMM/onqz8AHgcD/E yPbYWBHMYZ+pjy7IFcMK+a+oo7IMIZd5XoYJfwgHdxqhoV/6XGJcRzARIvqL2LcF8MlL tQ3UhdoXW0wX87DL6QsdYQH8KBp1tFtJ6cK6I8c8nSrWQn2MCyQtPNJbabPUfXjUI/3t pt44UW9tbqJlYhsqtv9KSykoGtM+AHuxb0GAYmuI+KnAKfrYIeEchcN+jvXHCA7x44VC l5uCKhQIsibW9y4wtzkw0IeAlBgv5dMhRRAlh69PtzwDm59KlVWM94I5eJA2o4MQu2kk MUwQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject :content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:to:from:dkim-signature; bh=iP7yjGj6DQYxtptdhaqdZYKaVje7sF0dhM48afUYuHY=; b=SQl6uhi/BjW/gXIgapoYEpE+ZwQxp2hcPf/wGs4nJxuO4o0gTVQpu4okuabmMk+eHK Muv2CLhHg2Tx40+EpjPSz09YtxeIFo3q+VeoQ+JjIzrH0gkOTQW8mFiefEDHdDhlg63V Y+QIS5dpIOF+tMfIliSBUNtVYaqFW0dD+vjxA0oR8I0Xkr9f3U36CMRgofBrtJFlfPAi W+Zi8bKektkSfW0Mm/sf1KbRMUCc4FF3KBKehDLEv+AL1hbsKKZDF0JSpmbz84RTGsKU Z0lkdUWGybno+Gcq0z863v3LzmYELWXAQpIFbgAJZzZYESSQKzaH1818+dIE4k2cvUW1 GQIQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="ZniW+4e/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id y27si7205903qtk.149.2018.12.10.07.39.54 for (version=TLS1 cipher=AES128-SHA bits=128/128); Mon, 10 Dec 2018 07:39:54 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b="ZniW+4e/"; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:33383 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWNez-0000IZ-83 for patch@linaro.org; Mon, 10 Dec 2018 10:39:53 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43369) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gWNUD-0008HD-9K for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gWNUA-0000YN-18 for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:44 -0500 Received: from mail-wr1-x443.google.com ([2a00:1450:4864:20::443]:37075) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gWNU9-0000Xp-KD for qemu-devel@nongnu.org; Mon, 10 Dec 2018 10:28:41 -0500 Received: by mail-wr1-x443.google.com with SMTP id j10so10911291wru.4 for ; Mon, 10 Dec 2018 07:28: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=iP7yjGj6DQYxtptdhaqdZYKaVje7sF0dhM48afUYuHY=; b=ZniW+4e/HXir49G6IUIz1LEYuSlrCL6AizyCxNXh6bfCpb+Rc5Z37nQP/LsKkwUlpz n3VFJlEutGzdh6yaJO7rfh7vMlc/G/5YIf5OSLH5ciAB/GW9DSxpxcfx46AGk/IYOmtS Fx8+5oOG62grKKW9oqEhZcVbSXLAKJpMGmpO4= 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=iP7yjGj6DQYxtptdhaqdZYKaVje7sF0dhM48afUYuHY=; b=Ugnaou2GphsPsMl9nwysAz5gs6CBol9UeoY4hvfLTduUA9VfnYC4Wdc/h21sr8vFNO 31pYMFmVya2Yj+jzmOgNoag/VqO7B4QuKLgD26jf3GA06jP6x/c8Qq8+8DpD3m6LP38T ToIMV1YR5CEYlSFUuzzIinFnDmwJTJwtN5uJGZzpl8JKApK3cdIAXG7amOzPuZvYVRVG FENpr5twBv85xwbIRxpaIOONXJY+YZSqq4T9Kbwy45hdswru1Fpgc3UPv4fQuC6vwiof cgbk29S8BpTE/ciWRXndeBihrPvbG5dt3x4Zv1euH8v2jWtYzuw8NPvNqb5hjnVjTCfV 6n5Q== X-Gm-Message-State: AA+aEWZ9YVEhPtGP/ZZzQyGn2bbevxeeJrnZgWPe8oe2Ivb+YGD6XEBJ GApJRDbGE86zw4KhN4BAeCqbhw== X-Received: by 2002:adf:891a:: with SMTP id s26mr10148856wrs.44.1544455720352; Mon, 10 Dec 2018 07:28:40 -0800 (PST) Received: from zen.linaro.local ([81.128.185.34]) by smtp.gmail.com with ESMTPSA id o4sm8595618wmh.40.2018.12.10.07.28.34 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 10 Dec 2018 07:28:36 -0800 (PST) Received: from zen.linaroharston (localhost [127.0.0.1]) by zen.linaro.local (Postfix) with ESMTP id E33373E07A9; Mon, 10 Dec 2018 15:28:30 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Date: Mon, 10 Dec 2018 15:28:29 +0000 Message-Id: <20181210152829.29271-14-alex.bennee@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181210152829.29271-1-alex.bennee@linaro.org> References: <20181210152829.29271-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::443 Subject: [Qemu-devel] [RFC PATCH 13/13] tests/tcg: enable cris 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: Fam Zheng , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , jcmvbkbc@gmail.com, michael@walle.cc, amarkovic@wavecomp.com, edgar.iglesias@gmail.com, shorne@gmail.com, =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , aurelien@aurel32.net Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" Currently we don't actually run them. 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.softmmu-target | 50 ++++++++ 4 files changed, 57 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.softmmu-target -- 2.17.1 diff --git a/tests/docker/Makefile.include b/tests/docker/Makefile.include index 9467e9d088..e1ed0df5f9 100644 --- a/tests/docker/Makefile.include +++ b/tests/docker/Makefile.include @@ -128,6 +128,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.softmmu-target b/tests/tcg/cris/Makefile.softmmu-target new file mode 100644 index 0000000000..988741f1b3 --- /dev/null +++ b/tests/tcg/cris/Makefile.softmmu-target @@ -0,0 +1,50 @@ +# -*- Mode: makefile -*- +# +# Cris softmmu tests +# + +CRIS_SRC = $(SRC_PATH)/tests/tcg/cris/system +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)) + +# add to the list of 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/system +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) + +# Currently we skip these as the system tests originally targeted the +# GNU Simulator and probably need some crafting to load as a kernel +# into QEMU +$(CRIS_RUNS): + $(call skip-test, $@, "NEEDS MAGIC INVOCATION")