Skip to contentSkip to conversation

perf jevents: Use name for special find value

PATCH Superseded Ian Rogers 3 participants 15 messages May 25, 2024 – Jul 30, 2024 perf events

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore

Ian Rogers

author reviewer
#0 lore raw

PATCH v2 1/2 perf jevents: Use name for special find value

-1000 was used as a special value added in Commit 3d5045492ab2 ("perf
pmu-events: Add pmu_events_table__find_event()") to show that 1 table lacked a PMU/event but that didn't terminate the search in other tables. Add a new constant PMU_EVENTS__NOT_FOUND for this value and use it.

---
 tools/perf/pmu-events/jevents.py   | 6 +++---
 tools/perf/pmu-events/pmu-events.h | 9 +++++++++
 2 files changed, 12 insertions(+), 3 deletions(-)
tools/perf/pmu-events/jevents.py +3 -3
index e42efc16723e..7cc16ff96dc8 100755
@@ -905,7 +905,7 @@ static int pmu_events_table__find_event_pmu(const struct pmu_events_table *table
   do_call:
                 return fn ? fn(&pe, table, data) : 0;
         }
-        return -1000;
+        return PMU_EVENTS__NOT_FOUND;
 }
 
 int pmu_events_table__for_each_event(const struct pmu_events_table *table,
@@ -943,10 +943,10 @@ int pmu_events_table__find_event(const struct pmu_events_table *table,
                         continue;
 
                 ret = pmu_events_table__find_event_pmu(table, table_pmu, name, fn, data);
-                if (ret != -1000)
+                if (ret != PMU_EVENTS__NOT_FOUND)
                         return ret;
         }
-        return -1000;
+        return PMU_EVENTS__NOT_FOUND;
 }
 
 size_t pmu_events_table__num_events(const struct pmu_events_table *table,
tools/perf/pmu-events/pmu-events.h +9 -0
index f5aa96f1685c..5435ad92180c 100644
@@ -70,6 +70,8 @@ struct pmu_metric {
 struct pmu_events_table;
 struct pmu_metrics_table;
 
+#define PMU_EVENTS__NOT_FOUND -1000
+
 typedef int (*pmu_event_iter_fn)(const struct pmu_event *pe,
 				 const struct pmu_events_table *table,
 				 void *data);
@@ -82,6 +84,13 @@ int pmu_events_table__for_each_event(const struct pmu_events_table *table,
 				    struct perf_pmu *pmu,
 				    pmu_event_iter_fn fn,
 				    void *data);
+/*
+ * Search for table and entry matching with pmu__name_match. Each matching event
+ * has fn called on it. 0 implies to success/continue the search while non-zero
+ * means to terminate. The special value PMU_EVENTS__NOT_FOUND is used to
+ * indicate no event was found in one of the tables which doesn't terminate the
+ * search of all tables.
+ */
 int pmu_events_table__find_event(const struct pmu_events_table *table,
                                  struct perf_pmu *pmu,
                                  const char *name,
Signature · 1 line
2.45.1.288.g0e0cd299f1-goog
author reviewer
#1 lore raw

PATCH v2 2/2 perf jevents: Autogenerate empty-pmu-events.c

empty-pmu-events.c exists so that builds may occur without python being installed on a system. Manually updating empty-pmu-events.c to be in sync with jevents.py is a pain, let's use jevents.py to generate empty-pmu-events.c.

1) change jevents.py so that an arch and model of none cause generation of a pmu-events.c without any json. Add a SPDX and autogenerated warning to the start of the file.

2) change Build so that if a generated pmu-events.c for arch none and model none doesn't match empty-pmu-events.c the build fails with a cat of the differences. Update Makefile.perf to clean up the files used for this.

3) update empty-pmu-events.c to match the output of jevents.py with arch and mode of none.

---
 tools/perf/Makefile.perf                 |   2 +
 tools/perf/pmu-events/Build              |  12 +-
 tools/perf/pmu-events/empty-pmu-events.c | 894 ++++++++++++++---------
 tools/perf/pmu-events/jevents.py         |   6 +-
 4 files changed, 562 insertions(+), 352 deletions(-)
