* [PATCH v6 0/2] JSON output for perf stat
@ 2022-07-07 20:12 Ian Rogers
2022-07-07 20:12 ` [PATCH v6 1/2] perf stat: Add JSON output option Ian Rogers
2022-07-07 20:12 ` [PATCH v6 2/2] perf test: Json format checking Ian Rogers
0 siblings, 2 replies; 9+ messages in thread
From: Ian Rogers @ 2022-07-07 20:12 UTC (permalink / raw)
To: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim,
Kan Liang, Zhengjun Xing, Sandipan Das, Claire Jensen,
Alyssa Ross, Like Xu, James Clark, Florian Fischer, linux-kernel,
linux-perf-users, Claire Jensen
Cc: Stephane Eranian, Ian Rogers
Parsing the CSV or text output of perf stat can be problematic when
new output is added (columns in CSV format). JSON names values and
simplifies the job of parsing. Add a JSON output option to perf-stat
then add unit test that parses and validates the output.
This is a resend of two v2 patches:
https://lore.kernel.org/lkml/20210813220754.2104922-1-cjense@google.com/
https://lore.kernel.org/lkml/20210813220936.2105426-1-cjense@google.com/
with a few formatting changes and improvements to the linter.
v6. Is a rebase.
v5. Drops the merged CSV check, fixes a json test issue found by
Arnaldo and a typo.
v4. Does some minor fixes to the json linter.
v3. There is some tidy up of CSV code including a potential memory
over run in the os.nfields set up caught by sanitizers. To
facilitate this an AGGR_MAX value is added. v3 also adds the CSV
testing.
v2. Fixes the system wide no aggregation test to not run if the
paranoia is wrong. It also makes the counter-value check handle
the "<not counted>" and "<not supported>" cases.
Claire Jensen (2):
perf stat: Add JSON output option
perf test: Json format checking
tools/perf/Documentation/perf-stat.txt | 21 +
tools/perf/builtin-stat.c | 6 +
.../tests/shell/lib/perf_json_output_lint.py | 95 +++++
tools/perf/tests/shell/stat+json_output.sh | 147 +++++++
tools/perf/util/stat-display.c | 384 +++++++++++++-----
tools/perf/util/stat.c | 1 +
tools/perf/util/stat.h | 2 +
7 files changed, 550 insertions(+), 106 deletions(-)
create mode 100644 tools/perf/tests/shell/lib/perf_json_output_lint.py
create mode 100755 tools/perf/tests/shell/stat+json_output.sh
--
2.37.0.rc0.161.g10f37bed90-goog
^ permalink raw reply [flat|nested] 9+ messages in thread* [PATCH v6 1/2] perf stat: Add JSON output option 2022-07-07 20:12 [PATCH v6 0/2] JSON output for perf stat Ian Rogers @ 2022-07-07 20:12 ` Ian Rogers 2022-07-07 20:12 ` [PATCH v6 2/2] perf test: Json format checking Ian Rogers 1 sibling, 0 replies; 9+ messages in thread From: Ian Rogers @ 2022-07-07 20:12 UTC (permalink / raw) To: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo, Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim, Kan Liang, Zhengjun Xing, Sandipan Das, Claire Jensen, Alyssa Ross, Like Xu, James Clark, Florian Fischer, linux-kernel, linux-perf-users, Claire Jensen Cc: Stephane Eranian, Ian Rogers From: Claire Jensen <cjense@google.com> CSV output is tricky to format and column layout changes are susceptible to breaking parsers. New JSON-formatted output has variable names to identify fields that are consistent and informative, making the output parseable. CSV output example: 1.20,msec,task-clock:u,1204272,100.00,0.697,CPUs utilized 0,,context-switches:u,1204272,100.00,0.000,/sec 0,,cpu-migrations:u,1204272,100.00,0.000,/sec 70,,page-faults:u,1204272,100.00,58.126,K/sec JSON output example: {"counter-value" : "3805.723968", "unit" : "msec", "event" : "cpu-clock", "event-runtime" : 3805731510100.00, "pcnt-running" : 100.00, "metric-value" : 4.007571, "metric-unit" : "CPUs utilized"} {"counter-value" : "6166.000000", "unit" : "", "event" : "context-switches", "event-runtime" : 3805723045100.00, "pcnt-running" : 100.00, "metric-value" : 1.620191, "metric-unit" : "K/sec"} {"counter-value" : "466.000000", "unit" : "", "event" : "cpu-migrations", "event-runtime" : 3805727613100.00, "pcnt-running" : 100.00, "metric-value" : 122.447136, "metric-unit" : "/sec"} {"counter-value" : "208.000000", "unit" : "", "event" : "page-faults", "event-runtime" : 3805726799100.00, "pcnt-running" : 100.00, "metric-value" : 54.654516, "metric-unit" : "/sec"} Also added documentation for JSON option. There is some tidy up of CSV code including a potential memory over run in the os.nfields set up. To facilitate this an AGGR_MAX value is added. Signed-off-by: Claire Jensen <cjense@google.com> Signed-off-by: Ian Rogers <irogers@google.com> --- tools/perf/Documentation/perf-stat.txt | 21 ++ tools/perf/builtin-stat.c | 6 + tools/perf/util/stat-display.c | 384 ++++++++++++++++++------- tools/perf/util/stat.c | 1 + tools/perf/util/stat.h | 2 + 5 files changed, 308 insertions(+), 106 deletions(-) diff --git a/tools/perf/Documentation/perf-stat.txt b/tools/perf/Documentation/perf-stat.txt index d8a33f4a47c5..d7ff1867feda 100644 --- a/tools/perf/Documentation/perf-stat.txt +++ b/tools/perf/Documentation/perf-stat.txt @@ -570,6 +570,27 @@ Additional metrics may be printed with all earlier fields being empty. include::intel-hybrid.txt[] +JSON FORMAT +----------- + +With -j, perf stat is able to print out a JSON format output +that can be used for parsing. + +- timestamp : optional usec time stamp in fractions of second (with -I) +- optional aggregate options: + - core : core identifier (with --per-core) + - die : die identifier (with --per-die) + - socket : socket identifier (with --per-socket) + - node : node identifier (with --per-node) + - thread : thread identifier (with --per-thread) +- counter-value : counter value +- unit : unit of the counter value or empty +- event : event name +- variance : optional variance if multiple values are collected (with -r) +- runtime : run time of counter +- metric-value : optional metric value +- metric-unit : optional unit of metric + SEE ALSO -------- linkperf:perf-top[1], linkperf:perf-list[1] diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 4ce87a8eb7d7..6c7e59440e3a 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -1256,6 +1256,8 @@ static struct option stat_options[] = { "Merge identical named hybrid events"), OPT_STRING('x', "field-separator", &stat_config.csv_sep, "separator", "print counts with custom separator"), + OPT_BOOLEAN('j', "json-output", &stat_config.json_output, + "print counts in JSON format"), OPT_CALLBACK('G', "cgroup", &evsel_list, "name", "monitor event in cgroup name only", parse_stat_cgroups), OPT_STRING(0, "for-each-cgroup", &stat_config.cgroup_list, "name", @@ -1442,6 +1444,7 @@ static aggr_cpu_id_get_t aggr_mode__get_aggr(enum aggr_mode aggr_mode) case AGGR_GLOBAL: case AGGR_THREAD: case AGGR_UNSET: + case AGGR_MAX: default: return NULL; } @@ -1466,6 +1469,7 @@ static aggr_get_id_t aggr_mode__get_id(enum aggr_mode aggr_mode) case AGGR_GLOBAL: case AGGR_THREAD: case AGGR_UNSET: + case AGGR_MAX: default: return NULL; } @@ -1616,6 +1620,7 @@ static aggr_cpu_id_get_t aggr_mode__get_aggr_file(enum aggr_mode aggr_mode) case AGGR_GLOBAL: case AGGR_THREAD: case AGGR_UNSET: + case AGGR_MAX: default: return NULL; } @@ -1636,6 +1641,7 @@ static aggr_get_id_t aggr_mode__get_id_file(enum aggr_mode aggr_mode) case AGGR_GLOBAL: case AGGR_THREAD: case AGGR_UNSET: + case AGGR_MAX: default: return NULL; } diff --git a/tools/perf/util/stat-display.c b/tools/perf/util/stat-display.c index 606f09b09226..2bbd11446fa9 100644 --- a/tools/perf/util/stat-display.c +++ b/tools/perf/util/stat-display.c @@ -28,15 +28,21 @@ static void print_running(struct perf_stat_config *config, u64 run, u64 ena) { - if (config->csv_output) { - fprintf(config->output, "%s%" PRIu64 "%s%.2f", - config->csv_sep, - run, - config->csv_sep, - ena ? 100.0 * run / ena : 100.0); - } else if (run != ena) { + + double enabled_percent = 100; + + if (run != ena) + enabled_percent = 100 * run / ena; + if (config->json_output) + fprintf(config->output, + "\"event-runtime\" : %lu, \"pcnt-running\" : %.2f, ", + run, enabled_percent); + else if (config->csv_output) + fprintf(config->output, + "%s%" PRIu64 "%s%.2f", config->csv_sep, + run, config->csv_sep, enabled_percent); + else if (run != ena) fprintf(config->output, " (%.2f%%)", 100.0 * run / ena); - } } static void print_noise_pct(struct perf_stat_config *config, @@ -44,7 +50,9 @@ static void print_noise_pct(struct perf_stat_config *config, { double pct = rel_stddev_stats(total, avg); - if (config->csv_output) + if (config->json_output) + fprintf(config->output, "\"variance\" : %.2f, ", pct); + else if (config->csv_output) fprintf(config->output, "%s%.2f%%", config->csv_sep, pct); else if (pct) fprintf(config->output, " ( +-%6.2f%% )", pct); @@ -66,7 +74,11 @@ static void print_cgroup(struct perf_stat_config *config, struct evsel *evsel) { if (nr_cgroups) { const char *cgrp_name = evsel->cgrp ? evsel->cgrp->name : ""; - fprintf(config->output, "%s%s", config->csv_sep, cgrp_name); + + if (config->json_output) + fprintf(config->output, "\"cgroup\" : \"%s\", ", cgrp_name); + else + fprintf(config->output, "%s%s", config->csv_sep, cgrp_name); } } @@ -74,69 +86,123 @@ static void print_cgroup(struct perf_stat_config *config, struct evsel *evsel) static void aggr_printout(struct perf_stat_config *config, struct evsel *evsel, struct aggr_cpu_id id, int nr) { + + + if (config->json_output && !config->interval) + fprintf(config->output, "{"); + switch (config->aggr_mode) { case AGGR_CORE: - fprintf(config->output, "S%d-D%d-C%*d%s%*d%s", - id.socket, - id.die, - config->csv_output ? 0 : -8, - id.core, - config->csv_sep, - config->csv_output ? 0 : 4, - nr, - config->csv_sep); + if (config->json_output) { + fprintf(config->output, + "\"core\" : \"S%d-D%d-C%d\", \"aggregate-number\" : %d, ", + id.socket, + id.die, + id.core, + nr); + } else { + fprintf(config->output, "S%d-D%d-C%*d%s%*d%s", + id.socket, + id.die, + config->csv_output ? 0 : -8, + id.core, + config->csv_sep, + config->csv_output ? 0 : 4, + nr, + config->csv_sep); + } break; case AGGR_DIE: - fprintf(config->output, "S%d-D%*d%s%*d%s", - id.socket, - config->csv_output ? 0 : -8, - id.die, - config->csv_sep, - config->csv_output ? 0 : 4, - nr, - config->csv_sep); + if (config->json_output) { + fprintf(config->output, + "\"die\" : \"S%d-D%d\", \"aggregate-number\" : %d, ", + id.socket, + id.die, + nr); + } else { + fprintf(config->output, "S%d-D%*d%s%*d%s", + id.socket, + config->csv_output ? 0 : -8, + id.die, + config->csv_sep, + config->csv_output ? 0 : 4, + nr, + config->csv_sep); + } break; case AGGR_SOCKET: - fprintf(config->output, "S%*d%s%*d%s", - config->csv_output ? 0 : -5, - id.socket, - config->csv_sep, - config->csv_output ? 0 : 4, - nr, - config->csv_sep); - break; + if (config->json_output) { + fprintf(config->output, + "\"socket\" : \"S%d\", \"aggregate-number\" : %d, ", + id.socket, + nr); + } else { + fprintf(config->output, "S%*d%s%*d%s", + config->csv_output ? 0 : -5, + id.socket, + config->csv_sep, + config->csv_output ? 0 : 4, + nr, + config->csv_sep); + } + break; case AGGR_NODE: - fprintf(config->output, "N%*d%s%*d%s", - config->csv_output ? 0 : -5, - id.node, - config->csv_sep, - config->csv_output ? 0 : 4, - nr, - config->csv_sep); - break; + if (config->json_output) { + fprintf(config->output, "\"node\" : \"N%d\", \"aggregate-number\" : %d, ", + id.node, + nr); + } else { + fprintf(config->output, "N%*d%s%*d%s", + config->csv_output ? 0 : -5, + id.node, + config->csv_sep, + config->csv_output ? 0 : 4, + nr, + config->csv_sep); + } + break; case AGGR_NONE: - if (evsel->percore && !config->percore_show_thread) { - fprintf(config->output, "S%d-D%d-C%*d%s", - id.socket, - id.die, - config->csv_output ? 0 : -3, - id.core, config->csv_sep); - } else if (id.cpu.cpu > -1) { - fprintf(config->output, "CPU%*d%s", - config->csv_output ? 0 : -7, - id.cpu.cpu, config->csv_sep); + if (config->json_output) { + if (evsel->percore && !config->percore_show_thread) { + fprintf(config->output, "\"core\" : \"S%d-D%d-C%d\"", + id.socket, + id.die, + id.core); + } else if (id.core > -1) { + fprintf(config->output, "\"cpu\" : \"%d\", ", + id.cpu.cpu); + } + } else { + if (evsel->percore && !config->percore_show_thread) { + fprintf(config->output, "S%d-D%d-C%*d%s", + id.socket, + id.die, + config->csv_output ? 0 : -3, + id.core, config->csv_sep); + } else if (id.core > -1) { + fprintf(config->output, "CPU%*d%s", + config->csv_output ? 0 : -7, + id.cpu.cpu, config->csv_sep); + } } break; case AGGR_THREAD: - fprintf(config->output, "%*s-%*d%s", - config->csv_output ? 0 : 16, - perf_thread_map__comm(evsel->core.threads, id.thread), - config->csv_output ? 0 : -8, - perf_thread_map__pid(evsel->core.threads, id.thread), - config->csv_sep); + if (config->json_output) { + fprintf(config->output, "\"thread\" : \"%s-%d\", ", + perf_thread_map__comm(evsel->core.threads, id.thread), + perf_thread_map__pid(evsel->core.threads, id.thread)); + } else { + fprintf(config->output, "%*s-%*d%s", + config->csv_output ? 0 : 16, + perf_thread_map__comm(evsel->core.threads, id.thread), + config->csv_output ? 0 : -8, + perf_thread_map__pid(evsel->core.threads, id.thread), + config->csv_sep); + } break; case AGGR_GLOBAL: case AGGR_UNSET: + case AGGR_MAX: default: break; } @@ -234,6 +300,31 @@ static void print_metric_csv(struct perf_stat_config *config __maybe_unused, fprintf(out, "%s%s%s%s", config->csv_sep, vals, config->csv_sep, skip_spaces(unit)); } +static void print_metric_json(struct perf_stat_config *config __maybe_unused, + void *ctx, + const char *color __maybe_unused, + const char *fmt __maybe_unused, + const char *unit, double val) +{ + struct outstate *os = ctx; + FILE *out = os->fh; + + fprintf(out, "\"metric-value\" : %f, ", val); + fprintf(out, "\"metric-unit\" : \"%s\"", unit); + if (!config->metric_only) + fprintf(out, "}"); +} + +static void new_line_json(struct perf_stat_config *config, void *ctx) +{ + struct outstate *os = ctx; + + fputc('\n', os->fh); + if (os->prefix) + fprintf(os->fh, "%s", os->prefix); + aggr_printout(config, os->evsel, os->id, os->nr); +} + /* Filter out some columns that don't work well in metrics only mode */ static bool valid_only_metric(const char *unit) @@ -300,6 +391,27 @@ static void print_metric_only_csv(struct perf_stat_config *config __maybe_unused fprintf(out, "%s%s", vals, config->csv_sep); } +static void print_metric_only_json(struct perf_stat_config *config __maybe_unused, + void *ctx, const char *color __maybe_unused, + const char *fmt, + const char *unit, double val) +{ + struct outstate *os = ctx; + FILE *out = os->fh; + char buf[64], *vals, *ends; + char tbuf[1024]; + + if (!valid_only_metric(unit)) + return; + unit = fixunit(tbuf, os->evsel, unit); + snprintf(buf, sizeof(buf), fmt, val); + ends = vals = skip_spaces(buf); + while (isdigit(*ends) || *ends == '.') + ends++; + *ends = 0; + fprintf(out, "{\"metric-value\" : \"%s\"}", vals); +} + static void new_line_metric(struct perf_stat_config *config __maybe_unused, void *ctx __maybe_unused) { @@ -318,10 +430,13 @@ static void print_metric_header(struct perf_stat_config *config, os->evsel->priv != os->evsel->evlist->selected->priv) return; - if (!valid_only_metric(unit)) + if (!valid_only_metric(unit) && !config->json_output) return; unit = fixunit(tbuf, os->evsel, unit); - if (config->csv_output) + + if (config->json_output) + fprintf(os->fh, "\"unit\" : \"%s\"", unit); + else if (config->csv_output) fprintf(os->fh, "%s%s", unit, config->csv_sep); else fprintf(os->fh, "%*s ", config->metric_only_len, unit); @@ -367,14 +482,28 @@ static void abs_printout(struct perf_stat_config *config, aggr_printout(config, evsel, id, nr); - fprintf(output, fmt, avg, config->csv_sep); + if (config->json_output) + fprintf(output, "\"counter-value\" : \"%f\", ", avg); + else + fprintf(output, fmt, avg, config->csv_sep); + + if (config->json_output) { + if (evsel->unit) { + fprintf(output, "\"unit\" : \"%s\", ", + evsel->unit); + } + } else { + if (evsel->unit) + fprintf(output, "%-*s%s", + config->csv_output ? 0 : config->unit_width, + evsel->unit, config->csv_sep); + } - if (evsel->unit) - fprintf(output, "%-*s%s", - config->csv_output ? 0 : config->unit_width, - evsel->unit, config->csv_sep); - fprintf(output, "%-*s", config->csv_output ? 0 : 25, evsel__name(evsel)); + if (config->json_output) + fprintf(output, "\"event\" : \"%s\", ", evsel__name(evsel)); + else + fprintf(output, "%-*s", config->csv_output ? 0 : 25, evsel__name(evsel)); print_cgroup(config, evsel); } @@ -416,34 +545,30 @@ static void printout(struct perf_stat_config *config, struct aggr_cpu_id id, int .nr = nr, .evsel = counter, }; - print_metric_t pm = print_metric_std; + print_metric_t pm; new_line_t nl; - if (config->metric_only) { - nl = new_line_metric; - if (config->csv_output) - pm = print_metric_only_csv; - else - pm = print_metric_only; - } else - nl = new_line_std; - - if (config->csv_output && !config->metric_only) { - static int aggr_fields[] = { - [AGGR_GLOBAL] = 0, - [AGGR_THREAD] = 1, + if (config->csv_output) { + static const int aggr_fields[AGGR_MAX] = { [AGGR_NONE] = 1, + [AGGR_GLOBAL] = 0, [AGGR_SOCKET] = 2, [AGGR_DIE] = 2, [AGGR_CORE] = 2, + [AGGR_THREAD] = 1, + [AGGR_UNSET] = 0, + [AGGR_NODE] = 0, }; - pm = print_metric_csv; - nl = new_line_csv; - os.nfields = 3; - os.nfields += aggr_fields[config->aggr_mode]; - if (counter->cgrp) - os.nfields++; + pm = config->metric_only ? print_metric_only_csv : print_metric_csv; + nl = config->metric_only ? new_line_metric : new_line_csv; + os.nfields = 3 + aggr_fields[config->aggr_mode] + (counter->cgrp ? 1 : 0); + } else if (config->json_output) { + pm = config->metric_only ? print_metric_only_json : print_metric_json; + nl = config->metric_only ? new_line_metric : new_line_json; + } else { + pm = config->metric_only ? print_metric_only : print_metric_std; + nl = config->metric_only ? new_line_metric : new_line_std; } if (!config->no_csv_summary && config->csv_output && @@ -458,10 +583,15 @@ static void printout(struct perf_stat_config *config, struct aggr_cpu_id id, int } aggr_printout(config, counter, id, nr); - fprintf(config->output, "%*s%s", - config->csv_output ? 0 : 18, - counter->supported ? CNTR_NOT_COUNTED : CNTR_NOT_SUPPORTED, - config->csv_sep); + if (config->json_output) { + fprintf(config->output, "\"counter-value\" : \"%s\", ", + counter->supported ? CNTR_NOT_COUNTED : CNTR_NOT_SUPPORTED); + } else { + fprintf(config->output, "%*s%s", + config->csv_output ? 0 : 18, + counter->supported ? CNTR_NOT_COUNTED : CNTR_NOT_SUPPORTED, + config->csv_sep); + } if (counter->supported) { if (!evlist__has_hybrid(counter->evlist)) { @@ -471,21 +601,32 @@ static void printout(struct perf_stat_config *config, struct aggr_cpu_id id, int } } - fprintf(config->output, "%-*s%s", - config->csv_output ? 0 : config->unit_width, - counter->unit, config->csv_sep); + if (config->json_output) { + fprintf(config->output, "\"unit\" : \"%s\", ", counter->unit); + } else { + fprintf(config->output, "%-*s%s", + config->csv_output ? 0 : config->unit_width, + counter->unit, config->csv_sep); + } - fprintf(config->output, "%*s", - config->csv_output ? 0 : -25, evsel__name(counter)); + if (config->json_output) { + fprintf(config->output, "\"event\" : \"%s\", ", + evsel__name(counter)); + } else { + fprintf(config->output, "%*s", + config->csv_output ? 0 : -25, evsel__name(counter)); + } print_cgroup(config, counter); - if (!config->csv_output) + if (!config->csv_output && !config->json_output) pm(config, &os, NULL, NULL, "", 0); print_noise(config, counter, noise); print_running(config, run, ena); if (config->csv_output) pm(config, &os, NULL, NULL, "", 0); + else if (config->json_output) + pm(config, &os, NULL, NULL, "", 0); return; } @@ -500,12 +641,15 @@ static void printout(struct perf_stat_config *config, struct aggr_cpu_id id, int if (config->csv_output && !config->metric_only) { print_noise(config, counter, noise); print_running(config, run, ena); + } else if (config->json_output && !config->metric_only) { + print_noise(config, counter, noise); + print_running(config, run, ena); } perf_stat__print_shadow_stats(config, counter, uval, first_shadow_cpu_map_idx(config, counter, &id), &out, &config->metric_events, st); - if (!config->csv_output && !config->metric_only) { + if (!config->csv_output && !config->metric_only && !config->json_output) { print_noise(config, counter, noise); print_running(config, run, ena); } @@ -1004,8 +1148,12 @@ static void print_metric_headers(struct perf_stat_config *config, struct outstate os = { .fh = config->output }; + bool first = true; + + if (config->json_output && !config->interval) + fprintf(config->output, "{"); - if (prefix) + if (prefix && !config->json_output) fprintf(config->output, "%s", prefix); if (!config->csv_output && !no_indent) @@ -1025,6 +1173,9 @@ static void print_metric_headers(struct perf_stat_config *config, os.evsel = counter; out.ctx = &os; out.print_metric = print_metric_header; + if (!first && config->json_output) + fprintf(config->output, ", "); + first = false; out.new_line = new_line_metric; out.force_header = true; perf_stat__print_shadow_stats(config, counter, 0, @@ -1033,6 +1184,8 @@ static void print_metric_headers(struct perf_stat_config *config, &config->metric_events, &rt_stat); } + if (config->json_output) + fprintf(config->output, "}"); fputc('\n', config->output); } @@ -1048,10 +1201,18 @@ static void print_interval(struct perf_stat_config *config, if (config->interval_clear) puts(CONSOLE_CLEAR); - if (!config->iostat_run) - sprintf(prefix, "%6lu.%09lu%s", (unsigned long) ts->tv_sec, ts->tv_nsec, config->csv_sep); - - if ((num_print_interval == 0 && !config->csv_output) || config->interval_clear) { + if (!config->iostat_run && !config->json_output) + sprintf(prefix, "%6lu.%09lu%s", (unsigned long) ts->tv_sec, + ts->tv_nsec, config->csv_sep); + if (!config->iostat_run && config->json_output && !config->metric_only) + sprintf(prefix, "{\"interval\" : %lu.%09lu, ", (unsigned long) + ts->tv_sec, ts->tv_nsec); + if (!config->iostat_run && config->json_output && config->metric_only) + sprintf(prefix, "{\"interval\" : %lu.%09lu}", (unsigned long) + ts->tv_sec, ts->tv_nsec); + + if ((num_print_interval == 0 && !config->csv_output && !config->json_output) + || config->interval_clear) { switch (config->aggr_mode) { case AGGR_NODE: fprintf(output, "# time node cpus"); @@ -1091,12 +1252,19 @@ static void print_interval(struct perf_stat_config *config, fprintf(output, " counts %*s events\n", unit_width, "unit"); } case AGGR_UNSET: + case AGGR_MAX: break; } } - if ((num_print_interval == 0 || config->interval_clear) && metric_only) + if ((num_print_interval == 0 || config->interval_clear) + && metric_only && !config->json_output) print_metric_headers(config, evlist, " ", true); + if ((num_print_interval == 0 || config->interval_clear) + && metric_only && config->json_output) { + fprintf(output, "{"); + print_metric_headers(config, evlist, " ", true); + } if (++num_print_interval == 25) num_print_interval = 0; } @@ -1110,7 +1278,7 @@ static void print_header(struct perf_stat_config *config, fflush(stdout); - if (!config->csv_output) { + if (!config->csv_output && !config->json_output) { fprintf(output, "\n"); fprintf(output, " Performance counter stats for "); if (_target->bpf_str) @@ -1303,6 +1471,9 @@ void evlist__print_counters(struct evlist *evlist, struct perf_stat_config *conf num_print_iv = 0; if (config->aggr_mode == AGGR_GLOBAL && prefix && !config->iostat_run) fprintf(config->output, "%s", prefix); + + if (config->json_output && !config->metric_only) + fprintf(config->output, "}"); } switch (config->aggr_mode) { @@ -1341,12 +1512,13 @@ void evlist__print_counters(struct evlist *evlist, struct perf_stat_config *conf } } break; + case AGGR_MAX: case AGGR_UNSET: default: break; } - if (!interval && !config->csv_output) + if (!interval && !config->csv_output && !config->json_output) print_footer(config); fflush(config->output); diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c index 37ea2d044708..0882b4754fcf 100644 --- a/tools/perf/util/stat.c +++ b/tools/perf/util/stat.c @@ -401,6 +401,7 @@ process_counter_values(struct perf_stat_config *config, struct evsel *evsel, aggr->ena += count->ena; aggr->run += count->run; case AGGR_UNSET: + case AGGR_MAX: default: break; } diff --git a/tools/perf/util/stat.h b/tools/perf/util/stat.h index b5aeb8e6d34b..668250022f8c 100644 --- a/tools/perf/util/stat.h +++ b/tools/perf/util/stat.h @@ -57,6 +57,7 @@ enum aggr_mode { AGGR_THREAD, AGGR_UNSET, AGGR_NODE, + AGGR_MAX }; enum { @@ -121,6 +122,7 @@ struct perf_stat_config { bool no_inherit; bool identifier; bool csv_output; + bool json_output; bool interval_clear; bool metric_only; bool null_run; -- 2.37.0.rc0.161.g10f37bed90-goog ^ permalink raw reply related [flat|nested] 9+ messages in thread
* [PATCH v6 2/2] perf test: Json format checking 2022-07-07 20:12 [PATCH v6 0/2] JSON output for perf stat Ian Rogers 2022-07-07 20:12 ` [PATCH v6 1/2] perf stat: Add JSON output option Ian Rogers @ 2022-07-07 20:12 ` Ian Rogers 2022-07-08 8:31 ` Thomas Richter 2022-07-18 15:44 ` Arnaldo Carvalho de Melo 1 sibling, 2 replies; 9+ messages in thread From: Ian Rogers @ 2022-07-07 20:12 UTC (permalink / raw) To: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo, Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim, Kan Liang, Zhengjun Xing, Sandipan Das, Claire Jensen, Alyssa Ross, Like Xu, James Clark, Florian Fischer, linux-kernel, linux-perf-users, Claire Jensen Cc: Stephane Eranian, Ian Rogers From: Claire Jensen <cjense@google.com> Add field checking tests for perf stat JSON output. Sanity checks the expected number of fields are present, that the expected keys are present and they have the correct values. Signed-off-by: Claire Jensen <cjense@google.com> Signed-off-by: Ian Rogers <irogers@google.com> --- .../tests/shell/lib/perf_json_output_lint.py | 95 +++++++++++ tools/perf/tests/shell/stat+json_output.sh | 147 ++++++++++++++++++ 2 files changed, 242 insertions(+) create mode 100644 tools/perf/tests/shell/lib/perf_json_output_lint.py create mode 100755 tools/perf/tests/shell/stat+json_output.sh diff --git a/tools/perf/tests/shell/lib/perf_json_output_lint.py b/tools/perf/tests/shell/lib/perf_json_output_lint.py new file mode 100644 index 000000000000..aaa4a8677b6c --- /dev/null +++ b/tools/perf/tests/shell/lib/perf_json_output_lint.py @@ -0,0 +1,95 @@ +#!/usr/bin/python +# SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) +# Basic sanity check of perf JSON output as specified in the man page. + +import argparse +import sys +import json + +ap = argparse.ArgumentParser() +ap.add_argument('--no-args', action='store_true') +ap.add_argument('--interval', action='store_true') +ap.add_argument('--system-wide-no-aggr', action='store_true') +ap.add_argument('--system-wide', action='store_true') +ap.add_argument('--event', action='store_true') +ap.add_argument('--per-core', action='store_true') +ap.add_argument('--per-thread', action='store_true') +ap.add_argument('--per-die', action='store_true') +ap.add_argument('--per-node', action='store_true') +ap.add_argument('--per-socket', action='store_true') +args = ap.parse_args() + +Lines = sys.stdin.readlines() + +def isfloat(num): + try: + float(num) + return True + except ValueError: + return False + + +def isint(num): + try: + int(num) + return True + except ValueError: + return False + +def is_counter_value(num): + return isfloat(num) or num == '<not counted>' or num == '<not supported>' + +def check_json_output(expected_items): + if expected_items != -1: + for line in Lines: + if 'failed' not in line: + count = 0 + count = line.count(',') + if count != expected_items and (count == 1 or count == 2) and 'metric-value' in line: + # Events that generate >1 metric may have isolated metric + # values and possibly have an interval prefix. + continue + if count != expected_items: + raise RuntimeError(f'wrong number of fields. counted {count} expected {expected_items}' + f' in \'{line}\'') + checks = { + 'aggregate-number': lambda x: isfloat(x), + 'core': lambda x: True, + 'counter-value': lambda x: is_counter_value(x), + 'cgroup': lambda x: True, + 'cpu': lambda x: isint(x), + 'die': lambda x: True, + 'event': lambda x: True, + 'event-runtime': lambda x: isfloat(x), + 'interval': lambda x: isfloat(x), + 'metric-unit': lambda x: True, + 'metric-value': lambda x: isfloat(x), + 'node': lambda x: True, + 'pcnt-running': lambda x: isfloat(x), + 'socket': lambda x: True, + 'thread': lambda x: True, + 'unit': lambda x: True, + } + input = '[\n' + ','.join(Lines) + '\n]' + for item in json.loads(input): + for key, value in item.items(): + if key not in checks: + raise RuntimeError(f'Unexpected key: key={key} value={value}') + if not checks[key](value): + raise RuntimeError(f'Check failed for: key={key} value={value}') + + +try: + if args.no_args or args.system_wide or args.event: + expected_items = 6 + elif args.interval or args.per_thread or args.system_wide_no_aggr: + expected_items = 7 + elif args.per_core or args.per_socket or args.per_node or args.per_die: + expected_items = 8 + else: + # If no option is specified, don't check the number of items. + expected_items = -1 + check_json_output(expected_items) +except: + print('Test failed for input:\n' + '\n'.join(Lines)) + raise diff --git a/tools/perf/tests/shell/stat+json_output.sh b/tools/perf/tests/shell/stat+json_output.sh new file mode 100755 index 000000000000..ea8714a36051 --- /dev/null +++ b/tools/perf/tests/shell/stat+json_output.sh @@ -0,0 +1,147 @@ +#!/bin/bash +# perf stat JSON output linter +# SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) +# Checks various perf stat JSON output commands for the +# correct number of fields. + +set -e + +pythonchecker=$(dirname $0)/lib/perf_json_output_lint.py +if [ "x$PYTHON" == "x" ] +then + if which python3 > /dev/null + then + PYTHON=python3 + elif which python > /dev/null + then + PYTHON=python + else + echo Skipping test, python not detected please set environment variable PYTHON. + exit 2 + fi +fi + +# Return true if perf_event_paranoid is > $1 and not running as root. +function ParanoidAndNotRoot() +{ + [ $(id -u) != 0 ] && [ $(cat /proc/sys/kernel/perf_event_paranoid) -gt $1 ] +} + +check_no_args() +{ + echo -n "Checking json output: no args " + perf stat -j true 2>&1 | $PYTHON $pythonchecker --no-args + echo "[Success]" +} + +check_system_wide() +{ + echo -n "Checking json output: system wide " + if ParanoidAndNotRoot 0 + then + echo "[Skip] paranoia and not root" + return + fi + perf stat -j -a true 2>&1 | $PYTHON $pythonchecker --system-wide + echo "[Success]" +} + +check_system_wide_no_aggr() +{ + echo -n "Checking json output: system wide " + if ParanoidAndNotRoot 0 + then + echo "[Skip] paranoia and not root" + return + fi + echo -n "Checking json output: system wide no aggregation " + perf stat -j -A -a --no-merge true 2>&1 | $PYTHON $pythonchecker --system-wide-no-aggr + echo "[Success]" +} + +check_interval() +{ + echo -n "Checking json output: interval " + perf stat -j -I 1000 true 2>&1 | $PYTHON $pythonchecker --interval + echo "[Success]" +} + + +check_event() +{ + echo -n "Checking json output: event " + perf stat -j -e cpu-clock true 2>&1 | $PYTHON $pythonchecker --event + echo "[Success]" +} + +check_per_core() +{ + echo -n "Checking json output: per core " + if ParanoidAndNotRoot 0 + then + echo "[Skip] paranoia and not root" + return + fi + perf stat -j --per-core -a true 2>&1 | $PYTHON $pythonchecker --per-core + echo "[Success]" +} + +check_per_thread() +{ + echo -n "Checking json output: per thread " + if ParanoidAndNotRoot 0 + then + echo "[Skip] paranoia and not root" + return + fi + perf stat -j --per-thread -a true 2>&1 | $PYTHON $pythonchecker --per-thread + echo "[Success]" +} + +check_per_die() +{ + echo -n "Checking json output: per die " + if ParanoidAndNotRoot 0 + then + echo "[Skip] paranoia and not root" + return + fi + perf stat -j --per-die -a true 2>&1 | $PYTHON $pythonchecker --per-die + echo "[Success]" +} + +check_per_node() +{ + echo -n "Checking json output: per node " + if ParanoidAndNotRoot 0 + then + echo "[Skip] paranoia and not root" + return + fi + perf stat -j --per-node -a true 2>&1 | $PYTHON $pythonchecker --per-node + echo "[Success]" +} + +check_per_socket() +{ + echo -n "Checking json output: per socket " + if ParanoidAndNotRoot 0 + then + echo "[Skip] paranoia and not root" + return + fi + perf stat -j --per-socket -a true 2>&1 | $PYTHON $pythonchecker --per-socket + echo "[Success]" +} + +check_no_args +check_system_wide +check_system_wide_no_aggr +check_interval +check_event +check_per_core +check_per_thread +check_per_die +check_per_node +check_per_socket +exit 0 -- 2.37.0.rc0.161.g10f37bed90-goog ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v6 2/2] perf test: Json format checking 2022-07-07 20:12 ` [PATCH v6 2/2] perf test: Json format checking Ian Rogers @ 2022-07-08 8:31 ` Thomas Richter 2022-07-08 15:39 ` Ian Rogers 2022-07-18 15:44 ` Arnaldo Carvalho de Melo 1 sibling, 1 reply; 9+ messages in thread From: Thomas Richter @ 2022-07-08 8:31 UTC (permalink / raw) To: Ian Rogers, Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo, Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim, Kan Liang, Zhengjun Xing, Sandipan Das, Claire Jensen, Alyssa Ross, Like Xu, James Clark, Florian Fischer, linux-kernel, linux-perf-users, Claire Jensen Cc: Stephane Eranian On 7/7/22 22:12, Ian Rogers wrote: > From: Claire Jensen <cjense@google.com> > > Add field checking tests for perf stat JSON output. > Sanity checks the expected number of fields are present, that the > expected keys are present and they have the correct values. > > Signed-off-by: Claire Jensen <cjense@google.com> > Signed-off-by: Ian Rogers <irogers@google.com> > --- > .../tests/shell/lib/perf_json_output_lint.py | 95 +++++++++++ > tools/perf/tests/shell/stat+json_output.sh | 147 ++++++++++++++++++ > 2 files changed, 242 insertions(+) > create mode 100644 tools/perf/tests/shell/lib/perf_json_output_lint.py > create mode 100755 tools/perf/tests/shell/stat+json_output.sh > .... I wonder if it is really necessary to have a python file to post process the perf stat output? With commit 7473ee56dbc9 ("perf test: Add checking for perf stat CSV output.") the same approach was done which led to issues on s390 and required an additional patch to fix this: commit ec906102e5b7 ("perf test: Fix "perf stat CSV output linter" test on s390"). I wonder if you can do the perf stat output checking using bash/linux tools as it was done in commit ec906102e5b7. This would make maintenance much easier. Just me 2 cents... -- Thomas Richter, Dept 3303, IBM s390 Linux Development, Boeblingen, Germany -- Vorsitzender des Aufsichtsrats: Gregor Pillen Geschäftsführung: David Faller Sitz der Gesellschaft: Böblingen / Registergericht: Amtsgericht Stuttgart, HRB 243294 ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v6 2/2] perf test: Json format checking 2022-07-08 8:31 ` Thomas Richter @ 2022-07-08 15:39 ` Ian Rogers 0 siblings, 0 replies; 9+ messages in thread From: Ian Rogers @ 2022-07-08 15:39 UTC (permalink / raw) To: Thomas Richter Cc: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo, Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim, Kan Liang, Zhengjun Xing, Sandipan Das, Claire Jensen, Alyssa Ross, Like Xu, James Clark, Florian Fischer, linux-kernel, linux-perf-users, Claire Jensen, Stephane Eranian On Fri, Jul 8, 2022 at 1:31 AM Thomas Richter <tmricht@linux.ibm.com> wrote: > > On 7/7/22 22:12, Ian Rogers wrote: > > From: Claire Jensen <cjense@google.com> > > > > Add field checking tests for perf stat JSON output. > > Sanity checks the expected number of fields are present, that the > > expected keys are present and they have the correct values. > > > > Signed-off-by: Claire Jensen <cjense@google.com> > > Signed-off-by: Ian Rogers <irogers@google.com> > > --- > > .../tests/shell/lib/perf_json_output_lint.py | 95 +++++++++++ > > tools/perf/tests/shell/stat+json_output.sh | 147 ++++++++++++++++++ > > 2 files changed, 242 insertions(+) > > create mode 100644 tools/perf/tests/shell/lib/perf_json_output_lint.py > > create mode 100755 tools/perf/tests/shell/stat+json_output.sh > > > .... > I wonder if it is really necessary to have a python file to post process the > perf stat output? > > With > commit 7473ee56dbc9 ("perf test: Add checking for perf stat CSV output.") > the same approach was done which led to issues on s390 and required an additional > patch to fix this: > commit ec906102e5b7 ("perf test: Fix "perf stat CSV output linter" test on s390"). > > I wonder if you can do the perf stat output checking using bash/linux tools as it > was done in commit ec906102e5b7. This would make maintenance much easier. > > Just me 2 cents... Hi Thomas, In this case using python avoids writing a JSON decoder, which would be harder to do in bash although there is perhaps a linter or some such we could use. That'd wind up being another dependency :-/ Thanks, Ian > -- > Thomas Richter, Dept 3303, IBM s390 Linux Development, Boeblingen, Germany > -- > Vorsitzender des Aufsichtsrats: Gregor Pillen > Geschäftsführung: David Faller > Sitz der Gesellschaft: Böblingen / Registergericht: Amtsgericht Stuttgart, HRB 243294 ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v6 2/2] perf test: Json format checking 2022-07-07 20:12 ` [PATCH v6 2/2] perf test: Json format checking Ian Rogers 2022-07-08 8:31 ` Thomas Richter @ 2022-07-18 15:44 ` Arnaldo Carvalho de Melo 2022-07-18 15:46 ` Arnaldo Carvalho de Melo 1 sibling, 1 reply; 9+ messages in thread From: Arnaldo Carvalho de Melo @ 2022-07-18 15:44 UTC (permalink / raw) To: Ian Rogers Cc: Peter Zijlstra, Ingo Molnar, Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim, Kan Liang, Zhengjun Xing, Sandipan Das, Claire Jensen, Alyssa Ross, Like Xu, James Clark, Florian Fischer, linux-kernel, linux-perf-users, Claire Jensen, Stephane Eranian Em Thu, Jul 07, 2022 at 01:12:13PM -0700, Ian Rogers escreveu: > From: Claire Jensen <cjense@google.com> > > Add field checking tests for perf stat JSON output. > Sanity checks the expected number of fields are present, that the > expected keys are present and they have the correct values. it isn't installing the lib: [root@five ~]# perf test -v json 91: perf stat JSON output linter : --- start --- test child forked, pid 4086678 Checking json output: no args python3: can't open file '/var/home/acme/libexec/perf-core/tests/shell/lib/perf_json_output_lint.py': [Errno 2] No such file or directory test child finished with -2 ---- end ---- perf stat JSON output linter: Skip [root@five ~]# I'm trying to fix, but please test it after installing... - Arnaldo > Signed-off-by: Claire Jensen <cjense@google.com> > Signed-off-by: Ian Rogers <irogers@google.com> > --- > .../tests/shell/lib/perf_json_output_lint.py | 95 +++++++++++ > tools/perf/tests/shell/stat+json_output.sh | 147 ++++++++++++++++++ > 2 files changed, 242 insertions(+) > create mode 100644 tools/perf/tests/shell/lib/perf_json_output_lint.py > create mode 100755 tools/perf/tests/shell/stat+json_output.sh > > diff --git a/tools/perf/tests/shell/lib/perf_json_output_lint.py b/tools/perf/tests/shell/lib/perf_json_output_lint.py > new file mode 100644 > index 000000000000..aaa4a8677b6c > --- /dev/null > +++ b/tools/perf/tests/shell/lib/perf_json_output_lint.py > @@ -0,0 +1,95 @@ > +#!/usr/bin/python > +# SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) > +# Basic sanity check of perf JSON output as specified in the man page. > + > +import argparse > +import sys > +import json > + > +ap = argparse.ArgumentParser() > +ap.add_argument('--no-args', action='store_true') > +ap.add_argument('--interval', action='store_true') > +ap.add_argument('--system-wide-no-aggr', action='store_true') > +ap.add_argument('--system-wide', action='store_true') > +ap.add_argument('--event', action='store_true') > +ap.add_argument('--per-core', action='store_true') > +ap.add_argument('--per-thread', action='store_true') > +ap.add_argument('--per-die', action='store_true') > +ap.add_argument('--per-node', action='store_true') > +ap.add_argument('--per-socket', action='store_true') > +args = ap.parse_args() > + > +Lines = sys.stdin.readlines() > + > +def isfloat(num): > + try: > + float(num) > + return True > + except ValueError: > + return False > + > + > +def isint(num): > + try: > + int(num) > + return True > + except ValueError: > + return False > + > +def is_counter_value(num): > + return isfloat(num) or num == '<not counted>' or num == '<not supported>' > + > +def check_json_output(expected_items): > + if expected_items != -1: > + for line in Lines: > + if 'failed' not in line: > + count = 0 > + count = line.count(',') > + if count != expected_items and (count == 1 or count == 2) and 'metric-value' in line: > + # Events that generate >1 metric may have isolated metric > + # values and possibly have an interval prefix. > + continue > + if count != expected_items: > + raise RuntimeError(f'wrong number of fields. counted {count} expected {expected_items}' > + f' in \'{line}\'') > + checks = { > + 'aggregate-number': lambda x: isfloat(x), > + 'core': lambda x: True, > + 'counter-value': lambda x: is_counter_value(x), > + 'cgroup': lambda x: True, > + 'cpu': lambda x: isint(x), > + 'die': lambda x: True, > + 'event': lambda x: True, > + 'event-runtime': lambda x: isfloat(x), > + 'interval': lambda x: isfloat(x), > + 'metric-unit': lambda x: True, > + 'metric-value': lambda x: isfloat(x), > + 'node': lambda x: True, > + 'pcnt-running': lambda x: isfloat(x), > + 'socket': lambda x: True, > + 'thread': lambda x: True, > + 'unit': lambda x: True, > + } > + input = '[\n' + ','.join(Lines) + '\n]' > + for item in json.loads(input): > + for key, value in item.items(): > + if key not in checks: > + raise RuntimeError(f'Unexpected key: key={key} value={value}') > + if not checks[key](value): > + raise RuntimeError(f'Check failed for: key={key} value={value}') > + > + > +try: > + if args.no_args or args.system_wide or args.event: > + expected_items = 6 > + elif args.interval or args.per_thread or args.system_wide_no_aggr: > + expected_items = 7 > + elif args.per_core or args.per_socket or args.per_node or args.per_die: > + expected_items = 8 > + else: > + # If no option is specified, don't check the number of items. > + expected_items = -1 > + check_json_output(expected_items) > +except: > + print('Test failed for input:\n' + '\n'.join(Lines)) > + raise > diff --git a/tools/perf/tests/shell/stat+json_output.sh b/tools/perf/tests/shell/stat+json_output.sh > new file mode 100755 > index 000000000000..ea8714a36051 > --- /dev/null > +++ b/tools/perf/tests/shell/stat+json_output.sh > @@ -0,0 +1,147 @@ > +#!/bin/bash > +# perf stat JSON output linter > +# SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) > +# Checks various perf stat JSON output commands for the > +# correct number of fields. > + > +set -e > + > +pythonchecker=$(dirname $0)/lib/perf_json_output_lint.py > +if [ "x$PYTHON" == "x" ] > +then > + if which python3 > /dev/null > + then > + PYTHON=python3 > + elif which python > /dev/null > + then > + PYTHON=python > + else > + echo Skipping test, python not detected please set environment variable PYTHON. > + exit 2 > + fi > +fi > + > +# Return true if perf_event_paranoid is > $1 and not running as root. > +function ParanoidAndNotRoot() > +{ > + [ $(id -u) != 0 ] && [ $(cat /proc/sys/kernel/perf_event_paranoid) -gt $1 ] > +} > + > +check_no_args() > +{ > + echo -n "Checking json output: no args " > + perf stat -j true 2>&1 | $PYTHON $pythonchecker --no-args > + echo "[Success]" > +} > + > +check_system_wide() > +{ > + echo -n "Checking json output: system wide " > + if ParanoidAndNotRoot 0 > + then > + echo "[Skip] paranoia and not root" > + return > + fi > + perf stat -j -a true 2>&1 | $PYTHON $pythonchecker --system-wide > + echo "[Success]" > +} > + > +check_system_wide_no_aggr() > +{ > + echo -n "Checking json output: system wide " > + if ParanoidAndNotRoot 0 > + then > + echo "[Skip] paranoia and not root" > + return > + fi > + echo -n "Checking json output: system wide no aggregation " > + perf stat -j -A -a --no-merge true 2>&1 | $PYTHON $pythonchecker --system-wide-no-aggr > + echo "[Success]" > +} > + > +check_interval() > +{ > + echo -n "Checking json output: interval " > + perf stat -j -I 1000 true 2>&1 | $PYTHON $pythonchecker --interval > + echo "[Success]" > +} > + > + > +check_event() > +{ > + echo -n "Checking json output: event " > + perf stat -j -e cpu-clock true 2>&1 | $PYTHON $pythonchecker --event > + echo "[Success]" > +} > + > +check_per_core() > +{ > + echo -n "Checking json output: per core " > + if ParanoidAndNotRoot 0 > + then > + echo "[Skip] paranoia and not root" > + return > + fi > + perf stat -j --per-core -a true 2>&1 | $PYTHON $pythonchecker --per-core > + echo "[Success]" > +} > + > +check_per_thread() > +{ > + echo -n "Checking json output: per thread " > + if ParanoidAndNotRoot 0 > + then > + echo "[Skip] paranoia and not root" > + return > + fi > + perf stat -j --per-thread -a true 2>&1 | $PYTHON $pythonchecker --per-thread > + echo "[Success]" > +} > + > +check_per_die() > +{ > + echo -n "Checking json output: per die " > + if ParanoidAndNotRoot 0 > + then > + echo "[Skip] paranoia and not root" > + return > + fi > + perf stat -j --per-die -a true 2>&1 | $PYTHON $pythonchecker --per-die > + echo "[Success]" > +} > + > +check_per_node() > +{ > + echo -n "Checking json output: per node " > + if ParanoidAndNotRoot 0 > + then > + echo "[Skip] paranoia and not root" > + return > + fi > + perf stat -j --per-node -a true 2>&1 | $PYTHON $pythonchecker --per-node > + echo "[Success]" > +} > + > +check_per_socket() > +{ > + echo -n "Checking json output: per socket " > + if ParanoidAndNotRoot 0 > + then > + echo "[Skip] paranoia and not root" > + return > + fi > + perf stat -j --per-socket -a true 2>&1 | $PYTHON $pythonchecker --per-socket > + echo "[Success]" > +} > + > +check_no_args > +check_system_wide > +check_system_wide_no_aggr > +check_interval > +check_event > +check_per_core > +check_per_thread > +check_per_die > +check_per_node > +check_per_socket > +exit 0 > -- > 2.37.0.rc0.161.g10f37bed90-goog -- - Arnaldo ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v6 2/2] perf test: Json format checking 2022-07-18 15:44 ` Arnaldo Carvalho de Melo @ 2022-07-18 15:46 ` Arnaldo Carvalho de Melo 2022-07-18 15:49 ` Arnaldo Carvalho de Melo 0 siblings, 1 reply; 9+ messages in thread From: Arnaldo Carvalho de Melo @ 2022-07-18 15:46 UTC (permalink / raw) To: Ian Rogers Cc: Peter Zijlstra, Ingo Molnar, Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim, Kan Liang, Zhengjun Xing, Sandipan Das, Claire Jensen, Alyssa Ross, Like Xu, James Clark, Florian Fischer, linux-kernel, linux-perf-users, Claire Jensen, Stephane Eranian Em Mon, Jul 18, 2022 at 12:44:59PM -0300, Arnaldo Carvalho de Melo escreveu: > Em Thu, Jul 07, 2022 at 01:12:13PM -0700, Ian Rogers escreveu: > > From: Claire Jensen <cjense@google.com> > > > > Add field checking tests for perf stat JSON output. > > Sanity checks the expected number of fields are present, that the > > expected keys are present and they have the correct values. > > it isn't installing the lib: > > [root@five ~]# perf test -v json > 91: perf stat JSON output linter : > --- start --- > test child forked, pid 4086678 > Checking json output: no args python3: can't open file '/var/home/acme/libexec/perf-core/tests/shell/lib/perf_json_output_lint.py': [Errno 2] No such file or directory > test child finished with -2 > ---- end ---- > perf stat JSON output linter: Skip > [root@five ~]# > > I'm trying to fix, but please test it after installing... It should: install-tests: all install-gtk $(call QUIET_INSTALL, tests) \ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'; \ $(INSTALL) tests/attr.py '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'; \ $(INSTALL) tests/pe-file.exe* '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'; \ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr'; \ $(INSTALL) tests/attr/* '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr'; \ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell'; \ $(INSTALL) tests/shell/*.sh '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell'; \ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/lib'; \ $(INSTALL) tests/shell/lib/*.sh '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/lib' /me checking... - Arnaldo > - Arnaldo > > > > Signed-off-by: Claire Jensen <cjense@google.com> > > Signed-off-by: Ian Rogers <irogers@google.com> > > --- > > .../tests/shell/lib/perf_json_output_lint.py | 95 +++++++++++ > > tools/perf/tests/shell/stat+json_output.sh | 147 ++++++++++++++++++ > > 2 files changed, 242 insertions(+) > > create mode 100644 tools/perf/tests/shell/lib/perf_json_output_lint.py > > create mode 100755 tools/perf/tests/shell/stat+json_output.sh > > > > diff --git a/tools/perf/tests/shell/lib/perf_json_output_lint.py b/tools/perf/tests/shell/lib/perf_json_output_lint.py > > new file mode 100644 > > index 000000000000..aaa4a8677b6c > > --- /dev/null > > +++ b/tools/perf/tests/shell/lib/perf_json_output_lint.py > > @@ -0,0 +1,95 @@ > > +#!/usr/bin/python > > +# SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) > > +# Basic sanity check of perf JSON output as specified in the man page. > > + > > +import argparse > > +import sys > > +import json > > + > > +ap = argparse.ArgumentParser() > > +ap.add_argument('--no-args', action='store_true') > > +ap.add_argument('--interval', action='store_true') > > +ap.add_argument('--system-wide-no-aggr', action='store_true') > > +ap.add_argument('--system-wide', action='store_true') > > +ap.add_argument('--event', action='store_true') > > +ap.add_argument('--per-core', action='store_true') > > +ap.add_argument('--per-thread', action='store_true') > > +ap.add_argument('--per-die', action='store_true') > > +ap.add_argument('--per-node', action='store_true') > > +ap.add_argument('--per-socket', action='store_true') > > +args = ap.parse_args() > > + > > +Lines = sys.stdin.readlines() > > + > > +def isfloat(num): > > + try: > > + float(num) > > + return True > > + except ValueError: > > + return False > > + > > + > > +def isint(num): > > + try: > > + int(num) > > + return True > > + except ValueError: > > + return False > > + > > +def is_counter_value(num): > > + return isfloat(num) or num == '<not counted>' or num == '<not supported>' > > + > > +def check_json_output(expected_items): > > + if expected_items != -1: > > + for line in Lines: > > + if 'failed' not in line: > > + count = 0 > > + count = line.count(',') > > + if count != expected_items and (count == 1 or count == 2) and 'metric-value' in line: > > + # Events that generate >1 metric may have isolated metric > > + # values and possibly have an interval prefix. > > + continue > > + if count != expected_items: > > + raise RuntimeError(f'wrong number of fields. counted {count} expected {expected_items}' > > + f' in \'{line}\'') > > + checks = { > > + 'aggregate-number': lambda x: isfloat(x), > > + 'core': lambda x: True, > > + 'counter-value': lambda x: is_counter_value(x), > > + 'cgroup': lambda x: True, > > + 'cpu': lambda x: isint(x), > > + 'die': lambda x: True, > > + 'event': lambda x: True, > > + 'event-runtime': lambda x: isfloat(x), > > + 'interval': lambda x: isfloat(x), > > + 'metric-unit': lambda x: True, > > + 'metric-value': lambda x: isfloat(x), > > + 'node': lambda x: True, > > + 'pcnt-running': lambda x: isfloat(x), > > + 'socket': lambda x: True, > > + 'thread': lambda x: True, > > + 'unit': lambda x: True, > > + } > > + input = '[\n' + ','.join(Lines) + '\n]' > > + for item in json.loads(input): > > + for key, value in item.items(): > > + if key not in checks: > > + raise RuntimeError(f'Unexpected key: key={key} value={value}') > > + if not checks[key](value): > > + raise RuntimeError(f'Check failed for: key={key} value={value}') > > + > > + > > +try: > > + if args.no_args or args.system_wide or args.event: > > + expected_items = 6 > > + elif args.interval or args.per_thread or args.system_wide_no_aggr: > > + expected_items = 7 > > + elif args.per_core or args.per_socket or args.per_node or args.per_die: > > + expected_items = 8 > > + else: > > + # If no option is specified, don't check the number of items. > > + expected_items = -1 > > + check_json_output(expected_items) > > +except: > > + print('Test failed for input:\n' + '\n'.join(Lines)) > > + raise > > diff --git a/tools/perf/tests/shell/stat+json_output.sh b/tools/perf/tests/shell/stat+json_output.sh > > new file mode 100755 > > index 000000000000..ea8714a36051 > > --- /dev/null > > +++ b/tools/perf/tests/shell/stat+json_output.sh > > @@ -0,0 +1,147 @@ > > +#!/bin/bash > > +# perf stat JSON output linter > > +# SPDX-License-Identifier: (LGPL-2.1 OR BSD-2-Clause) > > +# Checks various perf stat JSON output commands for the > > +# correct number of fields. > > + > > +set -e > > + > > +pythonchecker=$(dirname $0)/lib/perf_json_output_lint.py > > +if [ "x$PYTHON" == "x" ] > > +then > > + if which python3 > /dev/null > > + then > > + PYTHON=python3 > > + elif which python > /dev/null > > + then > > + PYTHON=python > > + else > > + echo Skipping test, python not detected please set environment variable PYTHON. > > + exit 2 > > + fi > > +fi > > + > > +# Return true if perf_event_paranoid is > $1 and not running as root. > > +function ParanoidAndNotRoot() > > +{ > > + [ $(id -u) != 0 ] && [ $(cat /proc/sys/kernel/perf_event_paranoid) -gt $1 ] > > +} > > + > > +check_no_args() > > +{ > > + echo -n "Checking json output: no args " > > + perf stat -j true 2>&1 | $PYTHON $pythonchecker --no-args > > + echo "[Success]" > > +} > > + > > +check_system_wide() > > +{ > > + echo -n "Checking json output: system wide " > > + if ParanoidAndNotRoot 0 > > + then > > + echo "[Skip] paranoia and not root" > > + return > > + fi > > + perf stat -j -a true 2>&1 | $PYTHON $pythonchecker --system-wide > > + echo "[Success]" > > +} > > + > > +check_system_wide_no_aggr() > > +{ > > + echo -n "Checking json output: system wide " > > + if ParanoidAndNotRoot 0 > > + then > > + echo "[Skip] paranoia and not root" > > + return > > + fi > > + echo -n "Checking json output: system wide no aggregation " > > + perf stat -j -A -a --no-merge true 2>&1 | $PYTHON $pythonchecker --system-wide-no-aggr > > + echo "[Success]" > > +} > > + > > +check_interval() > > +{ > > + echo -n "Checking json output: interval " > > + perf stat -j -I 1000 true 2>&1 | $PYTHON $pythonchecker --interval > > + echo "[Success]" > > +} > > + > > + > > +check_event() > > +{ > > + echo -n "Checking json output: event " > > + perf stat -j -e cpu-clock true 2>&1 | $PYTHON $pythonchecker --event > > + echo "[Success]" > > +} > > + > > +check_per_core() > > +{ > > + echo -n "Checking json output: per core " > > + if ParanoidAndNotRoot 0 > > + then > > + echo "[Skip] paranoia and not root" > > + return > > + fi > > + perf stat -j --per-core -a true 2>&1 | $PYTHON $pythonchecker --per-core > > + echo "[Success]" > > +} > > + > > +check_per_thread() > > +{ > > + echo -n "Checking json output: per thread " > > + if ParanoidAndNotRoot 0 > > + then > > + echo "[Skip] paranoia and not root" > > + return > > + fi > > + perf stat -j --per-thread -a true 2>&1 | $PYTHON $pythonchecker --per-thread > > + echo "[Success]" > > +} > > + > > +check_per_die() > > +{ > > + echo -n "Checking json output: per die " > > + if ParanoidAndNotRoot 0 > > + then > > + echo "[Skip] paranoia and not root" > > + return > > + fi > > + perf stat -j --per-die -a true 2>&1 | $PYTHON $pythonchecker --per-die > > + echo "[Success]" > > +} > > + > > +check_per_node() > > +{ > > + echo -n "Checking json output: per node " > > + if ParanoidAndNotRoot 0 > > + then > > + echo "[Skip] paranoia and not root" > > + return > > + fi > > + perf stat -j --per-node -a true 2>&1 | $PYTHON $pythonchecker --per-node > > + echo "[Success]" > > +} > > + > > +check_per_socket() > > +{ > > + echo -n "Checking json output: per socket " > > + if ParanoidAndNotRoot 0 > > + then > > + echo "[Skip] paranoia and not root" > > + return > > + fi > > + perf stat -j --per-socket -a true 2>&1 | $PYTHON $pythonchecker --per-socket > > + echo "[Success]" > > +} > > + > > +check_no_args > > +check_system_wide > > +check_system_wide_no_aggr > > +check_interval > > +check_event > > +check_per_core > > +check_per_thread > > +check_per_die > > +check_per_node > > +check_per_socket > > +exit 0 > > -- > > 2.37.0.rc0.161.g10f37bed90-goog > > -- > > - Arnaldo -- - Arnaldo ^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v6 2/2] perf test: Json format checking 2022-07-18 15:46 ` Arnaldo Carvalho de Melo @ 2022-07-18 15:49 ` Arnaldo Carvalho de Melo 2022-08-05 20:05 ` Ian Rogers 0 siblings, 1 reply; 9+ messages in thread From: Arnaldo Carvalho de Melo @ 2022-07-18 15:49 UTC (permalink / raw) To: Ian Rogers Cc: Peter Zijlstra, Ingo Molnar, Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim, Kan Liang, Zhengjun Xing, Sandipan Das, Claire Jensen, Alyssa Ross, Like Xu, James Clark, Florian Fischer, linux-kernel, linux-perf-users, Claire Jensen, Stephane Eranian Em Mon, Jul 18, 2022 at 12:46:10PM -0300, Arnaldo Carvalho de Melo escreveu: > Em Mon, Jul 18, 2022 at 12:44:59PM -0300, Arnaldo Carvalho de Melo escreveu: > > Em Thu, Jul 07, 2022 at 01:12:13PM -0700, Ian Rogers escreveu: > > > From: Claire Jensen <cjense@google.com> > > > > > > Add field checking tests for perf stat JSON output. > > > Sanity checks the expected number of fields are present, that the > > > expected keys are present and they have the correct values. > > > > it isn't installing the lib: > > > > [root@five ~]# perf test -v json > > 91: perf stat JSON output linter : > > --- start --- > > test child forked, pid 4086678 > > Checking json output: no args python3: can't open file '/var/home/acme/libexec/perf-core/tests/shell/lib/perf_json_output_lint.py': [Errno 2] No such file or directory > > test child finished with -2 > > ---- end ---- > > perf stat JSON output linter: Skip > > [root@five ~]# > > > > I'm trying to fix, but please test it after installing... > > > It should: > > install-tests: all install-gtk > $(call QUIET_INSTALL, tests) \ > $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'; \ > $(INSTALL) tests/attr.py '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'; \ > $(INSTALL) tests/pe-file.exe* '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'; \ > $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr'; \ > $(INSTALL) tests/attr/* '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr'; \ > $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell'; \ > $(INSTALL) tests/shell/*.sh '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell'; \ > $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/lib'; \ > $(INSTALL) tests/shell/lib/*.sh '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/lib' > > /me checking... The patch below is needed, but then should we mix .py and .sh in that directory? ⬢[acme@toolbox perf]$ git diff diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf index 8f0b1fb39984fb7b..65e5ba767fd6210e 100644 --- a/tools/perf/Makefile.perf +++ b/tools/perf/Makefile.perf @@ -1006,6 +1006,7 @@ install-tests: all install-gtk $(INSTALL) tests/shell/*.sh '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell'; \ $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/lib'; \ $(INSTALL) tests/shell/lib/*.sh '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/lib' + $(INSTALL) tests/shell/lib/*.py '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/lib' install-bin: install-tools install-tests install-traceevent-plugins ⬢[acme@toolbox perf]$ And then, after that I'm getting: [root@five ~]# perf test json 91: perf stat JSON output linter : FAILED! [root@five ~]# perf test -v json |& tail -20 {"core" : "S0-D0-C15", "aggregate-number" : 2, "counter-value" : "2675.000000", "unit" : "", "event" : "stalled-cycles-backend", "event-runtime" : 2864158, "pcnt-running" : 100.00, "metric-value" : 0.341252, "metric-unit" : "backend cycles idle"} {"core" : "S0-D0-C15", "aggregate-number" : 2, "counter-value" : "233533.000000", "unit" : "", "event" : "instructions", "event-runtime" : 2865528, "pcnt-running" : 100.00, "metric-value" : 0.297920, "metric-unit" : "insn per cycle"} {"core" : "S0-D0-C15", "aggregate-number" : 2, "metric-value" : 0.192975, "metric-unit" : "stalled cycles per insn"} {"core" : "S0-D0-C15", "aggregate-number" : 2, "counter-value" : "50214.000000", "unit" : "", "event" : "branches", "event-runtime" : 2865638, "pcnt-running" : 100.00, "metric-value" : 17.295742, "metric-unit" : "M/sec"} {"core" : "S0-D0-C15", "aggregate-number" : 2, "counter-value" : "1513.000000", "unit" : "", "event" : "branch-misses", "event-runtime" : 1564989, "pcnt-running" : 54.00, "metric-value" : 3.013104, "metric-unit" : "of all branches"} Traceback (most recent call last): File "/var/home/acme/libexec/perf-core/tests/shell/lib/perf_json_output_lint.py", line 92, in <module> check_json_output(expected_items) File "/var/home/acme/libexec/perf-core/tests/shell/lib/perf_json_output_lint.py", line 53, in check_json_output raise RuntimeError(f'wrong number of fields. counted {count} expected {expected_items}' RuntimeError: wrong number of fields. counted 3 expected 8 in '{"core" : "S0-D0-C0", "aggregate-number" : 2, "metric-value" : 0.094345, "metric-unit" : "stalled cycles per insn"} ' test child finished with -1 ---- end ---- perf stat JSON output linter: FAILED! [root@five ~]# Can you please check and send a v7? - Arnaldo ^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v6 2/2] perf test: Json format checking 2022-07-18 15:49 ` Arnaldo Carvalho de Melo @ 2022-08-05 20:05 ` Ian Rogers 0 siblings, 0 replies; 9+ messages in thread From: Ian Rogers @ 2022-08-05 20:05 UTC (permalink / raw) To: Arnaldo Carvalho de Melo Cc: Peter Zijlstra, Ingo Molnar, Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim, Kan Liang, Zhengjun Xing, Sandipan Das, Claire Jensen, Alyssa Ross, Like Xu, James Clark, Florian Fischer, linux-kernel, linux-perf-users, Claire Jensen, Stephane Eranian On Mon, Jul 18, 2022 at 8:49 AM Arnaldo Carvalho de Melo <acme@kernel.org> wrote: > > Em Mon, Jul 18, 2022 at 12:46:10PM -0300, Arnaldo Carvalho de Melo escreveu: > > Em Mon, Jul 18, 2022 at 12:44:59PM -0300, Arnaldo Carvalho de Melo escreveu: > > > Em Thu, Jul 07, 2022 at 01:12:13PM -0700, Ian Rogers escreveu: > > > > From: Claire Jensen <cjense@google.com> > > > > > > > > Add field checking tests for perf stat JSON output. > > > > Sanity checks the expected number of fields are present, that the > > > > expected keys are present and they have the correct values. > > > > > > it isn't installing the lib: > > > > > > [root@five ~]# perf test -v json > > > 91: perf stat JSON output linter : > > > --- start --- > > > test child forked, pid 4086678 > > > Checking json output: no args python3: can't open file '/var/home/acme/libexec/perf-core/tests/shell/lib/perf_json_output_lint.py': [Errno 2] No such file or directory > > > test child finished with -2 > > > ---- end ---- > > > perf stat JSON output linter: Skip > > > [root@five ~]# > > > > > > I'm trying to fix, but please test it after installing... > > > > > > It should: > > > > install-tests: all install-gtk > > $(call QUIET_INSTALL, tests) \ > > $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'; \ > > $(INSTALL) tests/attr.py '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'; \ > > $(INSTALL) tests/pe-file.exe* '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests'; \ > > $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr'; \ > > $(INSTALL) tests/attr/* '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/attr'; \ > > $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell'; \ > > $(INSTALL) tests/shell/*.sh '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell'; \ > > $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/lib'; \ > > $(INSTALL) tests/shell/lib/*.sh '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/lib' > > > > /me checking... > > The patch below is needed, but then should we mix .py and .sh in that > directory? > > ⬢[acme@toolbox perf]$ git diff > diff --git a/tools/perf/Makefile.perf b/tools/perf/Makefile.perf > index 8f0b1fb39984fb7b..65e5ba767fd6210e 100644 > --- a/tools/perf/Makefile.perf > +++ b/tools/perf/Makefile.perf > @@ -1006,6 +1006,7 @@ install-tests: all install-gtk > $(INSTALL) tests/shell/*.sh '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell'; \ > $(INSTALL) -d -m 755 '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/lib'; \ > $(INSTALL) tests/shell/lib/*.sh '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/lib' > + $(INSTALL) tests/shell/lib/*.py '$(DESTDIR_SQ)$(perfexec_instdir_SQ)/tests/shell/lib' > > install-bin: install-tools install-tests install-traceevent-plugins > > ⬢[acme@toolbox perf]$ > > And then, after that I'm getting: > > [root@five ~]# perf test json > 91: perf stat JSON output linter : FAILED! > [root@five ~]# perf test -v json |& tail -20 > {"core" : "S0-D0-C15", "aggregate-number" : 2, "counter-value" : "2675.000000", "unit" : "", "event" : "stalled-cycles-backend", "event-runtime" : 2864158, "pcnt-running" : 100.00, "metric-value" : 0.341252, "metric-unit" : "backend cycles idle"} > > {"core" : "S0-D0-C15", "aggregate-number" : 2, "counter-value" : "233533.000000", "unit" : "", "event" : "instructions", "event-runtime" : 2865528, "pcnt-running" : 100.00, "metric-value" : 0.297920, "metric-unit" : "insn per cycle"} > > {"core" : "S0-D0-C15", "aggregate-number" : 2, "metric-value" : 0.192975, "metric-unit" : "stalled cycles per insn"} > > {"core" : "S0-D0-C15", "aggregate-number" : 2, "counter-value" : "50214.000000", "unit" : "", "event" : "branches", "event-runtime" : 2865638, "pcnt-running" : 100.00, "metric-value" : 17.295742, "metric-unit" : "M/sec"} > > {"core" : "S0-D0-C15", "aggregate-number" : 2, "counter-value" : "1513.000000", "unit" : "", "event" : "branch-misses", "event-runtime" : 1564989, "pcnt-running" : 54.00, "metric-value" : 3.013104, "metric-unit" : "of all branches"} > > Traceback (most recent call last): > File "/var/home/acme/libexec/perf-core/tests/shell/lib/perf_json_output_lint.py", line 92, in <module> > check_json_output(expected_items) > File "/var/home/acme/libexec/perf-core/tests/shell/lib/perf_json_output_lint.py", line 53, in check_json_output > raise RuntimeError(f'wrong number of fields. counted {count} expected {expected_items}' > RuntimeError: wrong number of fields. counted 3 expected 8 in '{"core" : "S0-D0-C0", "aggregate-number" : 2, "metric-value" : 0.094345, "metric-unit" : "stalled cycles per insn"} > ' > test child finished with -1 > ---- end ---- > perf stat JSON output linter: FAILED! > [root@five ~]# > > Can you please check and send a v7? Done. Sorry for the delay: https://lore.kernel.org/lkml/20220805200105.2020995-1-irogers@google.com/ Thanks, Ian > - Arnaldo ^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2022-08-05 20:05 UTC | newest] Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-07-07 20:12 [PATCH v6 0/2] JSON output for perf stat Ian Rogers 2022-07-07 20:12 ` [PATCH v6 1/2] perf stat: Add JSON output option Ian Rogers 2022-07-07 20:12 ` [PATCH v6 2/2] perf test: Json format checking Ian Rogers 2022-07-08 8:31 ` Thomas Richter 2022-07-08 15:39 ` Ian Rogers 2022-07-18 15:44 ` Arnaldo Carvalho de Melo 2022-07-18 15:46 ` Arnaldo Carvalho de Melo 2022-07-18 15:49 ` Arnaldo Carvalho de Melo 2022-08-05 20:05 ` Ian Rogers
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).