On 7/21/20 12:46 AM, Jiri Olsa wrote:
> On Mon, Jul 20, 2020 at 02:32:40PM +0530, kajoljain wrote:
>>
>>
>> On 7/20/20 1:49 PM, Jiri Olsa wrote:
>>> On Mon, Jul 20, 2020 at 01:39:24PM +0530, kajoljain wrote:
>>>
>>> SNIP
>>>
>>>> This is with your perf/metric branch:
>>>> command# ./perf stat -M PowerBUS_Frequency -C 0 -I 1000
>>>> assertion failed at util/metricgroup.c:709
>>>> # time counts unit events
>>>> 1.000054545 7,807,505 hv_24x7/pm_pb_cyc,chip=0/ #
>>>> 2.0 GHz PowerBUS_Frequency_0
>>>> 1.000054545 7,807,485 hv_24x7/pm_pb_cyc,chip=1/
>>>>
>>>> 2.000232761 7,807,500 hv_24x7/pm_pb_cyc,chip=0/ #
>>>> 2.0 GHz PowerBUS_Frequency_0
>>>> 2.000232761 7,807,478 hv_24x7/pm_pb_cyc,chip=1/
>>>>
>>>> 3.000363762 7,799,665 hv_24x7/pm_pb_cyc,chip=0/ #
>>>> 1.9 GHz PowerBUS_Frequency_0
>>>> 3.000363762 7,807,502 hv_24x7/pm_pb_cyc,chip=1/
>>>>
>>>> ^C 3.259418599 2,022,150 hv_24x7/pm_pb_cyc,chip=0/ #
>>>> 0.5 GHz PowerBUS_Frequency_0
>>>> 3.259418599 2,022,164 hv_24x7/pm_pb_cyc,chip=1/
>>>>
>>>>
>>>> Performance counter stats for 'CPU(s) 0':
>>>>
>>>> 25,436,820 hv_24x7/pm_pb_cyc,chip=0/ # 6.4 GHz
>>>> PowerBUS_Frequency_0
>>>> 25,444,629 hv_24x7/pm_pb_cyc,chip=1/
>>>>
>>>>
>>>> 3.259505529 seconds time elapsed
>>>
>>> I found the bug, we are not adding runtime metrics as standalone ones,
>>> but as referenced metrics.. will fix and try to add test for that
>>>
>>> as for testing.. do I need some special ppc server to have support for
>>> this?
>>
>> Hi jiri,
>> We need power9 lpar machine and need to make sure `CONFIG_HV_PERF_CTRS`
>> is
>> enabled.
>
> could you please try with following patch on top?
Hi Jiri,
The change looks good to me. I tried with adding this patch on top of
your perf/metric branch. It did resolve the issue of not printing
all chips data. And now I can see proper values for hv-24x7 metric events.
I was also trying by adding new metric using the feature added in this patchset
with something like this:
diff --git a/tools/perf/pmu-events/arch/powerpc/power9/nest_metrics.json
b/tools/perf/pmu-events/arch/powerpc/power9/nest_metrics.json
index 8383a37647ad..dfe4bd63b587 100644
--- a/tools/perf/pmu-events/arch/powerpc/power9/nest_metrics.json
+++ b/tools/perf/pmu-events/arch/powerpc/power9/nest_metrics.json
@@ -16,6 +16,11 @@
"MetricName": "PowerBUS_Frequency",
"ScaleUnit": "2.5e-7GHz"
},
+ {
+ "MetricExpr": "Memory_WR_BW_Chip + Memory_RD_BW_Chip",
+ "MetricName": "Total_Memory_BW",
+ "ScaleUnit": "1.6e-2MB"
+ },
I guess as we have dependency on '?' symbol, I am not able to see all chips
data for Total_Memory_BW.
I am not sure if Its expected behavior?
This is what I am getting:
[root@ltc-zz189-lp4 perf]# ./perf stat --metric-only -M
Total_Memory_BW,Memory_WR_BW_Chip,Memory_RD_BW_Chip -I 1000 -C 0
# time MB Total_Memory_BW MB Memory_RD_BW_Chip_1 MB
Memory_WR_BW_Chip_1 MB Memory_WR_BW_Chip_0 MB Memory_RD_BW_Chip_0
1.000067388 36.4 0.2
36.3 65.0 72.1
2.000374276 36.2 0.3
35.9 65.4 77.9
3.000543202 36.3 0.3
36.0 68.7 81.2
4.000702855 36.3 0.3
36.0 70.9 93.3
5.000856837 36.0 0.2
35.8 67.4 81.5
^C 5.367865273 13.2 0.1
13.1 23.5 28.3
Performance counter stats for 'CPU(s) 0':
194.4 1.3 193.1
361.0 434.3
5.368039176 seconds time elapsed
We can only get single chip data's sum in Total_Memory_BW. Please let me know
if I am missing something.
Thanks,
Kajol Jain
>
> thanks,
> jirka
>
>
> ---
> diff --git a/tools/perf/util/metricgroup.c b/tools/perf/util/metricgroup.c
> index 6f179b9903a0..03aa4bd4a38b 100644
> --- a/tools/perf/util/metricgroup.c
> +++ b/tools/perf/util/metricgroup.c
> @@ -820,11 +820,11 @@ static int add_metric(struct list_head *metric_list,
> struct expr_id *parent,
> struct expr_ids *ids);
>
> -static int resolve_metric(struct metric *m,
> - bool metric_no_group,
> - struct list_head *metric_list,
> - struct pmu_events_map *map,
> - struct expr_ids *ids)
> +static int __resolve_metric(struct metric *m,
> + bool metric_no_group,
> + struct list_head *metric_list,
> + struct pmu_events_map *map,
> + struct expr_ids *ids)
> {
> struct hashmap_entry *cur;
> size_t bkt;
> @@ -869,6 +869,23 @@ static int resolve_metric(struct metric *m,
> return 0;
> }
>
> +static int resolve_metric(bool metric_no_group,
> + struct list_head *metric_list,
> + struct pmu_events_map *map,
> + struct expr_ids *ids)
> +{
> + struct metric *m;
> + int err;
> +
> + list_for_each_entry(m, metric_list, nd) {
> + err = __resolve_metric(m, metric_no_group, metric_list, map,
> ids);
> + if (err)
> + return err;
> + }
> +
> + return 0;
> +}
> +
> static int add_metric(struct list_head *metric_list,
> struct pmu_event *pe,
> bool metric_no_group,
> @@ -876,6 +893,7 @@ static int add_metric(struct list_head *metric_list,
> struct expr_id *parent,
> struct expr_ids *ids)
> {
> + struct metric *orig = *m;
> int ret = 0;
>
> pr_debug("metric expr %s for %s\n", pe->metric_expr, pe->metric_name);
> @@ -892,7 +910,7 @@ static int add_metric(struct list_head *metric_list,
> * those events to metric_list.
> */
>
> - for (j = 0; j < count && !ret; j++) {
> + for (j = 0; j < count && !ret; j++, *m = orig) {
> ret = __add_metric(metric_list, pe, metric_no_group, j,
> m, parent, ids);
> }
> }
> @@ -907,8 +925,8 @@ static int metricgroup__add_metric(const char *metric,
> bool metric_no_group,
>
> {
> struct expr_ids ids = { 0 };
> + struct metric *m = NULL;
> struct pmu_event *pe;
> - struct metric *m;
> LIST_HEAD(list);
> int i, ret;
> bool has_match = false;
> @@ -925,7 +943,7 @@ static int metricgroup__add_metric(const char *metric,
> bool metric_no_group,
> * Process any possible referenced metrics
> * included in the expression.
> */
> - ret = resolve_metric(m, metric_no_group,
> + ret = resolve_metric(metric_no_group,
> &list, map, &ids);
> if (ret)
> return ret;
>
