Skip to contentSkip to conversation

selftests: amd-pstate: Don't delete source files via Makefile

PATCH Superseded Doug Smythies 5 participants 13 messages Jan 20, 2023 – Feb 3, 2023 Kselftest

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 selftests: amd-pstate: Don't delete source files via Makefile

Revert the portion of a recent Makefile change that incorrectly deletes source files when doing "make clean".

Fixes ba2d788aa873 ("selftests: amd-pstate: Trigger tbench benchmark and test cpus")
---
 tools/testing/selftests/amd-pstate/Makefile | 5 -----
 1 file changed, 5 deletions(-)
tools/testing/selftests/amd-pstate/Makefile +0 -5
index 5f195ee756d6..5fd1424db37d 100644
@@ -7,11 +7,6 @@ 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/)
 
-ifeq (x86,$(ARCH))
-TEST_GEN_FILES += ../../../power/x86/amd_pstate_tracer/amd_pstate_trace.py
-TEST_GEN_FILES += ../../../power/x86/intel_pstate_tracer/intel_pstate_tracer.py
-endif
-
 TEST_PROGS := run.sh
 TEST_FILES := basic.sh tbench.sh gitsource.sh
 

--
2.25.1

Acked-by on v1 1/1
#1 lore raw
Quoted 7 lines · Doug Smythies

Revert the portion of a recent Makefile change that incorrectly deletes source files when doing "make clean".

Fixes ba2d788aa873 ("selftests: amd-pstate: Trigger tbench benchmark and test cpus")

(+ Shuah and linux-kselftest mailing list)

Thanks for fix!

Quoted 24 lines
---
 tools/testing/selftests/amd-pstate/Makefile | 5 -----
 1 file changed, 5 deletions(-)
tools/testing/selftests/amd-pstate/Makefile +0 -6
index 5f195ee756d6..5fd1424db37d 100644
@@ -7,11 +7,6 @@ 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/)
 
-ifeq (x86,$(ARCH))
-TEST_GEN_FILES += ../../../power/x86/amd_pstate_tracer/amd_pstate_trace.py
-TEST_GEN_FILES += ../../../power/x86/intel_pstate_tracer/intel_pstate_tracer.py
-endif
-
 TEST_PROGS := run.sh
 TEST_FILES := basic.sh tbench.sh gitsource.sh
 
--

2.25.1

Reviewed-by
#2 lore raw
Quoted 10 lines · Huang Rui
Quoted 7 lines · Doug Smythies

Revert the portion of a recent Makefile change that incorrectly deletes source files when doing "make clean".

Fixes ba2d788aa873 ("selftests: amd-pstate: Trigger tbench benchmark and test cpus")
Quoted 6 lines

(+ Shuah and linux-kselftest mailing list)

Thanks for fix!

[ I already replied - but with these important CCs ]

Hi Doug,

Thanks for the patch!

Small nit, I saw this with:

$ make -C tools/ clean

Otherwise:

BR,
-Sedat-

Quoted 24 lines
Quoted 24 lines
---
 tools/testing/selftests/amd-pstate/Makefile | 5 -----
 1 file changed, 5 deletions(-)
tools/testing/selftests/amd-pstate/Makefile +0 -6
index 5f195ee756d6..5fd1424db37d 100644
@@ -7,11 +7,6 @@ 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/)
 
-ifeq (x86,$(ARCH))
-TEST_GEN_FILES += ../../../power/x86/amd_pstate_tracer/amd_pstate_trace.py
-TEST_GEN_FILES += ../../../power/x86/intel_pstate_tracer/intel_pstate_tracer.py
-endif
-
 TEST_PROGS := run.sh
 TEST_FILES := basic.sh tbench.sh gitsource.sh
 
--

2.25.1

maintainer
#3 lore raw
Quoted 5 lines · Sedat Dilek
Quoted 4 lines · Huang Rui
Quoted 2 lines · Doug Smythies

Revert the portion of a recent Makefile change that incorrectly deletes source files when doing "make clean".

Ooo. That is bad.

Quoted 13 lines
Quoted 6 lines
Quoted 5 lines
Fixes ba2d788aa873 ("selftests: amd-pstate: Trigger tbench benchmark and test cpus")
Quoted 6 lines

(+ Shuah and linux-kselftest mailing list)

Thanks for fix!

Quoted 7 lines

[ I already replied - but with these important CCs ]

Hi Doug,

Thanks for the patch!

Small nit, I saw this with:

What did you see and should that be fixed as well.

Quoted 7 lines
$ make -C tools/ clean

Otherwise:

Send me the revised patch with all the right CCs and I will pull this right away.

