From patchwork Tue Sep 24 21:00:50 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: 174330 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp4766048ill; Tue, 24 Sep 2019 15:56:26 -0700 (PDT) X-Google-Smtp-Source: APXvYqxCqRjbKGd9zebKKPJCv+fV0DsKWOp9ZEDDu+thNklV3uaZnsIFyI1pWXhhYdyJKTW7ai7y X-Received: by 2002:a5d:4708:: with SMTP id y8mr3821242wrq.318.1569365786816; Tue, 24 Sep 2019 15:56:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569365786; cv=none; d=google.com; s=arc-20160816; b=R1lyzOtMId6P+qbvd1k7bujcLefHEAbyQo5rkEcmzHluJ36YrL5yFpTkUViTLpnNdH 2Rx51q6ZLoUwiuxRJo1yk4q0FDMRJ1Wgvs8Ocb75/xOshDFaI4EzLzNcraIxRw71G+3D gh65hA2vg4BxaIeKUQTWtzMp2zpkvvEd+z3S5aAHSuI6UUk/YEOYC5xJx5ps5Enic/Xc nLRS1dAdJFw44uLfnjtBZMvulDyaivR3C7/XqpwLItz4Y2rdX4jmEgV0+R3C4qU4pxc2 S2xbbKsUjeRUSxqKwOof1jMPeYErSTFe5c4cDpIc+d6lrOzwsN6l2TrlvBMYi/ENltet 9cSw== 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=x04afxfjp/7wMNZCMOO99KzZfPNsqx+XkQ0kjzlzqGlHTQAesOJhNO7SjoFDsPkSlv 6C82IrHUKWjVhJb5nhA41zmMHpDqhdU49nV+DNj7GRMIWzvwOFoklPaoShSKj/XoUxKj MtIUz5QoUqGiEZN/x+bzt36HTyP38oWN90ZFB4iuOx/JMQZsv7ev2isCzDMdbgfCQ9OI TOvLN+WjfVCvbA2EgjjjrkAionYJ7q/8UX4+vASQRlgXAkM+oLbBwuhWQQLaMRMYf5IS RkF/W+0WESxBMAnCGPm7W9rdFVQb6KLTh+XVHZ3NiA19Z0mLIRl6tfFwjTyBBEkOeIFI imiQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=cnc3lyGS; 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 b12si1677666eja.185.2019.09.24.15.56.26 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 24 Sep 2019 15:56:26 -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=cnc3lyGS; 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]:43562 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCtjN-0007e7-MU for patch@linaro.org; Tue, 24 Sep 2019 18:56:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56720) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iCs4z-000386-46 for qemu-devel@nongnu.org; Tue, 24 Sep 2019 17:10:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iCs4x-0007Wm-G4 for qemu-devel@nongnu.org; Tue, 24 Sep 2019 17:10:36 -0400 Received: from mail-wr1-x441.google.com ([2a00:1450:4864:20::441]:45161) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1iCs4x-0007W3-7P for qemu-devel@nongnu.org; Tue, 24 Sep 2019 17:10:35 -0400 Received: by mail-wr1-x441.google.com with SMTP id r5so3628656wrm.12 for ; Tue, 24 Sep 2019 14:10:35 -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=cnc3lyGSyoFZf/Vg1Gu6IuzZqLZFJHytgoAX/WTlUkTFbglfRKpsEv5C9+QJbSHXA6 O9AKY4cXfEyPKHT95/oQuCbQjGlG9WOcCrTpIOzNfsaOHcgq0trMyjM53HH0gvBov0dK oCIvwDqtyX6Zw1ZB49gkbWPN6L/qz3O20r6smZoo+eLAZXBg8AmiiL//zpJ5ASusBnit /S5lIc4Bn57lapRY56mDOjXTRaTBHWb+0FfPY9r2jg6DMwHEVEwaE6kI+Ggfmvuw8O7b WlIRNd+D7Q2jaDIIsVA0E2f2IUY5GaIfddJmOtFzQ3pY++B6TBe2ELT5DYDUzjARDYGn +yug== 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=cId5v7G8WLr/MA+ScaZ1g5rJXoCcaHi2WQQP76Pc62iNUkHCBP0RYrP/ip0p3NX8Vv rXIgwET1ON9/j2PzdRx//x9lKPZluHuz/g8V8Yrid3n3BZYyPhMwJBUbDb0zgmcIRFPw OgZ4WRESuLtB1Zu/OmP6IL2iCmGoZ3B4+JjDCY5Pr3sL6iphBZBKoLmK2ILNc77lgFuQ WCeBof3Zu1xnoVmKhgTJCE7C40929Y5FxUOx+I4KIpsGKAyInbKclG0oXqa496mX215B 4jvfZAvpli0AfFoYNdAOnvkp5oTpo+TQNo/Cs6X+blE/WPqwUnze0jo5dSuApYtQwui9 L9bg== X-Gm-Message-State: APjAAAUQbCe4wJgr+HPDRJyAyXZAVh/B9ZDbsMuoaB05Xjlbwmb9BgZq jsSmM2zRHq2C0zPRxsAXa8j+oN7pyFdirg== X-Received: by 2002:adf:e605:: with SMTP id p5mr4901046wrm.105.1569359434025; Tue, 24 Sep 2019 14:10:34 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id b184sm721383wmg.47.2019.09.24.14.10.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Sep 2019 14:10:32 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 5A3131FFA3; Tue, 24 Sep 2019 22:01:08 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v3 17/33] tests/tcg: clean-up some comments after the de-tangling Date: Tue, 24 Sep 2019 22:00:50 +0100 Message-Id: <20190924210106.27117-18-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190924210106.27117-1-alex.bennee@linaro.org> References: <20190924210106.27117-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 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 , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?b?YXVkw6k=?= , f4bug@amsat.org, jsnow@redhat.com, "open list:ARM TCG CPUs" , =?utf-8?q?Alex_Benn=C3=A9e?= 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 Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé 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