Commit cc26ffaa authored by Ian Rogers's avatar Ian Rogers Committed by Arnaldo Carvalho de Melo
Browse files

perf stat: Hide runtime_stat 



runtime_stat is only shared for the sake of tests that don't care
about its value. Move the definition into stat-shadow.c and have the
tests also use the global version.

Signed-off-by: default avatarIan Rogers <irogers@google.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Alexandre Torgue <alexandre.torgue@foss.st.com>
Cc: Andrii Nakryiko <andrii@kernel.org>
Cc: Athira Rajeev <atrajeev@linux.vnet.ibm.com>
Cc: Caleb Biggers <caleb.biggers@intel.com>
Cc: Eduard Zingerman <eddyz87@gmail.com>
Cc: Florian Fischer <florian.fischer@muhq.space>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: James Clark <james.clark@arm.com>
Cc: Jing Zhang <renyu.zj@linux.alibaba.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: John Garry <john.g.garry@oracle.com>
Cc: Kajol Jain <kjain@linux.ibm.com>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Leo Yan <leo.yan@linaro.org>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Perry Taylor <perry.taylor@intel.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Ravi Bangoria <ravi.bangoria@amd.com>
Cc: Sandipan Das <sandipan.das@amd.com>
Cc: Sean Christopherson <seanjc@google.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Suzuki Poulouse <suzuki.poulose@arm.com>
Cc: Xing Zhengjun <zhengjun.xing@linux.intel.com>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-stm32@st-md-mailman.stormreply.com
Link: https://lore.kernel.org/r/20230219092848.639226-48-irogers@google.com


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 758bc8e6

tools/perf/builtin-script.c

+2 −4
Original line number Diff line number Diff line
@@ -2074,8 +2074,7 @@ static void perf_sample__fprint_metric(struct perf_script *script, 
	val = sample->period * evsel->scale;

	perf_stat__update_shadow_stats(evsel,

				       val,

				       sample->cpu,

				       &rt_stat);

				       sample->cpu);

	evsel_script(evsel)->val = val;

	if (evsel_script(leader)->gnum == leader->core.nr_members) {

		for_each_group_member (ev2, leader) {
@@ -2083,8 +2082,7 @@ static void perf_sample__fprint_metric(struct perf_script *script, 
						      evsel_script(ev2)->val,

						      sample->cpu,

						      &ctx,

						      NULL,

						      &rt_stat);

						      NULL);

		}

		evsel_script(leader)->gnum = 0;

	}

tools/perf/builtin-stat.c

+2 −2
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ static void process_interval(void) 
	clock_gettime(CLOCK_MONOTONIC, &ts);

	diff_timespec(&rs, &ts, &ref_time);



	perf_stat__reset_shadow_per_stat(&rt_stat);

	perf_stat__reset_shadow_per_stat();

	evlist__reset_aggr_stats(evsel_list);



	if (read_counters(&rs) == 0)
@@ -910,7 +910,7 @@ static int __run_perf_stat(int argc, const char **argv, int run_idx) 
		evlist__copy_prev_raw_counts(evsel_list);

		evlist__reset_prev_raw_counts(evsel_list);

		evlist__reset_aggr_stats(evsel_list);

		perf_stat__reset_shadow_per_stat(&rt_stat);

		perf_stat__reset_shadow_per_stat();

	} else {

		update_stats(&walltime_nsecs_stats, t1 - t0);

		update_rusage_stats(&ru_stats, &stat_config.ru_data);

tools/perf/tests/parse-metric.c

+8 −11
Original line number Diff line number Diff line
@@ -30,8 +30,7 @@ static u64 find_value(const char *name, struct value *values) 
	return 0;

}



static void load_runtime_stat(struct runtime_stat *st, struct evlist *evlist,

			      struct value *vals)

static void load_runtime_stat(struct evlist *evlist, struct value *vals)

{

	struct evsel *evsel;

	u64 count;
@@ -39,14 +38,14 @@ static void load_runtime_stat(struct runtime_stat *st, struct evlist *evlist, 
	perf_stat__reset_shadow_stats();

	evlist__for_each_entry(evlist, evsel) {

		count = find_value(evsel->name, vals);

		perf_stat__update_shadow_stats(evsel, count, 0, st);

		perf_stat__update_shadow_stats(evsel, count, 0);

		if (!strcmp(evsel->name, "duration_time"))

			update_stats(&walltime_nsecs_stats, count);

	}

}



static double compute_single(struct rblist *metric_events, struct evlist *evlist,

			     struct runtime_stat *st, const char *name)

			     const char *name)

{

	struct metric_expr *mexp;

	struct metric_event *me;
@@ -58,7 +57,7 @@ static double compute_single(struct rblist *metric_events, struct evlist *evlist 
			list_for_each_entry (mexp, &me->head, nd) {

				if (strcmp(mexp->metric_name, name))

					continue;

				return test_generic_metric(mexp, 0, st);

				return test_generic_metric(mexp, 0);

			}

		}

	}
