[PATCH v2 1/3] perf vendor events intel: Fix broadwellde tma_info_system_dram_bw_use metric

[PATCH v2 1/3] perf vendor events intel: Fix broadwellde tma_info_system_dram_bw_use metric

[Ian Rogers]

Broadwell-de has a consumer core and server uncore. The uncore_arb PMU
isn't present and the broadwellx style cbox PMU should be used
instead. Fix the tma_info_system_dram_bw_use metric to use the server
metric rather than client.

The associated converter script fix is in:
https://github.com/intel/perfmon/pull/111

Fixes: 7d124303d620 ("perf vendor events intel: Update broadwell variant events/metrics")
Signed-off-by: Ian Rogers <irogers@google.com>
---
 tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json b/tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json
index 8fc62b8f667d..d0ef46c9bb61 100644
--- a/tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json
+++ b/tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json
@@ -652,7 +652,7 @@
     },
     {
         "BriefDescription": "Average external Memory Bandwidth Use for reads and writes [GB / sec]",
-        "MetricExpr": "64 * (arb@event\\=0x81\\,umask\\=0x1@ + arb@event\\=0x84\\,umask\\=0x1@) / 1e6 / duration_time / 1e3",
+        "MetricExpr": "64 * (UNC_M_CAS_COUNT.RD + UNC_M_CAS_COUNT.WR) / 1e9 / duration_time",
         "MetricGroup": "HPC;Mem;MemoryBW;SoC;tma_issueBW",
         "MetricName": "tma_info_system_dram_bw_use",
         "PublicDescription": "Average external Memory Bandwidth Use for reads and writes [GB / sec]. Related metrics: tma_fb_full, tma_mem_bandwidth, tma_sq_full"
-- 
2.42.0.515.g380fc7ccd1-goog

[PATCH v2 2/3] perf vendor events intel: Add broadwellde two metrics

[Ian Rogers]

Add tma_info_system_socket_clks and uncore_freq metrics that require a
broadwellx style uncore event for UNC_CLOCK.

The associated converter script fix is in:
https://github.com/intel/perfmon/pull/112

Fixes: 7d124303d620 ("perf vendor events intel: Update broadwell variant events/metrics")
Signed-off-by: Ian Rogers <irogers@google.com>
---
 .../arch/x86/broadwellde/bdwde-metrics.json          | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json b/tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json
index d0ef46c9bb61..e1f55fcfa0d0 100644
--- a/tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json
+++ b/tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json
@@ -48,6 +48,12 @@
         "MetricName": "C7_Pkg_Residency",
         "ScaleUnit": "100%"
     },
+    {
+        "BriefDescription": "Uncore frequency per die [GHZ]",
+        "MetricExpr": "tma_info_system_socket_clks / #num_dies / duration_time / 1e9",
+        "MetricGroup": "SoC",
+        "MetricName": "UNCORE_FREQ"
+    },
     {
         "BriefDescription": "Percentage of cycles spent in System Management Interrupts.",
         "MetricExpr": "((msr@aperf@ - cycles) / msr@aperf@ if msr@smi@ > 0 else 0)",
@@ -690,6 +696,12 @@
         "MetricGroup": "SMT",
         "MetricName": "tma_info_system_smt_2t_utilization"
     },
