From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org 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 smtp.lore.kernel.org (Postfix) with ESMTPS id D4360C87FC9 for ; Wed, 30 Jul 2025 07:26:33 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uh1Bm-0002QK-EV; Wed, 30 Jul 2025 03:25:27 -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 1uh1BU-0002Ea-3d for qemu-devel@nongnu.org; Wed, 30 Jul 2025 03:25:09 -0400 Received: from mail-pf1-x42a.google.com ([2607:f8b0:4864:20::42a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uh1BR-0002Fj-EU for qemu-devel@nongnu.org; Wed, 30 Jul 2025 03:25:07 -0400 Received: by mail-pf1-x42a.google.com with SMTP id d2e1a72fcca58-76b6422756fso202429b3a.2 for ; Wed, 30 Jul 2025 00:25:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1753860302; x=1754465102; darn=nongnu.org; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id:from:to :cc:subject:date:message-id:reply-to; bh=OU0KPj52IbZRi7ayQO65ZGfCSPjVv14ZEBpEoP4GkeM=; b=xJPn8/nRqJBOuvImbCqz0hl57syncghFQHiByGOGgFKNp/lcjfO8ZdopL7he9E75v3 mzP4GZXMPJcelvE9T63yHIaOKyXA3pGFPUWCmZP0Q6AnSA8m03Mz6qPNBcFpAlsp7Die bOo8GUolm69WxZxZbFGVk+lgmSLRdaAAW6XI9qKibSfJwkwDc06dJ/Zb7GniT/fyH1Dm iBrQH+HtgNBQZmQ7mKuFdbA9HuPkBcJCrPD247zfIi/+IDJmLJHFb7/svM21YmpfGyT5 F+Nu+dnqkOWgPgAnq4tUWdSnTSBYhTxDqBDaTZnKFIzD5GOluVfzIdHOmMgOxz3yhzuD l+ZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753860302; x=1754465102; h=content-transfer-encoding:in-reply-to:content-language:references :cc:to:from:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=OU0KPj52IbZRi7ayQO65ZGfCSPjVv14ZEBpEoP4GkeM=; b=Xi1BMLJv8oc2XQbC9Qcmd84I7l3fOxk7SUrFcBhn/nIug2xC9b7tbS56SyhrneXm3j sXoYRaPVDBwQK9nhA2i/AbWBHez2lh7DkAJEKHo73K4EoahPNfD/w2T3a9D6RLBBfPvc bMLHsjhQi0FV4RoJ/AvoWlRzgVUGMF8pym2aAInGJ7rcsxRqdYDJnWhC6KJGKf980SqW RtLtFYVvM9u4+FnMHHXf5j7TE5uRxnmHdS8jhaW4Mlaw7tH4X1WVLSFjABRPhSVV8u35 kafndM6uh+X/eLioVWlzS91CB5G260aQLPyzls96cGvR7oabplebw9x26VCbEURKpUAE CU6A== X-Forwarded-Encrypted: i=1; AJvYcCVLSazVa5CwWDUDH4cSgxem74lThYvoX9F7vjdpBcUA6UlcpIgQnVwXWJCGAc1AMnnql0zubFQhRhwz@nongnu.org X-Gm-Message-State: AOJu0YzknA9bXtnHMMNFpe37B0r2YqdeXF9n3peDd5faJRKGbpYvVnio mwF0UlpcXJ4xFp3RzbWZj5bq5glCKrGeCr0SD8jtluMukZwZo6ppOZv3HaEe8XQVgGM= X-Gm-Gg: ASbGncuSvAkCWVHFtWGOoD0Tr6WMQdXBB35bHmC19ew/6VtDY0g4PqGZZjFuu+dwHZQ h5yQBhsisjyNY2LNuk/0WGHMYoqvvyYDhZzmlNq4wYup4+qWdY3EeEYT9uk8BGOccdCfFZbAYv/ cT9aMfZ3ntlBpCm7UJV3/hY/xbIok3l7RMy2VPPblSgJ56Rw03aQ17kOn8bxIfBcm+zIC4PRYou zoVREfDsbMHgp4dYk1PNLtT3fzBuvUFvgUej9IzjhFykgxvuKUW5yzsPaRQqriP+RCSkZlh5pyr kB0uDOg7GRett4lcuKoQESInX5uCft2dJEpmRqHO5RPI5ZSH4VQUIb7M6UT47ZGEJgPs7Cyk/cX hiCOojCI57jcB0NyNYzPJOa8c+vWF2JW4EpU= X-Google-Smtp-Source: AGHT+IFzFVsjbQ/RZeePeggmEXhWoJTd53D5RMJ1mZTOBi+ZnHkCHkln3Gbm8CqChznJcVfStvD4IA== X-Received: by 2002:a05:6a20:938c:b0:231:acae:1983 with SMTP id adf61e73a8af0-23dc0d59618mr4260908637.3.1753860302092; Wed, 30 Jul 2025 00:25:02 -0700 (PDT) Received: from [192.168.1.87] ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7640b1e5c94sm9864393b3a.94.2025.07.30.00.25.01 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Wed, 30 Jul 2025 00:25:01 -0700 (PDT) Message-ID: Date: Wed, 30 Jul 2025 00:25:00 -0700 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PULL 11/14] tests/tcg: reduce the number of plugin tests combinations From: Pierrick Bouvier To: =?UTF-8?Q?Alex_Benn=C3=A9e?= , qemu-devel@nongnu.org Cc: Manos Pitsidianakis , =?UTF-8?Q?Philippe_Mathieu-Daud=C3=A9?= References: <20250727083254.3826585-1-alex.bennee@linaro.org> <20250727083254.3826585-12-alex.bennee@linaro.org> Content-Language: en-US In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Received-SPF: pass client-ip=2607:f8b0:4864:20::42a; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pf1-x42a.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, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham 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+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org On 7/28/25 12:03 PM, Pierrick Bouvier wrote: > Hi Alex, > > On 7/27/25 1:32 AM, Alex Bennée wrote: >> As our set of multiarch tests has grown the practice of running every >> plugin with every test is becoming unsustainable. If we switch to >> ensuring every test gets run with at least one plugin we can speed >> things up. >> >> Some plugins do need to be run with specific tests (for example the >> memory instrumentation test). We can handle this by manually adding >> them to EXTRA_RUNS. We also need to wrap rules in a CONFIG_PLUGIN test >> so we don't enable the runs when plugins are not enabled. >> >> Reviewed-by: Manos Pitsidianakis >> Signed-off-by: Alex Bennée >> Message-ID: <20250725154517.3523095-12-alex.bennee@linaro.org> >> >> diff --git a/tests/tcg/Makefile.target b/tests/tcg/Makefile.target >> index a12b15637ea..18afd5be194 100644 >> --- a/tests/tcg/Makefile.target >> +++ b/tests/tcg/Makefile.target >> @@ -173,14 +173,25 @@ PLUGINS=$(filter-out $(DISABLE_PLUGINS), \ >> # 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 >> # 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 below. >> +# and rotate the plugins so we don't grow too out of control as new >> +# tests are added. Plugins that need to run with a specific test >> +# should ensure they add their combination to EXTRA_RUNS. >> >> ifneq ($(MULTIARCH_TESTS),) >> -$(foreach p,$(PLUGINS), \ >> - $(foreach t,$(MULTIARCH_TESTS),\ >> - $(eval run-plugin-$(t)-with-$(p): $t $p) \ >> - $(eval RUN_TESTS+=run-plugin-$(t)-with-$(p)))) >> + >> +NUM_PLUGINS := $(words $(PLUGINS)) >> +NUM_TESTS := $(words $(MULTIARCH_TESTS)) >> + >> +define mod_plus_one >> + $(shell $(PYTHON) -c "print( ($(1) % $(2)) + 1 )") >> +endef >> + >> +$(foreach _idx, $(shell seq 1 $(NUM_TESTS)), \ >> + $(eval _test := $(word $(_idx), $(MULTIARCH_TESTS))) \ >> + $(eval _plugin := $(word $(call mod_plus_one, $(_idx), $(NUM_PLUGINS)), $(PLUGINS))) \ >> + $(eval run-plugin-$(_test)-with-$(_plugin): $(_test) $(_plugin)) \ >> + $(eval RUN_TESTS+=run-plugin-$(_test)-with-$(_plugin))) >> + >> endif # MULTIARCH_TESTS >> endif # CONFIG_PLUGIN >> >> diff --git a/tests/tcg/multiarch/Makefile.target b/tests/tcg/multiarch/Makefile.target >> index bfdf7197a7b..38345ff8805 100644 >> --- a/tests/tcg/multiarch/Makefile.target >> +++ b/tests/tcg/multiarch/Makefile.target >> @@ -189,6 +189,10 @@ run-plugin-semiconsole-with-%: >> TESTS += semihosting semiconsole >> endif >> >> +test-plugin-mem-access: CFLAGS+=-pthread -O0 >> +test-plugin-mem-access: LDFLAGS+=-pthread -O0 >> + >> +ifeq ($(CONFIG_PLUGIN),y) >> # Test plugin memory access instrumentation >> run-plugin-test-plugin-mem-access-with-libmem.so: \ >> PLUGIN_ARGS=$(COMMA)print-accesses=true >> @@ -197,8 +201,8 @@ run-plugin-test-plugin-mem-access-with-libmem.so: \ >> $(SRC_PATH)/tests/tcg/multiarch/check-plugin-output.sh \ >> $(QEMU) $< >> >> -test-plugin-mem-access: CFLAGS+=-pthread -O0 >> -test-plugin-mem-access: LDFLAGS+=-pthread -O0 >> +EXTRA_RUNS += run-plugin-test-plugin-mem-access-with-libmem.so >> +endif >> >> # Update TESTS >> TESTS += $(MULTIARCH_TESTS) >> diff --git a/tests/tcg/multiarch/system/Makefile.softmmu-target b/tests/tcg/multiarch/system/Makefile.softmmu-target >> index 5acf2700812..4171b4e6aa0 100644 >> --- a/tests/tcg/multiarch/system/Makefile.softmmu-target >> +++ b/tests/tcg/multiarch/system/Makefile.softmmu-target >> @@ -71,8 +71,11 @@ endif >> MULTIARCH_RUNS += run-gdbstub-memory run-gdbstub-interrupt \ >> run-gdbstub-untimely-packet run-gdbstub-registers >> >> +ifeq ($(CONFIG_PLUGIN),y) >> # Test plugin memory access instrumentation >> -run-plugin-memory-with-libmem.so: \ >> - PLUGIN_ARGS=$(COMMA)region-summary=true >> -run-plugin-memory-with-libmem.so: \ >> - CHECK_PLUGIN_OUTPUT_COMMAND=$(MULTIARCH_SYSTEM_SRC)/validate-memory-counts.py $@.out >> +run-plugin-memory-with-libmem.so: memory libmem.so >> +run-plugin-memory-with-libmem.so: PLUGIN_ARGS=$(COMMA)region-summary=true >> +run-plugin-memory-with-libmem.so: CHECK_PLUGIN_OUTPUT_COMMAND=$(MULTIARCH_SYSTEM_SRC)/validate-memory-counts.py $@.out >> + >> +EXTRA_RUNS += run-plugin-memory-with-libmem.so >> +endif > > I'm not sure how it's related, but check-tcg on aarch64 host now fails > [1] since this series was merged, and I suspect it may be related to > this patch. I didn't spend time to reproduce and investigate it. > Reverting this patch solved the problem on my side. As well, I'm not sure if it's a real problem to run all plugins for all tests. At the moment, it takes 5 min on a slow machine with 4 cpus and a sanitized build, something we can probably live with for now. Unfortunately Alex is out this week, but it would be nice if another maintainer could make a PR reverting this patch. Regards, Pierrick > [1] > https://github.com/pbo-linaro/qemu-ci/actions/runs/16575679153/job/46879690693