From patchwork Mon Jun 15 14:19:21 2020 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: 1309538 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=p2Mx2xqI; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49ltlG0Mtkz9sRh for ; Tue, 16 Jun 2020 00:20:10 +1000 (AEST) Received: from localhost ([::1]:46356 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkpy3-0002Or-QF for incoming@patchwork.ozlabs.org; Mon, 15 Jun 2020 10:20:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47590) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkpxR-0002O6-7c for qemu-devel@nongnu.org; Mon, 15 Jun 2020 10:19:29 -0400 Received: from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b]:39513) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jkpxP-0004W6-DF for qemu-devel@nongnu.org; Mon, 15 Jun 2020 10:19:28 -0400 Received: by mail-wm1-x32b.google.com with SMTP id o8so5395689wmh.4 for ; Mon, 15 Jun 2020 07:19:27 -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=2vuTkiAEKZ/TtxdygoDdG5n+TZKhJ8ST8nk6O2rWnx0=; b=p2Mx2xqINjF7zGNhDfLRF1K53gLI7dbiytDZGuUa2tUgMYuKmkjRkacRJNS2vaQVpW lrUHdfgJH3GYx2m0kLCEZpMYO+a74H1xwatk6uphpxY/6jTysesAANM9afK89cfYIvHe JcY5pwbkxQbbdYA6cPgQUxR1MNcf7oy367aKDsHHatyJYp8Ofz8o8lxUP9SpVg5CSQBF P0VBUoiPFqoG9OSFAlImEj03ivYX4snWL6Sw5jhyya7Q4JJnIfPZzup2wd9Wh4Y703sh M5irDP7toAKFiuHPiltFymgTETxMIbe1+7p602vixHngMk5S2X1TT+YGwrCo+6uFBsXG J8/A== 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=2vuTkiAEKZ/TtxdygoDdG5n+TZKhJ8ST8nk6O2rWnx0=; b=mgErCFZdtBp6XGbDZRW2MYe3ZcNusBx2H9hCGTmCT/vHAD3xisFH8ETTpRQYEhi0vF iEndwbBk9gCRh9AxEg5KHpWMvUBKgdDG48ivjdnYa/meK6J/ulLVhGC9hfVTlX5thJnn 1UMcyH0VLmC9RJc00+Ki7Hc1eTwWcyaLpTGteLYqBoSCp/rOVaumZZ7o7brkomyiHpaU wiGDexOzlssVyvr4nCNk1yBOafQJz4ut2i0y0JXzGpD0eSy0/RCkUBOwLjZdwwsiSc9x +C9z1BLrjFlBu93uOGBsGuxYKW8tsRTw84ImSsBqbHA/l7yZW4uQZJ3po725kFEiqgrs NqeA== X-Gm-Message-State: AOAM5302OSZLZVApIXB2sk2do1qoJSU5FHCS6HBaqBatRjaiamMt7z7G QyQdKzo6mxjEHuU/4oG3lM2lNA== X-Google-Smtp-Source: ABdhPJzk9sgw2fhJ0G0PXRUeq9r5E/9FFs3Tp9KsSFnY2fNYjwNX+oX3hif70mVFQiPR1thWhAQc9A== X-Received: by 2002:a1c:6446:: with SMTP id y67mr14157790wmb.156.1592230765904; Mon, 15 Jun 2020 07:19:25 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id g3sm27452688wrb.46.2020.06.15.07.19.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 07:19:23 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E14EA1FF87; Mon, 15 Jun 2020 15:19:22 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 1/2] tests/tcg: build plugin list from contents of src directory Date: Mon, 15 Jun 2020 15:19:21 +0100 Message-Id: <20200615141922.18829-2-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200615141922.18829-1-alex.bennee@linaro.org> References: <20200615141922.18829-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32b; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: fam@euphon.net, Peter Maydell , berrange@redhat.com, =?utf-8?q?Alex_Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , cota@braap.org, "open list:ARM TCG CPUs" , aurelien@aurel32.net Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" If you jump back and forth between branches while developing plugins you end up debugging failures caused by plugins left in the build directory. Fix this by basing plugins on the source tree instead. Signed-off-by: Alex Bennée --- tests/tcg/Makefile.target | 11 ++++++----- tests/tcg/aarch64/Makefile.target | 2 +- tests/tcg/arm/Makefile.target | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index b3cff3cad1a..2ae86776cdc 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -126,9 +126,10 @@ RUN_TESTS=$(patsubst %,run-%, $(TESTS)) # If plugins exist also include those in the tests ifeq ($(CONFIG_PLUGIN),y) -PLUGIN_DIR=../../plugin -VPATH+=$(PLUGIN_DIR) -PLUGINS=$(notdir $(wildcard $(PLUGIN_DIR)/*.so)) +PLUGIN_SRC=$(SRC_PATH)/tests/plugin +PLUGIN_LIB=../../plugin +VPATH+=$(PLUGIN_LIB) +PLUGINS=$(patsubst %.c, lib%.so, $(notdir $(wildcard $(PLUGIN_SRC)/*.c))) # We need to ensure expand the run-plugin-TEST-with-PLUGIN # pre-requistes manually here as we can't use stems to handle it. We @@ -152,7 +153,7 @@ run-%: % run-plugin-%: $(call run-test, $@, $(QEMU) $(QEMU_OPTS) \ - -plugin $(PLUGIN_DIR)/$(call extract-plugin,$@) \ + -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@) \ -d plugin -D $*.pout \ $(call strip-plugin,$<), \ "$* on $(TARGET_NAME)") @@ -168,7 +169,7 @@ run-plugin-%: $(call run-test, $@, \ $(QEMU) -monitor none -display none \ -chardev file$(COMMA)path=$@.out$(COMMA)id=output \ - -plugin $(PLUGIN_DIR)/$(call extract-plugin,$@) \ + -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@) \ -d plugin -D $*.pout \ $(QEMU_OPTS) $(call strip-plugin,$<), \ "$* on $(TARGET_NAME)") diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile.target index 312f36cde5f..6d60a2f2eed 100644 --- a/tests/tcg/aarch64/Makefile.target +++ b/tests/tcg/aarch64/Makefile.target @@ -31,7 +31,7 @@ run-semihosting: semihosting run-plugin-semihosting-with-%: $(call run-test, $@, $(QEMU) $(QEMU_OPTS) \ - -plugin $(PLUGIN_DIR)/$(call extract-plugin,$@) \ + -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@) \ $(call strip-plugin,$<) 2> $<.err, \ "$< on $(TARGET_NAME) with $*") diff --git a/tests/tcg/arm/Makefile.target b/tests/tcg/arm/Makefile.target index 3da09a38be7..ec951565626 100644 --- a/tests/tcg/arm/Makefile.target +++ b/tests/tcg/arm/Makefile.target @@ -45,7 +45,7 @@ run-semihosting-arm: semihosting-arm run-plugin-semihosting-with-%: $(call run-test, $@, $(QEMU) $(QEMU_OPTS) \ - -plugin $(PLUGIN_DIR)/$(call extract-plugin,$@) \ + -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@) \ $(call strip-plugin,$<) 2> $<.err, \ "$< on $(TARGET_NAME) with $*") From patchwork Mon Jun 15 14:19:22 2020 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: 1309539 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256 header.s=google header.b=NaUWilzA; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 49ltmt1fGhz9sRh for ; Tue, 16 Jun 2020 00:21:34 +1000 (AEST) Received: from localhost ([::1]:51116 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jkpzP-0004VH-T6 for incoming@patchwork.ozlabs.org; Mon, 15 Jun 2020 10:21:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47626) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jkpxS-0002On-Sa for qemu-devel@nongnu.org; Mon, 15 Jun 2020 10:19:30 -0400 Received: from mail-wr1-x42a.google.com ([2a00:1450:4864:20::42a]:45816) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jkpxQ-0004WK-Ai for qemu-devel@nongnu.org; Mon, 15 Jun 2020 10:19:30 -0400 Received: by mail-wr1-x42a.google.com with SMTP id c3so17280160wru.12 for ; Mon, 15 Jun 2020 07:19:27 -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=K+SeFonBSOo3t0Z274huc5h9np0tWPZf1g8S9xiBi5M=; b=NaUWilzAVG4mTfjrG1zyAAxjJAL2UTyd/QGcxmnJ7mhlPiS4RB5y7xsSjvDaTlGwK0 3ZFMSGqfRBNQXYKZcQ+5dtfRe+bPDKD7jXXCP0mqLB3AzbrWVt/zqAcyx7Y8lok5SSbs +ouwkbONitXNWMxjbenKri18tlGOkRQkW8rV2QcYEA1zkFlBXx0xkfuhw91mz0lTTIoz oIE5LMDLKaQACb1sIyHqo9QDctJ5A5Q/jMYvVZjSkF+Yox2UwcU7CK/dQtzdeNlHoOx/ SV7L2CduzN/ncq19dBJFPCRbmMbPjcf8S00SNzq5SO9Zyg6rKJ3ac1KyN8cAiGwL/aZC yjiA== 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=K+SeFonBSOo3t0Z274huc5h9np0tWPZf1g8S9xiBi5M=; b=QDc8cP/29vCtR5o/EKjWD48mFpyapyo3l0vKtaqRiU5oXDc0LEeQNLthYgzPCudsRQ 2T6mbvFEkUwGARpkVCY3zk+7ENGNQse0HP03Egl1EQXZOm/2zF1KhppbUIfFQkAv7RKs jD+9kROafgT4uHf5W3nkwqDP1jb4baUlxHtFjGa0clmBE+mc1DUBjFsEcpUxoCx6BR0K It0xe5tr7/GI7USRe8a/+nekPeMOgN7LOP0qCf1bEz1tyyv6lAx63Iz7koA0plcEiB/Z H6HO8O+Z/1P8ZMaNjyh9G0AU4sbLhLk97/9t7sEdQnzGf+SqB/F6Ob3YqbhVYPXYZN+0 wK+g== X-Gm-Message-State: AOAM530po5nmCAsuV/wDQ5/BltR4lF/mm2rk/FePLF5uhevrb20T7UA/ 6tmsN8p4ckZCnWhDkGvAdzG0Cg== X-Google-Smtp-Source: ABdhPJx1SFZ7GFEfBzRfbe1+t423elR4hDOHni0IAR8YOQcXqR438uVbj/Y0wqikZyyAMTwnpeSyKQ== X-Received: by 2002:adf:b198:: with SMTP id q24mr29107305wra.368.1592230766849; Mon, 15 Jun 2020 07:19:26 -0700 (PDT) Received: from zen.linaroharston ([51.148.130.216]) by smtp.gmail.com with ESMTPSA id a3sm23805858wrp.91.2020.06.15.07.19.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 15 Jun 2020 07:19:24 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id 077F91FF8C; Mon, 15 Jun 2020 15:19:23 +0100 (BST) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Subject: [PATCH v1 2/2] tests/tcg: ensure -cpu max also used for plugin run Date: Mon, 15 Jun 2020 15:19:22 +0100 Message-Id: <20200615141922.18829-3-alex.bennee@linaro.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200615141922.18829-1-alex.bennee@linaro.org> References: <20200615141922.18829-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::42a; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x42a.google.com X-detected-operating-system: by eggs.gnu.org: No matching host in p0f cache. That's all we know. X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action 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: fam@euphon.net, Peter Maydell , berrange@redhat.com, Eduardo Habkost , =?utf-8?q?Alex_?= =?utf-8?q?Benn=C3=A9e?= , richard.henderson@linaro.org, f4bug@amsat.org, cota@braap.org, "open list:ARM TCG CPUs" , Paolo Bonzini , aurelien@aurel32.net, Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" The check-tcg plugins build was failing because some special case tests that needed -cpu max failed because the plugin variant hadn't carried across the QEMU_OPTS tweak. Guests which globally set QEMU_OPTS=-cpu FOO where unaffected. Signed-off-by: Alex Bennée --- tests/tcg/aarch64/Makefile.target | 3 ++- tests/tcg/i386/Makefile.target | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile.target index 6d60a2f2eed..b617f2ac7e0 100644 --- a/tests/tcg/aarch64/Makefile.target +++ b/tests/tcg/aarch64/Makefile.target @@ -20,8 +20,9 @@ run-fcvt: fcvt # Pauth Tests ifneq ($(DOCKER_IMAGE)$(CROSS_CC_HAS_ARMV8_3),) AARCH64_TESTS += pauth-1 pauth-2 pauth-4 -run-pauth-%: QEMU_OPTS += -cpu max pauth-%: CFLAGS += -march=armv8.3-a +run-pauth-%: QEMU_OPTS += -cpu max +run-plugin-pauth-%: QEMU_OPTS += -cpu max endif # Semihosting smoke test for linux-user diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target index 53efec06683..1a6463a7dc1 100644 --- a/tests/tcg/i386/Makefile.target +++ b/tests/tcg/i386/Makefile.target @@ -12,6 +12,7 @@ X86_64_TESTS:=$(filter test-i386-ssse3, $(ALL_X86_TESTS)) test-i386-pcmpistri: CFLAGS += -msse4.2 run-test-i386-pcmpistri: QEMU_OPTS += -cpu max +run-plugin-test-i386-pcmpistri-%: QEMU_OPTS += -cpu max # # hello-i386 is a barebones app