From nobody Sat Feb 7 11:30:54 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC142EB64DB for ; Thu, 15 Jun 2023 00:18:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229605AbjFOAST (ORCPT ); Wed, 14 Jun 2023 20:18:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:48302 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236189AbjFOASI (ORCPT ); Wed, 14 Jun 2023 20:18:08 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 42EB3213F; Wed, 14 Jun 2023 17:18:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1686788282; x=1718324282; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=0bHJYVAGHZwPFUz4S/BPJ7Vx5SBc6SfLdUEEUsB9vuQ=; b=WJ46tQZCGZphrJ3ftwcgPyKV8phZt7WzKB9JLbrhBVQssQmNw+oM+lI9 +oK1b1Je6U4Ya9lrhGv7tRxWRyIlY/jmx+i2+RL7ja5HtvYF5clwCNiE7 Kkx6j/ZuIWw773Afh0QfR8kuafh/rRKECWzORIuPxwT+eU/utzu5UhMv2 HQWjg4y8dnlHDXmEinwKofuKXFjkvPeMYkX2eYS0Q5h3TPkgtKmDm/ruD YXOu3gZxGZMSXxBY1xaT53xyenstJD0C7D2OeVcjRFZnDzQzBKDIKhXw+ YHNXl9rSPgiZPjr4CH6VxMLx9d+7QcXgTVwQGcwdsesI6wn8dh6ArsmO9 A==; X-IronPort-AV: E=McAfee;i="6600,9927,10741"; a="357652485" X-IronPort-AV: E=Sophos;i="6.00,243,1681196400"; d="scan'208";a="357652485" Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Jun 2023 17:18:00 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10741"; a="825021472" X-IronPort-AV: E=Sophos;i="6.00,243,1681196400"; d="scan'208";a="825021472" Received: from kanliang-dev.jf.intel.com ([10.165.154.102]) by fmsmga002.fm.intel.com with ESMTP; 14 Jun 2023 17:17:58 -0700 From: kan.liang@linux.intel.com To: acme@kernel.org, mingo@redhat.com, peterz@infradead.org, irogers@google.com, namhyung@kernel.org, jolsa@kernel.org, adrian.hunter@intel.com, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: ak@linux.intel.com, eranian@google.com, ahmad.yasin@intel.com, Kan Liang Subject: [PATCH V2 1/8] perf evsel: Fix the annotation for hardware events on hybrid Date: Wed, 14 Jun 2023 17:17:28 -0700 Message-Id: <20230615001735.3643996-2-kan.liang@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20230615001735.3643996-1-kan.liang@linux.intel.com> References: <20230615001735.3643996-1-kan.liang@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Kan Liang The annotation for hardware events is wrong on hybrid. For example, # ./perf stat -a sleep 1 Performance counter stats for 'system wide': 32,148.85 msec cpu-clock # 32.000 CPUs ut= ilized 374 context-switches # 11.633 /sec 33 cpu-migrations # 1.026 /sec 295 page-faults # 9.176 /sec 18,979,960 cpu_core/cycles/ # 590.378 K/sec 261,230,783 cpu_atom/cycles/ # 8.126 M/sec = (54.21%) 17,019,732 cpu_core/instructions/ # 529.404 K/sec 38,020,470 cpu_atom/instructions/ # 1.183 M/sec = (63.36%) 3,296,743 cpu_core/branches/ # 102.546 K/sec 6,692,338 cpu_atom/branches/ # 208.167 K/sec = (63.40%) 96,421 cpu_core/branch-misses/ # 2.999 K/sec 1,016,336 cpu_atom/branch-misses/ # 31.613 K/sec = (63.38%) The hardware events have extended type on hybrid, but the evsel__match() doesn't take it into account. Filter the config on hybrid before checking. With the patch, # ./perf stat -a sleep 1 Performance counter stats for 'system wide': 32,139.90 msec cpu-clock # 32.003 CPUs ut= ilized 343 context-switches # 10.672 /sec 32 cpu-migrations # 0.996 /sec 73 page-faults # 2.271 /sec 13,712,841 cpu_core/cycles/ # 0.000 GHz 258,301,691 cpu_atom/cycles/ # 0.008 GHz = (54.20%) 12,428,163 cpu_core/instructions/ # 0.91 insn pe= r cycle 37,786,557 cpu_atom/instructions/ # 2.76 insn pe= r cycle (63.35%) 2,418,826 cpu_core/branches/ # 75.259 K/sec 6,965,962 cpu_atom/branches/ # 216.739 K/sec = (63.38%) 72,150 cpu_core/branch-misses/ # 2.98% of all = branches 1,032,746 cpu_atom/branch-misses/ # 42.70% of all = branches (63.35%) Suggested-by: Ian Rogers Signed-off-by: Kan Liang Reviewed-by: Ian Rogers --- tools/perf/util/evsel.h | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h index b365b449c6ea..cc6fb3049b99 100644 --- a/tools/perf/util/evsel.h +++ b/tools/perf/util/evsel.h @@ -10,6 +10,7 @@ #include #include #include "symbol_conf.h" +#include "pmus.h" =20 struct bpf_object; struct cgroup; @@ -350,9 +351,19 @@ u64 format_field__intval(struct tep_format_field *fiel= d, struct perf_sample *sam =20 struct tep_format_field *evsel__field(struct evsel *evsel, const char *nam= e); =20 -#define evsel__match(evsel, t, c) \ - (evsel->core.attr.type =3D=3D PERF_TYPE_##t && \ - evsel->core.attr.config =3D=3D PERF_COUNT_##c) +static inline bool __evsel__match(const struct evsel *evsel, u32 type, u64= config) +{ + if (evsel->core.attr.type !=3D type) + return false; + + if ((type =3D=3D PERF_TYPE_HARDWARE || type =3D=3D PERF_TYPE_HW_CACHE) && + perf_pmus__supports_extended_type()) + return (evsel->core.attr.config & PERF_HW_EVENT_MASK) =3D=3D config; + + return evsel->core.attr.config =3D=3D config; +} + +#define evsel__match(evsel, t, c) __evsel__match(evsel, PERF_TYPE_##t, PER= F_COUNT_##c) =20 static inline bool evsel__match2(struct evsel *e1, struct evsel *e2) { --=20 2.35.1