From patchwork Tue Sep 17 18:41:05 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: 173920 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1492307ill; Tue, 17 Sep 2019 11:43:10 -0700 (PDT) X-Google-Smtp-Source: APXvYqxUUyPiyhD1ezR5gWmVvjWX8dgIA/0oclmRp78JuO3rLIhxVaQ86JygDJ3aEVGfOOsBDDJQ X-Received: by 2002:ac8:b42:: with SMTP id m2mr231318qti.174.1568745789961; Tue, 17 Sep 2019 11:43:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568745789; cv=none; d=google.com; s=arc-20160816; b=RXw9kyjnqCvJB+S5dF0awF/4EsQ0Y4CTB+I6Bhvu7VMhBaIYoaJ5ZJQfcyzu5txg4k 5rUULTYGwTKmO+GJDpQy0tnfz7QwUq5A8TdqQPWed4+Mm86Fujd892GxFWH50m3X2tI4 i3laIjla43SAmWT24dQK1hWiw4y18m+A+eTX3kQndMxgBgatRkMpU9kAcIayU8MATXNT cnZMEdSgwD5D2reZuEB+SUwdIBPEM9eiw38IW5GagpjUo+wBBG4EjeHRdHxjyKrQyFSs Ncen3tzDFctHyZ8t6+z6JWuXc0fBE84jvRcEpqW72nZtjuW2408YMrPIeOdGPgdUU3dE YbkQ== 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=qkrQNPdYjgzsGeZKliHj5m6aTSoldYZ7J5gDgev0N24=; b=Tpc8lTtRxVcIZK4Rvd+wvgV4EF5TysWsBkD29PzcTs8wypJrdB0AH9w2E7D2g+QJP9 RogA6aEPAZRRjCCecfa2KST9G1jD6d0aQWUSUDuf0JgPF3SKNBv5hoUoELVrc/91VYkV fGZAs3Drw5Rm7r6ani0mGOxnPXqtBuORjYr79hULEw0lwx1krMz1qA1yGBZNk/4RCCUK J/YqdX5CKcWizJqsghpZyraxKmbM31gQY8clidxQZq0S8zOHceYPkDnYXTRO1CG/YnT0 M4a7QpyNHUNpF+9a2rFfQVGGwXpBisUYhoJIlOXhoxxoxEeNJnyaCtff2BNvCNDcVsCk IZPw== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=BDHk2pEV; 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 3si2160469qkj.256.2019.09.17.11.43.09 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 17 Sep 2019 11:43:09 -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=BDHk2pEV; 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]:49524 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAIRQ-0003Gz-Qj for patch@linaro.org; Tue, 17 Sep 2019 14:43:08 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:33911) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iAIPe-0003AU-8X for qemu-devel@nongnu.org; Tue, 17 Sep 2019 14:41:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iAIPc-0000CX-O7 for qemu-devel@nongnu.org; Tue, 17 Sep 2019 14:41:17 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:35934) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iAIPc-0000Bn-Hw for qemu-devel@nongnu.org; Tue, 17 Sep 2019 14:41:16 -0400 Received: by mail-wr1-x441.google.com with SMTP id y19so4286447wrd.3 for ; Tue, 17 Sep 2019 11:41:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=qkrQNPdYjgzsGeZKliHj5m6aTSoldYZ7J5gDgev0N24=; b=BDHk2pEVMvYSYDNdy9/vDM0gUUEZQ2xxffivEbTvuHrJFq/kJpDNUEek+C+3Lcc6OP mRiEC7OgwqNHKGh6ccYZ+4SCaGfqI2q/QfgxS6o4Jwn6kf52eoqgumevqmb2QDWpDeE4 trGurXyCUxwaal2cg1bkroWxqGPHfwISl7FpNoRoVvi6GyT/NMh/Si2N0ov7e8Zt/au0 CGbfFzgUHzDUZFht1xAiElOi+zhXCM/XCEb//3GK6K54RHHEdycHffOaUi7byO13dWdf EeZAq5bkVjBVTf3vLZeHZr++LMSJypNDI3i1kcgJ26ytrxJseRmuq7wgHb5drYJUIza6 ihfw== 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=qkrQNPdYjgzsGeZKliHj5m6aTSoldYZ7J5gDgev0N24=; b=Xv0WHNSZeufn5k3v0q7riSaDR6yG16F0OloCKaw83yEoFg07TE9QK/iGNtrlfcD9Ga tm/+NwND5Qdgy+p4Dy8ZNgk5fYylP2jQvDmz+cLtXywvGeX9jcXZJ8img+jlH/65KqMt V9vHnaAVb/UGxnMqDD1S8bqeW7sH9O/INRfgQG3hscT4dcx+8aoWSHUY7ji9l8Xzj6Mq dQXR/8q8R1n+aiQn2ETNpXmXnS40oMz4y9ZRpZElHdI2nSAoTI3HTCUBiq3Q4SBF8IsP xKk7LcUe7FZmV/67oh+vufMsqQMnKr1ZA4rj+pAC1zUNxnJrnd6ywedb64FjWtymGCUK Rp7g== X-Gm-Message-State: APjAAAXiii9xQbB1IEzqhAsQeq4cO0S739a4Kh93QsOQdJId+vbvxm9X oZhNptepeNvs9DOrw5rjvwgC2w== X-Received: by 2002:adf:fc0e:: with SMTP id i14mr56808wrr.302.1568745675354; Tue, 17 Sep 2019 11:41:15 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id n2sm3279274wmc.1.2019.09.17.11.41.11 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 17 Sep 2019 11:41:14 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id D91291FF92; Tue, 17 Sep 2019 19:41:09 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: peter.maydell@linaro.org Date: Tue, 17 Sep 2019 19:41:05 +0100 Message-Id: <20190917184109.12564-6-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190917184109.12564-1-alex.bennee@linaro.org> References: <20190917184109.12564-1-alex.bennee@linaro.org> MIME-Version: 1.0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:4864:20::441 Subject: [Qemu-devel] [PATCH v1 5/9] 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 Reviewed-by: Peter Maydell --- 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 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