+    {
+        "BriefDescription": "Socket actual clocks when any core is active on that socket",
+        "MetricExpr": "cbox_0@event\\=0x0@",
+        "MetricGroup": "SoC",
+        "MetricName": "tma_info_system_socket_clks"
+    },
     {
         "BriefDescription": "Average Frequency Utilization relative nominal frequency",
         "MetricExpr": "tma_info_thread_clks / CPU_CLK_UNHALTED.REF_TSC",
-- 
2.42.0.515.g380fc7ccd1-goog

[PATCH v2 3/3] perf vendor events intel: Add tigerlake two metrics

[Ian Rogers]

Add tma_info_system_socket_clks and uncore_freq metrics.

The associated converter script fix is in:
https://github.com/intel/perfmon/pull/112

Signed-off-by: Ian Rogers <irogers@google.com>
---
 .../pmu-events/arch/x86/tigerlake/tgl-metrics.json   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/tools/perf/pmu-events/arch/x86/tigerlake/tgl-metrics.json b/tools/perf/pmu-events/arch/x86/tigerlake/tgl-metrics.json
index fab084e1bc69..820d85c2933b 100644
--- a/tools/perf/pmu-events/arch/x86/tigerlake/tgl-metrics.json
+++ b/tools/perf/pmu-events/arch/x86/tigerlake/tgl-metrics.json
@@ -62,6 +62,12 @@
         "MetricName": "C9_Pkg_Residency",
         "ScaleUnit": "100%"
     },
+    {
+        "BriefDescription": "Uncore frequency per die [GHZ]",
+        "MetricExpr": "tma_info_system_socket_clks / #num_dies / duration_time / 1e9",
+        "MetricGroup": "SoC",
+        "MetricName": "UNCORE_FREQ"
+    },
     {
         "BriefDescription": "Percentage of cycles spent in System Management Interrupts.",
         "MetricExpr": "((msr@aperf@ - cycles) / msr@aperf@ if msr@smi@ > 0 else 0)",
@@ -1026,6 +1032,12 @@
         "MetricGroup": "SMT",
         "MetricName": "tma_info_system_smt_2t_utilization"
     },
