diff mbox series

[v1,03/51] perf pmu-events: Remove aggr_mode from pmu_event

Message ID	20230219092848.639226-4-irogers@google.com
State	New
Headers	Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Date: Sun, 19 Feb 2023 01:28:00 -0800 In-Reply-To: <20230219092848.639226-1-irogers@google.com> Message-Id: <20230219092848.639226-4-irogers@google.com> Mime-Version: 1.0 References: <20230219092848.639226-1-irogers@google.com> Subject: [PATCH v1 03/51] perf pmu-events: Remove aggr_mode from pmu_event From: Ian Rogers <irogers@google.com> To: Peter Zijlstra <peterz@infradead.org>, Ingo Molnar <mingo@redhat.com>, Arnaldo Carvalho de Melo <acme@kernel.org>, Mark Rutland <mark.rutland@arm.com>, Alexander Shishkin <alexander.shishkin@linux.intel.com>, Jiri Olsa <jolsa@kernel.org>, Namhyung Kim <namhyung@kernel.org>, Maxime Coquelin <mcoquelin.stm32@gmail.com>, Alexandre Torgue <alexandre.torgue@foss.st.com>, Zhengjun Xing <zhengjun.xing@linux.intel.com>, Sandipan Das <sandipan.das@amd.com>, James Clark <james.clark@arm.com>, Kajol Jain <kjain@linux.ibm.com>, John Garry <john.g.garry@oracle.com>, Kan Liang <kan.liang@linux.intel.com>, Adrian Hunter <adrian.hunter@intel.com>, Andrii Nakryiko <andrii@kernel.org>, Eduard Zingerman <eddyz87@gmail.com>, Suzuki Poulouse <suzuki.poulose@arm.com>, Leo Yan <leo.yan@linaro.org>, Florian Fischer <florian.fischer@muhq.space>, Ravi Bangoria <ravi.bangoria@amd.com>, Jing Zhang <renyu.zj@linux.alibaba.com>, Sean Christopherson <seanjc@google.com>, Athira Rajeev <atrajeev@linux.vnet.ibm.com>, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com, linux-arm-kernel@lists.infradead.org, Perry Taylor <perry.taylor@intel.com>, Caleb Biggers <caleb.biggers@intel.com> Cc: Stephane Eranian <eranian@google.com>, Ian Rogers <irogers@google.com> Content-Type: text/plain; charset="UTF-8" Precedence: bulk
Series	shadow metric clean up and improvements \| [v1,00/51] shadow metric clean up and improvements [v1,01/51] perf tools: Ensure evsel name is initialized [v1,02/51] perf metrics: Improve variable names [v1,03/51] perf pmu-events: Remove aggr_mode from pmu_event [v1,04/51] perf pmu-events: Change aggr_mode to be an enum [v1,05/51] perf pmu-events: Change deprecated to be a bool [v1,06/51] perf pmu-events: Change perpkg to be a bool [v1,07/51] perf expr: Make the online topology accessible globally [v1,08/51] perf pmu-events: Make the metric_constraint an enum [v1,09/51] perf pmu-events: Don't '\0' terminate enum values [v1,10/51] perf vendor events intel: Refresh alderlake events [v1,11/51] perf vendor events intel: Refresh alderlake-n metrics [v1,12/51] perf vendor events intel: Refresh broadwell metrics [v1,13/51] perf vendor events intel: Refresh broadwellde metrics [v1,14/51] perf vendor events intel: Refresh broadwellx metrics [v1,15/51] perf vendor events intel: Refresh cascadelakex events [v1,16/51] perf vendor events intel: Add graniterapids events [v1,17/51] perf vendor events intel: Refresh haswell metrics [v1,18/51] perf vendor events intel: Refresh haswellx metrics [v1,19/51] perf vendor events intel: Refresh icelake events [v1,20/51] perf vendor events intel: Refresh icelakex metrics [v1,21/51] perf vendor events intel: Refresh ivybridge metrics [v1,22/51] perf vendor events intel: Refresh ivytown metrics [v1,23/51] perf vendor events intel: Refresh jaketown events [v1,24/51] perf vendor events intel: Refresh knightslanding events [v1,25/51] perf vendor events intel: Refresh sandybridge events [v1,26/51] perf vendor events intel: Refresh sapphirerapids events [v1,27/51] perf vendor events intel: Refresh silvermont events [v1,28/51] perf vendor events intel: Refresh skylake events [v1,29/51] perf vendor events intel: Refresh skylakex metrics [v1,30/51] perf vendor events intel: Refresh tigerlake events [v1,31/51] perf vendor events intel: Refresh westmereep-dp events [v1,32/51] perf jevents: Add rand support to metrics [v1,33/51] perf jevent: Parse metric thresholds [v1,34/51] perf pmu-events: Test parsing metric thresholds with the fake PMU [v1,35/51] perf list: Support for printing metric thresholds [v1,36/51] perf metric: Compute and print threshold values [v1,37/51] perf expr: More explicit NAN handling [v1,38/51] perf metric: Add --metric-no-threshold option [v1,39/51] perf stat: Add TopdownL1 metric as a default if present [v1,40/51] perf stat: Implement --topdown using json metrics [v1,41/51] perf stat: Remove topdown event special handling [v1,42/51] perf doc: Refresh topdown documentation [v1,43/51] perf stat: Remove hard coded transaction events [v1,44/51] perf stat: Use metrics for --smi-cost [v1,45/51] perf stat: Remove perf_stat_evsel_id [v1,46/51] perf stat: Move enums from header [v1,47/51] perf stat: Hide runtime_stat [v1,48/51] perf stat: Add cpu_aggr_map for loop [v1,49/51] perf metric: Directly use counts rather than saved_value [v1,50/51] perf stat: Use counts rather than saved_value [v1,51/51] perf stat: Remove saved_value/runtime_stat

