From: Hao Chen <chenhao418@huawei.com>

For hns3 pmu events, we use command as below before:
perf stat -g -e hns3_pmu_sicl_0/config=0x00105,global=1/
-e hns3_pmu_sicl_0/config=0x10105,global=1/ -I 1000

We want to use -g parameter to make 0x00105 event and 0x10105 event
share a hardware event, but for kernel 6.2, 'commit 5f8f95673f68
("perf evlist: Remove group option.")' remove -g parameter.

So add this patch to set default related event idx as 0 to share
the first hardware event.

The new command shows as below:
perf stat -e hns3_pmu_sicl_0/config=0x00105,global=1/
-e hns3_pmu_sicl_0/config=0x10105,global=1/ -I 1000

Fixes: 5f8f95673f68 ("perf evlist: Remove group option.")
Signed-off-by: Hao Chen <chenhao418@huawei.com>
Signed-off-by: Jijie Shao <shaojijie@huawei.com>
---
 drivers/perf/hisilicon/hns3_pmu.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/perf/hisilicon/hns3_pmu.c b/drivers/perf/hisilicon/hns3_pmu.c
index e0457d84af6b..6a4d04cbae91 100644
--- a/drivers/perf/hisilicon/hns3_pmu.c
+++ b/drivers/perf/hisilicon/hns3_pmu.c
@@ -796,9 +796,11 @@ static int hns3_pmu_find_related_event_idx(struct hns3_pmu *hns3_pmu,
 		if (!hns3_pmu_cmp_event(sibling, event))
 			continue;
 
-		/* Related events is used in group */
+		/* Related events is used in group, else we use index 0 event as related event */
 		if (sibling->group_leader == event->group_leader)
 			return idx;
+		else
+			return 0;
 	}
 
 	/* No related event and all hardware events are used up */
-- 
2.30.0

On Wed, Aug 16, 2023 at 05:46:18PM +0800, Jijie Shao wrote:
> From: Hao Chen <chenhao418@huawei.com>
> 
> For hns3 pmu events, we use command as below before:
> perf stat -g -e hns3_pmu_sicl_0/config=0x00105,global=1/
> -e hns3_pmu_sicl_0/config=0x10105,global=1/ -I 1000
> 
> We want to use -g parameter to make 0x00105 event and 0x10105 event
> share a hardware event, but for kernel 6.2, 'commit 5f8f95673f68
> ("perf evlist: Remove group option.")' remove -g parameter.
> 
> So add this patch to set default related event idx as 0 to share
> the first hardware event.

Hmm, but the change cited above is a userspace change so I don't think
we should be making driver-side changes for that. Furthermore, the commit
message there suggests that you should be using a different syntax,
introduced by 89efb029502d ("perf tools: Add support to parse event
group syntax") (which describes the grammer and has some examples too).

Will

on 2023/8/21 19:58, Will Deacon wrote:
> On Wed, Aug 16, 2023 at 05:46:18PM +0800, Jijie Shao wrote:
>> From: Hao Chen <chenhao418@huawei.com>
>>
>> For hns3 pmu events, we use command as below before:
>> perf stat -g -e hns3_pmu_sicl_0/config=0x00105,global=1/
>> -e hns3_pmu_sicl_0/config=0x10105,global=1/ -I 1000
>>
>> We want to use -g parameter to make 0x00105 event and 0x10105 event
>> share a hardware event, but for kernel 6.2, 'commit 5f8f95673f68
>> ("perf evlist: Remove group option.")' remove -g parameter.
>>
>> So add this patch to set default related event idx as 0 to share
>> the first hardware event.
> Hmm, but the change cited above is a userspace change so I don't think
> we should be making driver-side changes for that. Furthermore, the commit
> message there suggests that you should be using a different syntax,
> introduced by 89efb029502d ("perf tools: Add support to parse event
> group syntax") (which describes the grammer and has some examples too).
>
> Will

Thanks for your introduction, we are retesting this scenario as

89efb029502d("perf tools: Add support to parse eventgroup syntax")

Jijie Shao