| Message ID | 20230126233645.200509-1-irogers@google.com (mailing list archive) |
|---|---|
| Headers | show |
| Series | jevents/pmu-events improvements | expand |
On 26/01/2023 23:36, Ian Rogers wrote: Hi Ian, At a glance, none of this series has your Signed-off-by tag.. Thanks, John > Add an optimization to jevents using the metric code, rewrite metrics > in terms of each other in order to minimize size and improve > readability. For example, on Power8 > other_stall_cpi is rewritten from: > "PM_CMPLU_STALL / PM_RUN_INST_CMPL - PM_CMPLU_STALL_BRU_CRU / PM_RUN_INST_CMPL - PM_CMPLU_STALL_FXU / PM_RUN_INST_CMPL - PM_CMPLU_STALL_VSU / PM_RUN_INST_CMPL - PM_CMPLU_STALL_LSU / PM_RUN_INST_CMPL - PM_CMPLU_STALL_NTCG_FLUSH / PM_RUN_INST_CMPL - PM_CMPLU_STALL_NO_NTF / PM_RUN_INST_CMPL" > to: > "stall_cpi - bru_cru_stall_cpi - fxu_stall_cpi - vsu_stall_cpi - lsu_stall_cpi - ntcg_flush_cpi - no_ntf_stall_cpi" > Which more closely matches the definition on Power9. > > A limitation of the substitutions are that they depend on strict > equality and the shape of the tree. This means that for "a + b + c" > then a substitution of "a + b" will succeed while "b + c" will fail > (the LHS for "+ c" is "a + b" not just "b"). > > Separate out the events and metrics in the pmu-events tables saving > 14.8% in the table size while making it that metrics no longer need to > iterate over all events and vice versa. These changes remove evsel's > direct metric support as the pmu_event no longer has a metric to > populate it. This is a minor issue as the code wasn't working > properly, metrics for this are rare and can still be properly ran > using '-M'. > > Add an ability to just build certain models into the jevents generated > pmu-metrics.c code. This functionality is appropriate for operating > systems like ChromeOS, that aim to minimize binary size and know all > the target CPU models.
On 27/01/2023 13:48, Ian Rogers wrote: > On Fri, Jan 27, 2023, 5:20 AM John Garry <john.g.garry@oracle.com > <mailto:john.g.garry@oracle.com>> wrote: > > On 26/01/2023 23:36, Ian Rogers wrote: > > Hi Ian, > > At a glance, none of this series has your Signed-off-by tag.. > > Thanks, > John > > > > Thanks John, will fix. Is there anything else? Not yet, but I am just trying to get through it - there's a lot here... Thanks, John
On 27/01/2023 13:48, Ian Rogers wrote: > On Fri, Jan 27, 2023, 5:20 AM John Garry <john.g.garry@oracle.com > <mailto:john.g.garry@oracle.com>> wrote: > > On 26/01/2023 23:36, Ian Rogers wrote: > > Hi Ian, > > At a glance, none of this series has your Signed-off-by tag.. > > Thanks, > John > > > > Thanks John, will fix. Is there anything else? Do you think that pmu-events/__pycache__/metric.cpython-36.pyc should be deleted with a make clean? I would expect stuff like this to be deleted (with a clean), but I am not sure if we have a policy on this (pyc files) Thanks, John
On Mon, Jan 30, 2023 at 7:22 AM John Garry <john.g.garry@oracle.com> wrote: > > On 27/01/2023 13:48, Ian Rogers wrote: > > On Fri, Jan 27, 2023, 5:20 AM John Garry <john.g.garry@oracle.com > > <mailto:john.g.garry@oracle.com>> wrote: > > > > On 26/01/2023 23:36, Ian Rogers wrote: > > > > Hi Ian, > > > > At a glance, none of this series has your Signed-off-by tag.. > > > > Thanks, > > John > > > > > > > > Thanks John, will fix. Is there anything else? > > Do you think that pmu-events/__pycache__/metric.cpython-36.pyc should be > deleted with a make clean? I would expect stuff like this to be deleted > (with a clean), but I am not sure if we have a policy on this (pyc files) Should they be covered by the existing clean target? https://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git/tree/tools/perf/Makefile.perf?h=perf/core#n1102 Thanks, Ian > Thanks, > John
On 31/01/2023 00:39, Ian Rogers wrote: >>> Thanks John, will fix. Is there anything else? >> Do you think that pmu-events/__pycache__/metric.cpython-36.pyc should be >> deleted with a make clean? I would expect stuff like this to be deleted >> (with a clean), but I am not sure if we have a policy on this (pyc files) > Should they be covered by the existing clean target? > https://urldefense.com/v3/__https://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git/tree/tools/perf/Makefile.perf?h=perf*core*n1102__;LyM!!ACWV5N9M2RV99hQ!IqhXlW8RwYRwSK4Gq_djcf1C7Zjp_q6OmUE8Kb6Cei9CvHFBoJWyMfT3IR8RHRS8iKkd7ZlvE4mvil-4Aos$ Well it didn't seem to work for me and I was using acme tmp.perf/core branch. Thanks, John
Patchset looks goot to me Reviewed-By: Kajol Jain<kjain@linux.ibm.com> On 1/27/23 05:06, Ian Rogers wrote: > Add an optimization to jevents using the metric code, rewrite metrics > in terms of each other in order to minimize size and improve > readability. For example, on Power8 > other_stall_cpi is rewritten from: > "PM_CMPLU_STALL / PM_RUN_INST_CMPL - PM_CMPLU_STALL_BRU_CRU / PM_RUN_INST_CMPL - PM_CMPLU_STALL_FXU / PM_RUN_INST_CMPL - PM_CMPLU_STALL_VSU / PM_RUN_INST_CMPL - PM_CMPLU_STALL_LSU / PM_RUN_INST_CMPL - PM_CMPLU_STALL_NTCG_FLUSH / PM_RUN_INST_CMPL - PM_CMPLU_STALL_NO_NTF / PM_RUN_INST_CMPL" > to: > "stall_cpi - bru_cru_stall_cpi - fxu_stall_cpi - vsu_stall_cpi - lsu_stall_cpi - ntcg_flush_cpi - no_ntf_stall_cpi" > Which more closely matches the definition on Power9. > > A limitation of the substitutions are that they depend on strict > equality and the shape of the tree. This means that for "a + b + c" > then a substitution of "a + b" will succeed while "b + c" will fail > (the LHS for "+ c" is "a + b" not just "b"). > > Separate out the events and metrics in the pmu-events tables saving > 14.8% in the table size while making it that metrics no longer need to > iterate over all events and vice versa. These changes remove evsel's > direct metric support as the pmu_event no longer has a metric to > populate it. This is a minor issue as the code wasn't working > properly, metrics for this are rare and can still be properly ran > using '-M'. > > Add an ability to just build certain models into the jevents generated > pmu-metrics.c code. This functionality is appropriate for operating > systems like ChromeOS, that aim to minimize binary size and know all > the target CPU models. > > v5. s/list/List/ in a type annotation to fix Python 3.6 as reported by > John Garry <john.g.garry@oracle.com>. Fix a bug in metric_test.py > where a bad character was imported. To avoid similar regressions, > run metric_test.py before generating pmu-events.c. > v4. Better support the implementor/model style --model argument for > jevents.py. Add #slots test fix. On some patches add reviewed-by > John Garry <john.g.garry@oracle.com> and Kajol > Jain<kjain@linux.ibm.com>. > v3. Rebase an incorporate review comments from John Garry > <john.g.garry@oracle.com>, in particular breaking apart patch 4 > into 3 patches. The no jevents breakage and then later fix is > avoided in this series too. > v2. Rebase. Modify the code that skips rewriting a metric with the > same name with itself, to make the name check case insensitive. > > Ian Rogers (15): > perf jevents metric: Correct Function equality > perf jevents metric: Add ability to rewrite metrics in terms of others > perf jevents: Rewrite metrics in the same file with each other > perf pmu-events: Add separate metric from pmu_event > perf pmu-events: Separate the metrics from events for no jevents > perf pmu-events: Remove now unused event and metric variables > perf stat: Remove evsel metric_name/expr > perf jevents: Combine table prefix and suffix writing > perf pmu-events: Introduce pmu_metrics_table > perf jevents: Generate metrics and events as separate tables > perf jevents: Add model list option > perf pmu-events: Fix testing with JEVENTS_ARCH=all > perf jevents: Correct bad character encoding > tools build: Add test echo-cmd > perf jevents: Run metric_test.py at compile-time > > tools/build/Makefile.build | 1 + > tools/perf/arch/arm64/util/pmu.c | 11 +- > tools/perf/arch/powerpc/util/header.c | 4 +- > tools/perf/builtin-list.c | 20 +- > tools/perf/builtin-stat.c | 1 - > tools/perf/pmu-events/Build | 16 +- > tools/perf/pmu-events/empty-pmu-events.c | 108 ++++++- > tools/perf/pmu-events/jevents.py | 357 +++++++++++++++++++---- > tools/perf/pmu-events/metric.py | 79 ++++- > tools/perf/pmu-events/metric_test.py | 15 +- > tools/perf/pmu-events/pmu-events.h | 26 +- > tools/perf/tests/expand-cgroup.c | 4 +- > tools/perf/tests/parse-metric.c | 4 +- > tools/perf/tests/pmu-events.c | 69 ++--- > tools/perf/util/cgroup.c | 1 - > tools/perf/util/evsel.c | 2 - > tools/perf/util/evsel.h | 2 - > tools/perf/util/expr.h | 1 + > tools/perf/util/expr.l | 8 +- > tools/perf/util/metricgroup.c | 207 +++++++------ > tools/perf/util/metricgroup.h | 4 +- > tools/perf/util/parse-events.c | 2 - > tools/perf/util/pmu.c | 44 +-- > tools/perf/util/pmu.h | 10 +- > tools/perf/util/print-events.c | 32 +- > tools/perf/util/print-events.h | 3 +- > tools/perf/util/python.c | 7 - > tools/perf/util/stat-shadow.c | 112 ------- > tools/perf/util/stat.h | 1 - > 29 files changed, 681 insertions(+), 470 deletions(-) > mode change 100644 => 100755 tools/perf/pmu-events/metric_test.py >
Add an optimization to jevents using the metric code, rewrite metrics in terms of each other in order to minimize size and improve readability. For example, on Power8 other_stall_cpi is rewritten from: "PM_CMPLU_STALL / PM_RUN_INST_CMPL - PM_CMPLU_STALL_BRU_CRU / PM_RUN_INST_CMPL - PM_CMPLU_STALL_FXU / PM_RUN_INST_CMPL - PM_CMPLU_STALL_VSU / PM_RUN_INST_CMPL - PM_CMPLU_STALL_LSU / PM_RUN_INST_CMPL - PM_CMPLU_STALL_NTCG_FLUSH / PM_RUN_INST_CMPL - PM_CMPLU_STALL_NO_NTF / PM_RUN_INST_CMPL" to: "stall_cpi - bru_cru_stall_cpi - fxu_stall_cpi - vsu_stall_cpi - lsu_stall_cpi - ntcg_flush_cpi - no_ntf_stall_cpi" Which more closely matches the definition on Power9. A limitation of the substitutions are that they depend on strict equality and the shape of the tree. This means that for "a + b + c" then a substitution of "a + b" will succeed while "b + c" will fail (the LHS for "+ c" is "a + b" not just "b"). Separate out the events and metrics in the pmu-events tables saving 14.8% in the table size while making it that metrics no longer need to iterate over all events and vice versa. These changes remove evsel's direct metric support as the pmu_event no longer has a metric to populate it. This is a minor issue as the code wasn't working properly, metrics for this are rare and can still be properly ran using '-M'. Add an ability to just build certain models into the jevents generated pmu-metrics.c code. This functionality is appropriate for operating systems like ChromeOS, that aim to minimize binary size and know all the target CPU models. v5. s/list/List/ in a type annotation to fix Python 3.6 as reported by John Garry <john.g.garry@oracle.com>. Fix a bug in metric_test.py where a bad character was imported. To avoid similar regressions, run metric_test.py before generating pmu-events.c. v4. Better support the implementor/model style --model argument for jevents.py. Add #slots test fix. On some patches add reviewed-by John Garry <john.g.garry@oracle.com> and Kajol Jain<kjain@linux.ibm.com>. v3. Rebase an incorporate review comments from John Garry <john.g.garry@oracle.com>, in particular breaking apart patch 4 into 3 patches. The no jevents breakage and then later fix is avoided in this series too. v2. Rebase. Modify the code that skips rewriting a metric with the same name with itself, to make the name check case insensitive. Ian Rogers (15): perf jevents metric: Correct Function equality perf jevents metric: Add ability to rewrite metrics in terms of others perf jevents: Rewrite metrics in the same file with each other perf pmu-events: Add separate metric from pmu_event perf pmu-events: Separate the metrics from events for no jevents perf pmu-events: Remove now unused event and metric variables perf stat: Remove evsel metric_name/expr perf jevents: Combine table prefix and suffix writing perf pmu-events: Introduce pmu_metrics_table perf jevents: Generate metrics and events as separate tables perf jevents: Add model list option perf pmu-events: Fix testing with JEVENTS_ARCH=all perf jevents: Correct bad character encoding tools build: Add test echo-cmd perf jevents: Run metric_test.py at compile-time tools/build/Makefile.build | 1 + tools/perf/arch/arm64/util/pmu.c | 11 +- tools/perf/arch/powerpc/util/header.c | 4 +- tools/perf/builtin-list.c | 20 +- tools/perf/builtin-stat.c | 1 - tools/perf/pmu-events/Build | 16 +- tools/perf/pmu-events/empty-pmu-events.c | 108 ++++++- tools/perf/pmu-events/jevents.py | 357 +++++++++++++++++++---- tools/perf/pmu-events/metric.py | 79 ++++- tools/perf/pmu-events/metric_test.py | 15 +- tools/perf/pmu-events/pmu-events.h | 26 +- tools/perf/tests/expand-cgroup.c | 4 +- tools/perf/tests/parse-metric.c | 4 +- tools/perf/tests/pmu-events.c | 69 ++--- tools/perf/util/cgroup.c | 1 - tools/perf/util/evsel.c | 2 - tools/perf/util/evsel.h | 2 - tools/perf/util/expr.h | 1 + tools/perf/util/expr.l | 8 +- tools/perf/util/metricgroup.c | 207 +++++++------ tools/perf/util/metricgroup.h | 4 +- tools/perf/util/parse-events.c | 2 - tools/perf/util/pmu.c | 44 +-- tools/perf/util/pmu.h | 10 +- tools/perf/util/print-events.c | 32 +- tools/perf/util/print-events.h | 3 +- tools/perf/util/python.c | 7 - tools/perf/util/stat-shadow.c | 112 ------- tools/perf/util/stat.h | 1 - 29 files changed, 681 insertions(+), 470 deletions(-) mode change 100644 => 100755 tools/perf/pmu-events/metric_test.py