Message ID | 20231207192338.400336-6-kan.liang@linux.intel.com |
---|---|
State | New |
Headers |
Return-Path: <linux-kernel-owner@vger.kernel.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:bcd1:0:b0:403:3b70:6f57 with SMTP id r17csp5012837vqy; Thu, 7 Dec 2023 11:24:15 -0800 (PST) X-Google-Smtp-Source: AGHT+IFZ10a1s43LYPS/08cmaadsQHFbKNkgMYamcMA5amG9845eXanyV6x1x2XfXew6O1DYQufz X-Received: by 2002:a05:6a00:4396:b0:6cd:fd83:7a1d with SMTP id bt22-20020a056a00439600b006cdfd837a1dmr3182059pfb.8.1701977055023; Thu, 07 Dec 2023 11:24:15 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1701977055; cv=none; d=google.com; s=arc-20160816; b=mP6epy/MedS3bmfcer0rnlsGkNSfGrwGZSn6eEYRjYsCed2oeQhpT+ypM76SODk0Lm e531ayKQEcx9AykFjk6Cc228YTgWVOx8ALuZh8VLbmMqAjZo+S+kZvkCtdVKKOpu0C/F 6aiLRrdORgBQwA5eUSxrINlYFkMII2mbOvk9QA5+w64Me8yyIiOU7Kic8M9cQGqKwzWS uJubAOS2aqxQZPZQKUJNYdrEdKxVshRerO/+cfYIXnvym7UrcZhOgcS2Htwu9YopVNAX C2LerwPKICfhvFEBLE5iby9kLX4PNzshee6O+ANKT5JcsibmDkzC9OlJWBNsnzIPA3qk TJdg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=9jHpn1ji2JGN9aZjymIoEgnUBfJbsvZkmvlDVZZ5n4Q=; fh=GS69O/4cJpYi1pSOvxmc2ttdZCZHkrRB3QAP1aeELJ0=; b=mLn7GxBt2Q0RGVTnsv/KWMFutiAiUjI+wW0Tg0S25bDTNhw1itoJHdqJPh4izKv8LV A7orsuz/Cae+3xcedumq09puNO6+3fkvijw7NJaKsZL9wwZ4gCEjcTffeoBCf/b9ABIO Ktn6B0617FzeAoumE1XkBr8+JnR4mvbLQLeP1rRz/SpnMj9oFyo1nV+WKBwKkzb8h/KX gjPRX3Zs+S9RsBCkbBXdZb1tTVCvBJzDgGVkaDxuprFjuybzbYJRGA0KAIifgmRGswUM hYBpF0k+B2Gjfbh2qitSL9hlzfOn5jx8XByWig0jGrMJsGva7GsqnFpR7nsjVMnos5ll Z2XQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=MuGyOXuO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id l126-20020a632584000000b005c21fcf96a2si155536pgl.825.2023.12.07.11.24.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Dec 2023 11:24:15 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=MuGyOXuO; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id 1C03B80F6D21; Thu, 7 Dec 2023 11:24:12 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1443808AbjLGTYC (ORCPT <rfc822;chrisfriedt@gmail.com> + 99 others); Thu, 7 Dec 2023 14:24:02 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56654 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1443303AbjLGTXy (ORCPT <rfc822;linux-kernel@vger.kernel.org>); Thu, 7 Dec 2023 14:23:54 -0500 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.88]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CFC2C10DC; Thu, 7 Dec 2023 11:24:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1701977040; x=1733513040; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=QVlIun+x/zTN7Nk+iIQmAHUfj+TS02eKqQOTDnYg8xg=; b=MuGyOXuO0hIDMXLXFSCufABkIIBg0uCT9ZwBI6Ae7ld7mi0hu3XNNLeh +eTOoSb3RyrIVxozZoZgMNiwy3/na0lzUZjpLFq5IPOvftTVvt5pigz1r mGQMOFY2Q/o/4xJ6H0bs50FZFd1sQN9gE0kH9CHGzH6LKycnJeXbTmwEt wt6z0lh3VYdLLoP2yzvcTvBQ4dUyu8M6bEhB6uqJFcVCEVxM7IYXZEdWs tVWf3STNRjXy67cw0Q7joRrS6XXGzLdR2G7a0AyanLsC3/FeSn47z+QBw jjfrgR4AhCqcC882NwxSXMQfq9HjCHujNW4BaRlWBJVGgV5ONm0VMmRi4 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10917"; a="425431785" X-IronPort-AV: E=Sophos;i="6.04,258,1695711600"; d="scan'208";a="425431785" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 07 Dec 2023 11:23:57 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10917"; a="721589171" X-IronPort-AV: E=Sophos;i="6.04,258,1695711600"; d="scan'208";a="721589171" Received: from kanliang-dev.jf.intel.com ([10.165.154.102]) by orsmga003.jf.intel.com with ESMTP; 07 Dec 2023 11:23:57 -0800 From: kan.liang@linux.intel.com To: acme@kernel.org, irogers@google.com, peterz@infradead.org, mingo@redhat.com, namhyung@kernel.org, jolsa@kernel.org, adrian.hunter@intel.com, john.g.garry@oracle.com, will@kernel.org, james.clark@arm.com, mike.leach@linaro.org, leo.yan@linaro.org, yuhaixin.yhx@linux.alibaba.com, renyu.zj@linux.alibaba.com, tmricht@linux.ibm.com, ravi.bangoria@amd.com, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Kan Liang <kan.liang@linux.intel.com> Subject: [PATCH V2 5/5] perf mem: Clean up is_mem_loads_aux_event() Date: Thu, 7 Dec 2023 11:23:38 -0800 Message-Id: <20231207192338.400336-6-kan.liang@linux.intel.com> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20231207192338.400336-1-kan.liang@linux.intel.com> References: <20231207192338.400336-1-kan.liang@linux.intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.8 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email Precedence: bulk List-ID: <linux-kernel.vger.kernel.org> X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (fry.vger.email [0.0.0.0]); Thu, 07 Dec 2023 11:24:12 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1784652292489257194 X-GMAIL-MSGID: 1784652292489257194 |
Series |
Clean up perf mem
|
|
Commit Message
Liang, Kan
Dec. 7, 2023, 7:23 p.m. UTC
From: Kan Liang <kan.liang@linux.intel.com> The aux_event can be retrieved from the perf_pmu now. Implement a generic support. Reviewed-by: Ian Rogers <irogers@google.com> Tested-by: Ravi Bangoria <ravi.bangoria@amd.com> Signed-off-by: Kan Liang <kan.liang@linux.intel.com> --- tools/perf/arch/x86/util/mem-events.c | 23 ++++------------------- tools/perf/util/mem-events.c | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 21 deletions(-)
Comments
On Thu, Dec 07, 2023 at 11:23:38AM -0800, kan.liang@linux.intel.com wrote: > From: Kan Liang <kan.liang@linux.intel.com> > > The aux_event can be retrieved from the perf_pmu now. Implement a > generic support. > > Reviewed-by: Ian Rogers <irogers@google.com> > Tested-by: Ravi Bangoria <ravi.bangoria@amd.com> > Signed-off-by: Kan Liang <kan.liang@linux.intel.com> > --- > tools/perf/arch/x86/util/mem-events.c | 23 ++++------------------- > tools/perf/util/mem-events.c | 14 ++++++++++++-- > 2 files changed, 16 insertions(+), 21 deletions(-) > > diff --git a/tools/perf/arch/x86/util/mem-events.c b/tools/perf/arch/x86/util/mem-events.c > index b776d849fc64..62df03e91c7e 100644 > --- a/tools/perf/arch/x86/util/mem-events.c > +++ b/tools/perf/arch/x86/util/mem-events.c > @@ -1,11 +1,9 @@ > // SPDX-License-Identifier: GPL-2.0 > -#include "util/pmu.h" > -#include "util/pmus.h" > -#include "util/env.h" > -#include "map_symbol.h" > -#include "mem-events.h" > #include "linux/string.h" > -#include "env.h" > +#include "util/map_symbol.h" > +#include "util/mem-events.h" > +#include "mem-events.h" > + > > #define MEM_LOADS_AUX 0x8203 > > @@ -28,16 +26,3 @@ struct perf_mem_event perf_mem_events_amd[PERF_MEM_EVENTS__MAX] = { > E(NULL, NULL, NULL, false, 0), > E("mem-ldst", "%s//", NULL, false, 0), > }; > - > -bool is_mem_loads_aux_event(struct evsel *leader) > -{ > - struct perf_pmu *pmu = perf_pmus__find("cpu"); > - > - if (!pmu) > - pmu = perf_pmus__find("cpu_core"); > - > - if (pmu && !perf_pmu__have_event(pmu, "mem-loads-aux")) > - return false; > - > - return leader->core.attr.config == MEM_LOADS_AUX; > -} > diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c > index 0d174f161034..d418320e52e3 100644 > --- a/tools/perf/util/mem-events.c > +++ b/tools/perf/util/mem-events.c > @@ -103,9 +103,19 @@ static const char *perf_pmu__mem_events_name(int i, struct perf_pmu *pmu) > return NULL; > } > > -__weak bool is_mem_loads_aux_event(struct evsel *leader __maybe_unused) > +bool is_mem_loads_aux_event(struct evsel *leader) > { > - return false; > + struct perf_pmu *pmu = leader->pmu; > + struct perf_mem_event *e; > + > + if (!pmu || !pmu->mem_events) > + return false; > + > + e = &pmu->mem_events[PERF_MEM_EVENTS__LOAD]; > + if (!e->aux_event) > + return false; > + > + return leader->core.attr.config == e->aux_event; > } I am wandering if we need to set the field 'aux_event' for Arm SPE. So a quesiton maybe is not relevant with this patch actually, we can see is_mem_loads_aux_event() is invoked in the file util/record.c: static struct evsel *evsel__read_sampler(struct evsel *evsel, struct evlist *evlist) { struct evsel *leader = evsel__leader(evsel); if (evsel__is_aux_event(leader) || arch_topdown_sample_read(leader) || is_mem_loads_aux_event(leader)) { ... } return leader; } Has evsel__is_aux_event() covered the memory load aux event? If it's, then is_mem_loads_aux_event() is not needed anymore. Thanks, Leo
On 2023-12-09 1:27 a.m., Leo Yan wrote: > On Thu, Dec 07, 2023 at 11:23:38AM -0800, kan.liang@linux.intel.com wrote: >> From: Kan Liang <kan.liang@linux.intel.com> >> >> The aux_event can be retrieved from the perf_pmu now. Implement a >> generic support. >> >> Reviewed-by: Ian Rogers <irogers@google.com> >> Tested-by: Ravi Bangoria <ravi.bangoria@amd.com> >> Signed-off-by: Kan Liang <kan.liang@linux.intel.com> >> --- >> tools/perf/arch/x86/util/mem-events.c | 23 ++++------------------- >> tools/perf/util/mem-events.c | 14 ++++++++++++-- >> 2 files changed, 16 insertions(+), 21 deletions(-) >> >> diff --git a/tools/perf/arch/x86/util/mem-events.c b/tools/perf/arch/x86/util/mem-events.c >> index b776d849fc64..62df03e91c7e 100644 >> --- a/tools/perf/arch/x86/util/mem-events.c >> +++ b/tools/perf/arch/x86/util/mem-events.c >> @@ -1,11 +1,9 @@ >> // SPDX-License-Identifier: GPL-2.0 >> -#include "util/pmu.h" >> -#include "util/pmus.h" >> -#include "util/env.h" >> -#include "map_symbol.h" >> -#include "mem-events.h" >> #include "linux/string.h" >> -#include "env.h" >> +#include "util/map_symbol.h" >> +#include "util/mem-events.h" >> +#include "mem-events.h" >> + >> >> #define MEM_LOADS_AUX 0x8203 >> >> @@ -28,16 +26,3 @@ struct perf_mem_event perf_mem_events_amd[PERF_MEM_EVENTS__MAX] = { >> E(NULL, NULL, NULL, false, 0), >> E("mem-ldst", "%s//", NULL, false, 0), >> }; >> - >> -bool is_mem_loads_aux_event(struct evsel *leader) >> -{ >> - struct perf_pmu *pmu = perf_pmus__find("cpu"); >> - >> - if (!pmu) >> - pmu = perf_pmus__find("cpu_core"); >> - >> - if (pmu && !perf_pmu__have_event(pmu, "mem-loads-aux")) >> - return false; >> - >> - return leader->core.attr.config == MEM_LOADS_AUX; >> -} >> diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c >> index 0d174f161034..d418320e52e3 100644 >> --- a/tools/perf/util/mem-events.c >> +++ b/tools/perf/util/mem-events.c >> @@ -103,9 +103,19 @@ static const char *perf_pmu__mem_events_name(int i, struct perf_pmu *pmu) >> return NULL; >> } >> >> -__weak bool is_mem_loads_aux_event(struct evsel *leader __maybe_unused) >> +bool is_mem_loads_aux_event(struct evsel *leader) >> { >> - return false; >> + struct perf_pmu *pmu = leader->pmu; >> + struct perf_mem_event *e; >> + >> + if (!pmu || !pmu->mem_events) >> + return false; >> + >> + e = &pmu->mem_events[PERF_MEM_EVENTS__LOAD]; >> + if (!e->aux_event) >> + return false; >> + >> + return leader->core.attr.config == e->aux_event; >> } > > I am wandering if we need to set the field 'aux_event' for Arm SPE. > > So a quesiton maybe is not relevant with this patch actually, we can > see is_mem_loads_aux_event() is invoked in the file util/record.c: > > static struct evsel *evsel__read_sampler(struct evsel *evsel, struct evlist *evlist) > { > struct evsel *leader = evsel__leader(evsel); > > if (evsel__is_aux_event(leader) || arch_topdown_sample_read(leader) || > is_mem_loads_aux_event(leader)) { > ... > } > > return leader; > } > > Has evsel__is_aux_event() covered the memory load aux event? If it's, > then is_mem_loads_aux_event() is not needed anymore. They are two different things. The evsel__is_aux_event() should means an event requires AUX area, like intel_pt. While the aux event for the mem_loads event is an extra event which has to be scheduled together with the mem_loads event when sampling. It's only available for some Intel platforms, e.g., SPR. Thanks, Kan > > Thanks, > Leo
diff --git a/tools/perf/arch/x86/util/mem-events.c b/tools/perf/arch/x86/util/mem-events.c index b776d849fc64..62df03e91c7e 100644 --- a/tools/perf/arch/x86/util/mem-events.c +++ b/tools/perf/arch/x86/util/mem-events.c @@ -1,11 +1,9 @@ // SPDX-License-Identifier: GPL-2.0 -#include "util/pmu.h" -#include "util/pmus.h" -#include "util/env.h" -#include "map_symbol.h" -#include "mem-events.h" #include "linux/string.h" -#include "env.h" +#include "util/map_symbol.h" +#include "util/mem-events.h" +#include "mem-events.h" + #define MEM_LOADS_AUX 0x8203 @@ -28,16 +26,3 @@ struct perf_mem_event perf_mem_events_amd[PERF_MEM_EVENTS__MAX] = { E(NULL, NULL, NULL, false, 0), E("mem-ldst", "%s//", NULL, false, 0), }; - -bool is_mem_loads_aux_event(struct evsel *leader) -{ - struct perf_pmu *pmu = perf_pmus__find("cpu"); - - if (!pmu) - pmu = perf_pmus__find("cpu_core"); - - if (pmu && !perf_pmu__have_event(pmu, "mem-loads-aux")) - return false; - - return leader->core.attr.config == MEM_LOADS_AUX; -} diff --git a/tools/perf/util/mem-events.c b/tools/perf/util/mem-events.c index 0d174f161034..d418320e52e3 100644 --- a/tools/perf/util/mem-events.c +++ b/tools/perf/util/mem-events.c @@ -103,9 +103,19 @@ static const char *perf_pmu__mem_events_name(int i, struct perf_pmu *pmu) return NULL; } -__weak bool is_mem_loads_aux_event(struct evsel *leader __maybe_unused) +bool is_mem_loads_aux_event(struct evsel *leader) { - return false; + struct perf_pmu *pmu = leader->pmu; + struct perf_mem_event *e; + + if (!pmu || !pmu->mem_events) + return false; + + e = &pmu->mem_events[PERF_MEM_EVENTS__LOAD]; + if (!e->aux_event) + return false; + + return leader->core.attr.config == e->aux_event; } int perf_pmu__mem_events_parse(struct perf_pmu *pmu, const char *str)