tools/perf/Makefile.perf +2 -0
index 5c35c0d89306..4369c57a1d12 100644
@@ -1210,6 +1210,8 @@ clean:: $(LIBAPI)-clean $(LIBBPF)-clean $(LIBSUBCMD)-clean $(LIBSYMBOL)-clean $(
 		$(OUTPUT)util/intel-pt-decoder/inat-tables.c \
 		$(OUTPUT)tests/llvm-src-{base,kbuild,prologue,relocation}.c \
 		$(OUTPUT)pmu-events/pmu-events.c \
+		$(OUTPUT)pmu-events/test-empty-pmu-events.c \
+		$(OUTPUT)pmu-events/empty-pmu-events.log \
 		$(OUTPUT)pmu-events/metric_test.log \
 		$(OUTPUT)$(fadvise_advice_array) \
 		$(OUTPUT)$(fsconfig_arrays) \
tools/perf/pmu-events/Build +11 -1
index 1d18bb89402e..c3fa43c49706 100644
@@ -11,6 +11,8 @@ METRIC_TEST_PY	=  pmu-events/metric_test.py
 EMPTY_PMU_EVENTS_C = pmu-events/empty-pmu-events.c
 PMU_EVENTS_C	=  $(OUTPUT)pmu-events/pmu-events.c
 METRIC_TEST_LOG	=  $(OUTPUT)pmu-events/metric_test.log
+TEST_EMPTY_PMU_EVENTS_C = $(OUTPUT)pmu-events/test-empty-pmu-events.c
+EMPTY_PMU_EVENTS_TEST_LOG = $(OUTPUT)pmu-events/empty-pmu-events.log
 
 ifeq ($(JEVENTS_ARCH),)
 JEVENTS_ARCH=$(SRCARCH)
@@ -31,7 +33,15 @@ $(METRIC_TEST_LOG): $(METRIC_TEST_PY) $(METRIC_PY)
 	$(call rule_mkdir)
 	$(Q)$(call echo-cmd,test)$(PYTHON) $< 2> $@ || (cat $@ && false)
 
-$(PMU_EVENTS_C): $(JSON) $(JSON_TEST) $(JEVENTS_PY) $(METRIC_PY) $(METRIC_TEST_LOG)
+$(TEST_EMPTY_PMU_EVENTS_C): $(JSON) $(JSON_TEST) $(JEVENTS_PY) $(METRIC_PY) $(METRIC_TEST_LOG)
+	$(call rule_mkdir)
+	$(Q)$(call echo-cmd,gen)$(PYTHON) $(JEVENTS_PY) none none pmu-events/arch $@
+
+$(EMPTY_PMU_EVENTS_TEST_LOG): $(EMPTY_PMU_EVENTS_C) $(TEST_EMPTY_PMU_EVENTS_C)
+	$(call rule_mkdir)
+	$(Q)$(call echo-cmd,test)diff -u $? 2> $@ || (cat $@ && false)
+
+$(PMU_EVENTS_C): $(JSON) $(JSON_TEST) $(JEVENTS_PY) $(METRIC_PY) $(METRIC_TEST_LOG) $(EMPTY_PMU_EVENTS_TEST_LOG)
 	$(call rule_mkdir)
 	$(Q)$(call echo-cmd,gen)$(PYTHON) $(JEVENTS_PY) $(JEVENTS_ARCH) $(JEVENTS_MODEL) pmu-events/arch $@
 endif
tools/perf/pmu-events/empty-pmu-events.c +544 -350

1,006 lines not on this page · raw message

tools/perf/pmu-events/jevents.py +5 -1
index 7cc16ff96dc8..32878b02fbcd 100755
@@ -1255,6 +1255,10 @@ such as "arm/cortex-a34".''',
       'output_file', type=argparse.FileType('w', encoding='utf-8'), nargs='?', default=sys.stdout)
   _args = ap.parse_args()
 
+  _args.output_file.write(f"""
+/* SPDX-License-Identifier: GPL-2.0 */
+/* THIS FILE WAS AUTOGENERATED BY jevents.py arch={_args.arch} model={_args.model} ! */
+""")
   _args.output_file.write("""
 #include <pmu-events/pmu-events.h>
 #include "util/header.h"
@@ -1280,7 +1284,7 @@ struct pmu_table_entry {
     if item.name == _args.arch or _args.arch == 'all' or item.name == 'test':
       archs.append(item.name)
 
-  if len(archs) < 2:
+  if len(archs) < 2 and _args.arch != 'none':
     raise IOError(f'Missing architecture directory \'{_args.arch}\'')
 
   archs.sort()
Signature · 1 line
2.45.1.288.g0e0cd299f1-goog
Reviewed-by on v2 2/2
#2 lore raw

Re: [PATCH v2 2/2] perf jevents: Autogenerate empty-pmu-events.c

Quoted 14 lines · Ian Rogers

empty-pmu-events.c exists so that builds may occur without python being installed on a system. > Manually updating empty-pmu-events.c to be in sync with jevents.py is a pain, let's use jevents.py to generate empty-pmu-events.c.

1) change jevents.py so that an arch and model of none cause generation of a pmu-events.c without any json. Add a SPDX and autogenerated warning to the start of the file.

2) change Build so that if a generated pmu-events.c for arch none and model none doesn't match empty-pmu-events.c the build fails with a cat of the differences. Update Makefile.perf to clean up the files used for this.

Quoted 4 lines

3) update empty-pmu-events.c to match the output of jevents.py with arch and mode of none.

Quoted 8 lines
---
  tools/perf/Makefile.perf                 |   2 +
  tools/perf/pmu-events/Build              |  12 +-
  tools/perf/pmu-events/empty-pmu-events.c | 894 ++++++++++++++---------
  tools/perf/pmu-events/jevents.py         |   6 +-
  4 files changed, 562 insertions(+), 352 deletions(-)
tools/perf/Makefile.per renamed from tools/perf/Makefile.perf +0 -0

...

tools/perf/Makefile.per

Quoted 11 lines
tools/perf/Makefile.per renamed from tools/perf/Makefile.perf +10 -1
-	},
+struct pmu_table_entry {
+        const struct compact_pmu_event *entries;
+        uint32_t num_entries;
+        struct compact_pmu_event pmu_name;
+};
+
+static const char *const big_c_string =
+/* offset=0 */ "default_core\000"
+/* offset=13 */ "bp_l1_btb_correct\000branch\000L1 BTB Correction\000event=0x8a\000\00000\000\000"
+/* offset=72 */ "bp_l2_btb_correct\000branch\000L2 BTB Correction\000event=0x8b\000\00000\000\000"

Please remind me: how to figure out this number when adding a new entry?

Quoted 1 line

+/* offset=131 */ "l3_cache_rd\000cache\000L3 cache access, read\000event=0x40\000\00000\000Attributable Level 3 cache access, read\000"

author reviewer
#3 lore raw

Re: [PATCH v2 2/2] perf jevents: Autogenerate empty-pmu-events.c

Quoted 16 lines · John Garry
Quoted 14 lines · Ian Rogers

empty-pmu-events.c exists so that builds may occur without python being installed on a system. > Manually updating empty-pmu-events.c to be in sync with jevents.py is a pain, let's use jevents.py to generate empty-pmu-events.c.

1) change jevents.py so that an arch and model of none cause generation of a pmu-events.c without any json. Add a SPDX and autogenerated warning to the start of the file.

2) change Build so that if a generated pmu-events.c for arch none and model none doesn't match empty-pmu-events.c the build fails with a cat of the differences. Update Makefile.perf to clean up the files used for this.

Quoted 7 lines
Quoted 4 lines

3) update empty-pmu-events.c to match the output of jevents.py with arch and mode of none.

Thanks!

Quoted 11 lines
Quoted 8 lines
---
  tools/perf/Makefile.perf                 |   2 +
  tools/perf/pmu-events/Build              |  12 +-
  tools/perf/pmu-events/empty-pmu-events.c | 894 ++++++++++++++---------
  tools/perf/pmu-events/jevents.py         |   6 +-
  4 files changed, 562 insertions(+), 352 deletions(-)
tools/perf/Makefile.per renamed from tools/perf/Makefile.perf +0 -0

...

Quoted 13 lines

tools/perf/Makefile.per

Quoted 11 lines
tools/perf/Makefile.per renamed from tools/perf/Makefile.perf +10 -1
-     },
+struct pmu_table_entry {
+        const struct compact_pmu_event *entries;
+        uint32_t num_entries;
+        struct compact_pmu_event pmu_name;
+};
+
+static const char *const big_c_string =
+/* offset=0 */ "default_core\000"
+/* offset=13 */ "bp_l1_btb_correct\000branch\000L1 BTB Correction\000event=0x8a\000\00000\000\000"
+/* offset=72 */ "bp_l2_btb_correct\000branch\000L2 BTB Correction\000event=0x8b\000\00000\000\000"

Please remind me: how to figure out this number when adding a new entry?

So this shouldn't be generated by hand. The old one was, this one is created by jevents.py as maintaining something by hand is a pain. If you need to add entries then they are in the tools/perf/pmu-events/arch/test/ directory. When you build with NO_JEVENTS=1 then this file will be used. When building normally jevents.py will be used and used to check that the empty-pmu-events.c isn't out-of-date - the build will break if it is. The fix is just to copy test-empty-pmu-events.c to empty-pmu-events.c, which is hopefully implied by the result of the diff being shown.

Thanks,
Ian

Quoted 1 line
Quoted 1 line

+/* offset=131 */ "l3_cache_rd\000cache\000L3 cache access, read\000event=0x40\000\00000\000Attributable Level 3 cache access, read\000"

#4 lore raw

Re: [PATCH v2 2/2] perf jevents: Autogenerate empty-pmu-events.c

In reply to Ian Rogers
we actually want to seek your advice. in our env, there is no problem to build parent.

hi, Ian Rogers,

we actually want to seek your advice. in our env, there is no problem to build parent.

* 3249f8b84526d (linux-review/Ian-Rogers/perf-jevents-Autogenerate-empty-pmu-events-c/20240525-093240) perf jevents: Autogenerate empty-pmu-events.c
* 7d88bd0d22746 perf jevents: Use name for special find value <--- parent

however, failed to build perf upon 3249f8b84526d. but there is not many useful information in below detail log.

is there any dependency or env setting for us to build this commit? Thanks!

Hello,

kernel test robot noticed "perf-sanity-tests.perf.make.fail" on:

commit: 3249f8b84526d3b69162812908c257ee9816a237 ("[PATCH v2 2/2] perf jevents: Autogenerate empty-pmu-events.c")
url: https://github.com/intel-lab-lkp/linux/commits/Ian-Rogers/perf-jevents-Autogenerate-empty-pmu-events-c/20240525-093240
base: https://git.kernel.org/cgit/linux/kernel/git/perf/perf-tools-next.git perf-tools-next
patch link: https://lore.kernel.org/all/[email protected]/
patch subject: [PATCH v2 2/2] perf jevents: Autogenerate empty-pmu-events.c

in testcase: perf-sanity-tests
version:
with following parameters:

perf_compiler: gcc

compiler: gcc-13
test machine: 224 threads 2 sockets Intel(R) Xeon(R) Platinum 8480+ (Sapphire Rapids) with 256G memory

(please refer to attached dmesg/kmsg for entire log/backtrace)

If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]>
| Closes: https://lore.kernel.org/oe-lkp/[email protected]

gcc march setting is sapphirerapids
valid

2024-05-30 15:55:30 make -j224 WERROR=0 BUILD_BPF_SKEL=0 ARCH= DEBUG=1 EXTRA_CFLAGS=-fno-omit-frame-pointer -fsanitize=undefined -fsanitize=address -C /usr/src/linux-perf-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf
make: Entering directory '/usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf'
  BUILD:   Doing 'make -j224' parallel build
  HOSTCC  fixdep.o
  HOSTLD  fixdep-in.o
  LINK    fixdep

Warning: Kernel ABI header differences:

Auto-detecting system features:

...                                   dwarf: [ on  ]
...                      dwarf_getlocations: [ on  ]
...                                   glibc: [ on  ]
...                                  libbfd: [ on  ]
...                          libbfd-buildid: [ on  ]
...                                  libcap: [ on  ]
...                                  libelf: [ on  ]
...                                 libnuma: [ on  ]
...                  numa_num_possible_cpus: [ on  ]
...                                 libperl: [ on  ]
...                               libpython: [ on  ]
...                               libcrypto: [ on  ]
...                               libunwind: [ on  ]
...                      libdw-dwarf-unwind: [ on  ]
...                             libcapstone: [ OFF ]
...                                    zlib: [ on  ]
...                                    lzma: [ on  ]
...                               get_cpuid: [ on  ]
...                                     bpf: [ on  ]
...                                  libaio: [ on  ]
...                                 libzstd: [ on  ]
  GEN     common-cmds.h
  GEN     /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/arch/arm64/include/generated/asm/sysreg-defs.h
  CC      jvmti/libjvmti.o
  CC      jvmti/jvmti_agent.o
  CC      jvmti/libstring.o
  CC      dlfilters/dlfilter-test-api-v0.o
  CC      jvmti/libctype.o
  CC      dlfilters/dlfilter-test-api-v2.o
  CC      dlfilters/dlfilter-show-cycles.o
  GEN     perf-archive
  GEN     perf-iostat
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libsubcmd/include/subcmd/exec-cmd.h
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libsubcmd/include/subcmd/help.h
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libsubcmd/include/subcmd/pager.h
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libsubcmd/include/subcmd/parse-options.h
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libsubcmd/include/subcmd/run-command.h
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libsubcmd/exec-cmd.o
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libsubcmd/help.o
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libsubcmd/pager.o
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libsubcmd/parse-options.o
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libsubcmd/run-command.o
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libsubcmd/sigchain.o
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libsubcmd/subcmd-config.o
  INSTALL libsubcmd_headers
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libapi/include/api/cpu.h
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libapi/include/api/debug.h
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libapi/include/api/io.h
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libapi/include/api/fd/array.h
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libsymbol/include/symbol/kallsyms.h
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libperf/include/perf/bpf_perf.h
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libapi/include/api/fs/fs.h
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libperf/include/perf/core.h
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libapi/include/api/fs/tracing_path.h
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libsymbol/kallsyms.o
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libapi/cpu.o
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libperf/include/perf/cpumap.h
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libapi/debug.o
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libperf/include/perf/threadmap.h
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libperf/core.o
  MKDIR   /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libapi/fd/
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libperf/include/perf/evlist.h
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libapi/str_error_r.o
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libperf/include/perf/evsel.h
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libperf/cpumap.o
  MKDIR   /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libapi/fs/
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libperf/include/perf/event.h
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libperf/threadmap.o
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libperf/include/perf/mmap.h
  MKDIR   /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libapi/fs/
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libperf/include/internal/cpumap.h
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libperf/include/internal/evlist.h
  MKDIR   /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libapi/fs/
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libperf/evsel.o
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libperf/include/internal/evsel.h
  INSTALL libsymbol_headers
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libperf/evlist.o
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libperf/include/internal/lib.h
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libperf/mmap.o
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libperf/include/internal/mmap.h
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libperf/include/internal/rc_check.h
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libperf/zalloc.o
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libapi/fd/array.o
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libperf/include/internal/threadmap.h
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libapi/fs/fs.o
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libperf/xyarray.o
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libperf/include/internal/xyarray.h
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libapi/fs/tracing_path.o
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libperf/lib.o
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libapi/fs/cgroup.o
  INSTALL libapi_headers
  GEN     /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/bpf_helper_defs.h
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/include/bpf/bpf.h
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/include/bpf/libbpf.h
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/include/bpf/btf.h
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/include/bpf/libbpf_common.h
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/include/bpf/libbpf_legacy.h
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/include/bpf/bpf_helpers.h
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/include/bpf/bpf_tracing.h
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/include/bpf/bpf_endian.h
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/include/bpf/bpf_core_read.h
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/include/bpf/skel_internal.h
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/include/bpf/libbpf_version.h
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/include/bpf/usdt.bpf.h
  INSTALL libperf_headers
  LINK    dlfilters/dlfilter-show-cycles.so
  LINK    dlfilters/dlfilter-test-api-v0.so
  LINK    dlfilters/dlfilter-test-api-v2.so
  INSTALL /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/include/bpf/bpf_helper_defs.h
  MKDIR   /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/staticobjs/
  MKDIR   /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/staticobjs/
  INSTALL libbpf_headers
  MKDIR   /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/staticobjs/
  MKDIR   /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/staticobjs/
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/staticobjs/libbpf.o
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/staticobjs/libbpf_errno.o
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/staticobjs/bpf.o
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/staticobjs/str_error.o
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/staticobjs/nlattr.o
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/staticobjs/btf.o
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/staticobjs/netlink.o
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/staticobjs/bpf_prog_linfo.o
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/staticobjs/libbpf_probes.o
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/staticobjs/hashmap.o
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/staticobjs/btf_dump.o
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/staticobjs/ringbuf.o
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/staticobjs/strset.o
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/staticobjs/linker.o
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/staticobjs/gen_loader.o
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/staticobjs/relo_core.o
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/staticobjs/usdt.o
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/staticobjs/zip.o
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/staticobjs/elf.o
  CC      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/staticobjs/features.o
  LD      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libsymbol/libsymbol-in.o
  LD      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libapi/fd/libapi-in.o
  AR      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libsymbol/libsymbol.a
  LD      jvmti/jvmti-in.o
  LINK    libperf-jvmti.so
  LD      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libapi/fs/libapi-in.o
  LD      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libapi/libapi-in.o
  AR      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libapi/libapi.a
  LD      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libperf/libperf-in.o
  AR      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libperf/libperf.a
  LD      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libsubcmd/libsubcmd-in.o
  AR      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libsubcmd/libsubcmd.a
  GEN     python/perf.cpython-311-x86_64-linux-gnu.so
  LD      /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/staticobjs/libbpf-in.o
  LINK    /usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/libbpf/libbpf.a
  CC      builtin-bench.o
  CC      builtin-annotate.o
  CC      builtin-config.o
  CC      builtin-diff.o
  CC      builtin-evlist.o
  CC      builtin-ftrace.o
  CC      builtin-help.o
  CC      builtin-buildid-list.o
  CC      builtin-buildid-cache.o
  CC      builtin-kallsyms.o
  CC      builtin-list.o
  CC      builtin-record.o
  CC      builtin-report.o
  CC      builtin-stat.o
  CC      builtin-top.o
  CC      builtin-script.o
  CC      builtin-kvm.o
  CC      builtin-inject.o
  CC      builtin-mem.o
  CC      builtin-data.o
  CC      builtin-version.o
  CC      builtin-c2c.o
  CC      builtin-daemon.o
  TEST    pmu-events/metric_test.log
  CC      builtin-kmem.o
  CC      builtin-kwork.o
  CC      builtin-lock.o
  CC      builtin-sched.o
  CC      builtin-timechart.o
  CC      builtin-trace.o
  CC      trace/beauty/clone.o
  CC      builtin-probe.o
  CC      perf.o
  CC      trace/beauty/fcntl.o
  CC      bench/sched-messaging.o
  CC      trace/beauty/flock.o
  CC      bench/sched-pipe.o
  CC      tests/builtin-test.o
  CC      trace/beauty/fs_at_flags.o
  CC      arch/common.o
  CC      tests/tests-scripts.o
  CC      bench/sched-seccomp-notify.o
  CC      bench/syscall.o
  CC      ui/setup.o
  CC      trace/beauty/fsmount.o
  CC      ui/helpline.o
  CC      tests/parse-events.o
  CC      trace/beauty/fspick.o
  CC      tests/dso-data.o
  CC      bench/mem-functions.o
  CC      bench/futex-hash.o
  CC      tests/attr.o
  CC      trace/beauty/ioctl.o
  CC      ui/util.o
  CC      ui/progress.o
  CC      tests/vmlinux-kallsyms.o
  CC      ui/hist.o
  CC      trace/beauty/kcmp.o
  CC      trace/beauty/mount_flags.o
  CC      tests/openat-syscall.o
  CC      trace/beauty/move_mount.o
  CC      bench/futex-wake.o
  CC      ui/stdio/hist.o
  CC      bench/futex-wake-parallel.o
  CC      tests/openat-syscall-all-cpus.o
  CC      scripts/perl/Perf-Trace-Util/Context.o
  CC      bench/futex-lock-pi.o
  CC      trace/beauty/arch_prctl.o
  CC      scripts/python/Perf-Trace-Util/Context.o
  CC      trace/beauty/pkey_alloc.o
  CC      ui/browser.o
  CC      bench/futex-requeue.o
  CC      tests/openat-syscall-tp-fields.o
  CC      tests/mmap-basic.o
  CC      tests/perf-record.o
  CC      trace/beauty/prctl.o
  CC      bench/epoll-wait.o
  CC      trace/beauty/renameat.o
  CC      bench/epoll-ctl.o
  CC      tests/evsel-roundtrip-name.o
  CC      trace/beauty/sockaddr.o
  CC      arch/x86/util/header.o
  CC      bench/synthesize.o
  CC      tests/evsel-tp-sched.o
  CC      trace/beauty/socket.o
  CC      trace/beauty/statx.o
  CC      bench/kallsyms-parse.o
  CC      tests/fdarray.o
  CC      arch/x86/util/tsc.o
  CC      arch/x86/tests/regs_load.o
  CC      bench/inject-buildid.o
  CC      bench/find-bit-bench.o
  CC      trace/beauty/timespec.o
  CC      tests/pmu.o
  CC      trace/beauty/sync_file_range.o
  CC      arch/x86/util/kvm-stat.o
  CC      arch/x86/tests/dwarf-unwind.o
  CC      arch/x86/util/pmu.o
  CC      arch/x86/tests/arch-tests.o
  CC      arch/x86/util/perf_regs.o
  CC      tests/pmu-events.o
  CC      ui/browsers/annotate-data.o
  CC      arch/x86/tests/sample-parsing.o
  CC      arch/x86/util/topdown.o
  CC      ui/browsers/annotate.o
  CC      tests/hists_common.o
  CC      bench/breakpoint.o
  CC      ui/tui/setup.o
  CC      bench/evlist-open-close.o
  CC      arch/x86/tests/hybrid.o
  CC      tests/hists_link.o
  CC      ui/browsers/hists.o
  CC      ui/tui/util.o
  CC      ui/tui/helpline.o
  CC      bench/uprobe.o
  CC      tests/hists_filter.o
  CC      ui/browsers/map.o
  CC      bench/pmu-scan.o
  CC      tests/hists_output.o
  CC      ui/tui/progress.o
  CC      arch/x86/tests/intel-pt-test.o
  CC      arch/x86/tests/amd-ibs-via-core-pmu.o
  CC      arch/x86/util/event.o
  CC      arch/x86/util/machine.o
  CC      arch/x86/tests/bp-modify.o
  CC      arch/x86/util/evlist.o
  CC      bench/mem-memcpy-x86-64-asm.o
  CC      tests/hists_cumulate.o
  CC      tests/python-use.o
  CC      ui/browsers/scripts.o
  CC      ui/browsers/header.o
  CC      ui/browsers/res_sample.o
  CC      bench/mem-memset-x86-64-asm.o
  CC      arch/x86/util/mem-events.o
  CC      bench/numa.o
  CC      tests/bp_signal_overflow.o
  CC      tests/bp_signal.o
  CC      arch/x86/util/evsel.o
  CC      tests/bp_account.o
  CC      arch/x86/util/iostat.o
  CC      tests/wp.o
  CC      trace/beauty/tracepoints/x86_msr.o
  CC      trace/beauty/tracepoints/x86_irq_vectors.o
  CC      arch/x86/util/env.o
  CC      arch/x86/util/dwarf-regs.o
  CC      tests/task-exit.o
  CC      arch/x86/util/unwind-libunwind.o
  CC      tests/sw-clock.o
  CC      tests/mmap-thread-lookup.o
  CC      arch/x86/util/archinsn.o
  CC      arch/x86/util/auxtrace.o
  CC      tests/thread-maps-share.o
  CC      tests/switch-tracking.o
  CC      arch/x86/util/intel-pt.o
  CC      tests/keep-tracking.o
  CC      arch/x86/util/intel-bts.o
  CC      tests/code-reading.o
  CC      tests/sample-parsing.o
  CC      tests/parse-no-sample-id-all.o
  CC      tests/kmod-path.o
  CC      tests/thread-map.o
  CC      tests/topology.o
  CC      tests/mem.o
  CC      tests/cpumap.o
  CC      tests/stat.o
  CC      tests/event_update.o
  CC      tests/event-times.o
  CC      tests/expr.o
  CC      tests/backward-ring-buffer.o
  CC      tests/sdt.o
  CC      tests/is_printable_array.o
  CC      tests/perf-hooks.o
  CC      tests/bitmap.o
  CC      tests/mem2node.o
  CC      tests/unit_number__scnprintf.o
  CC      tests/maps.o
  CC      tests/time-utils-test.o
  CC      tests/genelf.o
  CC      tests/api-io.o
  CC      tests/demangle-java-test.o
  CC      tests/demangle-ocaml-test.o
  CC      tests/pfm.o
  CC      tests/parse-metric.o
  CC      tests/pe-file-parsing.o
  CC      tests/expand-cgroup.o
  CC      tests/perf-time-to-tsc.o
  CC      tests/dlfilter-test.o
  CC      tests/sigtrap.o
  CC      tests/event_groups.o
  CC      tests/symbols.o
  CC      tests/util.o
  CC      tests/dwarf-unwind.o
  CC      tests/workloads/noploop.o
  CC      tests/workloads/thloop.o
  CC      tests/workloads/leafloop.o
  CC      tests/workloads/sqrtloop.o
  CC      tests/workloads/brstack.o
  CC      tests/workloads/datasym.o
  GEN     pmu-events/test-empty-pmu-events.c
  CC      util/arm64-frame-pointer-unwind-support.o
  CC      util/addr_location.o
  CC      util/annotate.o
  CC      util/block-info.o
  CC      util/build-id.o
  CC      util/block-range.o
  CC      util/cacheline.o
  CC      util/config.o
  CC      util/copyfile.o
  CC      util/ctype.o
  CC      util/db-export.o
  CC      util/disasm.o
  CC      util/event.o
  CC      util/env.o
  CC      util/evlist.o
  CC      util/sideband_evlist.o
  CC      util/evsel.o
  CC      util/evsel_fprintf.o
  CC      util/perf_event_attr_fprintf.o
  CC      util/evswitch.o
  CC      util/find_bit.o
  CC      util/get_current_dir_name.o
  CC      util/levenshtein.o
  CC      util/mmap.o
  CC      util/memswap.o
  BISON   util/parse-events-bison.c
  CC      util/print-events.o
  CC      util/tracepoint.o
  TEST    pmu-events/empty-pmu-events.log
  CC      util/perf_regs.o
test-empty-pmu-events.c renamed from empty-pmu-events.c +6 -6
@@ -136,7 +136,7 @@
 { 2623 }, /* M3\000\0001 / M3\000\000\000\000\000\000\000\00000 */
 { 2078 }, /* cache_miss_cycles\000group1\000dcache_miss_cpi + icache_miss_cycles\000\000\000\000\000\000\000\00000 */
 { 1947 }, /* dcache_miss_cpi\000\000l1d\\-loads\\-misses / inst_retired.any\000\000\000\000\000\000\000\00000 */
-{ 2011 }, /* icache_miss_cycles\000\000l1i\\-loads\\-misses / inst_retiredany\000\000\000\000\000\000\000\00000 */
+{ 2011 }, /* icache_miss_cycles\000\000l1i\\-loads\\-misses / inst_retired.any\000\000\000\000\000\000\000\00000 */
 
 };
 
@@ -373,7 +373,7 @@
 {
         for (size_t i = 0; i < table->num_pmus; i++) {
                 const struct pmu_table_entry *table_pmu = &table->pmus[i];
-                const char *pmu_name = &big_c_string[table_pmu->pmu_nameoffset];
+                const char *pmu_name = &big_c_string[table_pmu->pmu_name.offset];
                 int ret;
 
                 if (pmu && !pmu__name_match(pmu, pmu_name))
@@ -394,7 +394,7 @@
 {
         for (size_t i = 0; i < table->num_pmus; i++) {
                 const struct pmu_table_entry *table_pmu = &table->pmus[i];
-                const char *pmu_name = &big_c_string[table_pmu->pmu_nameoffset];
+                const char *pmu_name = &big_c_string[table_pmu->pmu_name.offset];
                 int ret;
 
                 if (!pmu__name_match(pmu, pmu_name))
@@ -414,7 +414,7 @@
 
         for (size_t i = 0; i < table->num_pmus; i++) {
                 const struct pmu_table_entry *table_pmu = &table->pmus[i];
-                const char *pmu_name = &big_c_string[table_pmu->pmu_nameoffset];
+                const char *pmu_name = &big_c_string[table_pmu->pmu_name.offset];
 
                 if (pmu__name_match(pmu, pmu_name))
                         count += table_pmu->num_entries;
@@ -524,7 +524,7 @@
 
         for (size_t i = 0; i < map->event_table.num_pmus; i++) {
                 const struct pmu_table_entry *table_pmu = &map->event_table.pmus[i];
-                const char *pmu_name = &big_c_string[table_pmu->pmu_nameoffset];
+                const char *pmu_name = &big_c_string[table_pmu->pmu_name.offset];
 
                 if (pmu__name_match(pmu, pmu_name))
                          return &map->event_table;
@@ -544,7 +544,7 @@
 
         for (size_t i = 0; i < map->metric_table.num_pmus; i++) {
                 const struct pmu_table_entry *table_pmu = &map->metric_table.pmus[i];
-                const char *pmu_name = &big_c_string[table_pmu->pmu_nameoffset];
+                const char *pmu_name = &big_c_string[table_pmu->pmu_name.offset];
 
                 if (pmu__name_match(pmu, pmu_name))
                            return &map->metric_table;
  CC      util/perf-regs-arch/perf_regs_aarch64.o
  CC      util/intel-pt-decoder/intel-pt-pkt-decoder.o
  CC      util/arm-spe-decoder/arm-spe-pkt-decoder.o
  CC      util/perf-regs-arch/perf_regs_arm.o
  GEN     util/intel-pt-decoder/inat-tables.c
  CC      util/arm-spe-decoder/arm-spe-decoder.o
  CC      util/intel-pt-decoder/intel-pt-log.o
  CC      util/perf-regs-arch/perf_regs_csky.o
  CC      util/intel-pt-decoder/intel-pt-decoder.o
  CC      util/perf-regs-arch/perf_regs_loongarch.o
  CC      util/hisi-ptt-decoder/hisi-ptt-pkt-decoder.o
  CC      util/perf-regs-arch/perf_regs_mips.o
  CC      util/perf-regs-arch/perf_regs_powerpc.o
  CC      util/path.o
  CC      util/perf-regs-arch/perf_regs_riscv.o
  CC      util/perf-regs-arch/perf_regs_s390.o
  CC      util/scripting-engines/trace-event-perl.o
  CC      util/perf-regs-arch/perf_regs_x86.o
  CC      util/scripting-engines/trace-event-python.o
  CC      util/print_binary.o
  CC      util/print_insn.o
  CC      util/rlimit.o
  CC      util/argv_split.o
  CC      util/bitmap.o
  CC      util/rbtree.o
  CC      util/libstring.o
  CC      util/hweight.o
  CC      util/smt.o
  CC      util/strbuf.o
  CC      util/string.o
  LD      trace/beauty/tracepoints/perf-in.o
  CC      util/strlist.o
  CC      util/top.o
  CC      util/strfilter.o
  CC      util/usage.o
  CC      util/dsos.o
  CC      util/symbol.o
  CC      util/symbol_fprintf.o
  CC      util/dso.o
  CC      util/map_symbol.o
  CC      util/color.o
  CC      util/color_config.o
  CC      util/metricgroup.o
  CC      util/header.o
  CC      util/callchain.o
  CC      util/debug.o
  CC      util/values.o
  CC      util/fncache.o
  CC      util/machine.o
  CC      util/map.o
  CC      util/maps.o
  CC      util/pstack.o
  CC      util/session.o
  CC      util/sample-raw.o
  CC      util/s390-sample-raw.o
  LD      trace/beauty/perf-in.o
  CC      util/amd-sample-raw.o
  CC      util/syscalltbl.o
  CC      util/ordered-events.o
  CC      util/namespaces.o
  CC      util/comm.o
  CC      util/thread.o
  CC      util/threads.o
  CC      util/thread_map.o
  CC      util/parse-events-bison.o
  BISON   util/pmu-bison.c
  CC      util/pmus.o
  CC      util/svghelper.o
  CC      util/trace-event-info.o
  CC      util/trace-event-scripting.o
  CC      util/trace-event.o
  CC      util/trace-event-parse.o
  CC      util/trace-event-read.o
  CC      util/sort.o
  CC      util/hist.o
  CC      util/util.o
  CC      util/cpumap.o
  CC      util/affinity.o
  CC      util/cputopo.o
  CC      util/cgroup.o
  CC      util/target.o
  CC      util/rblist.o
  CC      util/intlist.o
  CC      util/vdso.o
  CC      util/counts.o
  CC      util/stat.o
  CC      util/stat-shadow.o
  CC      util/stat-display.o
  CC      util/perf_api_probe.o
  CC      util/record.o
  CC      util/srcline.o
  CC      util/srccode.o
  CC      util/synthetic-events.o
  CC      util/data.o
  CC      util/tsc.o
  CC      util/cloexec.o
  CC      util/call-path.o
  CC      util/rwsem.o
  CC      util/thread-stack.o
  CC      util/spark.o
  CC      util/topdown.o
  CC      util/iostat.o
  LD      tests/workloads/perf-in.o
  CC      util/stream.o
  CC      util/auxtrace.o
  LD      util/perf-regs-arch/perf-in.o
  CC      util/intel-pt.o
  CC      util/intel-bts.o
  CC      util/arm-spe.o
  CC      util/hisi-ptt.o
  CC      util/s390-cpumsf.o
  CC      util/cs-etm-base.o
  CC      util/parse-branch-options.o
  CC      util/dump-insn.o
  CC      util/parse-regs-options.o
  CC      util/help-unknown-cmd.o
  CC      util/term.o
  CC      util/parse-sublevel-options.o
  CC      util/dlfilter.o
  CC      util/mem-info.o
  CC      util/mem-events.o
  CC      util/vsprintf.o
  CC      util/units.o
  CC      util/time-utils.o
  BISON   util/expr-bison.c
  CC      util/mem2node.o
  CC      util/clockid.o
  LD      ui/tui/perf-in.o
  CC      util/branch.o
  CC      util/list_sort.o
  CC      util/mutex.o
  CC      util/sharded_mutex.o
  CC      util/bpf_map.o
  CC      util/symbol-elf.o
  CC      util/probe-file.o
  CC      util/probe-event.o
  CC      util/probe-finder.o
  CC      util/dwarf-aux.o
  CC      util/dwarf-regs.o
  CC      util/debuginfo.o
  CC      util/annotate-data.o
  CC      util/unwind-libunwind-local.o
  CC      util/unwind-libunwind.o
  CC      util/data-convert-bt.o
  CC      util/lzma.o
  CC      util/zlib.o
  CC      util/data-convert-json.o
  CC      util/zstd.o
  CC      util/cap.o
  CXX     util/demangle-cxx.o
  CC      util/demangle-java.o
  CC      util/demangle-ocaml.o
  CC      util/demangle-rust.o
  CC      util/jitdump.o
  CC      util/genelf.o
  CC      util/genelf_debug.o
  CC      util/perf-hooks.o
  CC      util/bpf-event.o
  CC      util/bpf-utils.o
  CC      util/pfm.o
  FLEX    util/parse-events-flex.c
  FLEX    util/pmu-flex.c
  CC      util/pmu-bison.o
  FLEX    util/expr-flex.c
  CC      util/intel-pt-decoder/intel-pt-insn-decoder.o
  CC      util/expr-bison.o
  LD      util/hisi-ptt-decoder/perf-in.o
  LD      arch/x86/tests/perf-in.o
  CC      util/pmu.o
  CC      util/pmu-flex.o
  CC      util/expr-flex.o
  CC      util/expr.o
  CC      util/parse-events.o
  CC      util/parse-events-flex.o
  LD      scripts/python/Perf-Trace-Util/perf-in.o
  LD      util/arm-spe-decoder/perf-in.o
  LD      arch/x86/util/perf-in.o
  LD      arch/x86/perf-in.o
  LD      arch/perf-in.o
  LD      scripts/perl/Perf-Trace-Util/perf-in.o
  LD      scripts/perf-in.o
  LD      bench/perf-in.o
  LD      tests/perf-in.o
  LD      util/scripting-engines/perf-in.o
  LD      ui/browsers/perf-in.o
  LD      ui/perf-in.o
  LD      util/intel-pt-decoder/perf-in.o
  LD      util/perf-in.o
  LD      perf-in.o

make: Leaving directory '/usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf' make perf failed

make[3]: *** [pmu-events/Build:42: pmu-events/empty-pmu-events.log] Error 1 make[3]: *** Deleting file 'pmu-events/empty-pmu-events.log' make[2]: *** [Makefile.perf:730: pmu-events/pmu-events-in.o] Error 2 make[2]: *** Waiting for unfinished jobs....
make[1]: *** [Makefile.perf:264: sub-make] Error 2
make: *** [Makefile:70: all] Error 2

The kernel config and materials to reproduce are available at:
https://download.01.org/0day-ci/archive/20240531/[email protected]

Signature · 2 lines
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki
author reviewer
#5 lore raw

Re: [PATCH v2 2/2] perf jevents: Autogenerate empty-pmu-events.c

Quoted 7 lines · kernel test robot

hi, Ian Rogers,

we actually want to seek your advice. in our env, there is no problem to build parent.

Quoted 7 lines

* 3249f8b84526d (linux-review/Ian-Rogers/perf-jevents-Autogenerate-empty-pmu-events-c/20240525-093240) perf jevents: Autogenerate empty-pmu-events.c
* 7d88bd0d22746 perf jevents: Use name for special find value <--- parent

however, failed to build perf upon 3249f8b84526d. but there is not many useful information in below detail log.

is there any dependency or env setting for us to build this commit? Thanks!

Hi Oliver,

Thanks for the report and the work testing! Seeing the output:

[..snip..]

test-empty-pmu-events.c 2024-05-30 15:55:37.332495538 +0000

Quoted 12 lines
test-empty-pmu-events.c 2024-05-30 15:55:37.332495538 +0000 renamed from empty-pmu-events.c 2024-05-30 08:20:10.000000000 +0000 +1 -1
@@ -136,7 +136,7 @@
 { 2623 }, /* M3\000\0001 / M3\000\000\000\000\000\000\000\00000 */
 { 2078 }, /* cache_miss_cycles\000group1\000dcache_miss_cpi + icache_miss_cycles\000\000\000\000\000\000\000\00000 */
 { 1947 }, /* dcache_miss_cpi\000\000l1d\\-loads\\-misses / inst_retired.any\000\000\000\000\000\000\000\00000 */
-{ 2011 }, /* icache_miss_cycles\000\000l1i\\-loads\\-misses / inst_retiredany\000\000\000\000\000\000\000\00000 */
+{ 2011 }, /* icache_miss_cycles\000\000l1i\\-loads\\-misses / inst_retired.any\000\000\000\000\000\000\000\00000 */
 
 };
 
@@ -373,7 +373,7 @@

[..snip..]

It appears the version of empty-pmu-events.c the patch adds and the version generated in your test configuration are differing because of whitespace. Perhaps a hex editor will show what the exact difference is, it must relate to locales or something. Like you mention this could be resolved by an env change.

Quoted 2 lines

The kernel config and materials to reproduce are available at:
https://download.01.org/0day-ci/archive/20240531/[email protected]

I didn't see the generated test-empty-pmu-events.c there and so couldn't follow up on the locale/env exploration. I wonder that a suitable workaround is to change from the patch:

+$(EMPTY_PMU_EVENTS_TEST_LOG): $(EMPTY_PMU_EVENTS_C) $(TEST_EMPTY_PMU_EVENTS_C)
+ $(call rule_mkdir)
+ $(Q)$(call echo-cmd,test)diff -u $? 2> $@ || (cat $@ && false)

to instead of invoking "diff -u" to invoke "diff -w -u", that is to ignore whitespace. I can send a v3 with this.

Thanks,
Ian

#6 lore raw

Re: [PATCH v2 2/2] perf jevents: Autogenerate empty-pmu-events.c

hi, Ian,

Quoted 52 lines · Ian Rogers
Quoted 7 lines · kernel test robot

hi, Ian Rogers,

we actually want to seek your advice. in our env, there is no problem to build parent.

Quoted 7 lines

* 3249f8b84526d (linux-review/Ian-Rogers/perf-jevents-Autogenerate-empty-pmu-events-c/20240525-093240) perf jevents: Autogenerate empty-pmu-events.c
* 7d88bd0d22746 perf jevents: Use name for special find value <--- parent

however, failed to build perf upon 3249f8b84526d. but there is not many useful information in below detail log.

is there any dependency or env setting for us to build this commit? Thanks!

Hi Oliver,

Thanks for the report and the work testing! Seeing the output:

[..snip..]

test-empty-pmu-events.c 2024-05-30 15:55:37.332495538 +0000

Quoted 12 lines
test-empty-pmu-events.c 2024-05-30 15:55:37.332495538 +0000 renamed from empty-pmu-events.c 2024-05-30 08:20:10.000000000 +0000 +1 -1
@@ -136,7 +136,7 @@
 { 2623 }, /* M3\000\0001 / M3\000\000\000\000\000\000\000\00000 */
 { 2078 }, /* cache_miss_cycles\000group1\000dcache_miss_cpi + icache_miss_cycles\000\000\000\000\000\000\000\00000 */
 { 1947 }, /* dcache_miss_cpi\000\000l1d\\-loads\\-misses / inst_retired.any\000\000\000\000\000\000\000\00000 */
-{ 2011 }, /* icache_miss_cycles\000\000l1i\\-loads\\-misses / inst_retiredany\000\000\000\000\000\000\000\00000 */
+{ 2011 }, /* icache_miss_cycles\000\000l1i\\-loads\\-misses / inst_retired.any\000\000\000\000\000\000\000\00000 */
 
 };
 
@@ -373,7 +373,7 @@

[..snip..]

It appears the version of empty-pmu-events.c the patch adds and the version generated in your test configuration are differing because of whitespace. Perhaps a hex editor will show what the exact difference is, it must relate to locales or something. Like you mention this could be resolved by an env change.

Quoted 2 lines

The kernel config and materials to reproduce are available at:
https://download.01.org/0day-ci/archive/20240531/[email protected]

I didn't see the generated test-empty-pmu-events.c there and so couldn't follow up on the locale/env exploration. I wonder that a suitable workaround is to change from the patch:

+$(EMPTY_PMU_EVENTS_TEST_LOG): $(EMPTY_PMU_EVENTS_C) $(TEST_EMPTY_PMU_EVENTS_C)

(quoted diff) +2 -0
+       $(call rule_mkdir)
+       $(Q)$(call echo-cmd,test)diff -u $? 2> $@ || (cat $@ && false)
Quoted 2 lines

to instead of invoking "diff -u" to invoke "diff -w -u", that is to ignore whitespace. I can send a v3 with this.

I tried below patch

commit a79a41133a41adc2d69c8f603c7d880b3796cbf7

Author: 0day robot <[email protected]>
Date:   Mon Jun 3 16:35:45 2024 +0800

fix from Ian Rogers: invoke "diff -w -u" instead of "diff -u"

tools/perf/pmu-events/Build +1 -1
index c3fa43c497069..54d19b492db5c 100644
@@ -39,7 +39,7 @@ $(TEST_EMPTY_PMU_EVENTS_C): $(JSON) $(JSON_TEST) $(JEVENTS_PY) $(METRIC_PY) $(ME
 
 $(EMPTY_PMU_EVENTS_TEST_LOG): $(EMPTY_PMU_EVENTS_C) $(TEST_EMPTY_PMU_EVENTS_C)
        $(call rule_mkdir)
-       $(Q)$(call echo-cmd,test)diff -u $? 2> $@ || (cat $@ && false)
+       $(Q)$(call echo-cmd,test)diff -w -u $? 2> $@ || (cat $@ && false)
 
 $(PMU_EVENTS_C): $(JSON) $(JSON_TEST) $(JEVENTS_PY) $(METRIC_PY) $(METRIC_TEST_LOG) $(EMPTY_PMU_EVENTS_TEST_LOG)
        $(call rule_mkdir)

but make still failed. I still saw below in our build log

test-empty-pmu-events.c 2024-06-03 13:47:19.522463482 +0000 renamed from empty-pmu-events.c 2024-06-03 08:41:16.000000000 +0000 +1 -1
@@ -136,7 +136,7 @@
 { 2623 }, /* M3\000\0001 / M3\000\000\000\000\000\000\000\00000 */
 { 2078 }, /* cache_miss_cycles\000group1\000dcache_miss_cpi + icache_miss_cycles\000\000\000\000\000\000\000\00000 */
 { 1947 }, /* dcache_miss_cpi\000\000l1d\\-loads\\-misses / inst_retired.any\000\000\000\000\000\000\000\00000 */
-{ 2011 }, /* icache_miss_cycles\000\000l1i\\-loads\\-misses / inst_retiredany\000\000\000\000\000\000\000\00000 */
+{ 2011 }, /* icache_miss_cycles\000\000l1i\\-loads\\-misses / inst_retired.any\000\000\000\000\000\000\000\00000 */
 
 };
 

I will try to get generated test-empty-pmu-events.c tomorrow.

Quoted 3 lines

Thanks,
Ian

author reviewer
#7 lore raw

Re: [PATCH v2 2/2] perf jevents: Autogenerate empty-pmu-events.c

Quoted 96 lines · Oliver Sang

hi, Ian,

Quoted 52 lines · Ian Rogers
Quoted 7 lines · kernel test robot

hi, Ian Rogers,

we actually want to seek your advice. in our env, there is no problem to build parent.

Quoted 7 lines

* 3249f8b84526d (linux-review/Ian-Rogers/perf-jevents-Autogenerate-empty-pmu-events-c/20240525-093240) perf jevents: Autogenerate empty-pmu-events.c
* 7d88bd0d22746 perf jevents: Use name for special find value <--- parent

however, failed to build perf upon 3249f8b84526d. but there is not many useful information in below detail log.

is there any dependency or env setting for us to build this commit? Thanks!

Hi Oliver,

Thanks for the report and the work testing! Seeing the output:

[..snip..]

test-empty-pmu-events.c 2024-05-30 15:55:37.332495538 +0000

Quoted 12 lines
test-empty-pmu-events.c 2024-05-30 15:55:37.332495538 +0000 renamed from empty-pmu-events.c 2024-05-30 08:20:10.000000000 +0000 +1 -1
@@ -136,7 +136,7 @@
 { 2623 }, /* M3\000\0001 / M3\000\000\000\000\000\000\000\00000 */
 { 2078 }, /* cache_miss_cycles\000group1\000dcache_miss_cpi + icache_miss_cycles\000\000\000\000\000\000\000\00000 */
 { 1947 }, /* dcache_miss_cpi\000\000l1d\\-loads\\-misses / inst_retired.any\000\000\000\000\000\000\000\00000 */
-{ 2011 }, /* icache_miss_cycles\000\000l1i\\-loads\\-misses / inst_retiredany\000\000\000\000\000\000\000\00000 */
+{ 2011 }, /* icache_miss_cycles\000\000l1i\\-loads\\-misses / inst_retired.any\000\000\000\000\000\000\000\00000 */
 
 };
 
@@ -373,7 +373,7 @@

[..snip..]

It appears the version of empty-pmu-events.c the patch adds and the version generated in your test configuration are differing because of whitespace. Perhaps a hex editor will show what the exact difference is, it must relate to locales or something. Like you mention this could be resolved by an env change.

Quoted 2 lines

The kernel config and materials to reproduce are available at:
https://download.01.org/0day-ci/archive/20240531/[email protected]

I didn't see the generated test-empty-pmu-events.c there and so couldn't follow up on the locale/env exploration. I wonder that a suitable workaround is to change from the patch:

+$(EMPTY_PMU_EVENTS_TEST_LOG): $(EMPTY_PMU_EVENTS_C) $(TEST_EMPTY_PMU_EVENTS_C)

(quoted diff) +2 -0
+       $(call rule_mkdir)
+       $(Q)$(call echo-cmd,test)diff -u $? 2> $@ || (cat $@ && false)
Quoted 2 lines

to instead of invoking "diff -u" to invoke "diff -w -u", that is to ignore whitespace. I can send a v3 with this.

I tried below patch

commit a79a41133a41adc2d69c8f603c7d880b3796cbf7

Author: 0day robot <[email protected]>
Date:   Mon Jun 3 16:35:45 2024 +0800

fix from Ian Rogers: invoke "diff -w -u" instead of "diff -u"

tools/perf/pmu-events/Build +1 -1
index c3fa43c497069..54d19b492db5c 100644
@@ -39,7 +39,7 @@ $(TEST_EMPTY_PMU_EVENTS_C): $(JSON) $(JSON_TEST) $(JEVENTS_PY) $(METRIC_PY) $(ME
 
 $(EMPTY_PMU_EVENTS_TEST_LOG): $(EMPTY_PMU_EVENTS_C) $(TEST_EMPTY_PMU_EVENTS_C)
        $(call rule_mkdir)
-       $(Q)$(call echo-cmd,test)diff -u $? 2> $@ || (cat $@ && false)
+       $(Q)$(call echo-cmd,test)diff -w -u $? 2> $@ || (cat $@ && false)
 
 $(PMU_EVENTS_C): $(JSON) $(JSON_TEST) $(JEVENTS_PY) $(METRIC_PY) $(METRIC_TEST_LOG) $(EMPTY_PMU_EVENTS_TEST_LOG)
        $(call rule_mkdir)

but make still failed. I still saw below in our build log

test-empty-pmu-events.c 2024-06-03 13:47:19.522463482 +0000 renamed from empty-pmu-events.c 2024-06-03 08:41:16.000000000 +0000 +1 -1
@@ -136,7 +136,7 @@
 { 2623 }, /* M3\000\0001 / M3\000\000\000\000\000\000\000\00000 */
 { 2078 }, /* cache_miss_cycles\000group1\000dcache_miss_cpi + icache_miss_cycles\000\000\000\000\000\000\000\00000 */
 { 1947 }, /* dcache_miss_cpi\000\000l1d\\-loads\\-misses / inst_retired.any\000\000\000\000\000\000\000\00000 */
-{ 2011 }, /* icache_miss_cycles\000\000l1i\\-loads\\-misses / inst_retiredany\000\000\000\000\000\000\000\00000 */
+{ 2011 }, /* icache_miss_cycles\000\000l1i\\-loads\\-misses / inst_retired.any\000\000\000\000\000\000\000\00000 */
 
 };
 
Quoted 1 line

I will try to get generated test-empty-pmu-events.c tomorrow.

Thanks Oliver, if you could get the environment variables that would probably also be useful.

Ian

Quoted 3 lines
Quoted 3 lines

Thanks,
Ian

author reviewer
#8 lore raw

Re: [PATCH v2 2/2] perf jevents: Autogenerate empty-pmu-events.c

Quoted 2 lines · Ian Rogers

On Mon, Jun 3, 2024 at 7:19 AM Oliver Sang <[email protected]> wrote:

[...]

Quoted 34 lines
Quoted 34 lines

I tried below patch

commit a79a41133a41adc2d69c8f603c7d880b3796cbf7

Author: 0day robot <[email protected]>
Date:   Mon Jun 3 16:35:45 2024 +0800

fix from Ian Rogers: invoke "diff -w -u" instead of "diff -u"

tools/perf/pmu-events/Build +1 -1
index c3fa43c497069..54d19b492db5c 100644
@@ -39,7 +39,7 @@ $(TEST_EMPTY_PMU_EVENTS_C): $(JSON) $(JSON_TEST) $(JEVENTS_PY) $(METRIC_PY) $(ME
 
 $(EMPTY_PMU_EVENTS_TEST_LOG): $(EMPTY_PMU_EVENTS_C) $(TEST_EMPTY_PMU_EVENTS_C)
        $(call rule_mkdir)
-       $(Q)$(call echo-cmd,test)diff -u $? 2> $@ || (cat $@ && false)
+       $(Q)$(call echo-cmd,test)diff -w -u $? 2> $@ || (cat $@ && false)
 
 $(PMU_EVENTS_C): $(JSON) $(JSON_TEST) $(JEVENTS_PY) $(METRIC_PY) $(METRIC_TEST_LOG) $(EMPTY_PMU_EVENTS_TEST_LOG)
        $(call rule_mkdir)

but make still failed. I still saw below in our build log

test-empty-pmu-events.c 2024-06-03 13:47:19.522463482 +0000 renamed from empty-pmu-events.c 2024-06-03 08:41:16.000000000 +0000 +1 -1
@@ -136,7 +136,7 @@
 { 2623 }, /* M3\000\0001 / M3\000\000\000\000\000\000\000\00000 */
 { 2078 }, /* cache_miss_cycles\000group1\000dcache_miss_cpi + icache_miss_cycles\000\000\000\000\000\000\000\00000 */
 { 1947 }, /* dcache_miss_cpi\000\000l1d\\-loads\\-misses / inst_retired.any\000\000\000\000\000\000\000\00000 */
-{ 2011 }, /* icache_miss_cycles\000\000l1i\\-loads\\-misses / inst_retiredany\000\000\000\000\000\000\000\00000 */
+{ 2011 }, /* icache_miss_cycles\000\000l1i\\-loads\\-misses / inst_retired.any\000\000\000\000\000\000\000\00000 */
 
Quoted 7 lines
Quoted 4 lines
test-empty-pmu-events.c 2024-06-03 13:47:19.522463482 +0000 renamed from empty-pmu-events.c 2024-06-03 08:41:16.000000000 +0000 +0 -0
 };
 

I will try to get generated test-empty-pmu-events.c tomorrow.

Thanks Oliver, if you could get the environment variables that would probably also be useful.

Hi Oliver, any update on this?

Thanks,
Ian

#9 lore raw

Re: [PATCH v2 2/2] perf jevents: Autogenerate empty-pmu-events.c

hi, Ian,

Quoted 41 lines · Ian Rogers
Quoted 2 lines · Ian Rogers

On Mon, Jun 3, 2024 at 7:19 AM Oliver Sang <[email protected]> wrote:

[...]

Quoted 37 lines
Quoted 37 lines

I tried below patch

commit a79a41133a41adc2d69c8f603c7d880b3796cbf7

Author: 0day robot <[email protected]>
Date:   Mon Jun 3 16:35:45 2024 +0800

fix from Ian Rogers: invoke "diff -w -u" instead of "diff -u"

tools/perf/pmu-events/Build +1 -1
index c3fa43c497069..54d19b492db5c 100644
@@ -39,7 +39,7 @@ $(TEST_EMPTY_PMU_EVENTS_C): $(JSON) $(JSON_TEST) $(JEVENTS_PY) $(METRIC_PY) $(ME
 
 $(EMPTY_PMU_EVENTS_TEST_LOG): $(EMPTY_PMU_EVENTS_C) $(TEST_EMPTY_PMU_EVENTS_C)
        $(call rule_mkdir)
-       $(Q)$(call echo-cmd,test)diff -u $? 2> $@ || (cat $@ && false)
+       $(Q)$(call echo-cmd,test)diff -w -u $? 2> $@ || (cat $@ && false)
 
 $(PMU_EVENTS_C): $(JSON) $(JSON_TEST) $(JEVENTS_PY) $(METRIC_PY) $(METRIC_TEST_LOG) $(EMPTY_PMU_EVENTS_TEST_LOG)
        $(call rule_mkdir)

but make still failed. I still saw below in our build log

test-empty-pmu-events.c 2024-06-03 13:47:19.522463482 +0000 renamed from empty-pmu-events.c 2024-06-03 08:41:16.000000000 +0000 +1 -1
@@ -136,7 +136,7 @@
 { 2623 }, /* M3\000\0001 / M3\000\000\000\000\000\000\000\00000 */
 { 2078 }, /* cache_miss_cycles\000group1\000dcache_miss_cpi + icache_miss_cycles\000\000\000\000\000\000\000\00000 */
 { 1947 }, /* dcache_miss_cpi\000\000l1d\\-loads\\-misses / inst_retired.any\000\000\000\000\000\000\000\00000 */
-{ 2011 }, /* icache_miss_cycles\000\000l1i\\-loads\\-misses / inst_retiredany\000\000\000\000\000\000\000\00000 */
+{ 2011 }, /* icache_miss_cycles\000\000l1i\\-loads\\-misses / inst_retired.any\000\000\000\000\000\000\000\00000 */
 
 };
 
Quoted 6 lines
Quoted 4 lines
Quoted 1 line

I will try to get generated test-empty-pmu-events.c tomorrow.

Thanks Oliver, if you could get the environment variables that would probably also be useful.

Hi Oliver, any update on this?

sorry for late.

I pack whole pmu-events folder as attached pmu-events.tar.gz

below is the env variables

declare -x ARCH="x86_64"
declare -x BENCHMARK_ROOT="/lkp/benchmarks"
declare -x BOOT_IMAGE="/pkg/linux/x86_64-rhel-8.3-bpf/gcc-13/3249f8b84526d3b69162812908c257ee9816a237/vmlinuz-6.9.0-11004-g3249f8b84526"
declare -x DBUS_SESSION_BUS_ADDRESS="unix:path=/run/user/0/bus"
declare -x HISTSIZE="51200"
declare -x HOME="/root"
declare -x HOSTNAME="lkp-spr-2sp1"
declare -x LANG="en_US.UTF-8"
declare -x LC_ADDRESS="zh_CN.UTF-8"
declare -x LC_IDENTIFICATION="zh_CN.UTF-8"
declare -x LC_MEASUREMENT="zh_CN.UTF-8"
declare -x LC_MONETARY="zh_CN.UTF-8"
declare -x LC_NAME="zh_CN.UTF-8"
declare -x LC_NUMERIC="zh_CN.UTF-8"
declare -x LC_PAPER="zh_CN.UTF-8"
declare -x LC_TELEPHONE="zh_CN.UTF-8"
declare -x LC_TIME="zh_CN.UTF-8"
declare -x LESS="-MRiqscj5"
declare -x LESSCLOSE="/usr/bin/lesspipe %s %s"
declare -x LESSOPEN="| /usr/bin/lesspipe %s"
declare -x LOGNAME="root"
declare -x LS_COLORS
declare -x MOTD_SHOWN="pam"
declare -x OLDPWD="/usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf/pmu-events"
declare -x PAGER="less"
declare -x PATH="/root/bin:/usr/local/sbin:/usr/local/bin:/usr/lib/git-core:/usr/sbin:/usr/bin:/sbin:/bin:/lkp/xsang/src/bin"
declare -x PS1="\\[\\033[0m\\]\\[\\033[1;30m\\]\\[\\033[1;31m\\]\\u\\[\\033[1;30m\\]@\\[\\033[1;34m\\]\\h\\[\\033[1;30m\\] \\[\\033[0;37m\\033[4m\\]\\w\\[\\033[0m\\]\\[\\033[1;30m\\]\\[\\033[0;31m\\]# \\[\\033[0;37m\\]"
declare -x PS2="\\[\\033[1;30m\\]> \\[\\033[0;37m\\]"
declare -x PWD="/usr/src/perf_selftests-x86_64-rhel-8.3-bpf-3249f8b84526d3b69162812908c257ee9816a237/tools/perf"
declare -x RESULT_ROOT="/result/perf-sanity-tests/gcc/lkp-spr-2sp1/debian-12-x86_64-20240206.cgz/x86_64-rhel-8.3-bpf/gcc-13/3249f8b84526d3b69162812908c257ee9816a237/20"
declare -x SHELL="/bin/bash"
declare -x SHLVL="1"
declare -x TERM="linux"
declare -x USER="root"
declare -x XAUTHORITY="/root/.Xauthority"
declare -x XDG_RUNTIME_DIR="/run/user/0"
declare -x XDG_SESSION_CLASS="user"
declare -x XDG_SESSION_ID="2"
declare -x XDG_SESSION_TYPE="tty"
declare -x _rt="/result/perf-sanity-tests/gcc/lkp-spr-2sp1/debian-12-x86_64-20240206.cgz/x86_64-rhel-8.3-bpf/gcc-13/3249f8b84526d3b69162812908c257ee9816a237"
declare -x acpi_rsdp="0x777fe014"
declare -x apic="debug"
declare -x arch="x86_64"
declare -x base_commit="a38297e3fb012ddfa7ce0321a7e5a8daeb1872b6"
declare -x bootloader_append=$'root=/dev/ram0\nRESULT_ROOT=/result/perf-sanity-tests/gcc/lkp-spr-2sp1/debian-12-x86_64-20240206.cgz/x86_64-rhel-8.3-bpf/gcc-13/3249f8b84526d3b69162812908c257ee9816a237/20\nBOOT_IMAGE=/pkg/linux/x86_64-rhel-8.3-bpf/gcc-13/3249f8b84526d3b69162812908c257ee9816a237/vmlinuz-6.9.0-11004-g3249f8b84526\nbranch=linux-review/Ian-Rogers/perf-jevents-Autogenerate-empty-pmu-events-c/20240525-093240\njob=/lkp/jobs/scheduled/lkp-spr-2sp1/perf-sanity-tests-gcc-debian-12-x86_64-20240206.cgz-3249f8b84526-20240613-8245-291s0m-0.yaml\nuser=xsang\nARCH=x86_64\nkconfig=x86_64-rhel-8.3-bpf\ncommit=3249f8b84526d3b69162812908c257ee9816a237\nnmi_watchdog=0\nintremap=posted_msi\nacpi_rsdp=0x777fe014\nmax_uptime=1200\nLKP_SERVER=internal-lkp-server\nnokaslr\nselinux=0\ndebug\napic=debug\nsysrq_always_enabled\nrcupdate.rcu_cpu_stall_timeout=100\nnet.ifnames=0\nprintk.devkmsg=on\npanic=-1\nsoftlockup_panic=1\nnmi_watchdog=panic\noops=panic\nload_ramdisk=2\nprompt_ramdisk=0\ndrbd.minor_count=8\nsystemd.log_level=err\nignore_loglevel\nconsole=tty0\nearlyprintk=ttyS0,115200\nconsole=ttyS0,115200\nvga=normal\nrw' declare -x branch="linux-review/Ian-Rogers/perf-jevents-Autogenerate-empty-pmu-events-c/20240525-093240"
declare -x brand="Intel(R) Xeon(R) Platinum 8480+"
declare -x category="functional"
declare -x commit="3249f8b84526d3b69162812908c257ee9816a237"
declare -x compiler="gcc-13"
declare -x console="tty0"
declare -x enqueue_time="2024-06-13 09:44:38 +0800"
declare -x head_commit="e2c0a3562d2f7822c36edaf8449abbb95db9bd86"
declare -x id="321340fbc98d04a39a68e8fdcfd2415a4c02fe1b"
declare -x initrd="/osimage/debian/debian-12-x86_64-20240206.cgz"
declare -x initrds="linux_perf"
declare -x intremap="posted_msi"
declare -x ip="::::lkp-spr-2sp1::dhcp"
declare -x job="/lkp/jobs/scheduled/lkp-spr-2sp1/perf-sanity-tests-gcc-debian-12-x86_64-20240206.cgz-3249f8b84526-20240613-8245-291s0m-0.yaml"
declare -x job_file="/lkp/jobs/queued/int/lkp-spr-2sp1/perf-sanity-tests-gcc-debian-12-x86_64-20240206.cgz-3249f8b84526-20240613-8245-291s0m-0.yaml"
declare -x job_initrd="/lkp/jobs/scheduled/lkp-spr-2sp1/perf-sanity-tests-gcc-debian-12-x86_64-20240206.cgz-3249f8b84526-20240613-8245-291s0m-0.cgz"
declare -x job_origin="perf-sanity-tests.yaml"
declare -x kbuild_queue_analysis="1"
declare -x kconfig="x86_64-rhel-8.3-bpf"
declare -x kernel="/pkg/linux/x86_64-rhel-8.3-bpf/gcc-13/3249f8b84526d3b69162812908c257ee9816a237/vmlinuz-6.9.0-11004-g3249f8b84526"
declare -x kernel_cmdline_hw="acpi_rsdp=0x777fe014"
declare -x last_kernel="5.9.0-2-amd64"
declare -x linux_perf_initrd="/pkg/linux/x86_64-rhel-8.3-bpf/gcc-13/3249f8b84526d3b69162812908c257ee9816a237/linux-perf.cgz"
declare -x lkp_initrd="/osimage/user/xsang/lkp-x86_64.cgz"
declare -x load_ramdisk="2"
declare -x max_uptime="1200"
declare -x memory="256G"
declare -x model="Sapphire Rapids"
declare -x modules_initrd="/pkg/linux/x86_64-rhel-8.3-bpf/gcc-13/3249f8b84526d3b69162812908c257ee9816a237/modules.cgz"
declare -x need_memory="2G"
declare -x nmi_watchdog="panic"
declare -x nr_cpu="224"
declare -x nr_node="2"
declare -x nr_ssd_partitions="6"
declare -x oops="panic"
declare -x panic="-1"
declare -x prompt_ramdisk="0"
declare -x queue="int"
declare -x queue_cmdline_keys="user"
declare -x queuer_version="/lkp/xsang/.src-20240613-094320"
declare -x result_root="/result/perf-sanity-tests/gcc/lkp-spr-2sp1/debian-12-x86_64-20240206.cgz/x86_64-rhel-8.3-bpf/gcc-13/3249f8b84526d3b69162812908c257ee9816a237/20"
declare -x root="/dev/ram0"
declare -x selinux="0"
declare -x site="inn"
declare -x softlockup_panic="1"
declare -x suite="perf-sanity-tests"
declare -x tbox_group="lkp-spr-2sp1"
declare -x testbox="lkp-spr-2sp1"
declare -x testcase="perf-sanity-tests"
declare -x ucode="0x2b0004b1"
declare -x ucode_initrd="/osimage/ucode/intel-ucode-20230906.cgz"
declare -x vga="normal"

Quoted 3 lines

Thanks,
Ian

author reviewer
#10 lore raw

Re: [PATCH v2 2/2] perf jevents: Autogenerate empty-pmu-events.c

Quoted 10 lines · Oliver Sang
Quoted 10 lines
Quoted 10 lines

test-empty-pmu-events.c 2024-06-03 13:47:19.522463482 +0000 line 139

Quoted 10 lines

but make still failed. I still saw below in our build log

test-empty-pmu-events.c 2024-06-03 13:47:19.522463482 +0000 renamed from empty-pmu-events.c 2024-06-03 08:41:16.000000000 +0000 +1 -1
@@ -136,7 +136,7 @@
 { 2623 }, /* M3\000\0001 / M3\000\000\000\000\000\000\000\00000 */
 { 2078 }, /* cache_miss_cycles\000group1\000dcache_miss_cpi + icache_miss_cycles\000\000\000\000\000\000\000\00000 */
 { 1947 }, /* dcache_miss_cpi\000\000l1d\\-loads\\-misses / inst_retired.any\000\000\000\000\000\000\000\00000 */
-{ 2011 }, /* icache_miss_cycles\000\000l1i\\-loads\\-misses / inst_retiredany\000\000\000\000\000\000\000\00000 */
+{ 2011 }, /* icache_miss_cycles\000\000l1i\\-loads\\-misses / inst_retired.any\000\000\000\000\000\000\000\00000 */

Hi Oliver,

I tried to reproduce the problem by installing more locales on my machine, setting the environment variables, checking my environment variables, etc. I couldn't reproduce it. Looking more closely at the diff above and the other diffs in your email something strange appears to be happening around dots.

From:
--- pmu-events/empty-pmu-events.c
we know the minus lines are those from the files in this patch series. From:
+++ pmu-events/test-empty-pmu-events.c
we know the plus lines are those generated by jevents.py.

In the diff output above the "inst_retired.any" doesn't match "inst_retiredany" (no dot before the word "any"). The repository file pmu-events/empty-pmu-events.c is missing the dot in the event name but jevents.py is generating it, hence the diff. But looking at pmu-events/empty-pmu-events.c in:
https://lore.kernel.org/lkml/[email protected]/
The dot is present.

I think what is happening is that when you apply the patches for some reason the dots are being consumed in tools/perf/pmu-events/empty-pmu-events.c, the build then informs you of this by failing. The locales idea was a red herring and this has something to do with how you apply patches.

Does this make sense? Perhaps you can try testing the patches in an ordinary client applying the patches using something like "b4 am [email protected]". At the moment I think the patch series is good and I don't have a way to fix what I think the problem is, with how you applied the patches.

Thanks,
Ian

#11 lore raw

Re: [PATCH v2 2/2] perf jevents: Autogenerate empty-pmu-events.c

hi, Ian,

thanks a lot for detail analysis! we will check further.

Quoted 49 lines · Ian Rogers
Quoted 10 lines · Oliver Sang
Quoted 10 lines
Quoted 10 lines

test-empty-pmu-events.c 2024-06-03 13:47:19.522463482 +0000 line 139

Quoted 10 lines

but make still failed. I still saw below in our build log

test-empty-pmu-events.c 2024-06-03 13:47:19.522463482 +0000 renamed from empty-pmu-events.c 2024-06-03 08:41:16.000000000 +0000 +1 -1
@@ -136,7 +136,7 @@
 { 2623 }, /* M3\000\0001 / M3\000\000\000\000\000\000\000\00000 */
 { 2078 }, /* cache_miss_cycles\000group1\000dcache_miss_cpi + icache_miss_cycles\000\000\000\000\000\000\000\00000 */
 { 1947 }, /* dcache_miss_cpi\000\000l1d\\-loads\\-misses / inst_retired.any\000\000\000\000\000\000\000\00000 */
-{ 2011 }, /* icache_miss_cycles\000\000l1i\\-loads\\-misses / inst_retiredany\000\000\000\000\000\000\000\00000 */
+{ 2011 }, /* icache_miss_cycles\000\000l1i\\-loads\\-misses / inst_retired.any\000\000\000\000\000\000\000\00000 */

Hi Oliver,

I tried to reproduce the problem by installing more locales on my machine, setting the environment variables, checking my environment variables, etc. I couldn't reproduce it. Looking more closely at the diff above and the other diffs in your email something strange appears to be happening around dots.

From:
--- pmu-events/empty-pmu-events.c
we know the minus lines are those from the files in this patch series. From:
+++ pmu-events/test-empty-pmu-events.c
we know the plus lines are those generated by jevents.py.

In the diff output above the "inst_retired.any" doesn't match "inst_retiredany" (no dot before the word "any"). The repository file pmu-events/empty-pmu-events.c is missing the dot in the event name but jevents.py is generating it, hence the diff. But looking at pmu-events/empty-pmu-events.c in:
https://lore.kernel.org/lkml/[email protected]/
The dot is present.

I think what is happening is that when you apply the patches for some reason the dots are being consumed in tools/perf/pmu-events/empty-pmu-events.c, the build then informs you of this by failing. The locales idea was a red herring and this has something to do with how you apply patches.

Does this make sense? Perhaps you can try testing the patches in an ordinary client applying the patches using something like "b4 am [email protected]". At the moment I think the patch series is good and I don't have a way to fix what I think the problem is, with how you applied the patches.

Thanks,
Ian

author reviewer
#12 lore raw

Re: [PATCH v2 2/2] perf jevents: Autogenerate empty-pmu-events.c

Quoted 4 lines · Oliver Sang

hi, Ian,

thanks a lot for detail analysis! we will check further.

Hi Oliver,

I'd like to see these patches land, is there any follow up? I think the build breakage was patches applied incorrectly so I don't think there is any reason not to take the series.

Thanks,
Ian

#13 lore raw

Re: [PATCH v2 2/2] perf jevents: Autogenerate empty-pmu-events.c

hi, Ian,

Quoted 11 lines · Ian Rogers
Quoted 4 lines · Oliver Sang

hi, Ian,

thanks a lot for detail analysis! we will check further.

Hi Oliver,

I'd like to see these patches land, is there any follow up? I think the build breakage was patches applied incorrectly so I don't think there is any reason not to take the series.

yes, our code issue while applying patch. sorry about a wrong report due to it, and thanks again you helped a lot figure this out for us!

Quoted 3 lines

Thanks,
Ian