lkml.org 
[lkml]   [2023]   [Jun]   [26]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    Date
    SubjectRe: [PATCH v1] perf pmu: Correct auto_merge_stats test
    Hi Ian,

    On Sun, Jun 25, 2023 at 10:31 PM Ian Rogers <irogers@google.com> wrote:
    >
    > The original logic was:
    > https://lore.kernel.org/all/20230527072210.2900565-35-irogers@google.com/
    > return !is_pmu_hybrid(pmu->name)
    >
    > is_pmu_hybrid was removed but with the incorrect condition which was
    > fixed for core PMUs but not uncore. This change fixes both.
    >
    > Fixes: e23421426e13 ("perf pmu: Correct perf_pmu__auto_merge_stats() affecting hybrid")
    > Signed-off-by: Ian Rogers <irogers@google.com>

    Tested-by: Namhyung Kim <namhyung@kernel.org>

    Thanks,
    Namhyung


    > ---
    > tools/perf/util/pmu.c | 2 +-
    > 1 file changed, 1 insertion(+), 1 deletion(-)
    >
    > diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
    > index 64fa568a5426..8d5ecd4ff1a9 100644
    > --- a/tools/perf/util/pmu.c
    > +++ b/tools/perf/util/pmu.c
    > @@ -1427,7 +1427,7 @@ bool perf_pmu__supports_legacy_cache(const struct perf_pmu *pmu)
    >
    > bool perf_pmu__auto_merge_stats(const struct perf_pmu *pmu)
    > {
    > - return pmu->is_core && perf_pmus__num_core_pmus() == 1;
    > + return !pmu->is_core || perf_pmus__num_core_pmus() == 1;
    > }
    >
    > bool perf_pmu__have_event(const struct perf_pmu *pmu, const char *name)
    > --
    > 2.41.0.162.gfafddb0af9-goog
    >

    \
     
     \ /
      Last update: 2023-06-27 00:17    [W:9.596 / U:0.052 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site