powerpc/perf: Add json file metric support for the hv_24x7 socket/chip level events
Subsystems (2)
v5 cover powerpc/perf: Add json file metric support for the hv_24x7 socket/chip level events
Patchset fixes the inconsistent results we are getting when we run multiple 24x7 events.
Patchset adds json file metric support for the hv_24x7 socket/chip level events. "hv_24x7" pmu interface events needs system dependent parameter like socket/chip/core. For example, hv_24x7 chip level events needs specific chip-id to which the data is requested should be added as part of pmu events.
So to enable JSON file support to "hv_24x7" interface, patchset expose total number of sockets and chips per-socket details in sysfs files (sockets, chips) under "/sys/devices/hv_24x7/interface/".
To get sockets and number of chips per sockets, patchset adds a rtas call with token "PROCESSOR_MODULE_INFO" to get these details. Patchset also handles partition migration case to re-init these system depended parameters by adding proper calls in post_mobility_fixup() (mobility.c).
Second patch of the patchset adds expr_scanner_ctx object to hold user data for the expr scanner, which can be used to hold runtime parameter.
Patch 9 & 11 of the patchset handles perf tool plumbing needed to replace the "?" character in the metric expression to proper value and hv_24x7 json metric file for different Socket/chip resources.
Patch set also enable Hz/hz prinitg for --metric-only option to print metric data for bus frequency.
Applied and tested all these patches cleanly on top of jiri's flex changes with the changes done by Kan Liang for "Support metric group constraint" patchset and made required changes.
Changelog:
v4 -> v5
- Using sysfs__read_int instead of sysfs__read_ull while reading parameter value in powerpc/util/header.c file.
- Using asprintf rather then malloc and sprintf
Suggested by Arnaldo Carvalho de Melo
- Break patch 6 from previous version to two patch,
- One to add refactor current "metricgroup__add_metric" function and another where actually "?" handling infra added.
- Add expr__runtimeparam as part of 'expr_scanner_ctx' struct rather then making it global variable. Thanks Jiri for adding this structure to hold user data for the expr scanner.
- Add runtime param as agrugement to function 'expr__find_other' and 'expr__parse' and made changes on references accordingly.
v3 -> v4
- Apply these patch on top of Kan liang changes.
As suggested by Jiri.
v2 -> v3
- Remove setting event_count to 0 part in function 'h_24x7_event_read' with comment rather then adding 0 to event_count value. Suggested by: Sukadev Bhattiprolu
- Apply tool side changes require to replace "?" on Jiri's flex patch series and made all require changes to make it compatible with added flex change.
v1 -> v2
- Rename hv-24x7 metric json file as nest_metrics.json
Jiri Olsa (2):
perf expr: Add expr_ prefix for parse_ctx and parse_id perf expr: Add expr_scanner_ctx object
Kajol Jain (9):
powerpc/perf/hv-24x7: Fix inconsistent output values incase multiple
hv-24x7 events run
powerpc/hv-24x7: Add rtas call in hv-24x7 driver to get processor
details
powerpc/hv-24x7: Add sysfs files inside hv-24x7 device to show
processor details
Documentation/ABI: Add ABI documentation for chips and sockets powerpc/hv-24x7: Update post_mobility_fixup() to handle migration perf/tools: Refactoring metricgroup__add_metric function perf/tools: Enhance JSON/metric infrastructure to handle "?" tools/perf: Enable Hz/hz prinitg for --metric-only option perf/tools/pmu-events/powerpc: Add hv_24x7 socket/chip level metric
events
.../sysfs-bus-event_source-devices-hv_24x7 | 14 ++ arch/powerpc/perf/hv-24x7.c | 104 ++++++++++++-- arch/powerpc/platforms/pseries/mobility.c | 12 ++ arch/powerpc/platforms/pseries/pseries.h | 3 + tools/perf/arch/powerpc/util/header.c | 10 ++ .../arch/powerpc/power9/nest_metrics.json | 19 +++ tools/perf/tests/expr.c | 12 +- tools/perf/util/expr.c | 25 ++-- tools/perf/util/expr.h | 19 ++- tools/perf/util/expr.l | 37 +++-- tools/perf/util/expr.y | 6 +- tools/perf/util/metricgroup.c | 127 ++++++++++++++---- tools/perf/util/metricgroup.h | 1 + tools/perf/util/stat-display.c | 2 - tools/perf/util/stat-shadow.c | 14 +- 15 files changed, 326 insertions(+), 79 deletions(-) create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/nest_metrics.json
Signature · 1 line
2.18.1
PATCH v5 1/11 perf expr: Add expr_ prefix for parse_ctx and parse_id
From: Jiri Olsa <[email protected]>
Adding expr_ prefix for parse_ctx and parse_id,
to straighten out the expr* namespace.
There's no functional change.
--- tools/perf/tests/expr.c | 4 ++-- tools/perf/util/expr.c | 10 +++++----- tools/perf/util/expr.h | 12 ++++++------ tools/perf/util/expr.y | 6 +++--- tools/perf/util/stat-shadow.c | 2 +- 5 files changed, 17 insertions(+), 17 deletions(-)
tools/perf/tests/expr.c +2 -2
@@ -6,7 +6,7 @@#include <string.h> #include <linux/zalloc.h> -static int test (struct parse_ctx *ctx,const char *e,double val2) +static int test (struct expr_parse_ctx *ctx,const char *e,double val2) {double val;
@@ -22,7 +22,7 @@ int test__expr(struct test *t __maybe_unused, int subtest __maybe_unused)const char **other;double val;int i, ret; -struct parse_ctx ctx; +struct expr_parse_ctx ctx;int num_other;expr__ctx_init (&ctx);
tools/perf/util/expr.c +5 -5
@@ -11,7 +11,7 @@ extern int expr_debug;#endif /* Caller must make sure id is allocated */ -void expr__add_id (struct parse_ctx *ctx,const char *name,double val) +void expr__add_id (struct expr_parse_ctx *ctx,const char *name,double val) {int idx;
@@ -21,13 +21,13 @@ void expr__add_id(struct parse_ctx *ctx, const char *name, double val) ctx->ids[idx].val = val; } -void expr__ctx_init (struct parse_ctx *ctx) +void expr__ctx_init (struct expr_parse_ctx *ctx) { ctx->num_ids =0 ; }static int -__expr__parse (double *val,struct parse_ctx *ctx,const char *expr, +__expr__parse (double *val,struct expr_parse_ctx *ctx,const char *expr,int start) {YY_BUFFER_STATE buffer;
@@ -52,7 +52,7 @@ __expr__parse(double *val, struct parse_ctx *ctx, const char *expr,return ret; } -int expr__parse (double *final_val,struct parse_ctx *ctx,const char *expr) +int expr__parse (double *final_val,struct expr_parse_ctx *ctx,const char *expr) {return __expr__parse (final_val, ctx, expr,EXPR_PARSE ) ?-1 :0 ; }
@@ -75,7 +75,7 @@ int expr__find_other(const char *expr, const char *one, const char ***other, int *num_other) {int err, i =0 , j =0 ; -struct parse_ctx ctx; +struct expr_parse_ctx ctx;expr__ctx_init (&ctx); err =__expr__parse (NULL , &ctx, expr,EXPR_OTHER );
tools/perf/util/expr.h +6 -6
@@ -5,19 +5,19 @@#define EXPR_MAX_OTHER 20#define MAX_PARSE_ID EXPR_MAX_OTHER -struct parse_id { +struct expr_parse_id {const char *name;double val; }; -struct parse_ctx { +struct expr_parse_ctx {int num_ids; -struct parse_id ids[MAX_PARSE_ID ]; +struct expr_parse_id ids[MAX_PARSE_ID ]; }; -void expr__ctx_init (struct parse_ctx *ctx); -void expr__add_id (struct parse_ctx *ctx,const char *id,double val); -int expr__parse (double *final_val,struct parse_ctx *ctx,const char *expr); +void expr__ctx_init (struct expr_parse_ctx *ctx); +void expr__add_id (struct expr_parse_ctx *ctx,const char *id,double val); +int expr__parse (double *final_val,struct expr_parse_ctx *ctx,const char *expr);int expr__find_other (const char *expr,const char *one,const char ***other,int *num_other);
tools/perf/util/expr.y +3 -3
@@ -15,7 +15,7 @@ %define api.pure full %parse-param { double *final_val } -%parse-param { struct parse_ctx *ctx } +%parse-param { struct expr_parse_ctx *ctx } %parse-param {void *scanner} %lex-param {void* scanner}
@@ -39,14 +39,14 @@ %{ static void expr_error(double *final_val __maybe_unused, - struct parse_ctx *ctx __maybe_unused, + struct expr_parse_ctx *ctx __maybe_unused, void *scanner, const char *s) { pr_debug("%s\n", s); } -static int lookup_id(struct parse_ctx *ctx, char *id, double *val) +static int lookup_id(struct expr_parse_ctx *ctx, char *id, double *val) { int i;
tools/perf/util/stat-shadow.c +1 -1
@@ -729,7 +729,7 @@ static void generic_metric(struct perf_stat_config *config, struct runtime_stat *st) {print_metric_t print_metric = out->print_metric; -struct parse_ctx pctx; +struct expr_parse_ctx pctx;double ratio, scale;int i;void *ctxp = out->ctx;
Signature · 1 line
2.18.1
PATCH v5 2/11 perf expr: Add expr_scanner_ctx object
In reply to Kajol JainFrom: Jiri Olsa <[email protected]>
Adding expr_scanner_ctx object to hold user data
for the expr scanner. Currently it holds onlystart_token, Kajol Jain will use it to hold 24x7
runtime param.
--- tools/perf/util/expr.c | 6 ++++-- tools/perf/util/expr.h | 4 ++++ tools/perf/util/expr.l | 10 +++++----- 3 files changed, 13 insertions(+), 7 deletions(-)
tools/perf/util/expr.c +4 -2
@@ -3,7 +3,6 @@#include <assert.h> #include "expr.h" #include "expr-bison.h" -#define YY_EXTRA_TYPE int#include "expr-flex.h" #ifdef PARSER_DEBUG
@@ -30,11 +29,14 @@ static int __expr__parse(double *val, struct expr_parse_ctx *ctx, const char *expr, int start) { +struct expr_scanner_ctx scanner_ctx = { + .start_token = start, + };YY_BUFFER_STATE buffer;void *scanner;int ret; - ret =expr_lex_init_extra (start, &scanner); + ret =expr_lex_init_extra (&scanner_ctx, &scanner);if (ret)return ret;
tools/perf/util/expr.h +4 -0
@@ -15,6 +15,10 @@ struct expr_parse_ctx {struct expr_parse_id ids[MAX_PARSE_ID ]; }; +struct expr_scanner_ctx { +int start_token; +}; +void expr__ctx_init (struct expr_parse_ctx *ctx);void expr__add_id (struct expr_parse_ctx *ctx,const char *id,double val);int expr__parse (double *final_val,struct expr_parse_ctx *ctx,const char *expr);
tools/perf/util/expr.l +5 -5
@@ -76,13 +76,13 @@ sym [0-9a-zA-Z_\.:@]+ symbol {spec}*{sym}*{spec}*{sym}* %% - { - int start_token; + struct expr_scanner_ctx *sctx = expr_get_extra(yyscanner); - start_token = expr_get_extra(yyscanner); + { + int start_token = sctx->start_token; - if (start_token) { - expr_set_extra(NULL, yyscanner); + if (sctx->start_token) { + sctx->start_token = 0; return start_token; } }
Signature · 1 line
2.18.1
PATCH v5 3/11 powerpc/perf/hv-24x7: Fix inconsistent output values incase multiple hv-24x7 events run
In reply to Kajol JainCommit 2b206ee6b0df ("powerpc/perf/hv-24x7: Display change in counter values")' added to print _change_ in the counter value rather then raw value for 24x7 counters. Incase of transactions, the event count is set to 0 at the beginning of the transaction. It also sets the event's prev_count to the raw value at the time of initialization. Because of setting event count to 0, we are seeing some weird behaviour, whenever we run multiple 24x7 events at a time.
For example:
command#: ./perf stat -e "{hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=0/,
hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=1/}"
-C 0 -I 1000 sleep 100
1.000121704 120 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=0/
1.000121704 5 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=1/
2.000357733 8 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=0/
2.000357733 10 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=1/
3.000495215 18,446,744,073,709,551,616 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=0/
3.000495215 18,446,744,073,709,551,616 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=1/
4.000641884 56 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=0/
4.000641884 18,446,744,073,709,551,616 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=1/
5.000791887 18,446,744,073,709,551,616 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=0/Getting these large values in case we do -I.
As we are setting event_count to 0, for interval case, overall event_count is not coming in incremental order. As we may can get new delta lesser then previous count. Because of which when we print intervals, we are getting negative value which create these large values.
This patch removes part where we set event_count to 0 in function 'h_24x7_event_read'. There won't be much impact as we do set event->hw.prev_count to the raw value at the time of initialization to print change value.
With this patch
In power9 platform
command#: ./perf stat -e "{hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=0/,
hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=1/}"
-C 0 -I 1000 sleep 100
1.000117685 93 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=0/
1.000117685 1 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=1/
2.000349331 98 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=0/
2.000349331 2 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=1/
3.000495900 131 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=0/
3.000495900 4 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=1/
4.000645920 204 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=0/
4.000645920 61 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=1/
4.284169997 22 hv_24x7/PM_MCS01_128B_RD_DISP_PORT01,chip=0/--- arch/powerpc/perf/hv-24x7.c | 10 ---------- 1 file changed, 10 deletions(-)
arch/powerpc/perf/hv-24x7.c +0 -10
@@ -1400,16 +1400,6 @@ static void h_24x7_event_read(struct perf_event *event) h24x7hw = &get_cpu_var (hv_24x7_hw); h24x7hw->events[i] = event;put_cpu_var (h24x7hw); -/* -* Clear the event count so we can compute the _change_ -* in the 24x7 raw counter value at the end of the txn. -* -* Note that we could alternatively read the 24x7 value -* now and save its value in event->hw.prev_count. But -* that would require issuing a hcall, which would then -* defeat the purpose of using the txn interface. -*/ -local64_set (&event->count,0 ); }put_cpu_var (hv_24x7_reqb);
Signature · 1 line
2.18.1
PATCH v5 4/11 powerpc/hv-24x7: Add rtas call in hv-24x7 driver to get processor details
In reply to Kajol JainFor hv_24x7 socket/chip level events, specific chip-id to which the data requested should be added as part of pmu events. But number of chips/socket in the system details are not exposed.
Patch implements read_sys_info_pseries() to get system parameter values like number of sockets and chips per socket. Rtas_call with token "PROCESSOR_MODULE_INFO"
is used to get these values.
Sub-sequent patch exports these values via sysfs.
Patch also make these parameters default to 1.
--- arch/powerpc/perf/hv-24x7.c | 72 ++++++++++++++++++++++++ arch/powerpc/platforms/pseries/pseries.h | 3 + 2 files changed, 75 insertions(+)
arch/powerpc/perf/hv-24x7.c +72 -0
@@ -20,6 +20,11 @@#include <asm/io.h> #include <linux/byteorder/generic.h> +#ifdef CONFIG_PPC_RTAS +#include <asm/rtas.h> +#include <../../platforms/pseries/pseries.h> +#endif +#include "hv-24x7.h" #include "hv-24x7-catalog.h" #include "hv-common.h"
@@ -57,6 +62,69 @@ static bool is_physical_domain(unsigned domain) } } +#ifdef CONFIG_PPC_RTAS +#define PROCESSOR_MODULE_INFO 43 +#define PROCESSOR_MAX_LENGTH (8 * 1024) + +static int strbe16toh (const char *buf,int offset) +{ +return (buf[offset] <<8 ) + buf[offset +1 ]; +} + +static u32 physsockets;/* Physical sockets */ +static u32 physchips;/* Physical chips */ + +/* +* Function read_sys_info_pseries() make a rtas_call which require +* data buffer of size 8K. As standard 'rtas_data_buf' is of size +* 4K, we are adding new local buffer 'rtas_local_data_buf'. +*/ +char rtas_local_data_buf[PROCESSOR_MAX_LENGTH] __cacheline_aligned; + +/* +* read_sys_info_pseries() +* Retrieve the number of sockets and chips per socket details +* through the get-system-parameter rtas call. +*/ +void read_sys_info_pseries (void ) +{ +int call_status, len, ntypes; + +/* +* Making system parameter: chips and sockets default to 1. +*/ + physsockets =1 ; + physchips =1 ; +memset (rtas_local_data_buf,0 ,PROCESSOR_MAX_LENGTH ); +spin_lock (&rtas_data_buf_lock); + + call_status =rtas_call (rtas_token ("ibm,get-system-parameter" ),3 ,1 , +NULL , +PROCESSOR_MODULE_INFO , +__pa (rtas_local_data_buf), +PROCESSOR_MAX_LENGTH ); + +spin_unlock (&rtas_data_buf_lock); + +if (call_status !=0 ) { +pr_info ("%s %s Error calling get-system-parameter (0x%x)\n" , + __FILE__, __func__, call_status); + }else { + rtas_local_data_buf[PROCESSOR_MAX_LENGTH -1 ] ='\0' ; + len =strbe16toh (rtas_local_data_buf,0 ); +if (len <6 ) +return ; + + ntypes =strbe16toh (rtas_local_data_buf,2 ); + +if (!ntypes) +return ; + physsockets =strbe16toh (rtas_local_data_buf,4 ); + physchips =strbe16toh (rtas_local_data_buf,6 ); + } +} +#endif /* CONFIG_PPC_RTAS */ +/* Domains for which more than one result element are returned for each event. */ static bool domain_needs_aggregation (unsigned int domain) {
@@ -1605,6 +1673,10 @@ static int hv_24x7_init(void)if (r)return r; +#ifdef CONFIG_PPC_RTAS +read_sys_info_pseries (); +#endif +return 0 ; }
arch/powerpc/platforms/pseries/pseries.h +3 -0
@@ -19,6 +19,9 @@ extern void request_event_sources_irqs(struct device_node *np,struct pt_regs ;extern int pSeries_system_reset_exception (struct pt_regs *regs); +#ifdef CONFIG_PPC_RTAS +extern void read_sys_info_pseries (void ); +#endif extern int pSeries_machine_check_exception (struct pt_regs *regs);extern long pseries_machine_check_realmode (struct pt_regs *regs);
Signature · 1 line
2.18.1
PATCH v5 5/11 powerpc/hv-24x7: Add sysfs files inside hv-24x7 device to show processor details
In reply to Kajol JainTo expose the system dependent parameter like total number of sockets and numbers of chips per socket, patch adds two sysfs files. "sockets" and "chips" are added to /sys/devices/hv_24x7/interface/ of the "hv_24x7" pmu.
--- arch/powerpc/perf/hv-24x7.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+)
arch/powerpc/perf/hv-24x7.c +22 -0
@@ -454,6 +454,20 @@ static ssize_t device_show_string(struct device *dev,return sprintf (buf,"%s\n" , (char *)d->var); } +#ifdef CONFIG_PPC_RTAS +static ssize_t sockets_show (struct device *dev, +struct device_attribute *attr,char *buf) +{ +return sprintf (buf,"%d\n" , physsockets); +} + +static ssize_t chips_show (struct device *dev,struct device_attribute *attr, +char *buf) +{ +return sprintf (buf,"%d\n" , physchips); +} +#endif +static struct attribute *device_str_attr_create_ (char *name,char *str) {struct dev_ext_attribute *attr =kzalloc (sizeof (*attr),GFP_KERNEL );
@@ -1100,6 +1114,10 @@ PAGE_0_ATTR(catalog_len, "%lld\n", (unsigned long long)be32_to_cpu(page_0->length) * 4096); static BIN_ATTR_RO(catalog, 0/* real length varies */);static DEVICE_ATTR_RO (domains); +#ifdef CONFIG_PPC_RTAS +static DEVICE_ATTR_RO (sockets); +static DEVICE_ATTR_RO (chips); +#endif static struct bin_attribute *if_bin_attrs[] = { &bin_attr_catalog,
@@ -1110,6 +1128,10 @@ static struct attribute *if_attrs[] = { &dev_attr_catalog_len.attr, &dev_attr_catalog_version.attr, &dev_attr_domains.attr, +#ifdef CONFIG_PPC_RTAS + &dev_attr_sockets.attr, + &dev_attr_chips.attr, +#endif NULL, };
Signature · 1 line
2.18.1
PATCH v5 6/11 Documentation/ABI: Add ABI documentation for chips and sockets
In reply to Kajol JainAdd documentation for the following sysfs files:/sys/devices/hv_24x7/interface/chips,/sys/devices/hv_24x7/interface/sockets
--- .../testing/sysfs-bus-event_source-devices-hv_24x7 | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
Documentation/ABI/testing/sysfs-bus-event_source-devices-hv_24x7 +14 -0
@@ -22,6 +22,20 @@ Description: Exposes the "version" field of the 24x7 catalog. This is also extractable from the provided binary "catalog" sysfs entry. +What: /sys/devices/hv_24x7/interface/sockets +Date: March 2020 +Contact: Linux on PowerPC Developer List <[email protected]> +Description: read only + This sysfs interface exposes the number of sockets present in the + system. + +What: /sys/devices/hv_24x7/interface/chips +Date: March 2020 +Contact: Linux on PowerPC Developer List <[email protected]> +Description: read only + This sysfs interface exposes the number of chips per socket + present in the system. + What: /sys/bus/event_source/devices/hv_24x7/event_descs/<event-name> Date: February 2014 Contact: Linux on PowerPC Developer List <[email protected]>
Signature · 1 line
2.18.1
PATCH v5 7/11 powerpc/hv-24x7: Update post_mobility_fixup() to handle migration
In reply to Kajol JainFunction 'read_sys_info_pseries()' is added to get system parameter values like number of sockets and chips per socket.
and it gets these details via rtas_call with token "PROCESSOR_MODULE_INFO".
Incase lpar migrate from one system to another, system parameter details like chips per sockets or number of sockets might change. So, it needs to be re-initialized otherwise, these values corresponds to previous system values.
This patch adds a call to 'read_sys_info_pseries()' from 'post-mobility_fixup()' to re-init the physsockets and physchips values.
--- arch/powerpc/platforms/pseries/mobility.c | 12 ++++++++++++ 1 file changed, 12 insertions(+)
arch/powerpc/platforms/pseries/mobility.c +12 -0
@@ -371,6 +371,18 @@ void post_mobility_fixup(void)/* Possibly switch to a new RFI flush type */ pseries_setup_rfi_flush (); +/* +* Incase lpar migrate from one system to another, system +* parameter details like chips per sockets and number of sockets +* might change. So, it needs to be re-initialized otherwise these +* values corresponds to previous system. +* Here, adding a call to read_sys_info_pseries() declared in +* platforms/pseries/pseries.h to re-init the physsockets and +* physchips value. +*/ +if (IS_ENABLED (CONFIG_HV_PERF_CTRS ) &&IS_ENABLED (CONFIG_PPC_RTAS )) +read_sys_info_pseries (); +return ; }
Signature · 1 line
2.18.1
PATCH v5 8/11 perf/tools: Refactoring metricgroup__add_metric function
In reply to Kajol JainThis patch refactor metricgroup__add_metric function where some part of it move to function metricgroup__add_metric_param. No logic change.
--- tools/perf/util/metricgroup.c | 63 +++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 25 deletions(-)
tools/perf/util/metricgroup.c +38 -25
@@ -474,6 +474,41 @@ static bool metricgroup__has_constraint(struct pmu_event *pe)return false; } +static int metricgroup__add_metric_param (struct strbuf *events, +struct list_head *group_list,struct pmu_event *pe) +{ + +const char **ids; +int idnum; +struct egroup *eg; +int ret = -EINVAL ; + +if (expr__find_other (pe->metric_expr,NULL , &ids, &idnum,1 ) <0 ) +return ret; + +if (events->len >0 ) +strbuf_addf (events,"," ); + +if (metricgroup__has_constraint (pe)) +metricgroup__add_metric_non_group (events, ids, idnum); +else +metricgroup__add_metric_weak_group (events, ids, idnum); + + eg =malloc (sizeof (*eg)); +if (!eg) + ret = -ENOMEM ; + + eg->ids = ids; + eg->idnum = idnum; + eg->metric_name = pe->metric_name; + eg->metric_expr = pe->metric_expr; + eg->metric_unit = pe->unit; +list_add_tail (&eg->nd, group_list); + ret =0 ; + +return ret; +} +static int metricgroup__add_metric (const char *metric,struct strbuf *events,struct list_head *group_list) {
@@ -493,35 +528,13 @@ static int metricgroup__add_metric(const char *metric, struct strbuf *events,continue ;if (match_metric (pe->metric_group, metric) ||match_metric (pe->metric_name, metric)) { -const char **ids; -int idnum; -struct egroup *eg;pr_debug ("metric expr %s for %s\n" , pe->metric_expr, pe->metric_name); -if (expr__find_other (pe->metric_expr, -NULL , &ids, &idnum) <0 ) + ret =metricgroup__add_metric_param (events, + group_list, pe); +if (ret == -EINVAL )continue ; -if (events->len >0 ) -strbuf_addf (events,"," ); - -if (metricgroup__has_constraint (pe)) -metricgroup__add_metric_non_group (events, ids, idnum); -else -metricgroup__add_metric_weak_group (events, ids, idnum); - - eg =malloc (sizeof (struct egroup )); -if (!eg) { - ret = -ENOMEM ; -break ; - } - eg->ids = ids; - eg->idnum = idnum; - eg->metric_name = pe->metric_name; - eg->metric_expr = pe->metric_expr; - eg->metric_unit = pe->unit; -list_add_tail (&eg->nd, group_list); - ret =0 ; } }return ret;
Signature · 1 line
2.18.1
Re: [PATCH v5 08/11] perf/tools: Refactoring metricgroup__add_metric function
Quoted 3 lines · Kajol Jain
This patch refactor
metricgroup__add_metricfunction where some part of it move to functionmetricgroup__add_metric_param. No logic change.
can't compile this change:
[jolsa@krava perf]$ make JOBS=1
BUILD: Doing 'make -j1' parallel build
CC util/metricgroup.outil/metricgroup.c: In function ‘metricgroup__add_metric_param’:util/metricgroup.c:486:6: error: too many arguments to function ‘expr__find_other’
486 | if (expr__find_other(pe->metric_expr, NULL, &ids, &idnum, 1) < 0)
| ^~~~~~~~~~~~~~~~
In file included from util/metricgroup.c:14:
util/expr.h:25:5: note: declared here
25 | int expr__find_other(const char *expr, const char *one, const char ***other,
| ^~~~~~~~~~~~~~~~mv: cannot stat 'util/.metricgroup.o.tmp': No such file or directory
make[4]: *** [/home/jolsa/kernel/linux-perf/tools/build/Makefile.build:97: util/metricgroup.o] Error 1 make[3]: *** [/home/jolsa/kernel/linux-perf/tools/build/Makefile.build:139: util] Error 2 make[2]: *** [Makefile.perf:616: perf-in.o] Error 2
make[1]: *** [Makefile.perf:225: sub-make] Error 2
make: *** [Makefile:70: all] Error 2
jirka
Quoted 94 lines
Signed-off-by Kajol Jain <[email protected]>--- tools/perf/util/metricgroup.c | 63 +++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 25 deletions(-)tools/perf/util/metricgroup.c +38
-25@@ -474,6 +474,41 @@ static bool metricgroup__has_constraint(struct pmu_event *pe)return false; } +static int metricgroup__add_metric_param (struct strbuf *events, +struct list_head *group_list,struct pmu_event *pe) +{ + +const char **ids; +int idnum; +struct egroup *eg; +int ret = -EINVAL ; + +if (expr__find_other (pe->metric_expr,NULL , &ids, &idnum,1 ) <0 ) +return ret; + +if (events->len >0 ) +strbuf_addf (events,"," ); + +if (metricgroup__has_constraint (pe)) +metricgroup__add_metric_non_group (events, ids, idnum); +else +metricgroup__add_metric_weak_group (events, ids, idnum); + + eg =malloc (sizeof (*eg)); +if (!eg) + ret = -ENOMEM ; + + eg->ids = ids; + eg->idnum = idnum; + eg->metric_name = pe->metric_name; + eg->metric_expr = pe->metric_expr; + eg->metric_unit = pe->unit; +list_add_tail (&eg->nd, group_list); + ret =0 ; + +return ret; +} +static int metricgroup__add_metric (const char *metric,struct strbuf *events,struct list_head *group_list) {@@ -493,35 +528,13 @@ static int metricgroup__add_metric(const char *metric, struct strbuf *events,continue ;if (match_metric (pe->metric_group, metric) ||match_metric (pe->metric_name, metric)) { -const char **ids; -int idnum; -struct egroup *eg;pr_debug ("metric expr %s for %s\n" , pe->metric_expr, pe->metric_name); -if (expr__find_other (pe->metric_expr, -NULL , &ids, &idnum) <0 ) + ret =metricgroup__add_metric_param (events, + group_list, pe); +if (ret == -EINVAL )continue ; -if (events->len >0 ) -strbuf_addf (events,"," ); - -if (metricgroup__has_constraint (pe)) -metricgroup__add_metric_non_group (events, ids, idnum); -else -metricgroup__add_metric_weak_group (events, ids, idnum); - - eg =malloc (sizeof (struct egroup )); -if (!eg) { - ret = -ENOMEM ; -break ; - } - eg->ids = ids; - eg->idnum = idnum; - eg->metric_name = pe->metric_name; - eg->metric_expr = pe->metric_expr; - eg->metric_unit = pe->unit; -list_add_tail (&eg->nd, group_list); - ret =0 ; } }return ret;Signature · 1 line
2.18.1
Re: [PATCH v5 08/11] perf/tools: Refactoring metricgroup__add_metric function
Quoted 18 lines · Jiri Olsa
Quoted 3 lines · Kajol Jain
This patch refactor
metricgroup__add_metricfunction where some part of it move to functionmetricgroup__add_metric_param. No logic change.can't compile this change:
[jolsa@krava perf]$ make JOBS=1
BUILD: Doing 'make -j1' parallel build
CCutil/metricgroup.outil/metricgroup.c: In function ‘metricgroup__add_metric_param’:util/metricgroup.c:486:6: error: too many arguments to function ‘expr__find_other’
486 | if (expr__find_other(pe->metric_expr, NULL, &ids, &idnum, 1)< 0)| ^~~~~~~~~~~~~~~~ In file included from util/metricgroup.c:14: util/expr.h:25:5: note: declared here 25 | int expr__find_other(const char *expr, const char *one, const char ***other, | ^~~~~~~~~~~~~~~~
Quoted 6 lines
mv: cannot stat 'util/.metricgroup.o.tmp': No such file or directory
make[4]: *** [/home/jolsa/kernel/linux-perf/tools/build/Makefile.build:97:util/metricgroup.o] Error 1 make[3]: *** [/home/jolsa/kernel/linux-perf/tools/build/Makefile.build:139: util] Error 2 make[2]: *** [Makefile.perf:616: perf-in.o] Error 2
make[1]: *** [Makefile.perf:225: sub-make] Error 2
make: *** [Makefile:70: all] Error 2
Hi Jiri,
I made a mistake while arranging the patches in the series. I'll re-arrange it
and send it again.
Thanks,
Kajol
Quoted 98 lines
jirka
Quoted 94 lines
Signed-off-by Kajol Jain <[email protected]>--- tools/perf/util/metricgroup.c | 63 +++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 25 deletions(-)tools/perf/util/metricgroup.c +38
-25@@ -474,6 +474,41 @@ static bool metricgroup__has_constraint(struct pmu_event *pe)return false; } +static int metricgroup__add_metric_param (struct strbuf *events, +struct list_head *group_list,struct pmu_event *pe) +{ + +const char **ids; +int idnum; +struct egroup *eg; +int ret = -EINVAL ; + +if (expr__find_other (pe->metric_expr,NULL , &ids, &idnum,1 ) <0 ) +return ret; + +if (events->len >0 ) +strbuf_addf (events,"," ); + +if (metricgroup__has_constraint (pe)) +metricgroup__add_metric_non_group (events, ids, idnum); +else +metricgroup__add_metric_weak_group (events, ids, idnum); + + eg =malloc (sizeof (*eg)); +if (!eg) + ret = -ENOMEM ; + + eg->ids = ids; + eg->idnum = idnum; + eg->metric_name = pe->metric_name; + eg->metric_expr = pe->metric_expr; + eg->metric_unit = pe->unit; +list_add_tail (&eg->nd, group_list); + ret =0 ; + +return ret; +} +static int metricgroup__add_metric (const char *metric,struct strbuf *events,struct list_head *group_list) {@@ -493,35 +528,13 @@ static int metricgroup__add_metric(const char *metric, struct strbuf *events,continue ;if (match_metric (pe->metric_group, metric) ||match_metric (pe->metric_name, metric)) { -const char **ids; -int idnum; -struct egroup *eg;pr_debug ("metric expr %s for %s\n" , pe->metric_expr, pe->metric_name); -if (expr__find_other (pe->metric_expr, -NULL , &ids, &idnum) <0 ) + ret =metricgroup__add_metric_param (events, + group_list, pe); +if (ret == -EINVAL )continue ; -if (events->len >0 ) -strbuf_addf (events,"," ); - -if (metricgroup__has_constraint (pe)) -metricgroup__add_metric_non_group (events, ids, idnum); -else -metricgroup__add_metric_weak_group (events, ids, idnum); - - eg =malloc (sizeof (struct egroup )); -if (!eg) { - ret = -ENOMEM ; -break ; - } - eg->ids = ids; - eg->idnum = idnum; - eg->metric_name = pe->metric_name; - eg->metric_expr = pe->metric_expr; - eg->metric_unit = pe->unit; -list_add_tail (&eg->nd, group_list); - ret =0 ; } }return ret;Signature · 1 line
2.18.1
Re: [PATCH v5 08/11] perf/tools: Refactoring metricgroup__add_metric function
In reply to Kajol JainQuoted 40 lines · Kajol Jain
This patch refactor
metricgroup__add_metricfunction where some part of it move to functionmetricgroup__add_metric_param. No logic change.Signed-off-by Kajol Jain <[email protected]>--- tools/perf/util/metricgroup.c | 63 +++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 25 deletions(-)tools/perf/util/metricgroup.c +23
-0@@ -474,6 +474,41 @@ static bool metricgroup__has_constraint(struct pmu_event *pe)return false; } +static int metricgroup__add_metric_param (struct strbuf *events, +struct list_head *group_list,struct pmu_event *pe) +{ + +const char **ids; +int idnum; +struct egroup *eg; +int ret = -EINVAL ; + +if (expr__find_other (pe->metric_expr,NULL , &ids, &idnum,1 ) <0 ) +return ret; + +if (events->len >0 ) +strbuf_addf (events,"," ); + +if (metricgroup__has_constraint (pe)) +metricgroup__add_metric_non_group (events, ids, idnum); +else +metricgroup__add_metric_weak_group (events, ids, idnum); + + eg =malloc (sizeof (*eg)); +if (!eg) + ret = -ENOMEM ;
tools/perf/util/metricgroup.c static bool metricgroup__has_constraint(struct pmu_event *pe) · line 509
Quoted 10 lines
tools/perf/util/metricgroup.c +10
-0+ + eg->ids = ids; + eg->idnum = idnum; + eg->metric_name = pe->metric_name; + eg->metric_expr = pe->metric_expr; + eg->metric_unit = pe->unit; +list_add_tail (&eg->nd, group_list); + ret =0 ; + +return ret;
return 0;
jirka
Re: [PATCH v5 08/11] perf/tools: Refactoring metricgroup__add_metric function
In reply to Kajol JainQuoted 30 lines · Kajol Jain
This patch refactor
metricgroup__add_metricfunction where some part of it move to functionmetricgroup__add_metric_param. No logic change.Signed-off-by Kajol Jain <[email protected]>--- tools/perf/util/metricgroup.c | 63 +++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 25 deletions(-)tools/perf/util/metricgroup.c +13
-0@@ -474,6 +474,41 @@ static bool metricgroup__has_constraint(struct pmu_event *pe)return false; } +static int metricgroup__add_metric_param (struct strbuf *events, +struct list_head *group_list,struct pmu_event *pe) +{ + +const char **ids; +int idnum; +struct egroup *eg; +int ret = -EINVAL ; + +if (expr__find_other (pe->metric_expr,NULL , &ids, &idnum,1 ) <0 ) +return ret; + +if (events->len >0 )
tools/perf/util/metricgroup.c static bool metricgroup__has_constraint(struct pmu_event *pe) · line 499
Quoted 10 lines
tools/perf/util/metricgroup.c +10
-0+strbuf_addf (events,"," ); + +if (metricgroup__has_constraint (pe)) +metricgroup__add_metric_non_group (events, ids, idnum); +else +metricgroup__add_metric_weak_group (events, ids, idnum); + + eg =malloc (sizeof (*eg)); +if (!eg) + ret = -ENOMEM ;
??? you need to return in here, eg is NULL
Quoted 21 lines
tools/perf/util/metricgroup.c +12
-2+ + eg->ids = ids; + eg->idnum = idnum; + eg->metric_name = pe->metric_name; + eg->metric_expr = pe->metric_expr; + eg->metric_unit = pe->unit; +list_add_tail (&eg->nd, group_list); + ret =0 ; + +return ret; +} +static int metricgroup__add_metric (const char *metric,struct strbuf *events,struct list_head *group_list) {@@ -493,35 +528,13 @@ static int metricgroup__add_metric(const char *metric, struct strbuf *events,continue ;if (match_metric (pe->metric_group, metric) ||match_metric (pe->metric_name, metric)) { -const char **ids; -int idnum;
tools/perf/util/metricgroup.c static int metricgroup__add_metric(const char *metric, struct strbuf *events, · line 537
Quoted 10 lines
tools/perf/util/metricgroup.c +3
-3-struct egroup *eg;pr_debug ("metric expr %s for %s\n" , pe->metric_expr, pe->metric_name); -if (expr__find_other (pe->metric_expr, -NULL , &ids, &idnum) <0 ) + ret =metricgroup__add_metric_param (events, + group_list, pe); +if (ret == -EINVAL )continue ;
previous code did 'continue' on ret < 0, why just -EINVAL now?
jirka
Re: [PATCH v5 08/11] perf/tools: Refactoring metricgroup__add_metric function
Quoted 35 lines · Jiri Olsa
Quoted 34 lines · Kajol Jain
This patch refactor
metricgroup__add_metricfunction where some part of it move to functionmetricgroup__add_metric_param. No logic change.Signed-off-by Kajol Jain <[email protected]>--- tools/perf/util/metricgroup.c | 63 +++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 25 deletions(-)tools/perf/util/metricgroup.c +17
-0@@ -474,6 +474,41 @@ static bool metricgroup__has_constraint(struct pmu_event *pe)return false; } +static int metricgroup__add_metric_param (struct strbuf *events, +struct list_head *group_list,struct pmu_event *pe) +{ + +const char **ids; +int idnum; +struct egroup *eg; +int ret = -EINVAL ; + +if (expr__find_other (pe->metric_expr,NULL , &ids, &idnum,1 ) <0 ) +return ret; + +if (events->len >0 ) +strbuf_addf (events,"," ); + +if (metricgroup__has_constraint (pe)) +metricgroup__add_metric_non_group (events, ids, idnum);
Quoted 8 lines
tools/perf/util/metricgroup.c static bool metricgroup__has_constraint(struct pmu_event *pe) · line 499
Quoted 6 lines
tools/perf/util/metricgroup.c +6
-0+else +metricgroup__add_metric_weak_group (events, ids, idnum); + + eg =malloc (sizeof (*eg)); +if (!eg) + ret = -ENOMEM ;??? you need to return in here, eg is NULL
Yes right, miss this part. Will correct it.
Quoted 26 lines
Quoted 26 lines
tools/perf/util/metricgroup.c +12
-3+ + eg->ids = ids; + eg->idnum = idnum; + eg->metric_name = pe->metric_name; + eg->metric_expr = pe->metric_expr; + eg->metric_unit = pe->unit; +list_add_tail (&eg->nd, group_list); + ret =0 ; + +return ret; +} +static int metricgroup__add_metric (const char *metric,struct strbuf *events,struct list_head *group_list) {@@ -493,35 +528,13 @@ static int metricgroup__add_metric(const char *metric, struct strbuf *events,continue ;if (match_metric (pe->metric_group, metric) ||match_metric (pe->metric_name, metric)) { -const char **ids; -int idnum; -struct egroup *eg;pr_debug ("metric expr %s for %s\n" , pe->metric_expr, pe->metric_name);
Quoted 8 lines
tools/perf/util/metricgroup.c static int metricgroup__add_metric(const char *metric, struct strbuf *events, · line 537
Quoted 6 lines
tools/perf/util/metricgroup.c +3
-2-if (expr__find_other (pe->metric_expr, -NULL , &ids, &idnum) <0 ) + ret =metricgroup__add_metric_param (events, + group_list, pe); +if (ret == -EINVAL )continue ;previous code did 'continue' on ret < 0, why just
-EINVALnow?
Actually incase we have memory issue then we are not
continuing that's why I added check for -EINVAL explicitly. Because for other cases I am returning -EINVAL itself. But Yes I miss one part, where
even after matched metric we are continuing incase ret = 0. Will update that part. Please let me know if it sounds fine.
Thanks,
Kajol
Quoted 3 lines
jirka
PATCH v5 9/11 perf/tools: Enhance JSON/metric infrastructure to handle "?"
In reply to Kajol JainPatch enhances current metric infrastructure to handle "?" in the metric expression. The "?" can be use for parameters whose value not known while creating metric events and which can be replace later at runtime to the proper value. It also add flexibility to create multiple events out of single metric event added in json file.
Patch adds function 'arch_get_runtimeparam' which is a arch specific function, returns the count of metric events need to be created. By default it return 1.
One loop is added in function 'metricgroup__add_metric_runtime_param', which create multiple events at run time depend on return value of 'arch_get_runtimeparam' and merge that event in 'group_list'.
This infrastructure needed for hv_24x7 socket/chip level events. "hv_24x7" chip level events needs specific chip-id to which the data is requested. Function 'arch_get_runtimeparam' implemented in header.c which extract number of sockets from sysfs file "sockets" under "/sys/devices/hv_24x7/interface/".
--- tools/perf/arch/powerpc/util/header.c | 10 ++++ tools/perf/tests/expr.c | 8 ++-- tools/perf/util/expr.c | 11 +++-- tools/perf/util/expr.h | 5 +- tools/perf/util/expr.l | 27 ++++++++--- tools/perf/util/metricgroup.c | 66 ++++++++++++++++++++++++++- tools/perf/util/metricgroup.h | 1 + tools/perf/util/stat-shadow.c | 12 ++++- 8 files changed, 119 insertions(+), 21 deletions(-)
tools/perf/arch/powerpc/util/header.c +10 -0
@@ -7,6 +7,8 @@#include <string.h> #include <linux/stringify.h> #include "header.h" +#include "metricgroup.h" +#include <api/fs/fs.h> #define mfspr (rn) ({unsigned long rval; \ asm volatile("mfspr %0," __stringify(rn) \
@@ -16,6 +18,8 @@#define PVR_VER (pvr) (((pvr) >> 16) & 0xFFFF)/* Version field */ #define PVR_REV (pvr) (((pvr) >> 0) & 0xFFFF)/* Revison field */ +#define SOCKETS_INFO_FILE_PATH "/devices/hv_24x7/interface/sockets" +int get_cpuid (char *buffer,size_t sz) {
@@ -44,3 +48,9 @@ get_cpuid_str(struct perf_pmu *pmu __maybe_unused)return bufp; } + +int arch_get_runtimeparam (void ) +{ +int count; +return sysfs__read_int (SOCKETS_INFO_FILE_PATH , &count) <0 ?1 : count; +}
tools/perf/tests/expr.c +4 -4
@@ -10,7 +10,7 @@ static int test(struct expr_parse_ctx *ctx, const char *e, double val2) {double val; -if (expr__parse (&val, ctx, e)) +if (expr__parse (&val, ctx, e,1 ))TEST_ASSERT_VAL ("parse test failed" ,0 );TEST_ASSERT_VAL ("unexpected value" , val == val2);return 0 ;
@@ -44,15 +44,15 @@ int test__expr(struct test *t __maybe_unused, int subtest __maybe_unused)return ret; p ="FOO/0" ; - ret =expr__parse (&val, &ctx, p); + ret =expr__parse (&val, &ctx, p,1 );TEST_ASSERT_VAL ("division by zero" , ret ==-1 ); p ="BAR/" ; - ret =expr__parse (&val, &ctx, p); + ret =expr__parse (&val, &ctx, p,1 );TEST_ASSERT_VAL ("missing operand" , ret ==-1 );TEST_ASSERT_VAL ("find other" , -expr__find_other ("FOO + BAR + BAZ + BOZO" ,"FOO" , &other, &num_other) ==0 ); +expr__find_other ("FOO + BAR + BAZ + BOZO" ,"FOO" , &other, &num_other,1 ) ==0 );TEST_ASSERT_VAL ("find other" , num_other ==3 );TEST_ASSERT_VAL ("find other" , !strcmp (other[0 ],"BAR" ));TEST_ASSERT_VAL ("find other" , !strcmp (other[1 ],"BAZ" ));
tools/perf/util/expr.c +6 -5
@@ -27,10 +27,11 @@ void expr__ctx_init(struct expr_parse_ctx *ctx)static int __expr__parse (double *val,struct expr_parse_ctx *ctx,const char *expr, -int start) +int start,int param) {struct expr_scanner_ctx scanner_ctx = { .start_token = start, + .expr__runtimeparam = param, };YY_BUFFER_STATE buffer;void *scanner;
@@ -54,9 +55,9 @@ __expr__parse(double *val, struct expr_parse_ctx *ctx, const char *expr,return ret; } -int expr__parse (double *final_val,struct expr_parse_ctx *ctx,const char *expr) +int expr__parse (double *final_val,struct expr_parse_ctx *ctx,const char *expr,int param) { -return __expr__parse (final_val, ctx, expr,EXPR_PARSE ) ?-1 :0 ; +return __expr__parse (final_val, ctx, expr,EXPR_PARSE , param) ?-1 :0 ; } static bool
@@ -74,13 +75,13 @@ already_seen(const char *val, const char *one, const char **other, }int expr__find_other (const char *expr,const char *one,const char ***other, -int *num_other) +int *num_other,int param) {int err, i =0 , j =0 ;struct expr_parse_ctx ctx;expr__ctx_init (&ctx); - err =__expr__parse (NULL , &ctx, expr,EXPR_OTHER ); + err =__expr__parse (NULL , &ctx, expr,EXPR_OTHER , param);if (err)return -1 ;
tools/perf/util/expr.h +3 -2
@@ -17,12 +17,13 @@ struct expr_parse_ctx {struct expr_scanner_ctx {int start_token; +int expr__runtimeparam; };void expr__ctx_init (struct expr_parse_ctx *ctx);void expr__add_id (struct expr_parse_ctx *ctx,const char *id,double val); -int expr__parse (double *final_val,struct expr_parse_ctx *ctx,const char *expr); +int expr__parse (double *final_val,struct expr_parse_ctx *ctx,const char *expr,int param);int expr__find_other (const char *expr,const char *one,const char ***other, -int *num_other); +int *num_other,int param);#endif
tools/perf/util/expr.l +20 -7
@@ -35,7 +35,7 @@ static int value(yyscan_t scanner, int base) * Allow @ instead of / to be able to specify pmu/event/ without * conflicts with normal division. */ -static char *normalize(char *str) +static char *normalize(char *str, int expr__runtimeparam) { char *ret = str; char *dst = str;
@@ -45,6 +45,19 @@ static char *normalize(char *str) *dst++ = '/'; else if (*str == '\\') *dst++ = *++str; + else if (*str == '?') { + char *paramval; + int i = 0; + int size = asprintf(¶mval, "%d", expr__runtimeparam); + + if (size < 0) + *dst++ = '0'; + else { + while (i < size) + *dst++ = paramval[i++]; + free(paramval); + } + } else *dst++ = *str; str++;
@@ -54,16 +67,16 @@ static char *normalize(char *str) return ret; } -static int str(yyscan_t scanner, int token) +static int str(yyscan_t scanner, int token, int expr__runtimeparam) { YYSTYPE *yylval = expr_get_lval(scanner); char *text = expr_get_text(scanner); - yylval->str = normalize(strdup(text)); + yylval->str = normalize(strdup(text), expr__runtimeparam); if (!yylval->str) return EXPR_ERROR; - yylval->str = normalize(yylval->str); + yylval->str = normalize(yylval->str, expr__runtimeparam); return token; } %}
@@ -72,8 +85,8 @@ number [0-9]+ sch [-,=] spec \\{sch} -sym [0-9a-zA-Z_\.:@]+ -symbol {spec}*{sym}*{spec}*{sym}* +sym [0-9a-zA-Z_\.:@?]+ +symbol {spec}*{sym}*{spec}*{sym}*{spec}*{sym} %% struct expr_scanner_ctx *sctx = expr_get_extra(yyscanner);
@@ -93,7 +106,7 @@ if { return IF; } else { return ELSE; } #smt_on { return SMT_ON; } {number} { return value(yyscanner, 10); } -{symbol} { return str(yyscanner, ID); } +{symbol} { return str(yyscanner, ID, sctx->expr__runtimeparam); } "|" { return '|'; } "^" { return '^'; } "&" { return '&'; }
tools/perf/util/metricgroup.c +65 -1
78 lines not on this page · raw message
tools/perf/util/metricgroup.h +1 -0
@@ -34,4 +34,5 @@ int metricgroup__parse_groups(const struct option *opt,void metricgroup__print (bool metrics,bool groups,char *filter,bool raw,bool details);bool metricgroup__has_metric (const char *metric); +int arch_get_runtimeparam (void );#endif
tools/perf/util/stat-shadow.c +10 -2
@@ -336,7 +336,7 @@ void perf_stat__collect_metric_expr(struct evlist *evsel_list) metric_events = counter->metric_events;if (!metric_events) {if (expr__find_other (counter->metric_expr, counter->name, - &metric_names, &num_metric_names) <0 ) + &metric_names, &num_metric_names,1 ) <0 )continue ; metric_events = calloc(sizeof(struct evsel *),
@@ -777,7 +777,15 @@ static void generic_metric(struct perf_stat_config *config, }if (!metric_events[i]) { -if (expr__parse (&ratio, &pctx, metric_expr) ==0 ) { +int param =1 ; +if (strstr (metric_expr,"?" )) { +char *tmp =strrchr (metric_name,'_' ); + + tmp++; + param =strtol (tmp, &tmp,10 ); + } + +if (expr__parse (&ratio, &pctx, metric_expr, param) ==0 ) {char *unit;char metric_bf[64 ];
Signature · 1 line
2.18.1
Re: [PATCH v5 09/11] perf/tools: Enhance JSON/metric infrastructure to handle "?"
On Tue, Mar 17, 2020 at 11:53:31AM +0530, Kajol Jain wrote:
SNIP
tools/perf/util/expr.h struct expr_parse_ctx { · line 20
Quoted 9 lines
tools/perf/util/expr.h +1
-0@@ -17,12 +17,13 @@ struct expr_parse_ctx {struct expr_scanner_ctx {int start_token; +int expr__runtimeparam;
no need for expr__ prefix in here.. jsut runtime_param
Quoted 15 lines
tools/perf/util/stat-shadow.c +1
-1@@ -336,7 +336,7 @@ void perf_stat__collect_metric_expr(struct evlist *evsel_list) metric_events = counter->metric_events;if (!metric_events) {if (expr__find_other (counter->metric_expr, counter->name, - &metric_names, &num_metric_names) <0 ) + &metric_names, &num_metric_names,1 ) <0 )continue ; metric_events = calloc(sizeof(struct evsel *),@@ -777,7 +777,15 @@ static void generic_metric(struct perf_stat_config *config, }
tools/perf/util/stat-shadow.c static void generic_metric(struct perf_stat_config *config, · line 786
Quoted 10 lines
tools/perf/util/stat-shadow.c +7
-1if (!metric_events[i]) { -if (expr__parse (&ratio, &pctx, metric_expr) ==0 ) { +int param =1 ; +if (strstr (metric_expr,"?" )) { +char *tmp =strrchr (metric_name,'_' ); + + tmp++; + param =strtol (tmp, &tmp,10 ); + }
so, if metric_expr contains '?' you go and search metric_name for '_' and use the number after '_' ... ugh.. what's the logic?
I understand you create as many metrics as the magic runtime param tells you.. but what's the connection to this?
could you please outline in the changelog or comment the whole scheme of how this all should work? like step by step on some simple example?
thanks,
jirka
Re: [PATCH v5 09/11] perf/tools: Enhance JSON/metric infrastructure to handle "?"
Quoted 10 lines · Jiri Olsa
On Tue, Mar 17, 2020 at 11:53:31AM +0530, Kajol Jain wrote:
SNIP
Quoted 6 lines
tools/perf/util/expr.h +0
-0@@ -17,12 +17,13 @@ struct expr_parse_ctx {
Quoted 5 lines
tools/perf/util/expr.h struct expr_parse_ctx { · line 20
Quoted 3 lines
tools/perf/util/expr.h +1
-0struct expr_scanner_ctx {int start_token; +int expr__runtimeparam;no need for
expr__prefix in here.. jsutruntime_param
Hi Jiri,
Will take care for this part.
Quoted 30 lines
Quoted 16 lines
tools/perf/util/stat-shadow.c +1
-1@@ -336,7 +336,7 @@ void perf_stat__collect_metric_expr(struct evlist *evsel_list) metric_events = counter->metric_events;if (!metric_events) {if (expr__find_other (counter->metric_expr, counter->name, - &metric_names, &num_metric_names) <0 ) + &metric_names, &num_metric_names,1 ) <0 )continue ; metric_events = calloc(sizeof(struct evsel *),@@ -777,7 +777,15 @@ static void generic_metric(struct perf_stat_config *config, }tools/perf/util/stat-shadow.c static void generic_metric(struct perf_stat_config *config, · line 786
Quoted 10 lines
tools/perf/util/stat-shadow.c +7
-1if (!metric_events[i]) { -if (expr__parse (&ratio, &pctx, metric_expr) ==0 ) { +int param =1 ; +if (strstr (metric_expr,"?" )) { +char *tmp =strrchr (metric_name,'_' ); + + tmp++; + param =strtol (tmp, &tmp,10 ); + }so, if
metric_exprcontains '?' you go and searchmetric_namefor '_' and use the number after '_' ... ugh.. what's the logic?
Quoted 5 lines
I understand you create as many metrics as the magic runtime param tells you.. but what's the connection to this?
could you please outline in the changelog or comment the whole scheme of how this all should work? like step by step on some simple example?
Sure, will add that part as comment in my next patch series.
So, you are right, basically right now I am trying to create as many metric events as define by runtime_param.
To do that, I add one loop in function metricgroup__add_metric_runtime_param where, we are actually passing this parameter value as part of expr__find_other function and changing "?" present in metric expression with this value.
And then adding this metric event to the tail of group_list.
As in our json file, there gonna be single metric event, and out of which we are creating multiple events, I am also merging this value to the original metric name to specify parameter value.
For example,
command:# ./perf stat -M PowerBUS_Frequency -C 0 -I 1000
# time counts unit events
1.000101867 9,356,933 hv_24x7/pm_pb_cyc,chip=0/ # 2.3 GHz PowerBUS_Frequency_0
1.000101867 9,366,134 hv_24x7/pm_pb_cyc,chip=1/ # 2.3 GHz PowerBUS_Frequency_1
2.000314878 9,365,868 hv_24x7/pm_pb_cyc,chip=0/ # 2.3 GHz PowerBUS_Frequency_0
2.000314878 9,366,092 hv_24x7/pm_pb_cyc,chip=1/ # 2.3 GHz PowerBUS_Frequency_1So, here _0 and _1 after PowerBUS_Frequency specify parameter value.
So, after adding this to group_list, again we call expr__parse in generic_metric function present in util/stat-display.c. By this time again we need to pass this parameter value. So, now to get this value actually I am trying to extract it from metric name itself. Not sure if its good way to do that.
Is it sound fine, or should I add param as part of structure evsel as well. So, another way to do that is adding this parameter in evsel structure and also egroup structure. So, I will update this value in metricgroup.c and access it in stat-shadow?
Thanks,
Kajol
Quoted 4 lines
thanks,
jirka
Re: [PATCH v5 09/11] perf/tools: Enhance JSON/metric infrastructure to handle "?"
In reply to Kajol JainOn Tue, Mar 17, 2020 at 11:53:31AM +0530, Kajol Jain wrote:
SNIP
Quoted 23 lines
tools/perf/arch/powerpc/util/header.c +4
-0@@ -7,6 +7,8 @@#include <string.h> #include <linux/stringify.h> #include "header.h" +#include "metricgroup.h" +#include <api/fs/fs.h> #define mfspr (rn) ({unsigned long rval; \ asm volatile("mfspr %0," __stringify(rn) \@@ -16,6 +18,8 @@#define PVR_VER (pvr) (((pvr) >> 16) & 0xFFFF)/* Version field */ #define PVR_REV (pvr) (((pvr) >> 0) & 0xFFFF)/* Revison field */ +#define SOCKETS_INFO_FILE_PATH "/devices/hv_24x7/interface/sockets" +int get_cpuid (char *buffer,size_t sz) {
tools/perf/arch/powerpc/util/header.c get_cpuid_str(struct perf_pmu *pmu __maybe_unused) · line 55
Quoted 8 lines
tools/perf/arch/powerpc/util/header.c +5
-0@@ -44,3 +48,9 @@ get_cpuid_str(struct perf_pmu *pmu __maybe_unused)return bufp; } + +int arch_get_runtimeparam (void ) +{ +int count; +return sysfs__read_int (SOCKETS_INFO_FILE_PATH , &count) <0 ?1 : count;
is that SOCKETS_INFO_FILE_PATH define used later? if not please put the path directly as an argument to sysfs__read_int
jirka
Re: [PATCH v5 09/11] perf/tools: Enhance JSON/metric infrastructure to handle "?"
Quoted 28 lines · Jiri Olsa
On Tue, Mar 17, 2020 at 11:53:31AM +0530, Kajol Jain wrote:
SNIP
Quoted 24 lines
tools/perf/arch/powerpc/util/header.c +4
-0@@ -7,6 +7,8 @@#include <string.h> #include <linux/stringify.h> #include "header.h" +#include "metricgroup.h" +#include <api/fs/fs.h> #define mfspr (rn) ({unsigned long rval; \ asm volatile("mfspr %0," __stringify(rn) \@@ -16,6 +18,8 @@#define PVR_VER (pvr) (((pvr) >> 16) & 0xFFFF)/* Version field */ #define PVR_REV (pvr) (((pvr) >> 0) & 0xFFFF)/* Revison field */ +#define SOCKETS_INFO_FILE_PATH "/devices/hv_24x7/interface/sockets" +int get_cpuid (char *buffer,size_t sz) {@@ -44,3 +48,9 @@ get_cpuid_str(struct perf_pmu *pmu __maybe_unused)
Quoted 11 lines
tools/perf/arch/powerpc/util/header.c get_cpuid_str(struct perf_pmu *pmu __maybe_unused) · line 55
Quoted 7 lines
tools/perf/arch/powerpc/util/header.c +5
-0return bufp; } + +int arch_get_runtimeparam (void ) +{ +int count; +return sysfs__read_int (SOCKETS_INFO_FILE_PATH , &count) <0 ?1 : count;is that
SOCKETS_INFO_FILE_PATHdefine used later? if not please put the path directly as an argument tosysfs__read_int
Ok will do that.
Thanks,
Kajol
Quoted 2 lines
jirka
Re: [PATCH v5 09/11] perf/tools: Enhance JSON/metric infrastructure to handle "?"
In reply to Kajol JainOn Tue, Mar 17, 2020 at 11:53:31AM +0530, Kajol Jain wrote:
SBIP
Quoted 42 lines
tools/perf/util/metricgroup.c +42
-0+static int metricgroup__add_metric_runtime_param (struct strbuf *events, +struct list_head *group_list,struct pmu_event *pe) +{ +int i, count; +int ret = -EINVAL ; + + count =arch_get_runtimeparam (); + +/* This loop is added to create multiple +* events depend on count value and add +* those events to group_list. +*/ + +for (i =0 ; i < count; i++) { +const char **ids; +int idnum; +struct egroup *eg; +char value[PATH_MAX ]; + +if (expr__find_other (pe->metric_expr,NULL , &ids, &idnum, i) <0 ) +return ret; + +if (events->len >0 ) +strbuf_addf (events,"," ); + +if (metricgroup__has_constraint (pe)) +metricgroup__add_metric_non_group (events, ids, idnum); +else +metricgroup__add_metric_weak_group (events, ids, idnum); + + eg =malloc (sizeof (*eg)); +if (!eg) { + ret = -ENOMEM ; +return ret; + } + +sprintf (value,"%s%c%d" , pe->metric_name,'_' , i); + eg->ids = ids; + eg->idnum = idnum; + eg->metric_name =strdup (value); +if (!eg->metric_name) { + ret = -ENOMEM ;
tools/perf/util/metricgroup.c static bool metricgroup__has_constraint(struct pmu_event *pe) · line 533
Quoted 10 lines
tools/perf/util/metricgroup.c +10
-0+return ret; + } + + eg->metric_expr = pe->metric_expr; + eg->metric_unit = pe->unit; +list_add_tail (&eg->nd, group_list); + ret =0 ; + +if (ret !=0 ) +break ;
again, this is part of metricgroup__add_metric_param no? why not use it?
jirka
Re: [PATCH v5 09/11] perf/tools: Enhance JSON/metric infrastructure to handle "?"
Quoted 50 lines · Jiri Olsa
On Tue, Mar 17, 2020 at 11:53:31AM +0530, Kajol Jain wrote:
SBIP
Quoted 46 lines
tools/perf/util/metricgroup.c +46
-0+static int metricgroup__add_metric_runtime_param (struct strbuf *events, +struct list_head *group_list,struct pmu_event *pe) +{ +int i, count; +int ret = -EINVAL ; + + count =arch_get_runtimeparam (); + +/* This loop is added to create multiple +* events depend on count value and add +* those events to group_list. +*/ + +for (i =0 ; i < count; i++) { +const char **ids; +int idnum; +struct egroup *eg; +char value[PATH_MAX ]; + +if (expr__find_other (pe->metric_expr,NULL , &ids, &idnum, i) <0 ) +return ret; + +if (events->len >0 ) +strbuf_addf (events,"," ); + +if (metricgroup__has_constraint (pe)) +metricgroup__add_metric_non_group (events, ids, idnum); +else +metricgroup__add_metric_weak_group (events, ids, idnum); + + eg =malloc (sizeof (*eg)); +if (!eg) { + ret = -ENOMEM ; +return ret; + } + +sprintf (value,"%s%c%d" , pe->metric_name,'_' , i); + eg->ids = ids; + eg->idnum = idnum; + eg->metric_name =strdup (value); +if (!eg->metric_name) { + ret = -ENOMEM ; +return ret; + } + + eg->metric_expr = pe->metric_expr;
Quoted 8 lines
tools/perf/util/metricgroup.c static bool metricgroup__has_constraint(struct pmu_event *pe) · line 533
Quoted 6 lines
tools/perf/util/metricgroup.c +6
-0+ eg->metric_unit = pe->unit; +list_add_tail (&eg->nd, group_list); + ret =0 ; + +if (ret !=0 ) +break ;again, this is part of
metricgroup__add_metric_paramno? why not use it?
Yes right, thanks for pointing it out. Will update in next version.
Thanks,
Kajol
Quoted 3 lines
jirka
PATCH v5 10/11 tools/perf: Enable Hz/hz prinitg for --metric-only option
In reply to Kajol JainCommit 54b5091606c18 ("perf stat: Implement --metric-only mode") added function 'valid_only_metric()' which drops "Hz" or "hz", if it is part of "ScaleUnit". This patch enable it since hv_24x7 supports couple of frequency events.
--- tools/perf/util/stat-display.c | 2 -- 1 file changed, 2 deletions(-)
tools/perf/util/stat-display.c +0 -2
@@ -237,8 +237,6 @@ static bool valid_only_metric(const char *unit)if (!unit)return false;if (strstr (unit,"/sec" ) || -strstr (unit,"hz" ) || -strstr (unit,"Hz" ) ||strstr (unit,"CPUs utilized" ))return false;return true;
Signature · 1 line
2.18.1
PATCH v5 11/11 perf/tools/pmu-events/powerpc: Add hv_24x7 socket/chip level metric events
In reply to Kajol JainThe hv_24×7 feature in IBM® POWER9™ processor-based servers provide the facility to continuously collect large numbers of hardware performance metrics efficiently and accurately.
This patch adds hv_24x7 metric file for different Socket/chip resources.
Result:
power9 platform:
command:# ./perf stat --metric-only -M Memory_RD_BW_Chip -C 0 -I 1000
1.000096188 0.9 0.3
2.000285720 0.5 0.1
3.000424990 0.4 0.1command:# ./perf stat --metric-only -M PowerBUS_Frequency -C 0 -I 1000
1.000097981 2.3 2.3
2.000291713 2.3 2.3
3.000421719 2.3 2.3
4.000550912 2.3 2.3--- .../arch/powerpc/power9/nest_metrics.json | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 tools/perf/pmu-events/arch/powerpc/power9/nest_metrics.json
tools/perf/pmu-events/arch/powerpc/power9/nest_metrics.json new file +19 -0
@@ -0,0 +1,19 @@ +[ + { + "MetricExpr": "(hv_24x7@PM_MCS01_128B_RD_DISP_PORT01\\,chip\\=?@ + hv_24x7@PM_MCS01_128B_RD_DISP_PORT23\\,chip\\=?@ + hv_24x7@PM_MCS23_128B_RD_DISP_PORT01\\,chip\\=?@ + hv_24x7@PM_MCS23_128B_RD_DISP_PORT23\\,chip\\=?@)", + "MetricName": "Memory_RD_BW_Chip", + "MetricGroup": "Memory_BW", + "ScaleUnit": "1.6e-2MB" + }, + { + "MetricExpr": "(hv_24x7@PM_MCS01_128B_WR_DISP_PORT01\\,chip\\=?@ + hv_24x7@PM_MCS01_128B_WR_DISP_PORT23\\,chip\\=?@ + hv_24x7@PM_MCS23_128B_WR_DISP_PORT01\\,chip\\=?@ + hv_24x7@PM_MCS23_128B_WR_DISP_PORT23\\,chip\\=?@ )", + "MetricName": "Memory_WR_BW_Chip", + "MetricGroup": "Memory_BW", + "ScaleUnit": "1.6e-2MB" + }, + { + "MetricExpr": "(hv_24x7@PM_PB_CYC\\,chip\\=?@ )", + "MetricName": "PowerBUS_Frequency", + "ScaleUnit": "2.5e-7GHz" + } +]
Signature · 1 line
2.18.1