| Message ID | 1602152121-240367-1-git-send-email-john.garry@huawei.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | perf pmu-events: Support event aliasing for system PMUs | expand |
On 10/8/20 3:45 PM, John Garry wrote: > Currently event aliasing and metrics for only CPU and uncore PMUs is > supported. In fact, only uncore PMUs aliasing is supported for when the > uncore PMUs are fixed for a CPU, which may not always be the case for > certain architectures. > > This series adds support for PMU event aliasing and metrics for system and > other uncore PMUs which are not tied to a specific CPU. > > For this, we introduce system event tables in generated pmu-events.c, > which contain a per-SoC table of events of all its system PMUs. Each > per-PMU event is matched by a "COMPAT" property. > > When creating aliased and metrics PMUs, we treat core/uncore and > system PMUs differently: > > - For CPU PMUs, we always match for the event mapfile based on the CPUID. > This has not changed. > > - For an system PMUs, we iterate through all the events in all the system > PMU tables. > > Matches are based on the "COMPAT" property matching the PMU sysfs > identifier contents, in /sys/bus/event_source/devices/<PMU>/identifier > > Uncore PMUs, may be matched via CPUID or same as system PMU, depending > on whether the uncore PMU is tied to a specific CPUID. > > Initial reference support is also added for ARM SMMUv3 PMCG (Performance > Monitor Event Group) PMU for HiSilicon hip09 platform with only a single > event so far - see driver in drivers/perf/arm_smmuv3_pmu.c reference. > > Here is a sample output with this series on Huawei D06CS board: > > root@ubuntu:/# ./perf list > [...] > > smmu v3 pmcg: > smmuv3_pmcg.config_cache_miss > [Configuration cache miss caused by transaction or(ATS or > non-ATS)translation request. Unit: smmuv3_pmcg] > smmuv3_pmcg.config_struct_access > [Configuration structure access. Unit: smmuv3_pmcg] > smmuv3_pmcg.cycles > [Clock cycles. Unit: smmuv3_pmcg] > smmuv3_pmcg.l1_tlb > [SMMUv3 PMCG L1 TABLE transation. Unit: smmuv3_pmcg] > smmuv3_pmcg.pcie_ats_trans_passed > [PCIe ATS Translated Transaction passed through SMMU. Unit: > smmuv3_pmcg] > smmuv3_pmcg.pcie_ats_trans_rq > [PCIe ATS Translation Request received. Unit: smmuv3_pmcg] > smmuv3_pmcg.tlb_miss > [TLB miss caused by incomingtransaction or (ATS or non-ATS) > translation request. Unit: smmuv3_pmcg] > smmuv3_pmcg.trans_table_walk_access > [Translation table walk access. Unit: smmuv3_pmcg] > smmuv3_pmcg.transaction > [Transaction. Unit: smmuv3_pmcg] > > > root@ubuntu:/# ./perf stat -v -e smmuv3_pmcg.l1_tlb sleep 1 > Using CPUID 0x00000000480fd010 > Using SYSID HIP08 > -> smmuv3_pmcg_200100020/event=0x8a/ > -> smmuv3_pmcg_200140020/event=0x8a/ > -> smmuv3_pmcg_100020/event=0x8a/ > -> smmuv3_pmcg_140020/event=0x8a/ > -> smmuv3_pmcg_200148020/event=0x8a/ > -> smmuv3_pmcg_148020/event=0x8a/ > smmuv3_pmcg.l1_tlb: 0 1001221690 1001221690 > smmuv3_pmcg.l1_tlb: 0 1001220090 1001220090 > smmuv3_pmcg.l1_tlb: 101 1001219660 1001219660 > smmuv3_pmcg.l1_tlb: 0 1001219010 1001219010 > smmuv3_pmcg.l1_tlb: 0 1001218360 1001218360 > smmuv3_pmcg.l1_tlb: 134 1001217850 1001217850 > > Performance counter stats for 'system wide': > > 235 smmuv3_pmcg.l1_tlb > > 1.001263128 seconds time elapsed > > root@ubuntu:/# > > Support is also added for imx8mm DDR PMU and HiSilicon hip09 uncore events. > Some events for hip09 may not be accurate at the moment. > > Series is here: > https://github.com/hisilicon/kernel-dev/tree/private-topic-perf-5.9-sys-pmu-events-v4 > > Kernel part is here: > https://lore.kernel.org/lkml/1602149181-237415-1-git-send-email-john.garry@huawei.com/T/#mc34f758ab72f3d4a90d854b9bda7e6bbb90835b2 > > Differences to v3: > - Rebase to v5.9-rc7 > - Includes Ian's uncore metric expressions Fix and another fix > - Add hip09 uncore events > - Tidy jevents.c changes a bit > > Differences to v2: > - fixups for imx8mm JSONs > - fix for metrics being repeated per PMU > - use sysfs__read_str() > - fix typo in PMCG JSON > - drop evsel fix, which someone else fixed > > Differences to v1: > - Stop using SoC id and use a per-PMU identifier instead > - Add metric group sys events support > - This is a bit hacky > - Add imx8mm DDR Perf support > - Add fix for parse events sel > - without it, I get this spewed for metric event: > > assertion failed at util/parse-events.c:1637 > > Ian Rogers (1): > perf metricgroup: Fix uncore metric expressions > > Joakim Zhang (1): > perf vendor events: Add JSON metrics for imx8mm DDR Perf > > John Garry (11): > perf jevents: Add support for an extra directory level > perf jevents: Add support for system events tables > perf pmu: Add pmu_id() > perf pmu: Add pmu_add_sys_aliases() > perf vendor events arm64: Add Architected events smmuv3-pmcg.json > perf vendor events arm64: Add hip09 SMMUv3 PMCG events > perf vendor events arm64: Add hip09 uncore events > perf metricgroup: Hack a fix for aliases when covering multiple PMUs > perf metricgroup: Split up metricgroup__print() > perf metricgroup: Support printing metric groups for system PMUs > perf metricgroup: Support adding metrics for system PMUs > Hi John, I am looking into these patches, it seems they are not re-based on top of latest Arnaldo's perf/core branch. Can you rebase these changes. I think we are missing multiple updates. Thanks, Kajol Jain > .../arch/arm64/freescale/imx8mm/sys/ddrc.json | 39 +++ > .../arm64/freescale/imx8mm/sys/metrics.json | 18 + > .../hisilicon/hip09/sys/smmu-v3-pmcg.json | 42 +++ > .../hisilicon/hip09/sys/uncore-ddrc.json | 58 ++++ > .../arm64/hisilicon/hip09/sys/uncore-hha.json | 82 +++++ > .../arm64/hisilicon/hip09/sys/uncore-l3c.json | 106 ++++++ > .../pmu-events/arch/arm64/smmuv3-pmcg.json | 58 ++++ > tools/perf/pmu-events/jevents.c | 136 ++++++-- > tools/perf/pmu-events/jevents.h | 11 +- > tools/perf/pmu-events/pmu-events.h | 6 + > tools/perf/util/metricgroup.c | 322 +++++++++++++----- > tools/perf/util/pmu.c | 96 ++++++ > tools/perf/util/pmu.h | 3 + > 13 files changed, 863 insertions(+), 114 deletions(-) > create mode 100644 tools/perf/pmu-events/arch/arm64/freescale/imx8mm/sys/ddrc.json > create mode 100644 tools/perf/pmu-events/arch/arm64/freescale/imx8mm/sys/metrics.json > create mode 100644 tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/smmu-v3-pmcg.json > create mode 100644 tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-ddrc.json > create mode 100644 tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-hha.json > create mode 100644 tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-l3c.json > create mode 100644 tools/perf/pmu-events/arch/arm64/smmuv3-pmcg.json >
On 08/10/2020 12:27, kajoljain wrote: > Hi John, > I am looking into these patches, it seems they are not re-based on top of > latest Arnaldo's perf/core branch. Can you rebase these changes. I think we are missing > multiple updates. > > > Thanks, > Kajol Jain > Hi Kajol Jain, My thought was that since the kernel part needs acceptance first [0], which is based on v5.9-rc7, I would just use the same baseline here. However I suppose I should still use Arnaldo's perf/core from now on as baseline, so I'll look at that now. Thanks, John [0] https://lore.kernel.org/lkml/1602149181-237415-1-git-send-email-john.garry@huawei.com/T/#mc34f758ab72f3d4a90d854b9bda7e6bbb90835b2
On Thu, Oct 08, 2020 at 12:49:15PM +0100, John Garry wrote: > On 08/10/2020 12:27, kajoljain wrote: > > Hi John, > > I am looking into these patches, it seems they are not re-based on top of > > latest Arnaldo's perf/core branch. Can you rebase these changes. I think we are missing > > multiple updates. > > > > > > Thanks, > > Kajol Jain > > > > Hi Kajol Jain, > > My thought was that since the kernel part needs acceptance first [0], which > is based on v5.9-rc7, I would just use the same baseline here. > > However I suppose I should still use Arnaldo's perf/core from now on as > baseline, so I'll look at that now. yes please, I can't already apply 2nd patch.. patching file pmu-events/jevents.c Hunk #1 succeeded at 82 with fuzz 2 (offset 29 lines). Hunk #2 FAILED at 335. Hunk #3 FAILED at 354. Hunk #4 succeeded at 406 (offset 22 lines). Hunk #5 FAILED at 439. Hunk #6 FAILED at 531. Hunk #7 FAILED at 555. Hunk #8 FAILED at 602. Hunk #9 FAILED at 698. Hunk #10 succeeded at 770 (offset 2 lines). Hunk #11 succeeded at 813 (offset 2 lines). Hunk #12 succeeded at 1075 (offset 2 lines). Hunk #13 succeeded at 1242 (offset 2 lines). Hunk #14 succeeded at 1273 (offset 2 lines). 7 out of 14 hunks FAILED -- saving rejects to file pmu-events/jevents.c.rej can't find file to patch at input line 439 thanks, jirka
On 14/10/2020 12:16, Jiri Olsa wrote: >> My thought was that since the kernel part needs acceptance first [0], which >> is based on v5.9-rc7, I would just use the same baseline here. >> >> However I suppose I should still use Arnaldo's perf/core from now on as >> baseline, so I'll look at that now. > yes please, I can't already apply 2nd patch.. > > patching file pmu-events/jevents.c > Hunk #1 succeeded at 82 with fuzz 2 (offset 29 lines). > Hunk #2 FAILED at 335. > Hunk #3 FAILED at 354. > Hunk #4 succeeded at 406 (offset 22 lines). > Hunk #5 FAILED at 439. > Hunk #6 FAILED at 531. > Hunk #7 FAILED at 555. > Hunk #8 FAILED at 602. > Hunk #9 FAILED at 698. > Hunk #10 succeeded at 770 (offset 2 lines). > Hunk #11 succeeded at 813 (offset 2 lines). > Hunk #12 succeeded at 1075 (offset 2 lines). > Hunk #13 succeeded at 1242 (offset 2 lines). > Hunk #14 succeeded at 1273 (offset 2 lines). > 7 out of 14 hunks FAILED -- saving rejects to file pmu-events/jevents.c.rej > can't find file to patch at input line 439 OK, so I already did the rebase and it was quite straightforward - the conflicts came with the recent changes in jevents. I will send out soon. Thanks, John
Currently event aliasing and metrics for only CPU and uncore PMUs is supported. In fact, only uncore PMUs aliasing is supported for when the uncore PMUs are fixed for a CPU, which may not always be the case for certain architectures. This series adds support for PMU event aliasing and metrics for system and other uncore PMUs which are not tied to a specific CPU. For this, we introduce system event tables in generated pmu-events.c, which contain a per-SoC table of events of all its system PMUs. Each per-PMU event is matched by a "COMPAT" property. When creating aliased and metrics PMUs, we treat core/uncore and system PMUs differently: - For CPU PMUs, we always match for the event mapfile based on the CPUID. This has not changed. - For an system PMUs, we iterate through all the events in all the system PMU tables. Matches are based on the "COMPAT" property matching the PMU sysfs identifier contents, in /sys/bus/event_source/devices/<PMU>/identifier Uncore PMUs, may be matched via CPUID or same as system PMU, depending on whether the uncore PMU is tied to a specific CPUID. Initial reference support is also added for ARM SMMUv3 PMCG (Performance Monitor Event Group) PMU for HiSilicon hip09 platform with only a single event so far - see driver in drivers/perf/arm_smmuv3_pmu.c reference. Here is a sample output with this series on Huawei D06CS board: root@ubuntu:/# ./perf list [...] smmu v3 pmcg: smmuv3_pmcg.config_cache_miss [Configuration cache miss caused by transaction or(ATS or non-ATS)translation request. Unit: smmuv3_pmcg] smmuv3_pmcg.config_struct_access [Configuration structure access. Unit: smmuv3_pmcg] smmuv3_pmcg.cycles [Clock cycles. Unit: smmuv3_pmcg] smmuv3_pmcg.l1_tlb [SMMUv3 PMCG L1 TABLE transation. Unit: smmuv3_pmcg] smmuv3_pmcg.pcie_ats_trans_passed [PCIe ATS Translated Transaction passed through SMMU. Unit: smmuv3_pmcg] smmuv3_pmcg.pcie_ats_trans_rq [PCIe ATS Translation Request received. Unit: smmuv3_pmcg] smmuv3_pmcg.tlb_miss [TLB miss caused by incomingtransaction or (ATS or non-ATS) translation request. Unit: smmuv3_pmcg] smmuv3_pmcg.trans_table_walk_access [Translation table walk access. Unit: smmuv3_pmcg] smmuv3_pmcg.transaction [Transaction. Unit: smmuv3_pmcg] root@ubuntu:/# ./perf stat -v -e smmuv3_pmcg.l1_tlb sleep 1 Using CPUID 0x00000000480fd010 Using SYSID HIP08 -> smmuv3_pmcg_200100020/event=0x8a/ -> smmuv3_pmcg_200140020/event=0x8a/ -> smmuv3_pmcg_100020/event=0x8a/ -> smmuv3_pmcg_140020/event=0x8a/ -> smmuv3_pmcg_200148020/event=0x8a/ -> smmuv3_pmcg_148020/event=0x8a/ smmuv3_pmcg.l1_tlb: 0 1001221690 1001221690 smmuv3_pmcg.l1_tlb: 0 1001220090 1001220090 smmuv3_pmcg.l1_tlb: 101 1001219660 1001219660 smmuv3_pmcg.l1_tlb: 0 1001219010 1001219010 smmuv3_pmcg.l1_tlb: 0 1001218360 1001218360 smmuv3_pmcg.l1_tlb: 134 1001217850 1001217850 Performance counter stats for 'system wide': 235 smmuv3_pmcg.l1_tlb 1.001263128 seconds time elapsed root@ubuntu:/# Support is also added for imx8mm DDR PMU and HiSilicon hip09 uncore events. Some events for hip09 may not be accurate at the moment. Series is here: https://github.com/hisilicon/kernel-dev/tree/private-topic-perf-5.9-sys-pmu-events-v4 Kernel part is here: https://lore.kernel.org/lkml/1602149181-237415-1-git-send-email-john.garry@huawei.com/T/#mc34f758ab72f3d4a90d854b9bda7e6bbb90835b2 Differences to v3: - Rebase to v5.9-rc7 - Includes Ian's uncore metric expressions Fix and another fix - Add hip09 uncore events - Tidy jevents.c changes a bit Differences to v2: - fixups for imx8mm JSONs - fix for metrics being repeated per PMU - use sysfs__read_str() - fix typo in PMCG JSON - drop evsel fix, which someone else fixed Differences to v1: - Stop using SoC id and use a per-PMU identifier instead - Add metric group sys events support - This is a bit hacky - Add imx8mm DDR Perf support - Add fix for parse events sel - without it, I get this spewed for metric event: assertion failed at util/parse-events.c:1637 Ian Rogers (1): perf metricgroup: Fix uncore metric expressions Joakim Zhang (1): perf vendor events: Add JSON metrics for imx8mm DDR Perf John Garry (11): perf jevents: Add support for an extra directory level perf jevents: Add support for system events tables perf pmu: Add pmu_id() perf pmu: Add pmu_add_sys_aliases() perf vendor events arm64: Add Architected events smmuv3-pmcg.json perf vendor events arm64: Add hip09 SMMUv3 PMCG events perf vendor events arm64: Add hip09 uncore events perf metricgroup: Hack a fix for aliases when covering multiple PMUs perf metricgroup: Split up metricgroup__print() perf metricgroup: Support printing metric groups for system PMUs perf metricgroup: Support adding metrics for system PMUs .../arch/arm64/freescale/imx8mm/sys/ddrc.json | 39 +++ .../arm64/freescale/imx8mm/sys/metrics.json | 18 + .../hisilicon/hip09/sys/smmu-v3-pmcg.json | 42 +++ .../hisilicon/hip09/sys/uncore-ddrc.json | 58 ++++ .../arm64/hisilicon/hip09/sys/uncore-hha.json | 82 +++++ .../arm64/hisilicon/hip09/sys/uncore-l3c.json | 106 ++++++ .../pmu-events/arch/arm64/smmuv3-pmcg.json | 58 ++++ tools/perf/pmu-events/jevents.c | 136 ++++++-- tools/perf/pmu-events/jevents.h | 11 +- tools/perf/pmu-events/pmu-events.h | 6 + tools/perf/util/metricgroup.c | 322 +++++++++++++----- tools/perf/util/pmu.c | 96 ++++++ tools/perf/util/pmu.h | 3 + 13 files changed, 863 insertions(+), 114 deletions(-) create mode 100644 tools/perf/pmu-events/arch/arm64/freescale/imx8mm/sys/ddrc.json create mode 100644 tools/perf/pmu-events/arch/arm64/freescale/imx8mm/sys/metrics.json create mode 100644 tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/smmu-v3-pmcg.json create mode 100644 tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-ddrc.json create mode 100644 tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-hha.json create mode 100644 tools/perf/pmu-events/arch/arm64/hisilicon/hip09/sys/uncore-l3c.json create mode 100644 tools/perf/pmu-events/arch/arm64/smmuv3-pmcg.json