| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <74e839ed-0733-d2db-7744-75921705ac5d@huawei.com>
Date: Fri, 5 Aug 2022 11:34:18 +0100
From: John Garry <john.garry@...wei.com>
To: Ian Rogers <irogers@...gle.com>, Will Deacon <will@...nel.org>,
"James Clark" <james.clark@....com>,
Mike Leach <mike.leach@...aro.org>,
Leo Yan <leo.yan@...aro.org>,
Peter Zijlstra <peterz@...radead.org>,
Ingo Molnar <mingo@...hat.com>,
Arnaldo Carvalho de Melo <acme@...nel.org>,
Mark Rutland <mark.rutland@....com>,
Alexander Shishkin <alexander.shishkin@...ux.intel.com>,
Jiri Olsa <jolsa@...nel.org>,
"Namhyung Kim" <namhyung@...nel.org>,
Andi Kleen <ak@...ux.intel.com>,
Zhengjun Xing <zhengjun.xing@...ux.intel.com>,
Ravi Bangoria <ravi.bangoria@....com>,
"Kan Liang" <kan.liang@...ux.intel.com>,
Adrian Hunter <adrian.hunter@...el.com>,
<linux-kernel@...r.kernel.org>,
<linux-arm-kernel@...ts.infradead.org>,
<linux-perf-users@...r.kernel.org>
CC: Stephane Eranian <eranian@...gle.com>
Subject: Re: [PATCH v4 04/17] perf jevent: Add an 'all' architecture argument
On 04/08/2022 23:18, Ian Rogers wrote:
> When 'all' is passed as the architecture generate a mapping table for
> all architectures. This simplifies testing. To identify the table for an
> architecture add an arch variable to the pmu_events_map.
so could this 'all' arg ever passed for perf test? I thought maybe we
could use to verify tables for all architectures - I didn't think that
we did it today.
Thanks,
John
>
> Signed-off-by: Ian Rogers <irogers@...gle.com>
> ---
> tools/perf/pmu-events/empty-pmu-events.c | 2 +
> tools/perf/pmu-events/jevents.py | 70 +++++++++++++++---------
> tools/perf/pmu-events/pmu-events.h | 1 +
> tools/perf/tests/pmu-events.c | 3 +-
> 4 files changed, 47 insertions(+), 29 deletions(-)
>
> diff --git a/tools/perf/pmu-events/empty-pmu-events.c b/tools/perf/pmu-events/empty-pmu-events.c
> index 77e655c6f116..d8cf9283e486 100644
> --- a/tools/perf/pmu-events/empty-pmu-events.c
> +++ b/tools/perf/pmu-events/empty-pmu-events.c
> @@ -110,12 +110,14 @@ static const struct pmu_event pme_test_soc_cpu[] = {
>
> const struct pmu_events_map pmu_events_map[] = {
> {
> + .arch = "testarch",
> .cpuid = "testcpu",
> .version = "v1",
> .type = "core",
> .table = pme_test_soc_cpu,
> },
> {
> + .arch = 0,
> .cpuid = 0,
> .version = 0,
> .type = 0,
> diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jevents.py
> index cdfa4e0e7557..e6e6c42c3f8a 100755
> --- a/tools/perf/pmu-events/jevents.py
> +++ b/tools/perf/pmu-events/jevents.py
> @@ -304,38 +304,45 @@ def process_one_file(parents: Sequence[str], item: os.DirEntry) -> None:
> print_events_table_entries(item, get_topic(item.name))
>
>
> -def print_mapping_table() -> None:
> +def print_mapping_table(archs: Sequence[str]) -> None:
> """Read the mapfile and generate the struct from cpuid string to event table."""
> - with open(f'{_args.starting_dir}/{_args.arch}/mapfile.csv') as csvfile:
> - table = csv.reader(csvfile)
> - _args.output_file.write(
> - 'const struct pmu_events_map pmu_events_map[] = {\n')
> - first = True
> - for row in table:
> - # Skip the first row or any row beginning with #.
> - if not first and len(row) > 0 and not row[0].startswith('#'):
> - tblname = file_name_to_table_name([], row[2].replace('/', '_'))
> - _args.output_file.write("""{
> -\t.cpuid = \"%s\",
> -\t.version = \"%s\",
> -\t.type = \"%s\",
> -\t.table = %s
> -},
> -""" % (row[0].replace('\\', '\\\\'), row[1], row[3], tblname))
> - first = False
> -
> - _args.output_file.write("""{
> + _args.output_file.write('const struct pmu_events_map pmu_events_map[] = {\n')
> + for arch in archs:
> + if arch == 'test':
> + _args.output_file.write("""{
> +\t.arch = "testarch",
> \t.cpuid = "testcpu",
> \t.version = "v1",
> \t.type = "core",
> \t.table = pme_test_soc_cpu,
> },
> -{
> +""")
> + else:
> + with open(f'{_args.starting_dir}/{arch}/mapfile.csv') as csvfile:
> + table = csv.reader(csvfile)
> + first = True
> + for row in table:
> + # Skip the first row or any row beginning with #.
> + if not first and len(row) > 0 and not row[0].startswith('#'):
> + tblname = file_name_to_table_name([], row[2].replace('/', '_'))
> + cpuid = row[0].replace('\\', '\\\\')
> + _args.output_file.write(f"""{{
> +\t.arch = "{arch}",
> +\t.cpuid = "{cpuid}",
> +\t.version = "{row[1]}",
> +\t.type = "{row[3]}",
> +\t.table = {tblname}
> +}},
> +""")
> + first = False
> +
> + _args.output_file.write("""{
> +\t.arch = 0,
> \t.cpuid = 0,
> \t.version = 0,
> \t.type = 0,
> \t.table = 0,
> -},
> +}
> };
> """)
>
> @@ -386,15 +393,24 @@ def main() -> None:
> _args = ap.parse_args()
>
> _args.output_file.write("#include \"pmu-events/pmu-events.h\"\n")
> - for path in [_args.arch, 'test']:
> - arch_path = f'{_args.starting_dir}/{path}'
> - if not os.path.isdir(arch_path):
> - raise IOError(f'Missing architecture directory in \'{arch_path}\'')
> + archs = []
> + for item in os.scandir(_args.starting_dir):
> + if not item.is_dir():
> + continue
> + if item.name == _args.arch or _args.arch == 'all' or item.name == 'test':
> + archs.append(item.name)
> +
> + if len(archs) < 2:
> + raise IOError(f'Missing architecture directory \'{_args.arch}\'')
> +
> + archs.sort()
> + for arch in archs:
> + arch_path = f'{_args.starting_dir}/{arch}'
> preprocess_arch_std_files(arch_path)
> ftw(arch_path, [], process_one_file)
> print_events_table_suffix()
>
> - print_mapping_table()
> + print_mapping_table(archs)
> print_system_mapping_table()
>
>
> diff --git a/tools/perf/pmu-events/pmu-events.h b/tools/perf/pmu-events/pmu-events.h
> index 6efe73976440..7a360792635f 100644
> --- a/tools/perf/pmu-events/pmu-events.h
> +++ b/tools/perf/pmu-events/pmu-events.h
> @@ -38,6 +38,7 @@ struct pmu_event {
> * The cpuid can contain any character other than the comma.
> */
> struct pmu_events_map {
> + const char *arch;
> const char *cpuid;
> const char *version;
> const char *type; /* core, uncore etc */
> diff --git a/tools/perf/tests/pmu-events.c b/tools/perf/tests/pmu-events.c
> index 263cbb67c861..82192f1a7bf7 100644
> --- a/tools/perf/tests/pmu-events.c
> +++ b/tools/perf/tests/pmu-events.c
> @@ -864,8 +864,7 @@ static void expr_failure(const char *msg,
> const struct pmu_events_map *map,
> const struct pmu_event *pe)
> {
> - pr_debug("%s for map %s %s %s\n",
> - msg, map->cpuid, map->version, map->type);
> + pr_debug("%s for map %s %s\n", msg, map->arch, map->cpuid);
> pr_debug("On metric %s\n", pe->metric_name);
> pr_debug("On expression %s\n", pe->metric_expr);
> }
Powered by blists - more mailing lists