thanks,
-- Shuah

#4 lore raw
Quoted 36 lines · Shuah Khan
Quoted 5 lines · Sedat Dilek
Quoted 4 lines · Huang Rui
Quoted 2 lines · Doug Smythies

Revert the portion of a recent Makefile change that incorrectly deletes source files when doing "make clean".

Ooo. That is bad.

Quoted 13 lines
Quoted 6 lines
Quoted 5 lines
Fixes ba2d788aa873 ("selftests: amd-pstate: Trigger tbench benchmark and test cpus")
Quoted 6 lines

(+ Shuah and linux-kselftest mailing list)

Thanks for fix!

Quoted 7 lines

[ I already replied - but with these important CCs ]

Hi Doug,

Thanks for the patch!

Small nit, I saw this with:

What did you see and should that be fixed as well.

Quoted 3 lines
$ make -C tools/ clean
Quoted 8 lines
Quoted 4 lines

Otherwise:

Send me the revised patch with all the right CCs and I will pull this right away.

Hi Shuah,

that was my original posting...

Subject: [6.2-rc4] tools: {amd,intel}_pstate_tracer: make -C tools/ clean
https://lore.kernel.org/all/CA+icZUUOckm1kwOEZhSw8zsaL5z7r8uczwiKeKGEVioZ=GeFNg@mail.gmail.com/

...and should contain all CCs I got with scripts/get_maintainer.pl.

Is that OK?

BR,
-Sedat-

maintainer
#5 lore raw
Quoted 48 lines · Sedat Dilek
Quoted 36 lines · Shuah Khan
Quoted 5 lines · Sedat Dilek
Quoted 4 lines · Huang Rui
Quoted 2 lines · Doug Smythies

Revert the portion of a recent Makefile change that incorrectly deletes source files when doing "make clean".

Ooo. That is bad.

Quoted 13 lines
Quoted 6 lines
Quoted 5 lines
Fixes ba2d788aa873 ("selftests: amd-pstate: Trigger tbench benchmark and test cpus")
Quoted 6 lines

(+ Shuah and linux-kselftest mailing list)

Thanks for fix!

Quoted 7 lines

[ I already replied - but with these important CCs ]

Hi Doug,

Thanks for the patch!

Small nit, I saw this with:

What did you see and should that be fixed as well.

Quoted 3 lines
$ make -C tools/ clean
Quoted 8 lines
Quoted 4 lines

Otherwise:

Send me the revised patch with all the right CCs and I will pull this right away.

Hi Shuah,

Quoted 9 lines

that was my original posting...

Subject: [6.2-rc4] tools: {amd,intel}_pstate_tracer: make -C tools/ clean
https://lore.kernel.org/all/CA+icZUUOckm1kwOEZhSw8zsaL5z7r8uczwiKeKGEVioZ=GeFNg@mail.gmail.com/

...and should contain all CCs I got with scripts/get_maintainer.pl.

Is that OK?

Yes - the current list looks complete to me.

thanks,
-- Shuah

Reviewed-by on v1 1/1
#6 lore raw
In reply to Doug Smythies
Quoted 8 lines · Doug Smythies

Revert the portion of a recent Makefile change that incorrectly deletes source files when doing "make clean".

Fixes ba2d788aa873 ("selftests: amd-pstate: Trigger tbench benchmark and test cpus")

Hi Doug,

Thanks for the patch!

Small nit, I saw this with:

$ make -C tools/ clean

Otherwise:

BR,
-Sedat-

Quoted 24 lines
---
 tools/testing/selftests/amd-pstate/Makefile | 5 -----
 1 file changed, 5 deletions(-)
tools/testing/selftests/amd-pstate/Makefile +0 -6
index 5f195ee756d6..5fd1424db37d 100644
@@ -7,11 +7,6 @@ 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/)
 
-ifeq (x86,$(ARCH))
-TEST_GEN_FILES += ../../../power/x86/amd_pstate_tracer/amd_pstate_trace.py
-TEST_GEN_FILES += ../../../power/x86/intel_pstate_tracer/intel_pstate_tracer.py
-endif
-
 TEST_PROGS := run.sh
 TEST_FILES := basic.sh tbench.sh gitsource.sh
 
--

2.25.1

#7 lore raw

PATCH v2 1/1 selftests: amd-pstate: Don't delete source files via Makefile

In reply to Doug Smythies

Revert the portion of a recent Makefile change that incorrectly deletes source files when doing "make clean".

Fixes ba2d788aa873 ("selftests: amd-pstate: Trigger tbench benchmark and test cpus")

---
v2: fix address list.

---
 tools/testing/selftests/amd-pstate/Makefile | 5 -----
 1 file changed, 5 deletions(-)
