From patchwork Thu Sep 19 17:10:06 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: 174086 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp1331885ill; Thu, 19 Sep 2019 10:55:28 -0700 (PDT) X-Google-Smtp-Source: APXvYqwvPP4re67OPbdoD8I6SMtlPbYDBfzfGmf71VkbYadFTbflgbgI5XMDu51cTLCPEqYcmSvl X-Received: by 2002:a05:6402:120e:: with SMTP id c14mr17336773edw.272.1568915728557; Thu, 19 Sep 2019 10:55:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1568915728; cv=none; d=google.com; s=arc-20160816; b=R1fqwxb9FDQ5ZFFbz0V/4bpW36vrMKjuzQoROyQFqcZEGfVdNG9/LdnsIBHSxPhvGu Vc7s3sF3iChChYnskPChKqyocOEozW1/VoD6+Jg6PHDnn6bhWvew1MIedmMq6F4CCIDq CTDOH0vR3jl4F6eGVuURa8+aQjJJGFspvlAqV2hajp7kRqGENMBi/rxUJ18xK4SiClhK 0sJRyjnXZAvMrecXlMa8jWL7Pj7YtcrUUa6Z2KxWJbeDepP5+sA2W0+oLxIq5bf37NGQ WFIXf73RKnRVgYSIt5lqt0xJqp658lPgNi+svScYx+VnlrL7F5yyQmA2VJW/twwoV6BQ OqiA== 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:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=qkrQNPdYjgzsGeZKliHj5m6aTSoldYZ7J5gDgev0N24=; b=l8rOEqygk1XcvWb/62DRmQfEiqmISoxyvAlo3E9tqIH74aneXfxYg7vssg2wVnntU+ tOInHmVhLKGBaAuATBgnLRE7blFXXHytipKouJfapysV7m5pOGp+6ExOEBIeXT3JX5Kq G2JNeh2ppEbq7IrulqpyT6Vb3UDwVwgc9mAahrOzS3Cyhxw4Im8qLnzZXa+xAvnJtbwa NJRgy1OX8GLjOfAs1W8z3wK+uhSvF8jv5TH+OCxUzowpipVCLJPg45q7gvBI7tAsm0nS fS6dU+hzHUO92Yh0o8YRXpPyTemmGaDdLl5YJCQ1nDPY10Uy52n2MelzSN5/bopT7081 XR8A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Klhzn33n; 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=pass (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 n2si5561168edt.408.2019.09.19.10.55.28 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Sep 2019 10:55:28 -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=pass header.i=@linaro.org header.s=google header.b=Klhzn33n; 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=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:47374 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iB0eN-0002GR-70 for patch@linaro.org; Thu, 19 Sep 2019 13:55:27 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50104) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iB07N-0008Ns-HM for qemu-devel@nongnu.org; Thu, 19 Sep 2019 13:21:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iAzwl-0004Nb-H2 for qemu-devel@nongnu.org; Thu, 19 Sep 2019 13:10:24 -0400 Received: from mail-wm1-x343.google.com ([2a00:1450:4864:20::343]:53673) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iAzwl-0004Mx-AQ for qemu-devel@nongnu.org; Thu, 19 Sep 2019 13:10:23 -0400 Received: by mail-wm1-x343.google.com with SMTP id i16so5518494wmd.3 for ; Thu, 19 Sep 2019 10:10:23 -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=Klhzn33n90q3jrfUfd0J3LfkrOUYuc29UNP9Ht9Z7TxLYqg1L22Qbp0UpepMBAroFU QnJ0GKJ/njWO1UdfYgG0sSGUwgayg0dzq07c7m/w/G7jkbTJ5flyAnmD1noHtVU6TCHw Y6B8Yw068kD3DVr3zK1MN0dBVRUkMcfJIKVWS11fyc7DusyGTBUgTYWlSQgTqxADT/VT lfCDgsnxG0BpOa8csVDI7IHO26tOdiCLUqYECaUjBO3Ei8dGOUwVBKqUu7oypy4kBHFW ZSuZt2ojf7d5nxYA2ZjS8eKrWJDmThrbLI8xKSJ/E6PkfLu++byAxaL51q4ArOheCasG /fDg== 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=TE5uV0IMM0YFT1QapCI+NAL5KznAjn3Hhw9Tv4YA9EGWBfHbZxDd5R0Jk5JW78wMYK DUatCOehwGqE7lObKaY1wCHXS1AsVYLbVPTy+tctVG2TdEeKu5vzLWcLQpw79NJ9HoyE ZctS/zRGU4gaetiWzkRUBTK6h6MaTaU1MZBqE+mRJhKSoxWWI0oyM2ZqRS8dZ4DqESKp pstUeJ/1+ZsoLPz9zbqGWrGFfkguYYKx7tZqsHV99TJz5B07zswIfTZcgPjYFRtfKJhC zm8YK3JcNIzeXTl1X5WF8Nx23wI/KAeVeoZCSX5BdidMk2/pulcxK4PP0BoIUFqjuHpw WsxQ== X-Gm-Message-State: APjAAAUNT0YyjvO6p/YVElcTEmUcYqaxLGyVMbwtuY2Xj7hiwW3K7mUk efRqggtMuGxORTHLREDhRo/UnQ== X-Received: by 2002:a1c:2144:: with SMTP id h65mr3906066wmh.114.1568913022190; Thu, 19 Sep 2019 10:10:22 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id y12sm10697593wrn.74.2019.09.19.10.10.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Sep 2019 10:10:19 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 4D79F1FF96; Thu, 19 Sep 2019 18:10:16 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v2 07/16] tests/tcg: clean-up some comments after the de-tangling Date: Thu, 19 Sep 2019 18:10:06 +0100 Message-Id: <20190919171015.12681-8-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190919171015.12681-1-alex.bennee@linaro.org> References: <20190919171015.12681-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 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: peter.maydell@linaro.org, qemu-arm@nongnu.org, =?utf-8?q?Alex_Benn?= =?utf-8?b?w6ll?= , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= 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