From patchwork Wed Sep 11 16:49:55 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 173619 Delivered-To: patch@linaro.org Received: by 2002:a05:6e02:ce:0:0:0:0 with SMTP id r14csp993753ilq; Wed, 11 Sep 2019 09:50:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqzGeT8oPULXcGm/HS94i2eUuiz8nGYUxtPlaBH89heVm2NXEUWRPEwMDJzCRvu3r6zzDG2C X-Received: by 2002:aed:3527:: with SMTP id a36mr36529778qte.82.1568220649588; Wed, 11 Sep 2019 09:50:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568220649; cv=none; d=google.com; s=arc-20160816; b=C7/BPIacSXv8jWQQtEQ3DujAiS++YajFIog5oz4510My4C660WMmlQHGX5kF/s1u7S NmanDz6tAH7zNoNe7oDnAzByI1v70bs06O4i5futGFFLee6KwTDK+RRNvlMe7v/G0SV/ IFhUrr1fCjudkUzyNAwHghCoGNGSjw01MGOr3JMszXx6rqDKyzhclChp1+lcVK4MT6It 8L8JJSCtHB0gF2ZXlWUIXqETzIw+pP8Sm4P6uYzMBEyjG0l+8J8YJRfRvq/jUraBgGpe 0fLmwolWPnoM4SM3bgKlE0go3GRbr2eti4YWscaint94dzClOMyStNYCgem5TQX3y8B4 VarA== 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=LdShYhT6EQrLVHl+0PZ3U9EB4Wx5zUovoSRv7pyVvlc=; b=oPQ3ko9RkIOWVrFuS1zBd87GhYfsDh6w+yMKy1gP7knqyPHGrvE9FaYhOji/UsjCwH UivAUXQWFRiXqqYswXZmb9b/joZAqKGZEkjcMwN8KSf2EOt6YW6qY+sgGu3sv0itENU7 OA02QQwe/+8GxD93bRlLr4P28AwJl6SbIPCllt8iRpyD7W0gP+TeG/ucyFynDM53Ra79 2+9c6UeB3a+UmGl6BA9QGunZznEuYwbZQ3BMcgpQ8uC/BIWp5H8q/TUifqqUW5qhrOIs NCNDgbgKUs2bXPYlyfBFm3Fk97rduVp22YlgDjM3QbSLcN8wWttn39fHz5LmRvTK8vDz x2CA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SthgXHrE; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f1si15873887qtm.155.2019.09.11.09.50.49 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Wed, 11 Sep 2019 09:50:49 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=SthgXHrE; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:53814 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i85pQ-0006tG-0c for patch@linaro.org; Wed, 11 Sep 2019 12:50:48 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:43480) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i85oi-0006Ua-Qn for qemu-devel@nongnu.org; Wed, 11 Sep 2019 12:50:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i85oh-000481-6U for qemu-devel@nongnu.org; Wed, 11 Sep 2019 12:50:04 -0400 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]:53734) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i85og-00047L-VS for qemu-devel@nongnu.org; Wed, 11 Sep 2019 12:50:03 -0400 Received: by mail-wm1-x344.google.com with SMTP id q18so4306081wmq.3 for ; Wed, 11 Sep 2019 09:50:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LdShYhT6EQrLVHl+0PZ3U9EB4Wx5zUovoSRv7pyVvlc=; b=SthgXHrElek+o9gIx9oiI/fmC4N5MLFMdcGZoWUrBpH48/6i54wz+Tctgtt8zTp1r0 LwVO3tQ7r1iq0aW1nzNqJzCLE3FDWYdmIhDxkOjY18K4GHrkvIS1DsUzuRLOf6szWutR ZtyMFG0JzFYfucQbA0PXUMGLnc7qmrrPjq4ttRJnyg99tKEzbFn810kAijBbvuXnAlCe 2khhvK1g1n1DVk2nOWkiHaJSOpBr909cF/Q/m8n0pKPxv2il4DyK0VF0kYIThsXDNcxM Q2w70i6NrNI1LzOL1svivtdHk3+zA+utYtrtRdp5GeT/kcMiL7M/9w7Dlml8YSc6JKJ3 TlIg== 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=LdShYhT6EQrLVHl+0PZ3U9EB4Wx5zUovoSRv7pyVvlc=; b=mroDm4zSuR6SOGDx6UUnPbCezIbPqw/tyNYELhvpFLf1jYGXFbcNBOM/ReLnMScMXc hCpkV81WLazs5Nk7j+rU83neEZ/C8JbRO9LwyHKeUx6KdVCBg3QWr+RzyWlxq/vxLrdA LXQ3Kewi9fCWOCTmoHeU+nqXI2e65KrnY/ATeww4GQ3eaB4FHAD5P3hrFi9kg54F+e1c XyMwRnSAuWk5OfLWF1OMcpOTHU/a45EZ2ShBVE43DueT9rvTG4b2KqEylKF+HgMnFCkg 1427GS8RX5re2mf/voEU73hdFH7kML9cwebAx3+IBfps9joE1PmeMXlSZLAO3ym00Tv0 XvqQ== X-Gm-Message-State: APjAAAWqDK6sef3uBMJMKfb5/OR5xS7OcBBeS9sA1YaODCuYGmDI2Swc gGFHI51QwxY7EbcXSTiTmm+lQg== X-Received: by 2002:a7b:ca4b:: with SMTP id m11mr4585914wml.144.1568220601841; Wed, 11 Sep 2019 09:50:01 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id f17sm17979624wru.29.2019.09.11.09.50.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 11 Sep 2019 09:50:00 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 168511FF8C; Wed, 11 Sep 2019 17:50:00 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Wed, 11 Sep 2019 17:49:55 +0100 Message-Id: <20190911164959.11003-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190911164959.11003-1-alex.bennee@linaro.org> References: <20190911164959.11003-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::344 Subject: [Qemu-devel] [PATCH v5 1/5] tests/tcg: clean-up some comments after the de-tangling X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" These were missed in the recent de-tangling so have been updated to be more actuate. I've also built up ARM_TESTS in a manner similar to AARCH64_TESTS for better consistency. Signed-off-by: Alex Bennée --- tests/tcg/Makefile.target | 7 +++++-- tests/tcg/aarch64/Makefile.target | 3 ++- tests/tcg/arm/Makefile.target | 15 ++++++++------- 3 files changed, 15 insertions(+), 10 deletions(-) -- 2.20.1 Reviewed-by: Peter Maydell diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index 8808beaf74b..679eb56bd37 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -74,8 +74,11 @@ 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. +# The order we include is important. We include multiarch first and +# then the target. If there are common tests shared between +# sub-targets (e.g. ARM & AArch64) then it is up to +# $(TARGET_NAME)/Makefile.target to include the common parent +# architecture in its VPATH. -include $(SRC_PATH)/tests/tcg/multiarch/Makefile.target -include $(SRC_PATH)/tests/tcg/$(TARGET_NAME)/Makefile.target diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile.target index e763dd9da37..9758f89f905 100644 --- a/tests/tcg/aarch64/Makefile.target +++ b/tests/tcg/aarch64/Makefile.target @@ -8,7 +8,7 @@ VPATH += $(ARM_SRC) AARCH64_SRC=$(SRC_PATH)/tests/tcg/aarch64 VPATH += $(AARCH64_SRC) -# we don't build any other ARM test +# Float-convert Tests AARCH64_TESTS=fcvt fcvt: LDFLAGS+=-lm @@ -17,6 +17,7 @@ run-fcvt: fcvt $(call run-test,$<,$(QEMU) $<, "$< on $(TARGET_NAME)") $(call diff-out,$<,$(AARCH64_SRC)/fcvt.ref) +# Pauth Tests AARCH64_TESTS += pauth-1 pauth-2 run-pauth-%: QEMU_OPTS += -cpu max diff --git a/tests/tcg/arm/Makefile.target b/tests/tcg/arm/Makefile.target index aa4e4e3782c..7347d3d0adb 100644 --- a/tests/tcg/arm/Makefile.target +++ b/tests/tcg/arm/Makefile.target @@ -8,25 +8,26 @@ ARM_SRC=$(SRC_PATH)/tests/tcg/arm # Set search path for all sources VPATH += $(ARM_SRC) -ARM_TESTS=hello-arm test-arm-iwmmxt - -TESTS += $(ARM_TESTS) fcvt - +# Basic Hello World +ARM_TESTS = hello-arm hello-arm: CFLAGS+=-marm -ffreestanding hello-arm: LDFLAGS+=-nostdlib +# IWMXT floating point extensions +ARM_TESTS += test-arm-iwmmxt test-arm-iwmmxt: CFLAGS+=-marm -march=iwmmxt -mabi=aapcs -mfpu=fpv4-sp-d16 test-arm-iwmmxt: test-arm-iwmmxt.S $(CC) $(CFLAGS) $< -o $@ $(LDFLAGS) -ifeq ($(TARGET_NAME), arm) +# Float-convert Tests +ARM_TESTS += fcvt fcvt: LDFLAGS+=-lm # fcvt: CFLAGS+=-march=armv8.2-a+fp16 -mfpu=neon-fp-armv8 - run-fcvt: fcvt $(call run-test,fcvt,$(QEMU) $<,"$< on $(TARGET_NAME)") $(call diff-out,fcvt,$(ARM_SRC)/fcvt.ref) -endif + +TESTS += $(ARM_TESTS) # On ARM Linux only supports 4k pages EXTRA_RUNS+=run-test-mmap-4096