| Message ID | 20230204133454.260066-1-guillaume.tucker@collabora.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 2da789cda462bda93679f53ee38f9aa2309d47e8 |
| Headers | show |
| Series | selftests: amd-pstate: fix TEST_FILES | expand |
Hi Shuah, On 04/02/2023 14:34, Guillaume Tucker wrote: > Bring back the Python scripts that were initially added with > TEST_GEN_FILES but now with TEST_FILES to avoid having them deleted > when doing a clean. Also fix the way the architecture is being > determined as they should also be installed when ARCH=x86_64 is > provided explicitly. Then also append extra files to TEST_FILES and > TEST_PROGS with += so they don't get discarded. > > Fixes: ba2d788aa873 ("selftests: amd-pstate: Trigger tbench benchmark and test cpus") > Fixes: ac527cee87c9 ("selftests: amd-pstate: Don't delete source files via Makefile") > Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com> > --- > tools/testing/selftests/amd-pstate/Makefile | 13 +++++++++---- > 1 file changed, 9 insertions(+), 4 deletions(-) > > diff --git a/tools/testing/selftests/amd-pstate/Makefile b/tools/testing/selftests/amd-pstate/Makefile > index 5fd1424db37d..c382f579fe94 100644 > --- a/tools/testing/selftests/amd-pstate/Makefile > +++ b/tools/testing/selftests/amd-pstate/Makefile > @@ -4,10 +4,15 @@ > # No binaries, but make sure arg-less "make" doesn't trigger "run_tests" > all: > > -uname_M := $(shell uname -m 2>/dev/null || echo not) > -ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/) > +ARCH ?= $(shell uname -m 2>/dev/null || echo not) > +ARCH := $(shell echo $(ARCH) | sed -e s/i.86/x86/ -e s/x86_64/x86/) > > -TEST_PROGS := run.sh > -TEST_FILES := basic.sh tbench.sh gitsource.sh > +ifeq (x86,$(ARCH)) > +TEST_FILES += ../../../power/x86/amd_pstate_tracer/amd_pstate_trace.py > +TEST_FILES += ../../../power/x86/intel_pstate_tracer/intel_pstate_tracer.py > +endif > + > +TEST_PROGS += run.sh > +TEST_FILES += basic.sh tbench.sh gitsource.sh > > include ../lib.mk Is there anything blocking this patch from being applied? It brings back the tools needed to run the amd-pstate tests into the kselftest installation directory. I could try to run the test on an AMD platform and check it's working as before, but there was no change in the tools themselves and I've checked the scripts get installed correctly now like before. We might also actually run this test in KernelCI since there are a few AMD platforms available. Thanks, Guillaume
On Sat, Feb 04, 2023 at 09:34:54PM +0800, Guillaume Tucker wrote: > Bring back the Python scripts that were initially added with > TEST_GEN_FILES but now with TEST_FILES to avoid having them deleted > when doing a clean. Also fix the way the architecture is being > determined as they should also be installed when ARCH=x86_64 is > provided explicitly. Then also append extra files to TEST_FILES and > TEST_PROGS with += so they don't get discarded. > > Fixes: ba2d788aa873 ("selftests: amd-pstate: Trigger tbench benchmark and test cpus") > Fixes: ac527cee87c9 ("selftests: amd-pstate: Don't delete source files via Makefile") > Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com> Acked-by: Huang Rui <ray.huang@amd.com> > --- > tools/testing/selftests/amd-pstate/Makefile | 13 +++++++++---- > 1 file changed, 9 insertions(+), 4 deletions(-) > > diff --git a/tools/testing/selftests/amd-pstate/Makefile b/tools/testing/selftests/amd-pstate/Makefile > index 5fd1424db37d..c382f579fe94 100644 > --- a/tools/testing/selftests/amd-pstate/Makefile > +++ b/tools/testing/selftests/amd-pstate/Makefile > @@ -4,10 +4,15 @@ > # No binaries, but make sure arg-less "make" doesn't trigger "run_tests" > all: > > -uname_M := $(shell uname -m 2>/dev/null || echo not) > -ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/) > +ARCH ?= $(shell uname -m 2>/dev/null || echo not) > +ARCH := $(shell echo $(ARCH) | sed -e s/i.86/x86/ -e s/x86_64/x86/) > > -TEST_PROGS := run.sh > -TEST_FILES := basic.sh tbench.sh gitsource.sh > +ifeq (x86,$(ARCH)) > +TEST_FILES += ../../../power/x86/amd_pstate_tracer/amd_pstate_trace.py > +TEST_FILES += ../../../power/x86/intel_pstate_tracer/intel_pstate_tracer.py > +endif > + > +TEST_PROGS += run.sh > +TEST_FILES += basic.sh tbench.sh gitsource.sh > > include ../lib.mk > -- > 2.30.2 >
On 3/2/23 23:05, Huang Rui wrote: > On Sat, Feb 04, 2023 at 09:34:54PM +0800, Guillaume Tucker wrote: >> Bring back the Python scripts that were initially added with >> TEST_GEN_FILES but now with TEST_FILES to avoid having them deleted >> when doing a clean. Also fix the way the architecture is being >> determined as they should also be installed when ARCH=x86_64 is >> provided explicitly. Then also append extra files to TEST_FILES and >> TEST_PROGS with += so they don't get discarded. >> >> Fixes: ba2d788aa873 ("selftests: amd-pstate: Trigger tbench benchmark and test cpus") >> Fixes: ac527cee87c9 ("selftests: amd-pstate: Don't delete source files via Makefile") >> Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com> > > Acked-by: Huang Rui <ray.huang@amd.com> > Thank you both. I will pick this up for 6.3-rc2 thanks, -- Shuah
On 03/03/2023 21:29, Shuah Khan wrote: > On 3/2/23 23:05, Huang Rui wrote: >> On Sat, Feb 04, 2023 at 09:34:54PM +0800, Guillaume Tucker wrote: >>> Bring back the Python scripts that were initially added with >>> TEST_GEN_FILES but now with TEST_FILES to avoid having them deleted >>> when doing a clean. Also fix the way the architecture is being >>> determined as they should also be installed when ARCH=x86_64 is >>> provided explicitly. Then also append extra files to TEST_FILES and >>> TEST_PROGS with += so they don't get discarded. >>> >>> Fixes: ba2d788aa873 ("selftests: amd-pstate: Trigger tbench benchmark and test cpus") >>> Fixes: ac527cee87c9 ("selftests: amd-pstate: Don't delete source files via Makefile") >>> Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com> >> >> Acked-by: Huang Rui <ray.huang@amd.com> >> > > Thank you both. I will pick this up for 6.3-rc2 Great, many thanks. Guillaume
diff --git a/tools/testing/selftests/amd-pstate/Makefile b/tools/testing/selftests/amd-pstate/Makefile index 5fd1424db37d..c382f579fe94 100644 --- a/tools/testing/selftests/amd-pstate/Makefile +++ b/tools/testing/selftests/amd-pstate/Makefile @@ -4,10 +4,15 @@ # No binaries, but make sure arg-less "make" doesn't trigger "run_tests" all: -uname_M := $(shell uname -m 2>/dev/null || echo not) -ARCH ?= $(shell echo $(uname_M) | sed -e s/i.86/x86/ -e s/x86_64/x86/) +ARCH ?= $(shell uname -m 2>/dev/null || echo not) +ARCH := $(shell echo $(ARCH) | sed -e s/i.86/x86/ -e s/x86_64/x86/) -TEST_PROGS := run.sh -TEST_FILES := basic.sh tbench.sh gitsource.sh +ifeq (x86,$(ARCH)) +TEST_FILES += ../../../power/x86/amd_pstate_tracer/amd_pstate_trace.py +TEST_FILES += ../../../power/x86/intel_pstate_tracer/intel_pstate_tracer.py +endif + +TEST_PROGS += run.sh +TEST_FILES += basic.sh tbench.sh gitsource.sh include ../lib.mk
Bring back the Python scripts that were initially added with TEST_GEN_FILES but now with TEST_FILES to avoid having them deleted when doing a clean. Also fix the way the architecture is being determined as they should also be installed when ARCH=x86_64 is provided explicitly. Then also append extra files to TEST_FILES and TEST_PROGS with += so they don't get discarded. Fixes: ba2d788aa873 ("selftests: amd-pstate: Trigger tbench benchmark and test cpus") Fixes: ac527cee87c9 ("selftests: amd-pstate: Don't delete source files via Makefile") Signed-off-by: Guillaume Tucker <guillaume.tucker@collabora.com> --- tools/testing/selftests/amd-pstate/Makefile | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)