tools/testing/selftests/amd-pstate/Makefile +0 -5
index 5f195ee756d6..5fd1424db37d 100644
@@ -7,11 +7,6 @@ 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/)
 
-ifeq (x86,$(ARCH))
-TEST_GEN_FILES += ../../../power/x86/amd_pstate_tracer/amd_pstate_trace.py
-TEST_GEN_FILES += ../../../power/x86/intel_pstate_tracer/intel_pstate_tracer.py
-endif
-
 TEST_PROGS := run.sh
 TEST_FILES := basic.sh tbench.sh gitsource.sh
 

--
2.25.1

#8 lore raw
Quoted 10 lines · Doug Smythies

Revert the portion of a recent Makefile change that incorrectly deletes source files when doing "make clean".

Fixes ba2d788aa873 ("selftests: amd-pstate: Trigger tbench benchmark and test cpus")
Quoted 3 lines

---
v2: fix address list.
---

Hi Doug,

thanks for the update.

You happen to know through which Git tree this will go? linux-pm?
linux-kselftest?

https://lore.kernel.org/lkml/?q=Doug+Smythies

Hmm, I cannot download the patch with b4:

link="https://lore.kernel.org/lkml/[email protected]/"

$ b4 -d am $link
Running git --no-pager config -z --get-regexp b4\..*
Running git --no-pager config -z --get-regexp get-lore-mbox\..*
Running git --no-pager config -z --get-regexp gpg\..*
t_mbx_url=https://lore.kernel.org/all/https%3A%2F%2Flore.kernel.org%2Flkml%2F000601d92db79e9d0b0telus.net%2F/t.mbox.gz
Grabbing thread from
lore.kernel.org/all/https%3A%2F%2Flore.kernel.org%2Flkml%2F000601d92db79e9d0b0telus.net%2F/t.mbox.gz
That message-id is not known.

Maybe be patient.

BR,
-Sedat-

Quoted 24 lines
 tools/testing/selftests/amd-pstate/Makefile | 5 -----
 1 file changed, 5 deletions(-)
tools/testing/selftests/amd-pstate/Makefile +0 -6
index 5f195ee756d6..5fd1424db37d 100644
@@ -7,11 +7,6 @@ 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/)
 
-ifeq (x86,$(ARCH))
-TEST_GEN_FILES += ../../../power/x86/amd_pstate_tracer/amd_pstate_trace.py
-TEST_GEN_FILES += ../../../power/x86/intel_pstate_tracer/intel_pstate_tracer.py
-endif
-
 TEST_PROGS := run.sh
 TEST_FILES := basic.sh tbench.sh gitsource.sh
 
--

2.25.1

maintainer
#9 lore raw
In reply to Doug Smythies
Quoted 20 lines · Doug Smythies

Revert the portion of a recent Makefile change that incorrectly deletes source files when doing "make clean".

Fixes ba2d788aa873 ("selftests: amd-pstate: Trigger tbench benchmark and test cpus")

---
v2: fix address list.

---
  tools/testing/selftests/amd-pstate/Makefile | 5 -----
  1 file changed, 5 deletions(-)
tools/testing/selftests/amd-pstate/Makefile +0 -0
index 5f195ee756d6..5fd1424db37d 100644

tools/testing/selftests/amd-pstate/Makefile all: · line 14

Quoted 8 lines
tools/testing/selftests/amd-pstate/Makefile +0 -5
@@ -7,11 +7,6 @@ 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/)
 
-ifeq (x86,$(ARCH))
-TEST_GEN_FILES += ../../../power/x86/amd_pstate_tracer/amd_pstate_trace.py
-TEST_GEN_FILES += ../../../power/x86/intel_pstate_tracer/intel_pstate_tracer.py
-endif
-

This looks good - Do you need these files to run this test and if so do these need to installed when the test is run on a test system?

Now applied to linux-kselftest fixes. I will send this up for the next rc.

thanks,
-- Shuah

#10 lore raw
Quoted 24 lines · On 2023.01.25 09:03 Shuah Khan wrote:
Quoted 23 lines · Doug Smythies

Revert the portion of a recent Makefile change that incorrectly deletes source files when doing "make clean".

Fixes ba2d788aa873 ("selftests: amd-pstate: Trigger tbench benchmark and test cpus")

---
v2: fix address list.

---
  tools/testing/selftests/amd-pstate/Makefile | 5 -----
  1 file changed, 5 deletions(-)
tools/testing/selftests/amd-pstate/Makefile +0 -0
index 5f195ee756d6..5fd1424db37d 100644
@@ -7,11 +7,6 @@ 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/)
 