Commit Message

Ian Rogers Feb. 19, 2023, 9:28 a.m. UTC

  aggr_mode is used on Power to set a flag for metrics. For pmu_event it
is unused.

Signed-off-by: Ian Rogers <irogers@google.com>
---
 tools/perf/pmu-events/jevents.py   | 2 +-
 tools/perf/pmu-events/pmu-events.h | 1 -
 tools/perf/tests/pmu-events.c      | 6 ------
 3 files changed, 1 insertion(+), 8 deletions(-)

diff mbox series

Patch

diff --git a/tools/perf/pmu-events/jevents.py b/tools/perf/pmu-events/jevents.py
index 2bcd07ce609f..db8b92de113e 100755
--- a/tools/perf/pmu-events/jevents.py
+++ b/tools/perf/pmu-events/jevents.py
@@ -44,7 +44,7 @@  _json_event_attributes = [
     # Seems useful, put it early.
     'event',
     # Short things in alphabetical order.
-    'aggr_mode', 'compat', 'deprecated', 'perpkg', 'unit',
+    'compat', 'deprecated', 'perpkg', 'unit',
     # Longer things (the last won't be iterated over during decompress).
     'long_desc'
 ]
diff --git a/tools/perf/pmu-events/pmu-events.h b/tools/perf/pmu-events/pmu-events.h
index b7d4a66b8ad2..cee8b83792f8 100644
--- a/tools/perf/pmu-events/pmu-events.h
+++ b/tools/perf/pmu-events/pmu-events.h
@@ -22,7 +22,6 @@  struct pmu_event {
 	const char *pmu;
 	const char *unit;
 	const char *perpkg;
-	const char *aggr_mode;
 	const char *deprecated;
 };
 
diff --git a/tools/perf/tests/pmu-events.c b/tools/perf/tests/pmu-events.c
index accf44b3d968..9b4c94ba5460 100644
--- a/tools/perf/tests/pmu-events.c
+++ b/tools/perf/tests/pmu-events.c
@@ -331,12 +331,6 @@  static int compare_pmu_events(const struct pmu_event *e1, const struct pmu_event
 		return -1;
 	}
 
-	if (!is_same(e1->aggr_mode, e2->aggr_mode)) {
-		pr_debug2("testing event e1 %s: mismatched aggr_mode, %s vs %s\n",
-			  e1->name, e1->aggr_mode, e2->aggr_mode);
-		return -1;
-	}
-
 	if (!is_same(e1->deprecated, e2->deprecated)) {
 		pr_debug2("testing event e1 %s: mismatched deprecated, %s vs %s\n",
 			  e1->name, e1->deprecated, e2->deprecated);