Skip to contentSkip to conversation

perf test: Fix "PMU event table sanity" for NO_JEVENTS=1

PATCH Applied Ian Rogers 3 participants 3 messages Mar 8, 2023 – Mar 14, 2023 perf events

lore
Share & tools
lore

Ian Rogers

author reviewer
#0 lore raw

PATCH 1/1 perf test: Fix "PMU event table sanity" for NO_JEVENTS=1

A table was renamed and needed to be renamed in the empty case.

Fixes 62774db2a05d ("perf jevents: Generate metrics and events as separate tables")
---
 tools/perf/pmu-events/empty-pmu-events.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
tools/perf/pmu-events/empty-pmu-events.c +3 -3
index a938b74cf487..e74defb5284f 100644
@@ -227,7 +227,7 @@ static const struct pmu_events_map pmu_events_map[] = {
 	},
 };
 
-static const struct pmu_event pme_test_soc_sys[] = {
+static const struct pmu_event pmu_events__test_soc_sys[] = {
 	{
 		.name = "sys_ddr_pmu.write_cycles",
 		.event = "event=0x2b",
@@ -258,8 +258,8 @@ struct pmu_sys_events {
 
 static const struct pmu_sys_events pmu_sys_event_tables[] = {
 	{
-		.table = { pme_test_soc_sys },
-		.name = "pme_test_soc_sys",
+		.table = { pmu_events__test_soc_sys },
+		.name = "pmu_events__test_soc_sys",
 	},
 	{
 		.table = { 0 }
Signature · 1 line
2.40.0.rc0.216.gc4246ad0f0-goog
Reviewed-by on v1 1/1
#1 lore raw
Quoted 3 lines · Ian Rogers

A table was renamed and needed to be renamed in the empty case.

Fixes 62774db2a05d ("perf jevents: Generate metrics and events as separate tables")

This looks ok, so:

But a comment, below.

Quoted 10 lines
---
  tools/perf/pmu-events/empty-pmu-events.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
tools/perf/pmu-events/empty-pmu-events.c +0 -0
index a938b74cf487..e74defb5284f 100644

tools/perf/pmu-events/empty-pmu-events.c static const struct pmu_events_map pmu_events_map[] = { · line 230

Quoted 5 lines
tools/perf/pmu-events/empty-pmu-events.c +1 -1
@@ -227,7 +227,7 @@ static const struct pmu_events_map pmu_events_map[] = {
  	},
  };
 
-static const struct pmu_event pme_test_soc_sys[] = {
+static const struct pmu_event pmu_events__test_soc_sys[] = {

Would it make sense or even possible to put these table names in macros in a common header?

Thanks,
John

Quoted 14 lines
tools/perf/pmu-events/empty-pmu-events.c +2 -2
  	{
  		.name = "sys_ddr_pmu.write_cycles",
  		.event = "event=0x2b",
@@ -258,8 +258,8 @@ struct pmu_sys_events {
 
  static const struct pmu_sys_events pmu_sys_event_tables[] = {
  	{
-		.table = { pme_test_soc_sys },
-		.name = "pme_test_soc_sys",
+		.table = { pmu_events__test_soc_sys },
+		.name = "pmu_events__test_soc_sys",
  	},
  	{
  		.table = { 0 }
maintainer Applied
#2 lore raw

Em Wed, Mar 08, 2023 at 09:58:16AM +0000, John Garry escreveu:

Quoted 8 lines · Ian Rogers
Quoted 3 lines

A table was renamed and needed to be renamed in the empty case.

Fixes 62774db2a05d ("perf jevents: Generate metrics and events as separate tables")

This looks ok, so:

Thanks, applied.

- Arnaldo

Quoted 37 lines

But a comment, below.

Quoted 10 lines
---
  tools/perf/pmu-events/empty-pmu-events.c | 6 +++---
  1 file changed, 3 insertions(+), 3 deletions(-)
tools/perf/pmu-events/empty-pmu-events.c +0 -0
index a938b74cf487..e74defb5284f 100644

tools/perf/pmu-events/empty-pmu-events.c static const struct pmu_events_map pmu_events_map[] = { · line 229

Quoted 4 lines
tools/perf/pmu-events/empty-pmu-events.c +1 -1
@@ -227,7 +227,7 @@ static const struct pmu_events_map pmu_events_map[] = {
  	},
  };
-static const struct pmu_event pme_test_soc_sys[] = {
+static const struct pmu_event pmu_events__test_soc_sys[] = {

Would it make sense or even possible to put these table names in macros in a common header?

Thanks,
John

Quoted 13 lines
tools/perf/pmu-events/empty-pmu-events.c +2 -2
  	{
  		.name = "sys_ddr_pmu.write_cycles",
  		.event = "event=0x2b",
@@ -258,8 +258,8 @@ struct pmu_sys_events {
  static const struct pmu_sys_events pmu_sys_event_tables[] = {
  	{
-		.table = { pme_test_soc_sys },
-		.name = "pme_test_soc_sys",
+		.table = { pmu_events__test_soc_sys },
+		.name = "pmu_events__test_soc_sys",
  	},
  	{
  		.table = { 0 }
Signature · 1 line
- Arnaldo