From: Madhavan Srinivasan <maddy@linux.ibm.com>
To: Michael Ellerman <mpe@ellerman.id.au>, linuxppc-dev@lists.ozlabs.org
Cc: spoorthy@linux.ibm.com, linux-kselftest@vger.kernel.org
Subject: Re: [PATCH v2 1/2] selftests/powerpc: Convert pmu Makefile to for loop style
Date: Thu, 2 May 2024 13:51:56 +0530 [thread overview]
Message-ID: <5f0cb59d-0deb-4919-97b6-a99ae640c424@linux.ibm.com> (raw)
In-Reply-To: <20240422133453.1793988-1-mpe@ellerman.id.au>
On 4/22/24 7:04 PM, Michael Ellerman wrote:
> The pmu Makefile has grown more sub directories over the years. Rather
> than open coding the rules for each subdir, use for loops.
Nice cleanup. Thanks.
Tested-by: Madhavan Srinivasan <maddy@linux.ibm.com>
> Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
> ---
> tools/testing/selftests/powerpc/pmu/Makefile | 43 ++++++++++----------
> 1 file changed, 22 insertions(+), 21 deletions(-)
>
> v2: Actually send both patches.
>
> diff --git a/tools/testing/selftests/powerpc/pmu/Makefile b/tools/testing/selftests/powerpc/pmu/Makefile
> index 1fcacae1b188..773933e5180e 100644
> --- a/tools/testing/selftests/powerpc/pmu/Makefile
> +++ b/tools/testing/selftests/powerpc/pmu/Makefile
> @@ -9,7 +9,9 @@ top_srcdir = ../../../../..
> include ../../lib.mk
> include ../flags.mk
>
> -all: $(TEST_GEN_PROGS) ebb sampling_tests event_code_tests
> +SUB_DIRS := ebb sampling_tests event_code_tests
> +
> +all: $(TEST_GEN_PROGS) $(SUB_DIRS)
>
> $(TEST_GEN_PROGS): $(EXTRA_SOURCES)
>
> @@ -23,12 +25,16 @@ $(OUTPUT)/count_stcx_fail: loop.S $(EXTRA_SOURCES)
>
> $(OUTPUT)/per_event_excludes: ../utils.c
>
> +$(SUB_DIRS):
> + BUILD_TARGET=$(OUTPUT)/$@; mkdir -p $$BUILD_TARGET; $(MAKE) OUTPUT=$$BUILD_TARGET -k -C $@ all
> +
> DEFAULT_RUN_TESTS := $(RUN_TESTS)
> override define RUN_TESTS
> $(DEFAULT_RUN_TESTS)
> - +TARGET=ebb; BUILD_TARGET=$$OUTPUT/$$TARGET; $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET run_tests
> - +TARGET=sampling_tests; BUILD_TARGET=$$OUTPUT/$$TARGET; $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET run_tests
> - +TARGET=event_code_tests; BUILD_TARGET=$$OUTPUT/$$TARGET; $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET run_tests
> + +@for TARGET in $(SUB_DIRS); do \
> + BUILD_TARGET=$(OUTPUT)/$$TARGET; \
> + $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET run_tests; \
> + done;
> endef
>
> emit_tests:
> @@ -36,34 +42,29 @@ emit_tests:
> BASENAME_TEST=`basename $$TEST`; \
> echo "$(COLLECTION):$$BASENAME_TEST"; \
> done
> - +TARGET=ebb; BUILD_TARGET=$$OUTPUT/$$TARGET; $(MAKE) OUTPUT=$$BUILD_TARGET -s -C $$TARGET emit_tests
> - +TARGET=sampling_tests; BUILD_TARGET=$$OUTPUT/$$TARGET; $(MAKE) OUTPUT=$$BUILD_TARGET -s -C $$TARGET emit_tests
> - +TARGET=event_code_tests; BUILD_TARGET=$$OUTPUT/$$TARGET; $(MAKE) OUTPUT=$$BUILD_TARGET -s -C $$TARGET emit_tests
> + +@for TARGET in $(SUB_DIRS); do \
> + BUILD_TARGET=$(OUTPUT)/$$TARGET; \
> + $(MAKE) OUTPUT=$$BUILD_TARGET -s -C $$TARGET emit_tests; \
> + done;
>
> DEFAULT_INSTALL_RULE := $(INSTALL_RULE)
> override define INSTALL_RULE
> $(DEFAULT_INSTALL_RULE)
> - +TARGET=ebb; BUILD_TARGET=$$OUTPUT/$$TARGET; $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET install
> - +TARGET=sampling_tests; BUILD_TARGET=$$OUTPUT/$$TARGET; $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET install
> - +TARGET=event_code_tests; BUILD_TARGET=$$OUTPUT/$$TARGET; $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET install
> + +@for TARGET in $(SUB_DIRS); do \
> + BUILD_TARGET=$(OUTPUT)/$$TARGET; \
> + $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET install; \
> + done;
> endef
>
> DEFAULT_CLEAN := $(CLEAN)
> override define CLEAN
> $(DEFAULT_CLEAN)
> $(RM) $(TEST_GEN_PROGS) $(OUTPUT)/loop.o
> - +TARGET=ebb; BUILD_TARGET=$$OUTPUT/$$TARGET; $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET clean
> - +TARGET=sampling_tests; BUILD_TARGET=$$OUTPUT/$$TARGET; $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET clean
> - +TARGET=event_code_tests; BUILD_TARGET=$$OUTPUT/$$TARGET; $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET clean
> + +@for TARGET in $(SUB_DIRS); do \
> + BUILD_TARGET=$(OUTPUT)/$$TARGET; \
> + $(MAKE) OUTPUT=$$BUILD_TARGET -C $$TARGET clean; \
> + done;
> endef
>
> -ebb:
> - TARGET=$@; BUILD_TARGET=$$OUTPUT/$$TARGET; mkdir -p $$BUILD_TARGET; $(MAKE) OUTPUT=$$BUILD_TARGET -k -C $$TARGET all
> -
> -sampling_tests:
> - TARGET=$@; BUILD_TARGET=$$OUTPUT/$$TARGET; mkdir -p $$BUILD_TARGET; $(MAKE) OUTPUT=$$BUILD_TARGET -k -C $$TARGET all
> -
> -event_code_tests:
> - TARGET=$@; BUILD_TARGET=$$OUTPUT/$$TARGET; mkdir -p $$BUILD_TARGET; $(MAKE) OUTPUT=$$BUILD_TARGET -k -C $$TARGET all
>
> .PHONY: all run_tests ebb sampling_tests event_code_tests emit_tests
next prev parent reply other threads:[~2024-05-02 8:22 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-22 13:34 [PATCH v2 1/2] selftests/powerpc: Convert pmu Makefile to for loop style Michael Ellerman
2024-04-22 13:34 ` [PATCH v2 2/2] selftests/powerpc: Install tests in sub-directories Michael Ellerman
2024-05-02 8:21 ` Madhavan Srinivasan [this message]
2024-05-03 10:41 ` [PATCH v2 1/2] selftests/powerpc: Convert pmu Makefile to for loop style Michael Ellerman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5f0cb59d-0deb-4919-97b6-a99ae640c424@linux.ibm.com \
--to=maddy@linux.ibm.com \
--cc=linux-kselftest@vger.kernel.org \
--cc=linuxppc-dev@lists.ozlabs.org \
--cc=mpe@ellerman.id.au \
--cc=spoorthy@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox