hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

perf test: Use full metric resolution 

The simple metric resolution doesn't handle recursion properly, switch
to use the full resolution as with the parse-metric tests which also
increases coverage. Don't set the values for the metric backward as
failures to generate a result are ignored.

Signed-off-by: Ian Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.garry@huawei.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Mike Leach <mike.leach@linaro.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Will Deacon <will@kernel.org>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Cc: linux-arm-kernel@lists.infradead.org
Link: https://lore.kernel.org/r/20220812230949.683239-9-irogers@google.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Ian Rogers 2022-08-12 16:09:43 -07:00 committed by Arnaldo Carvalho de Melo
parent 29be2fe0c1
commit 64234c141b
1 changed files with 77 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

222
tools/perf/tests/pmu-events.c
View File

@ -9,10 +9,12 @@
#include <linux/zalloc.h>
#include "debug.h"
#include "../pmu-events/pmu-events.h"
#include <perf/evlist.h>
#include "util/evlist.h"
#include "util/expr.h"
#include "util/parse-events.h"
#include "metricgroup.h"
#include "stat.h"
struct perf_pmu_test_event {
/* used for matching against events from generated pmu-events.c */
@ -801,27 +803,6 @@ static int check_parse_id(const char *id, struct parse_events_error *error,
return ret;
}
static int check_parse_cpu(const char *id, bool same_cpu, const struct pmu_event *pe)
{
struct parse_events_error error;
int ret;
parse_events_error__init(&error);
ret = check_parse_id(id, &error, NULL);
if (ret && same_cpu) {
pr_warning("Parse event failed metric '%s' id '%s' expr '%s'\n",
pe->metric_name, id, pe->metric_expr);
pr_warning("Error string '%s' help '%s'\n", error.str,
error.help);
} else if (ret) {
pr_debug3("Parse event failed, but for an event that may not be supported by this CPU.\nid '%s' metric '%s' expr '%s'\n",
id, pe->metric_name, pe->metric_expr);
ret = 0;
}
parse_events_error__exit(&error);
return ret;
}
static int check_parse_fake(const char *id)
{
struct parse_events_error error;
@ -838,160 +819,111 @@ struct metric {
struct metric_ref metric_ref;
};
static int resolve_metric_simple(struct expr_parse_ctx *pctx,
struct list_head *compound_list,
const struct pmu_event *map,
const char *metric_name)
{
struct hashmap_entry *cur, *cur_tmp;
struct metric *metric, *tmp;
size_t bkt;
bool all;
int rc;
do {
all = true;
hashmap__for_each_entry_safe(pctx->ids, cur, cur_tmp, bkt) {
struct metric_ref *ref;
const struct pmu_event *pe;
pe = metricgroup__find_metric(cur->key, map);
if (!pe)
continue;
if (!strcmp(metric_name, (char *)cur->key)) {
pr_warning("Recursion detected for metric %s\n", metric_name);
rc = -1;
goto out_err;
}
all = false;
/* The metric key itself needs to go out.. */
expr__del_id(pctx, cur->key);
metric = malloc(sizeof(*metric));
if (!metric) {
rc = -ENOMEM;
goto out_err;
}
ref = &metric->metric_ref;
ref->metric_name = pe->metric_name;
ref->metric_expr = pe->metric_expr;
list_add_tail(&metric->list, compound_list);
rc = expr__find_ids(pe->metric_expr, NULL, pctx);
if (rc)
goto out_err;
break; /* The hashmap has been modified, so restart */
}
} while (!all);
return 0;
out_err:
list_for_each_entry_safe(metric, tmp, compound_list, list)
free(metric);
return rc;
}
static void expr_failure(const char *msg, const struct pmu_event *pe)
{
pr_debug("%s\nOn metric %s\nOn expression %s\n", msg, pe->metric_name, pe->metric_expr);
}
struct test__parsing_data {
const struct pmu_event *cpus_table;
struct expr_parse_ctx *ctx;
int failures;
};
static int test__parsing_callback(const struct pmu_event *pe, const struct pmu_event *table,
void *vdata)
void *data)
{
struct test__parsing_data *data = vdata;
struct metric *metric, *tmp;
struct hashmap_entry *cur;
LIST_HEAD(compound_list);
size_t bkt;
int *failures = data;
int k;
double result;
struct evlist *evlist;
struct perf_cpu_map *cpus;
struct runtime_stat st;
struct evsel *evsel;
struct rblist metric_events = {
.nr_entries = 0,
};
int err = 0;
if (!pe->metric_expr)
return 0;
pr_debug("Found metric '%s'\n", pe->metric_name);
(*failures)++;
expr__ctx_clear(data->ctx);
if (expr__find_ids(pe->metric_expr, NULL, data->ctx) < 0) {
expr_failure("Parse find ids failed", pe);
data->failures++;
return 0;
/*
* We need to prepare evlist for stat mode running on CPU 0
* because that's where all the stats are going to be created.
*/
evlist = evlist__new();
if (!evlist)
return -ENOMEM;
cpus = perf_cpu_map__new("0");
if (!cpus) {
evlist__delete(evlist);
return -ENOMEM;
}
if (resolve_metric_simple(data->ctx, &compound_list, table,
pe->metric_name)) {
expr_failure("Could not resolve metrics", pe);
data->failures++;
return TEST_FAIL; /* Don't tolerate errors due to severity */
perf_evlist__set_maps(&evlist->core, cpus, NULL);
runtime_stat__init(&st);
err = metricgroup__parse_groups_test(evlist, table, pe->metric_name,
false, false,
&metric_events);
if (err) {
if (!strcmp(pe->metric_name, "M1") || !strcmp(pe->metric_name, "M2") ||
!strcmp(pe->metric_name, "M3")) {
(*failures)--;
pr_debug("Expected broken metric %s skipping\n", pe->metric_name);
err = 0;
}
goto out_err;
}
err = evlist__alloc_stats(evlist, false);
if (err)
goto out_err;
/*
* Add all ids with a made up value. The value may trigger divide by
* zero when subtracted and so try to make them unique.
*/
k = 1;
hashmap__for_each_entry(data->ctx->ids, cur, bkt)
expr__add_id_val(data->ctx, strdup(cur->key), k++);
hashmap__for_each_entry(data->ctx->ids, cur, bkt) {
if (check_parse_cpu(cur->key, table == data->cpus_table, pe))
data->failures++;
perf_stat__reset_shadow_stats();
evlist__for_each_entry(evlist, evsel) {
perf_stat__update_shadow_stats(evsel, k, 0, &st);
if (!strcmp(evsel->name, "duration_time"))
update_stats(&walltime_nsecs_stats, k);
k++;
}
evlist__for_each_entry(evlist, evsel) {
struct metric_event *me = metricgroup__lookup(&metric_events, evsel, false);
list_for_each_entry_safe(metric, tmp, &compound_list, list) {
expr__add_ref(data->ctx, &metric->metric_ref);
free(metric);
}
if (me != NULL) {
struct metric_expr *mexp;
if (expr__parse(&result, data->ctx, pe->metric_expr)) {
/*
* Parsing failed, make numbers go from large to small which can
* resolve divide by zero issues.
*/
k = 1024;
hashmap__for_each_entry(data->ctx->ids, cur, bkt)
expr__add_id_val(data->ctx, strdup(cur->key), k--);
if (expr__parse(&result, data->ctx, pe->metric_expr)) {
expr_failure("Parse failed", pe);
data->failures++;
list_for_each_entry (mexp, &me->head, nd) {
if (strcmp(mexp->metric_name, pe->metric_name))
continue;
pr_debug("Result %f\n", test_generic_metric(mexp, 0, &st));
err = 0;
(*failures)--;
goto out_err;
}
}
}
return 0;
pr_debug("Didn't find parsed metric %s", pe->metric_name);
err = 1;
out_err:
if (err)
pr_debug("Broken metric %s\n", pe->metric_name);
/* ... cleanup. */
metricgroup__rblist_exit(&metric_events);
runtime_stat__exit(&st);
evlist__free_stats(evlist);
perf_cpu_map__put(cpus);
evlist__delete(evlist);
return err;
}
static int test__parsing(struct test_suite *test __maybe_unused,
int subtest __maybe_unused)
{
struct test__parsing_data data = {
.cpus_table = pmu_events_table__find(),
.ctx = expr__ctx_new(),
.failures = 0,
};
int failures = 0;
if (!data.ctx) {
pr_debug("expr__ctx_new failed");
return TEST_FAIL;
}
pmu_for_each_core_event(test__parsing_callback, &data);
pmu_for_each_sys_event(test__parsing_callback, &data);
pmu_for_each_core_event(test__parsing_callback, &failures);
pmu_for_each_sys_event(test__parsing_callback, &failures);
expr__ctx_free(data.ctx);
return data.failures == 0 ? TEST_OK : TEST_FAIL;
return failures == 0 ? TEST_OK : TEST_FAIL;
}
struct test_metric {