@@ -74,7 +73,6 @@ static int __compute_metric(const char *name, struct value *vals, 
	};

	const struct pmu_metrics_table *pme_test;

	struct perf_cpu_map *cpus;

	struct runtime_stat st;

	struct evlist *evlist;

	int err;
@@ -93,7 +91,6 @@ static int __compute_metric(const char *name, struct value *vals, 
	}



	perf_evlist__set_maps(&evlist->core, cpus, NULL);

	runtime_stat__init(&st);



	/* Parse the metric into metric_events list. */

	pme_test = find_core_metrics_table("testarch", "testcpu");
@@ -107,18 +104,17 @@ static int __compute_metric(const char *name, struct value *vals, 
		goto out;



	/* Load the runtime stats with given numbers for events. */

	load_runtime_stat(&st, evlist, vals);

	load_runtime_stat(evlist, vals);



	/* And execute the metric */

	if (name1 && ratio1)

		*ratio1 = compute_single(&metric_events, evlist, &st, name1);

		*ratio1 = compute_single(&metric_events, evlist, name1);

	if (name2 && ratio2)

		*ratio2 = compute_single(&metric_events, evlist, &st, name2);

		*ratio2 = compute_single(&metric_events, evlist, name2);



out:

	/* ... cleanup. */

	metricgroup__rblist_exit(&metric_events);

	runtime_stat__exit(&st);

	evlist__free_stats(evlist);

	perf_cpu_map__put(cpus);

	evlist__delete(evlist);
@@ -300,6 +296,7 @@ static int test_metric_group(void) 


static int test__parse_metric(struct test_suite *test __maybe_unused, int subtest __maybe_unused)

{

	perf_stat__init_shadow_stats();

	TEST_ASSERT_VAL("IPC failed", test_ipc() == 0);

	TEST_ASSERT_VAL("frontend failed", test_frontend() == 0);

	TEST_ASSERT_VAL("DCache_L2 failed", test_dcache_l2() == 0);

tools/perf/tests/pmu-events.c

+3 −5
Original line number Diff line number Diff line
@@ -816,7 +816,6 @@ static int test__parsing_callback(const struct pmu_metric *pm, 
	int k;

	struct evlist *evlist;

	struct perf_cpu_map *cpus;

	struct runtime_stat st;

	struct evsel *evsel;

	struct rblist metric_events = {

		.nr_entries = 0,
@@ -844,7 +843,6 @@ static int test__parsing_callback(const struct pmu_metric *pm, 
	}



	perf_evlist__set_maps(&evlist->core, cpus, NULL);

	runtime_stat__init(&st);



	err = metricgroup__parse_groups_test(evlist, table, pm->metric_name, &metric_events);

	if (err) {
@@ -867,7 +865,7 @@ static int test__parsing_callback(const struct pmu_metric *pm, 
	k = 1;

	perf_stat__reset_shadow_stats();

	evlist__for_each_entry(evlist, evsel) {

		perf_stat__update_shadow_stats(evsel, k, 0, &st);

		perf_stat__update_shadow_stats(evsel, k, 0);

		if (!strcmp(evsel->name, "duration_time"))

			update_stats(&walltime_nsecs_stats, k);

		k++;
@@ -881,7 +879,7 @@ static int test__parsing_callback(const struct pmu_metric *pm, 
			list_for_each_entry (mexp, &me->head, nd) {

				if (strcmp(mexp->metric_name, pm->metric_name))

					continue;

				pr_debug("Result %f\n", test_generic_metric(mexp, 0, &st));

				pr_debug("Result %f\n", test_generic_metric(mexp, 0));

				err = 0;

				(*failures)--;

				goto out_err;
@@ -896,7 +894,6 @@ static int test__parsing_callback(const struct pmu_metric *pm, 


	/* ... cleanup. */

	metricgroup__rblist_exit(&metric_events);

	runtime_stat__exit(&st);

	evlist__free_stats(evlist);

	perf_cpu_map__put(cpus);

	evlist__delete(evlist);
@@ -908,6 +905,7 @@ static int test__parsing(struct test_suite *test __maybe_unused, 
{

	int failures = 0;



	perf_stat__init_shadow_stats();

	pmu_for_each_core_metric(test__parsing_callback, &failures);

	pmu_for_each_sys_metric(test__parsing_callback, &failures);

tools/perf/util/stat-display.c

+2 −3
Original line number Diff line number Diff line
@@ -729,7 +729,7 @@ static void printout(struct perf_stat_config *config, struct outstate *os, 


	if (ok) {

		perf_stat__print_shadow_stats(config, counter, uval, map_idx,

					      &out, &config->metric_events, &rt_stat);

					      &out, &config->metric_events);

	} else {

		pm(config, os, /*color=*/NULL, /*format=*/NULL, /*unit=*/"", /*val=*/0);

	}
@@ -1089,8 +1089,7 @@ static void print_metric_headers(struct perf_stat_config *config, 
		perf_stat__print_shadow_stats(config, counter, 0,

					      0,

					      &out,

					      &config->metric_events,

					      &rt_stat);

					      &config->metric_events);

	}



	if (!config->json_output)