+    {
+        "BriefDescription": "Socket actual clocks when any core is active on that socket",
+        "MetricExpr": "UNC_CLOCK.SOCKET",
+        "MetricGroup": "SoC",
+        "MetricName": "tma_info_system_socket_clks"
+    },
     {
         "BriefDescription": "Average Frequency Utilization relative nominal frequency",
         "MetricExpr": "tma_info_thread_clks / CPU_CLK_UNHALTED.REF_TSC",
-- 
2.42.0.515.g380fc7ccd1-goog

Re: [PATCH v2 1/3] perf vendor events intel: Fix broadwellde tma_info_system_dram_bw_use metric

[Liang, Kan]

On 2023-09-26 4:59 p.m., Ian Rogers wrote:
> Broadwell-de has a consumer core and server uncore. The uncore_arb PMU
> isn't present and the broadwellx style cbox PMU should be used
> instead. Fix the tma_info_system_dram_bw_use metric to use the server
> metric rather than client.
> 
> The associated converter script fix is in:
> https://github.com/intel/perfmon/pull/111
> 
> Fixes: 7d124303d620 ("perf vendor events intel: Update broadwell variant events/metrics")
> Signed-off-by: Ian Rogers <irogers@google.com>
> ---

Thanks Ian. The whole patch series looks good to me.

Reviewed-by: Kan Liang <kan.liang@linux.intel.com>

Thanks,
Kan

>  tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json b/tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json
> index 8fc62b8f667d..d0ef46c9bb61 100644
> --- a/tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json
> +++ b/tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json
> @@ -652,7 +652,7 @@
>      },
>      {
>          "BriefDescription": "Average external Memory Bandwidth Use for reads and writes [GB / sec]",
> -        "MetricExpr": "64 * (arb@event\\=0x81\\,umask\\=0x1@ + arb@event\\=0x84\\,umask\\=0x1@) / 1e6 / duration_time / 1e3",
> +        "MetricExpr": "64 * (UNC_M_CAS_COUNT.RD + UNC_M_CAS_COUNT.WR) / 1e9 / duration_time",
>          "MetricGroup": "HPC;Mem;MemoryBW;SoC;tma_issueBW",
>          "MetricName": "tma_info_system_dram_bw_use",
>          "PublicDescription": "Average external Memory Bandwidth Use for reads and writes [GB / sec]. Related metrics: tma_fb_full, tma_mem_bandwidth, tma_sq_full"

Re: [PATCH v2 1/3] perf vendor events intel: Fix broadwellde tma_info_system_dram_bw_use metric

[Ian Rogers]

On Wed, Sep 27, 2023 at 6:47 AM Liang, Kan <kan.liang@linux.intel.com> wrote:
>
>
>
> On 2023-09-26 4:59 p.m., Ian Rogers wrote:
> > Broadwell-de has a consumer core and server uncore. The uncore_arb PMU
> > isn't present and the broadwellx style cbox PMU should be used
> > instead. Fix the tma_info_system_dram_bw_use metric to use the server
> > metric rather than client.
> >
> > The associated converter script fix is in:
> > https://github.com/intel/perfmon/pull/111
> >
> > Fixes: 7d124303d620 ("perf vendor events intel: Update broadwell variant events/metrics")
> > Signed-off-by: Ian Rogers <irogers@google.com>
> > ---
>
> Thanks Ian. The whole patch series looks good to me.
>
> Reviewed-by: Kan Liang <kan.liang@linux.intel.com>

Would be good to pick this up in perf-tools-next.

Thanks,
Ian

> Thanks,
> Kan
>
> >  tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json b/tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json
> > index 8fc62b8f667d..d0ef46c9bb61 100644
> > --- a/tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json
> > +++ b/tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json
> > @@ -652,7 +652,7 @@
> >      },
> >      {
> >          "BriefDescription": "Average external Memory Bandwidth Use for reads and writes [GB / sec]",
> > -        "MetricExpr": "64 * (arb@event\\=0x81\\,umask\\=0x1@ + arb@event\\=0x84\\,umask\\=0x1@) / 1e6 / duration_time / 1e3",
> > +        "MetricExpr": "64 * (UNC_M_CAS_COUNT.RD + UNC_M_CAS_COUNT.WR) / 1e9 / duration_time",
> >          "MetricGroup": "HPC;Mem;MemoryBW;SoC;tma_issueBW",
> >          "MetricName": "tma_info_system_dram_bw_use",
> >          "PublicDescription": "Average external Memory Bandwidth Use for reads and writes [GB / sec]. Related metrics: tma_fb_full, tma_mem_bandwidth, tma_sq_full"

Re: [PATCH v2 1/3] perf vendor events intel: Fix broadwellde tma_info_system_dram_bw_use metric

[Ian Rogers]

On Thu, Oct 5, 2023 at 3:16 PM Ian Rogers <irogers@google.com> wrote:
>
> On Wed, Sep 27, 2023 at 6:47 AM Liang, Kan <kan.liang@linux.intel.com> wrote:
> >
> >
> >
> > On 2023-09-26 4:59 p.m., Ian Rogers wrote:
> > > Broadwell-de has a consumer core and server uncore. The uncore_arb PMU
> > > isn't present and the broadwellx style cbox PMU should be used
> > > instead. Fix the tma_info_system_dram_bw_use metric to use the server
> > > metric rather than client.
> > >
> > > The associated converter script fix is in:
> > > https://github.com/intel/perfmon/pull/111
> > >
> > > Fixes: 7d124303d620 ("perf vendor events intel: Update broadwell variant events/metrics")
> > > Signed-off-by: Ian Rogers <irogers@google.com>
> > > ---
> >
> > Thanks Ian. The whole patch series looks good to me.
> >
> > Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
>
> Would be good to pick this up in perf-tools-next.
>
> Thanks,
> Ian

Ping.

Thanks,
Ian

> > Thanks,
> > Kan
> >
> > >  tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json b/tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json
> > > index 8fc62b8f667d..d0ef46c9bb61 100644
> > > --- a/tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json
> > > +++ b/tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json
> > > @@ -652,7 +652,7 @@
> > >      },
> > >      {
> > >          "BriefDescription": "Average external Memory Bandwidth Use for reads and writes [GB / sec]",
> > > -        "MetricExpr": "64 * (arb@event\\=0x81\\,umask\\=0x1@ + arb@event\\=0x84\\,umask\\=0x1@) / 1e6 / duration_time / 1e3",
> > > +        "MetricExpr": "64 * (UNC_M_CAS_COUNT.RD + UNC_M_CAS_COUNT.WR) / 1e9 / duration_time",
> > >          "MetricGroup": "HPC;Mem;MemoryBW;SoC;tma_issueBW",
> > >          "MetricName": "tma_info_system_dram_bw_use",
> > >          "PublicDescription": "Average external Memory Bandwidth Use for reads and writes [GB / sec]. Related metrics: tma_fb_full, tma_mem_bandwidth, tma_sq_full"

Re: [PATCH v2 1/3] perf vendor events intel: Fix broadwellde tma_info_system_dram_bw_use metric

[Ian Rogers]

On Wed, Oct 25, 2023 at 2:56 PM Ian Rogers <irogers@google.com> wrote:
>
> On Thu, Oct 5, 2023 at 3:16 PM Ian Rogers <irogers@google.com> wrote:
> >
> > On Wed, Sep 27, 2023 at 6:47 AM Liang, Kan <kan.liang@linux.intel.com> wrote:
> > >
> > >
> > >
> > > On 2023-09-26 4:59 p.m., Ian Rogers wrote:
> > > > Broadwell-de has a consumer core and server uncore. The uncore_arb PMU
> > > > isn't present and the broadwellx style cbox PMU should be used
> > > > instead. Fix the tma_info_system_dram_bw_use metric to use the server
> > > > metric rather than client.
> > > >
> > > > The associated converter script fix is in:
> > > > https://github.com/intel/perfmon/pull/111
> > > >
> > > > Fixes: 7d124303d620 ("perf vendor events intel: Update broadwell variant events/metrics")
> > > > Signed-off-by: Ian Rogers <irogers@google.com>
> > > > ---
> > >
> > > Thanks Ian. The whole patch series looks good to me.
> > >
> > > Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
> >
> > Would be good to pick this up in perf-tools-next.
> >
> > Thanks,
> > Ian
>
> Ping.

Thanks Namhyung for picking this up. There were two other patches in
the v2 patch set that Kan reviewed:
https://lore.kernel.org/all/8a6b9556-c82c-4253-a4c1-74d696ad26df@linux.intel.com/
that I don't see in perf-tools-next.

Ian

> Thanks,
> Ian
>
> > > Thanks,
> > > Kan
> > >
> > > >  tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json | 2 +-
> > > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > > >
> > > > diff --git a/tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json b/tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json
> > > > index 8fc62b8f667d..d0ef46c9bb61 100644
> > > > --- a/tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json
> > > > +++ b/tools/perf/pmu-events/arch/x86/broadwellde/bdwde-metrics.json
> > > > @@ -652,7 +652,7 @@
> > > >      },
> > > >      {
> > > >          "BriefDescription": "Average external Memory Bandwidth Use for reads and writes [GB / sec]",
> > > > -        "MetricExpr": "64 * (arb@event\\=0x81\\,umask\\=0x1@ + arb@event\\=0x84\\,umask\\=0x1@) / 1e6 / duration_time / 1e3",
> > > > +        "MetricExpr": "64 * (UNC_M_CAS_COUNT.RD + UNC_M_CAS_COUNT.WR) / 1e9 / duration_time",
> > > >          "MetricGroup": "HPC;Mem;MemoryBW;SoC;tma_issueBW",
> > > >          "MetricName": "tma_info_system_dram_bw_use",
> > > >          "PublicDescription": "Average external Memory Bandwidth Use for reads and writes [GB / sec]. Related metrics: tma_fb_full, tma_mem_bandwidth, tma_sq_full"

Re: [PATCH v2 1/3] perf vendor events intel: Fix broadwellde tma_info_system_dram_bw_use metric

[Namhyung Kim]

Hi Ian,

On Wed, Oct 25, 2023 at 9:20 PM Ian Rogers <irogers@google.com> wrote:
>
> On Wed, Oct 25, 2023 at 2:56 PM Ian Rogers <irogers@google.com> wrote:
> >
> > On Thu, Oct 5, 2023 at 3:16 PM Ian Rogers <irogers@google.com> wrote:
> > >
> > > On Wed, Sep 27, 2023 at 6:47 AM Liang, Kan <kan.liang@linux.intel.com> wrote:
> > > >
> > > >
> > > >
> > > > On 2023-09-26 4:59 p.m., Ian Rogers wrote:
> > > > > Broadwell-de has a consumer core and server uncore. The uncore_arb PMU
> > > > > isn't present and the broadwellx style cbox PMU should be used
> > > > > instead. Fix the tma_info_system_dram_bw_use metric to use the server
> > > > > metric rather than client.
> > > > >
> > > > > The associated converter script fix is in:
> > > > > https://github.com/intel/perfmon/pull/111
> > > > >
> > > > > Fixes: 7d124303d620 ("perf vendor events intel: Update broadwell variant events/metrics")
> > > > > Signed-off-by: Ian Rogers <irogers@google.com>
> > > > > ---
> > > >
> > > > Thanks Ian. The whole patch series looks good to me.
> > > >
> > > > Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
> > >
> > > Would be good to pick this up in perf-tools-next.
> > >
> > > Thanks,
> > > Ian
> >
> > Ping.
>
> Thanks Namhyung for picking this up. There were two other patches in
> the v2 patch set that Kan reviewed:
> https://lore.kernel.org/all/8a6b9556-c82c-4253-a4c1-74d696ad26df@linux.intel.com/
> that I don't see in perf-tools-next.

Sorry about that.  I'll take care of them too.

Thanks,
Namhyung

Re: [PATCH v2 1/3] perf vendor events intel: Fix broadwellde tma_info_system_dram_bw_use metric

[Namhyung Kim]

On Thu, Oct 26, 2023 at 10:12 AM Namhyung Kim <namhyung@kernel.org> wrote:
>
> Hi Ian,
>
> On Wed, Oct 25, 2023 at 9:20 PM Ian Rogers <irogers@google.com> wrote:
> >
> > On Wed, Oct 25, 2023 at 2:56 PM Ian Rogers <irogers@google.com> wrote:
> > >
> > > On Thu, Oct 5, 2023 at 3:16 PM Ian Rogers <irogers@google.com> wrote:
> > > >
> > > > On Wed, Sep 27, 2023 at 6:47 AM Liang, Kan <kan.liang@linux.intel.com> wrote:
> > > > >
> > > > >
> > > > >
> > > > > On 2023-09-26 4:59 p.m., Ian Rogers wrote:
> > > > > > Broadwell-de has a consumer core and server uncore. The uncore_arb PMU
> > > > > > isn't present and the broadwellx style cbox PMU should be used
> > > > > > instead. Fix the tma_info_system_dram_bw_use metric to use the server
> > > > > > metric rather than client.
> > > > > >
> > > > > > The associated converter script fix is in:
> > > > > > https://github.com/intel/perfmon/pull/111
> > > > > >
> > > > > > Fixes: 7d124303d620 ("perf vendor events intel: Update broadwell variant events/metrics")
> > > > > > Signed-off-by: Ian Rogers <irogers@google.com>
> > > > > > ---
> > > > >
> > > > > Thanks Ian. The whole patch series looks good to me.
> > > > >
> > > > > Reviewed-by: Kan Liang <kan.liang@linux.intel.com>
> > > >
> > > > Would be good to pick this up in perf-tools-next.
> > > >
> > > > Thanks,
> > > > Ian
> > >
> > > Ping.
> >
> > Thanks Namhyung for picking this up. There were two other patches in
> > the v2 patch set that Kan reviewed:
> > https://lore.kernel.org/all/8a6b9556-c82c-4253-a4c1-74d696ad26df@linux.intel.com/
> > that I don't see in perf-tools-next.
>
> Sorry about that.  I'll take care of them too.

Applied to perf-tools-next, thanks!