From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33796) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmmBr-0006b6-VC for qemu-devel@nongnu.org; Wed, 21 Sep 2016 14:24:16 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bmmBl-0004N3-VY for qemu-devel@nongnu.org; Wed, 21 Sep 2016 14:24:14 -0400 Received: from mx1.redhat.com ([209.132.183.28]:46626) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bmmBl-0004Ml-Lp for qemu-devel@nongnu.org; Wed, 21 Sep 2016 14:24:09 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 9EF77C05A2A5 for ; Wed, 21 Sep 2016 18:24:08 +0000 (UTC) References: <1470993574-11906-1-git-send-email-famz@redhat.com> From: John Snow Message-ID: Date: Wed, 21 Sep 2016 14:24:07 -0400 MIME-Version: 1.0 In-Reply-To: <1470993574-11906-1-git-send-email-famz@redhat.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCH RFC] tests: Run qtest cases in parallel List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Fam Zheng , qemu-devel@nongnu.org On 08/12/2016 05:19 AM, Fam Zheng wrote: > Previously all test cases in a category, such as check-qtest-y, are > executed in a single long gtester command. This patch separates each > test into its own make target to allow better parallism. > > Signed-off-by: Fam Zheng > --- > > This saves 50% of the time "make check takes" compared to on master > (I use -j8). RFC because I'm not sure if the new gcov usage is correct > with the now much higher level of parallism compared to before. > --- > tests/Makefile.include | 34 ++++++++++++++++++---------------- > 1 file changed, 18 insertions(+), 16 deletions(-) > > diff --git a/tests/Makefile.include b/tests/Makefile.include > index 14be491..9bf0326 100644 > --- a/tests/Makefile.include > +++ b/tests/Makefile.include > @@ -691,27 +691,29 @@ GCOV_OPTIONS = -n $(if $(V),-f,) > # gtester tests, possibly with verbose output > > .PHONY: $(patsubst %, check-qtest-%, $(QTEST_TARGETS)) > -$(patsubst %, check-qtest-%, $(QTEST_TARGETS)): check-qtest-%: $(check-qtest-y) > + > +qtest-run-%: tests/% > $(if $(CONFIG_GCOV),@rm -f *.gcda */*.gcda */*/*.gcda */*/*/*.gcda,) > - $(call quiet-command,QTEST_QEMU_BINARY=$*-softmmu/qemu-system-$* \ > + $(call quiet-command,\ > + $(if $(QTEST_TARGET), \ > + QTEST_QEMU_BINARY=$(QTEST_TARGET)-softmmu/qemu-system-$(QTEST_TARGET)) \ > QTEST_QEMU_IMG=qemu-img$(EXESUF) \ > MALLOC_PERTURB_=$${MALLOC_PERTURB_:-$$((RANDOM % 255 + 1))} \ > - gtester $(GTESTER_OPTIONS) -m=$(SPEED) $(check-qtest-$*-y) $(check-qtest-generic-y),"GTESTER $@") > - $(if $(CONFIG_GCOV),@for f in $(gcov-files-$*-y) $(gcov-files-generic-y); do \ > - echo Gcov report for $$f:;\ > - $(GCOV) $(GCOV_OPTIONS) $$f -o `dirname $$f`; \ > - done,) > + gtester $< $(GTESTER_OPTIONS) -m=$(SPEED),"GTESTER $<") > + $(if $(CONFIG_GCOV), @echo Gcov report for $<:;\ > + $(GCOV) $(GCOV_OPTIONS) $< -o `dirname $<`; \ > + ) > + > +$(foreach target, $(QTEST_TARGETS), \ > + $(eval check-qtest-$(target): QTEST_TARGET := $(target)) \ > + $(eval check-qtest-$(target): $(patsubst tests/%, qtest-run-%, \ > + $(check-qtest-y) \ > + $(check-qtest-$(target)-y) \ > + $(check-qtest-generic-y))) \ > +) > > .PHONY: $(patsubst %, check-%, $(check-unit-y)) > -$(patsubst %, check-%, $(check-unit-y)): check-%: % > - $(if $(CONFIG_GCOV),@rm -f *.gcda */*.gcda */*/*.gcda */*/*/*.gcda,) > - $(call quiet-command, \ > - MALLOC_PERTURB_=$${MALLOC_PERTURB_:-$$((RANDOM % 255 + 1))} \ > - gtester $(GTESTER_OPTIONS) -m=$(SPEED) $*,"GTESTER $*") > - $(if $(CONFIG_GCOV),@for f in $(gcov-files-$(subst tests/,,$*)-y) $(gcov-files-generic-y); do \ > - echo Gcov report for $$f:;\ > - $(GCOV) $(GCOV_OPTIONS) $$f -o `dirname $$f`; \ > - done,) > +$(patsubst %, check-%, $(check-unit-y)): check-tests/%: qtest-run-% > > # gtester tests with XML output > > I can't vouch for gcov either, but: Tested-by: John Snow -j1: real 1m51.195s user 1m5.478s sys 0m21.158s -j9: real 0m53.039s user 1m41.754s sys 0m31.150s This seems useful. --js