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 7C2BEC87FCC for ; Thu, 31 Jul 2025 20:35:46 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1uha05-0003Fu-Gr; Thu, 31 Jul 2025 16:35:41 -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 1uhYsd-0000MZ-WF for qemu-devel@nongnu.org; Thu, 31 Jul 2025 15:23:56 -0400 Received: from mail-pl1-x636.google.com ([2607:f8b0:4864:20::636]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1uhYsb-0003hN-Pw for qemu-devel@nongnu.org; Thu, 31 Jul 2025 15:23:55 -0400 Received: by mail-pl1-x636.google.com with SMTP id d9443c01a7336-24049d1643aso6747285ad.3 for ; Thu, 31 Jul 2025 12:23:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1753989832; x=1754594632; darn=nongnu.org; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=piTlfTk4zS1bwN4FSBHMKtCdx9OZ65Bdnyb/uTtjKMs=; b=VTWwCGZEs/9ZLqvBnYGjfCSmzx7XdLck/efqihyuZDnPDFTZI9iZB7XbzvEOvtjSLN jyxagERiTV3oZCVpWv3ZBoKaiZOxwDLwHHLFMPQWN+S96IzzOzXK+wNyv8gvAHlUpXYw lCQPKPQKbWB2YXNbJVcNnJaoQVo7NzXQvT5hMpNvepYY9yMJgDSwzQi8ch5u9LrFliji hZBbwkmVL+yjP/f/QF7BJ3MywRbZObsnZDzSQJN8Gz+lALFOWaViROBN3UtJ3lZzSWm6 T5d6kDymCbfIaWR4Fi37RuOoZeHQjPdcKGEO0LqkTYZXC6URp648vhR1AIrj6ikRbW7B 1SVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753989832; x=1754594632; h=content-transfer-encoding:in-reply-to:from:references:cc:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=piTlfTk4zS1bwN4FSBHMKtCdx9OZ65Bdnyb/uTtjKMs=; b=lsYYVyMK2y89ky7ZezW2RaC2GdPF0TLxTVLP6vBjhrXcw05U7BX6Pkwqf59sxdrwc/ /Z3jhvk+5svyH5GLzzFeq2qEFm9AdeDMKM4xor4uykjlRPCyaUnzKcgE42Cmi7dtPJSE EtFPm/ivvibnM7Tn3I/hbKWHde+89gwrv0P/Q9RLQnzMi8Q+rae2pM1BhKdRSll/Yx1d iLMe59WKVEeQRvC15dlyuIRlLJ3D7aONOEt3Ahg32htmc6QqGNz2M8qlrMsKN+K5nk+7 6cZU1PW52z5tUbxxEHKxaKZ0cfyRDdorN+xGyRC3pR7F5C21kk9M/N+xhg04fom4+/sN 5Tfg== X-Forwarded-Encrypted: i=1; AJvYcCU5+g94HfbP0igxuy10V/pQEVqYKoPcZYFiqDENzKEbTqSTiL0F6/pjLHiPCAtdM6rRVHKgi7vvWxhU@nongnu.org X-Gm-Message-State: AOJu0YzAGw0bgzEYQ74eXh0eW0IR+1IHBHo90TPirBLCKcB64RIALuaA Ud+9OCTDliGGgq+vh6jP3kxuxro6idyJxNm1gUq9xlr5lIWNrRbw1Iwv31BNp4Yxp6E= X-Gm-Gg: ASbGncsIIbDRzdqomndN+wFgsAQdbkmh07PIHffpkk3hnmYZvyXbbbAc2c3mAbu+SvR mOW3AhDSES871i1VSn2Yx/592rcLqmb8bflv3CogFBX8ycsBo2lj/KGLBtRIBdvY7FyNRWtOEv3 M4OYAd723aU3M/4CyQ21EmQzPYx1Zv8eWmZN958DEDVKgeAM1vFLEKvzmBiXUqNpgLieA9+zOTn 7uGOqkgu2JdzY6v+bMZVxSHLpbBFoCLdFaD5X/9bNiuBDKHZgfaSSV7YaWyidtXMHy8XOCTvxcU 8ETRjmxRpU8z5X5++3l4B9TG1LAPxcZzYEWF49C4emrPK933xaUo8thkjRsq2TVC55El4k5vFpg kLTEiO15nKmfojApmHYb3NGwb4nRL3UcHG8pEPbfgJLY8wg== X-Google-Smtp-Source: AGHT+IEGW548QmM3CXwplio0BWUYMdy3nCf1m2L1BVW44BVEgKDzPLQu215npy89lCcY8Z/EOCpixg== X-Received: by 2002:a17:903:907:b0:240:79ef:ae80 with SMTP id d9443c01a7336-24096a6590amr90410125ad.8.1753989831952; Thu, 31 Jul 2025 12:23:51 -0700 (PDT) Received: from [192.168.1.87] ([38.41.223.211]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-241d1f0f7bfsm24661745ad.41.2025.07.31.12.23.50 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 31 Jul 2025 12:23:50 -0700 (PDT) Message-ID: <62c027d0-4331-4554-a4ea-0e9a5044ea89@linaro.org> Date: Thu, 31 Jul 2025 12:23:49 -0700 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PULL 11/14] tests/tcg: reduce the number of plugin tests combinations Content-Language: en-US To: Gustavo Romero , =?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> <2635ef88-b662-41b9-b206-ca1923e87e91@linaro.org> From: Pierrick Bouvier 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::636; envelope-from=pierrick.bouvier@linaro.org; helo=mail-pl1-x636.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/31/25 11:58 AM, Gustavo Romero wrote: > Hi, > > On 7/28/25 17:14, Gustavo Romero wrote: >> Hi, >> >> On 7/28/25 16:03, 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. >>> >>> [1] https://github.com/pbo-linaro/qemu-ci/actions/runs/16575679153/job/46879690693 >> >> I was not able to reproduce it locally on 22.04, but in the CI indeed the test command is missing the "test-plugin-mem-access" binary at the end, just before redirection to .so.out, it should be: >> >> [...] -D test-plugin-mem-access-with-libmem.so.pout test-plugin-mem-access >  run-plugin-test-plugin-mem-access-with-libmem.so.out >> >> not: >> >> [...] -D test-plugin-mem-access-with-libmem.so.pout  >  run-plugin-test-plugin-mem-access-with-libmem.so.out > > The problem is that the new rules generated by a shuffled combination of tests and plugin > (the one using eval) sometimes does not include the rule for the test+plugin combination > passed via EXTRA_RUNs. > > So EXTRA_RUNS tests like run-plugin-test-plugin-mem-access-with-libmem.so might end up > with a proper rule if the test test-plugin-mem-access is combined with other plugin > randomly, since now a plugin is picked up based on a tests index _idx modulo with the > number of plugins. > > A possible fix is to generate correctly the rules for the tests with plugins passed > via EXTRA_RUNS and ideally, following the patch's mood, remove the test from running > if any other plugin (no shuffle with any other plugin). > > Of course, as Pierrick said, this patch could be a premature optimization. So maybe > it doesn´t justify adding more complexity to our Makefile (Makefiles are hard to debug, > with 'eval' tricks, it's _reallly_ hard, so the more we avoid it the better). > > That said, if we want to keep this commit, I've kicked off a test to fix it here: > > https://gitlab.com/gusbromero/qemu/-/pipelines/1959953122 > > and sent the fix to the ML too. HTH. > Thanks for taking a look at this Gustavo. In the pipeline you shared, the build-some-softmmu fails with: Makefile:210: *** multiple target patterns. Stop. make: *** [/builds/gusbromero/qemu/tests/Makefile.include:50: build-tcg-tests-x86_64-softmmu] Error 2 make: *** Waiting for unfinished jobs.... Is that a new bug related to current patch? > > Cheers, > Gustavo