Quoted 8 lines

tools/testing/selftests/amd-pstate/Makefile all: · line 14

Quoted 5 lines
tools/testing/selftests/amd-pstate/Makefile +0 -5
-ifeq (x86,$(ARCH))
-TEST_GEN_FILES += ../../../power/x86/amd_pstate_tracer/amd_pstate_trace.py
-TEST_GEN_FILES += ../../../power/x86/intel_pstate_tracer/intel_pstate_tracer.py
-endif
-

This looks good - Do you need these files to run this test and if so do these need to installed when the test is run on a test system?

I do not know.
It is a question for the AMD people.

Quoted 2 lines

Now applied to linux-kselftest fixes. I will send this up for the next rc.

Thank you
... Doug

#11 lore raw
In reply to Doug Smythies
Quoted 20 lines · Doug Smythies

Revert the portion of a recent Makefile change that incorrectly deletes source files when doing "make clean".

Fixes ba2d788aa873 ("selftests: amd-pstate: Trigger tbench benchmark and test cpus")

---
v2: fix address list.

---
 tools/testing/selftests/amd-pstate/Makefile | 5 -----
 1 file changed, 5 deletions(-)
tools/testing/selftests/amd-pstate/Makefile +0 -0
index 5f195ee756d6..5fd1424db37d 100644

tools/testing/selftests/amd-pstate/Makefile all: · line 14

Quoted 8 lines
tools/testing/selftests/amd-pstate/Makefile +0 -5
@@ -7,11 +7,6 @@ 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/)
 
-ifeq (x86,$(ARCH))
-TEST_GEN_FILES += ../../../power/x86/amd_pstate_tracer/amd_pstate_trace.py
-TEST_GEN_FILES += ../../../power/x86/intel_pstate_tracer/intel_pstate_tracer.py
-endif
-

The two lines above should also be removed as they're only used in the condition to include the Python files.

I've also hit this issue and independently came up with an alternative solution, let me know if you want me to submit it as a patch on top of the previous fix; see below.

The Python scripts appear to be used in gitsource.sh and tbench.sh so I guess they are needed for these kselftests although I haven't tried to run them or do anything with them. This is just to fix make clean.

Author: Guillaume Tucker <[email protected]>
Date:   Fri Feb 3 11:23:50 2023 +0100

selftests: amd-pstate: fix TEST_FILES

Replace TEST_GEN_FILES 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 a2d788aa873 ("selftests: amd-pstate: Trigger tbench benchmark and test cpus")
tools/testing/selftests/amd-pstate/Makefile +6 -6
index 5f195ee756d6..c382f579fe94 100644
@@ -4,15 +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/)
 
 ifeq (x86,$(ARCH))
-TEST_GEN_FILES += ../../../power/x86/amd_pstate_tracer/amd_pstate_trace.py
-TEST_GEN_FILES += ../../../power/x86/intel_pstate_tracer/intel_pstate_tracer.py
+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
+TEST_PROGS += run.sh
+TEST_FILES += basic.sh tbench.sh gitsource.sh
 
 include ../lib.mk
maintainer
#12 lore raw
Quoted 34 lines · Guillaume Tucker
Quoted 20 lines · Doug Smythies

Revert the portion of a recent Makefile change that incorrectly deletes source files when doing "make clean".

Fixes ba2d788aa873 ("selftests: amd-pstate: Trigger tbench benchmark and test cpus")

---
v2: fix address list.

---
  tools/testing/selftests/amd-pstate/Makefile | 5 -----
  1 file changed, 5 deletions(-)
tools/testing/selftests/amd-pstate/Makefile +0 -0
index 5f195ee756d6..5fd1424db37d 100644

tools/testing/selftests/amd-pstate/Makefile all: · line 14

Quoted 8 lines
tools/testing/selftests/amd-pstate/Makefile +0 -5
@@ -7,11 +7,6 @@ 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/)
 
-ifeq (x86,$(ARCH))
-TEST_GEN_FILES += ../../../power/x86/amd_pstate_tracer/amd_pstate_trace.py
-TEST_GEN_FILES += ../../../power/x86/intel_pstate_tracer/intel_pstate_tracer.py
-endif
-

The two lines above should also be removed as they're only used in the condition to include the Python files.

Quoted 10 lines

I've also hit this issue and independently came up with an alternative solution, let me know if you want me to submit it as a patch on top of the previous fix; see below.

The Python scripts appear to be used in gitsource.sh and tbench.sh so I guess they are needed for these kselftests although I haven't tried to run them or do anything with them. This is just to fix make clean.

Please send me the patch.

thanks,
-- Shuah