On 02/08/2021 15:54, Arnaldo Carvalho de Melo wrote:

Em Thu, Jul 29, 2021 at 09:56:17PM +0800, John Garry escreveu:

quoted

In future to add support for sys events, relocate the core and uncore
events to a cpu folder.

Signed-off-by: John Garry<redacted>
---
  .../pmu-events/arch/test/{test_cpu => test_soc/cpu}/branch.json | 0
  .../pmu-events/arch/test/{test_cpu => test_soc/cpu}/cache.json  | 0
  .../pmu-events/arch/test/{test_cpu => test_soc/cpu}/other.json  | 0
  .../pmu-events/arch/test/{test_cpu => test_soc/cpu}/uncore.json | 0
  tools/perf/pmu-events/jevents.c                                 | 2 +-
  5 files changed, 1 insertion(+), 1 deletion(-)
  rename tools/perf/pmu-events/arch/test/{test_cpu => test_soc/cpu}/branch.json (100%)
  rename tools/perf/pmu-events/arch/test/{test_cpu => test_soc/cpu}/cache.json (100%)
  rename tools/perf/pmu-events/arch/test/{test_cpu => test_soc/cpu}/other.json (100%)
  rename tools/perf/pmu-events/arch/test/{test_cpu => test_soc/cpu}/uncore.json (100%)

diff --git a/tools/perf/pmu-events/arch/test/test_cpu/branch.json b/tools/perf/pmu-events/arch/test/test_soc/cpu/branch.json
similarity index 100%
rename from tools/perf/pmu-events/arch/test/test_cpu/branch.json
rename to tools/perf/pmu-events/arch/test/test_soc/cpu/branch.json
diff --git a/tools/perf/pmu-events/arch/test/test_cpu/cache.json b/tools/perf/pmu-events/arch/test/test_soc/cpu/cache.json
similarity index 100%
rename from tools/perf/pmu-events/arch/test/test_cpu/cache.json
rename to tools/perf/pmu-events/arch/test/test_soc/cpu/cache.json
diff --git a/tools/perf/pmu-events/arch/test/test_cpu/other.json b/tools/perf/pmu-events/arch/test/test_soc/cpu/other.json
similarity index 100%
rename from tools/perf/pmu-events/arch/test/test_cpu/other.json
rename to tools/perf/pmu-events/arch/test/test_soc/cpu/other.json
diff --git a/tools/perf/pmu-events/arch/test/test_cpu/uncore.json b/tools/perf/pmu-events/arch/test/test_soc/cpu/uncore.json
similarity index 100%
rename from tools/perf/pmu-events/arch/test/test_cpu/uncore.json
rename to tools/perf/pmu-events/arch/test/test_soc/cpu/uncore.json
diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c
index 9604446f8360..405bdd36b9b9 100644
--- a/tools/perf/pmu-events/jevents.c
+++ b/tools/perf/pmu-events/jevents.c

@@ -814,7 +814,7 @@ static void print_mapping_test_table(FILE *outfp)
  	fprintf(outfp, "\t.cpuid = \"testcpu\",\n");
  	fprintf(outfp, "\t.version = \"v1\",\n");
  	fprintf(outfp, "\t.type = \"core\",\n");
-	fprintf(outfp, "\t.table = pme_test_cpu,\n");
+	fprintf(outfp, "\t.table = pme_test_soc_cpu,\n");

Humm, is this already generated by some script? I.e. this
'pme_test_soc_cpu' table? Or does this works only when applying the full
patchset?

Hi Arnaldo,

This file jevents.c generates a table in tools/perf/pmu-events/pmu-events.c

Are you having some issue in applying and building this?

I ask as I think that there is some pre-existing dependency issue which 
I mean to fix, i.e. so please try a clean build.

Thanks,
John