From nobody Thu May 9 02:42:34 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=linaro.org ARC-Seal: i=1; a=rsa-sha256; t=1682082924; cv=none; d=zohomail.com; s=zohoarc; b=jTo+Q0arkkYK2U2VwF0z+WioCIfgp1jfH+I0M6kBJkOaZ6UWQiQcK6MMhoMo1KMLA9TR8LH1vPMFGEVMMf+T0sggqf0XcOnajy5ybZskhw+5xONyQPUt+gEVL2E0BQWPCz6uCov0/uJOJ32wfQm6FJbHJPCw9IKmR3X6UZqJx+c= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1682082924; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To; bh=o2gs4j1vcgytDmnJ6f5k26mePJruhnEBihlqTwcKDQk=; b=WLIsY7Lj66YC5jL1uy0matP4USa7AShCHW/iNO86d/Uru6L+iQdW/h5szmV1+4VRTiQNI/7Zjr/Y/l5HqzN3utBl5mgYKrio9E8TgOc8nTvL2GMuKfQYJi/lAKcXA4oor+VJi2RoyeUSA70ql1c3JDaowwQ+Qvk13ZACNATVdP8= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1682082924900641.7355682660192; Fri, 21 Apr 2023 06:15:24 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppqan-00081d-Op; Fri, 21 Apr 2023 09:14:25 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ppqam-000807-7v for qemu-devel@nongnu.org; Fri, 21 Apr 2023 09:14:24 -0400 Received: from mail-wm1-x335.google.com ([2a00:1450:4864:20::335]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ppqaW-0000cR-A9 for qemu-devel@nongnu.org; Fri, 21 Apr 2023 09:14:23 -0400 Received: by mail-wm1-x335.google.com with SMTP id 5b1f17b1804b1-3f192c23fffso4238305e9.3 for ; Fri, 21 Apr 2023 06:14:07 -0700 (PDT) Received: from zen.linaroharston ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id p13-20020a7bcc8d000000b003ee63fe5203sm4813143wma.36.2023.04.21.06.14.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Apr 2023 06:14:05 -0700 (PDT) Received: from zen.lan (localhost [127.0.0.1]) by zen.linaroharston (Postfix) with ESMTP id E46F41FFB7; Fri, 21 Apr 2023 14:14:04 +0100 (BST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1682082846; x=1684674846; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=o2gs4j1vcgytDmnJ6f5k26mePJruhnEBihlqTwcKDQk=; b=mzG3RWT2DIXAW9aw0PNvWplbfAaU3zBVlA7hK3o+2yEGmuLy7E5RF1zhWo6dj671+D VBRxiQA/hiXJ7p7fgQC1+N38NMVbuD6r0SmYENdOBq4414N1+sj8uJtXYPICFz9rHKBl CtLc4vj5UvH5cB88FHPNqNsrKGt6SJABYNSRE/SRLwNml2WfPMOF1gpsjuKQCZlx2iUG nWZ5wNZwpgUecZoLg8g6CCgPxSotZsB+2QEPgRo9n41niHWRhfFp1k4f9A9Bk7PunJbS ehzEKu4cdKt89BeX/ek+WGtmXJCgPo2ywk2bgug2BYWX5gwT2T+yUJDGjBVCvy7LIKkT EuOg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1682082846; x=1684674846; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=o2gs4j1vcgytDmnJ6f5k26mePJruhnEBihlqTwcKDQk=; b=YpbV3eaGDvLdXwbo/tDoRrgwhVczkKPJHcIqsbSZGJBPe103ctB+zJogPsPGEHrWxG wxFTKl7EsoPgLXj7zohH66B3daIhEQIREpMo2KH5aucYG5yqcoF5ew1AjTt7R7MwlY57 u/rQ+jw7uQG0xmpw9HvlknT8Np4spnFImNvCB5anMba0EXpFQtT8kKK2t19sMFhqvh7k M4XwrpHgvI8zlumbIShkBXRfmQsgeJO4yNxETt9FCUAAcP0IocGfTMHJGwRRRnUhPfSL fQVqq1BlzR1MK/TxFr5JA5RozNQW84nY8TUekWO01IVDu0QirqqYo0jJ4KOZGwIva8r5 TlDQ== X-Gm-Message-State: AAQBX9eISe+gM7w1gIejbwCzqWU/BlhcOtxGQgcc6n5RSlqR0Q4o+xUY XO5qOaldL6BgZQCHKJbtMz0OAg== X-Google-Smtp-Source: AKy350aLBwZA87dcCqhSgPfsuxBfj85AQzbYVHNbiTS6IvbTF1Dyf5Abb5aZypQaNzk/nNV9Ek2X5w== X-Received: by 2002:a05:600c:244:b0:3f1:954f:82e3 with SMTP id 4-20020a05600c024400b003f1954f82e3mr840682wmj.24.1682082846114; Fri, 21 Apr 2023 06:14:06 -0700 (PDT) From: =?UTF-8?q?Alex=20Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Peter Maydell , "Edgar E. Iglesias" , Paolo Bonzini , Richard Henderson , Eduardo Habkost , David Hildenbrand , Ilya Leoshkevich , Bastian Koppelmann , Max Filippov , qemu-arm@nongnu.org (open list:ARM TCG CPUs), qemu-s390x@nongnu.org (open list:S390 TCG CPUs) Subject: [RFC PATCH] tests/tcg: limit the scope of the plugin tests Date: Fri, 21 Apr 2023 14:14:00 +0100 Message-Id: <20230421131400.2750123-1-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=2a00:1450:4864:20::335; envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x335.google.com 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @linaro.org) X-ZM-MESSAGEID: 1682082925325100001 Running every plugin with every test is getting excessive as well as not really improving coverage that much. Restrict the plugin tests to just the MULTIARCH_TESTS which are shared between most architecture for both system and user-mode. For those that aren't we need to squash MULTIARCH_TESTS so we don't add them when they are not part of the TESTS global. Signed-off-by: Alex Benn=C3=A9e Acked-by: Richard Henderson --- tests/tcg/Makefile.target | 10 +++++++--- tests/tcg/aarch64/Makefile.softmmu-target | 2 -- tests/tcg/aarch64/Makefile.target | 1 - tests/tcg/arm/Makefile.softmmu-target | 4 +++- tests/tcg/arm/Makefile.target | 8 -------- tests/tcg/cris/Makefile.target | 3 +++ tests/tcg/hppa/Makefile.target | 2 -- tests/tcg/i386/Makefile.target | 10 ---------- tests/tcg/ppc64/Makefile.target | 2 -- tests/tcg/riscv64/Makefile.softmmu-target | 3 +++ tests/tcg/riscv64/Makefile.target | 1 - tests/tcg/s390x/Makefile.softmmu-target | 3 +++ tests/tcg/tricore/Makefile.softmmu-target | 3 +++ tests/tcg/xtensa/Makefile.softmmu-target | 3 +++ 14 files changed, 25 insertions(+), 30 deletions(-) diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target index 8318caf924..72876cc84e 100644 --- a/tests/tcg/Makefile.target +++ b/tests/tcg/Makefile.target @@ -152,13 +152,17 @@ PLUGINS=3D$(patsubst %.c, lib%.so, $(notdir $(wildcar= d $(PLUGIN_SRC)/*.c))) =20 # 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 -# also add some special helpers the run-plugin- rules can use bellow. +# only expand MULTIARCH_TESTS which are common on most of our targets +# to avoid an exponential explosion as new tests are added. We also +# add some special helpers the run-plugin- rules can use bellow. =20 +ifneq ($(MULTIARCH_TESTS),) $(foreach p,$(PLUGINS), \ - $(foreach t,$(TESTS),\ + $(foreach t,$(MULTIARCH_TESTS),\ $(eval run-plugin-$(t)-with-$(p): $t $p) \ $(eval RUN_TESTS+=3Drun-plugin-$(t)-with-$(p)))) -endif +endif # MULTIARCH_TESTS +endif # CONFIG_PLUGIN =20 strip-plugin =3D $(wordlist 1, 1, $(subst -with-, ,$1)) extract-plugin =3D $(wordlist 2, 2, $(subst -with-, ,$1)) diff --git a/tests/tcg/aarch64/Makefile.softmmu-target b/tests/tcg/aarch64/= Makefile.softmmu-target index df9747bae8..b74a2534e3 100644 --- a/tests/tcg/aarch64/Makefile.softmmu-target +++ b/tests/tcg/aarch64/Makefile.softmmu-target @@ -81,6 +81,4 @@ pauth-3: $(call skip-test, "BUILD of $@", "missing compiler support") run-pauth-3: $(call skip-test, "RUN of pauth-3", "not built") -run-plugin-pauth-3-with-%: - $(call skip-test, "RUN of pauth-3 ($*)", "not built") endif diff --git a/tests/tcg/aarch64/Makefile.target b/tests/tcg/aarch64/Makefile= .target index 9e91a20b0d..0315795487 100644 --- a/tests/tcg/aarch64/Makefile.target +++ b/tests/tcg/aarch64/Makefile.target @@ -32,7 +32,6 @@ ifneq ($(CROSS_CC_HAS_ARMV8_3),) AARCH64_TESTS +=3D pauth-1 pauth-2 pauth-4 pauth-5 pauth-%: CFLAGS +=3D -march=3Darmv8.3-a run-pauth-%: QEMU_OPTS +=3D -cpu max -run-plugin-pauth-%: QEMU_OPTS +=3D -cpu max endif =20 # BTI Tests diff --git a/tests/tcg/arm/Makefile.softmmu-target b/tests/tcg/arm/Makefile= .softmmu-target index 7df88ddea8..8b546e2aa3 100644 --- a/tests/tcg/arm/Makefile.softmmu-target +++ b/tests/tcg/arm/Makefile.softmmu-target @@ -23,4 +23,6 @@ LDFLAGS+=3D-nostdlib -N -static test-armv6m-undef: EXTRA_CFLAGS+=3D-mcpu=3Dcortex-m0 -mfloat-abi=3Dsoft =20 run-test-armv6m-undef: QEMU_OPTS+=3D-semihosting -M microbit -kernel -run-plugin-test-armv6m-undef-%: QEMU_OPTS+=3D-semihosting -M microbit -ker= nel + +# We don't currently support the multiarch system tests +undefine MULTIARCH_TESTS diff --git a/tests/tcg/arm/Makefile.target b/tests/tcg/arm/Makefile.target index b3b1504a1c..0038cef02c 100644 --- a/tests/tcg/arm/Makefile.target +++ b/tests/tcg/arm/Makefile.target @@ -46,11 +46,6 @@ semihosting-arm: semihosting.c run-semihosting-arm: semihosting-arm $(call run-test,$<,$(QEMU) $< 2> $<.err) =20 -run-plugin-semihosting-arm-with-%: - $(call run-test, $@, $(QEMU) $(QEMU_OPTS) \ - -plugin $(PLUGIN_LIB)/$(call extract-plugin,$@) \ - $(call strip-plugin,$<) 2> $<.err) - ARM_TESTS +=3D semiconsole-arm =20 semiconsole: CFLAGS +=3D -mthumb @@ -62,9 +57,6 @@ semiconsole-arm: semihosting.c run-semiconsole-arm: semiconsole-arm $(call skip-test, $<, "MANUAL ONLY") =20 -run-plugin-semiconsole-arm-with-%: - $(call skip-test, $<, "MANUAL ONLY") - endif =20 ARM_TESTS +=3D commpage diff --git a/tests/tcg/cris/Makefile.target b/tests/tcg/cris/Makefile.target index 372287bd03..43587d2769 100644 --- a/tests/tcg/cris/Makefile.target +++ b/tests/tcg/cris/Makefile.target @@ -57,3 +57,6 @@ SIMG:=3Dcris-axis-linux-gnu-run # e.g.: make -f ../../tests/tcg/Makefile run-check_orm-on-sim run-%-on-sim: $(call run-test, $<, $(SIMG) $<) + +# We don't currently support the multiarch tests +undefine MULTIARCH_TESTS diff --git a/tests/tcg/hppa/Makefile.target b/tests/tcg/hppa/Makefile.target index b78e6b4849..cdd0d572a7 100644 --- a/tests/tcg/hppa/Makefile.target +++ b/tests/tcg/hppa/Makefile.target @@ -10,8 +10,6 @@ EXTRA_RUNS+=3Drun-test-mmap-4096 # run-test-mmap-16384 ru= n-test-mmap-65536 # it requires the full vdso with dwarf2 unwind info. run-signals: signals $(call skip-test, $<, "BROKEN awaiting vdso support") -run-plugin-signals-with-%: - $(call skip-test, $<, "BROKEN awaiting vdso support") =20 VPATH +=3D $(SRC_PATH)/tests/tcg/hppa TESTS +=3D stby diff --git a/tests/tcg/i386/Makefile.target b/tests/tcg/i386/Makefile.target index bafd8c2180..821822ed0c 100644 --- a/tests/tcg/i386/Makefile.target +++ b/tests/tcg/i386/Makefile.target @@ -18,19 +18,15 @@ X86_64_TESTS:=3D$(filter test-i386-adcox test-i386-bmi2= $(SKIP_I386_TESTS), $(ALL_ =20 test-i386-sse-exceptions: CFLAGS +=3D -msse4.1 -mfpmath=3Dsse run-test-i386-sse-exceptions: QEMU_OPTS +=3D -cpu max -run-plugin-test-i386-sse-exceptions-%: QEMU_OPTS +=3D -cpu max =20 test-i386-pcmpistri: CFLAGS +=3D -msse4.2 run-test-i386-pcmpistri: QEMU_OPTS +=3D -cpu max -run-plugin-test-i386-pcmpistri-%: QEMU_OPTS +=3D -cpu max =20 test-i386-bmi2: CFLAGS=3D-O2 run-test-i386-bmi2: QEMU_OPTS +=3D -cpu max -run-plugin-test-i386-bmi2-%: QEMU_OPTS +=3D -cpu max =20 test-i386-adcox: CFLAGS=3D-O2 run-test-i386-adcox: QEMU_OPTS +=3D -cpu max -run-plugin-test-i386-adcox-%: QEMU_OPTS +=3D -cpu max =20 # # hello-i386 is a barebones app @@ -52,8 +48,6 @@ test-i386: $(call skip-test, "BUILD of $@", "missing -no-pie compiler support") run-test-i386: $(call skip-test, "RUN of test-i386", "not built") -run-plugin-test-i386-with-%: - $(call skip-test, "RUN of test-i386 ($*)", "not built") endif =20 ifeq ($(SPEED), slow) @@ -87,7 +81,6 @@ sha512-sse: sha512.c $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) =20 run-sha512-sse: QEMU_OPTS+=3D-cpu max -run-plugin-sha512-sse-with-%: QEMU_OPTS+=3D-cpu max =20 TESTS+=3Dsha512-sse =20 @@ -103,15 +96,12 @@ test-avx.h: test-avx.py x86.csv =20 test-3dnow: CFLAGS +=3D -masm=3Dintel -O -I. run-test-3dnow: QEMU_OPTS +=3D -cpu max -run-plugin-test-3dnow: QEMU_OPTS +=3D -cpu max test-3dnow: test-3dnow.h =20 test-mmx: CFLAGS +=3D -masm=3Dintel -O -I. run-test-mmx: QEMU_OPTS +=3D -cpu max -run-plugin-test-mmx: QEMU_OPTS +=3D -cpu max test-mmx: test-mmx.h =20 test-avx: CFLAGS +=3D -mavx -masm=3Dintel -O -I. run-test-avx: QEMU_OPTS +=3D -cpu max -run-plugin-test-avx: QEMU_OPTS +=3D -cpu max test-avx: test-avx.h diff --git a/tests/tcg/ppc64/Makefile.target b/tests/tcg/ppc64/Makefile.tar= get index f081f1c683..6d47d3cae6 100644 --- a/tests/tcg/ppc64/Makefile.target +++ b/tests/tcg/ppc64/Makefile.target @@ -24,14 +24,12 @@ PPC64_TESTS +=3D byte_reverse sha512-vector endif byte_reverse: CFLAGS +=3D -mcpu=3Dpower10 run-byte_reverse: QEMU_OPTS+=3D-cpu POWER10 -run-plugin-byte_reverse-with-%: QEMU_OPTS+=3D-cpu POWER10 =20 sha512-vector: CFLAGS +=3D-mcpu=3Dpower10 -O3 sha512-vector: sha512.c $(CC) $(CFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) =20 run-sha512-vector: QEMU_OPTS+=3D-cpu POWER10 -run-plugin-sha512-vector-with-%: QEMU_OPTS+=3D-cpu POWER10 =20 PPC64_TESTS +=3D signal_save_restore_xer PPC64_TESTS +=3D xxspltw diff --git a/tests/tcg/riscv64/Makefile.softmmu-target b/tests/tcg/riscv64/= Makefile.softmmu-target index e22cdb34c5..d5b126e5f1 100644 --- a/tests/tcg/riscv64/Makefile.softmmu-target +++ b/tests/tcg/riscv64/Makefile.softmmu-target @@ -19,3 +19,6 @@ QEMU_OPTS +=3D -M virt -display none -semihosting -device= loader,file=3D EXTRA_RUNS +=3D run-issue1060 run-issue1060: issue1060 $(call run-test, $<, $(QEMU) $(QEMU_OPTS)$<) + +# We don't currently support the multiarch system tests +undefine MULTIARCH_TESTS diff --git a/tests/tcg/riscv64/Makefile.target b/tests/tcg/riscv64/Makefile= .target index cc3ed65ffd..9973ba3b5f 100644 --- a/tests/tcg/riscv64/Makefile.target +++ b/tests/tcg/riscv64/Makefile.target @@ -9,4 +9,3 @@ TESTS +=3D noexec TESTS +=3D test-noc test-noc: LDFLAGS =3D -nostdlib -static run-test-noc: QEMU_OPTS +=3D -cpu rv64,c=3Dfalse -run-plugin-test-noc-%: QEMU_OPTS +=3D -cpu rv64,c=3Dfalse diff --git a/tests/tcg/s390x/Makefile.softmmu-target b/tests/tcg/s390x/Make= file.softmmu-target index 3e7f72abcd..192315dd20 100644 --- a/tests/tcg/s390x/Makefile.softmmu-target +++ b/tests/tcg/s390x/Makefile.softmmu-target @@ -23,3 +23,6 @@ include $(S390X_SRC)/pgm-specification.mak $(PGM_SPECIFICATION_TESTS): pgm-specification-softmmu.o $(PGM_SPECIFICATION_TESTS): LDFLAGS+=3Dpgm-specification-softmmu.o TESTS +=3D $(PGM_SPECIFICATION_TESTS) + +# We don't currently support the multiarch system tests +undefine MULTIARCH_TESTS diff --git a/tests/tcg/tricore/Makefile.softmmu-target b/tests/tcg/tricore/= Makefile.softmmu-target index b3cd56fffc..49e573bc3b 100644 --- a/tests/tcg/tricore/Makefile.softmmu-target +++ b/tests/tcg/tricore/Makefile.softmmu-target @@ -29,3 +29,6 @@ QEMU_OPTS +=3D -M tricore_testboard -cpu tc27x -nographic= -kernel =20 %.tst: %.o $(LD) $(LDFLAGS) $< -o $@ + +# We don't currently support the multiarch system tests +undefine MULTIARCH_TESTS diff --git a/tests/tcg/xtensa/Makefile.softmmu-target b/tests/tcg/xtensa/Ma= kefile.softmmu-target index ba6cd9fde3..78bf72dfaa 100644 --- a/tests/tcg/xtensa/Makefile.softmmu-target +++ b/tests/tcg/xtensa/Makefile.softmmu-target @@ -41,3 +41,6 @@ $(XTENSA_USABLE_TESTS): linker.ld macros.inc $(CRT) Makef= ile.softmmu-target $(CC) $(XTENSA_INC) $(ASFLAGS) $(EXTRA_CFLAGS) $< -o $@ $(LDFLAGS) $(NOST= DFLAGS) $(CRT) =20 endif + +# We don't currently support the multiarch system tests +undefine MULTIARCH_TESTS --=20 2.39.2