perf stat: Fix wrong skipping for per-die aggregation (034f7ee1) · Commits · EulixOS / Software / Kernel

tools/perf/util/evsel.c

+17 −1

Original line number	Diff line number	Diff line
		@@ -46,6 +46,7 @@
		#include "string2.h"
		#include "memswap.h"
		#include "util.h"
		#include "hashmap.h"
		#include "../perf-sys.h"
		#include "util/parse-branch-options.h"
		#include <internal/xyarray.h>
		@@ -1390,7 +1391,9 @@ void evsel__exit(struct evsel *evsel)
		zfree(&evsel->group_name);
		zfree(&evsel->name);
		zfree(&evsel->pmu_name);
		zfree(&evsel->per_pkg_mask);
		evsel__zero_per_pkg(evsel);
		hashmap__free(evsel->per_pkg_mask);
		evsel->per_pkg_mask = NULL;
		zfree(&evsel->metric_events);
		perf_evsel__object.fini(evsel);
		}
		@@ -2781,3 +2784,16 @@ int evsel__store_ids(struct evsel evsel, struct evlist evlist)

		return store_evsel_ids(evsel, evlist);
		}

		void evsel__zero_per_pkg(struct evsel *evsel)
		{
		struct hashmap_entry *cur;
		size_t bkt;

		if (evsel->per_pkg_mask) {
		hashmap__for_each_entry(evsel->per_pkg_mask, cur, bkt)
		free((char *)cur->key);

		hashmap__clear(evsel->per_pkg_mask);
		}
		}

tools/perf/util/evsel.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -19,6 +19,7 @@ struct perf_stat_evsel;
		union perf_event;
		struct bpf_counter_ops;
		struct target;
		struct hashmap;

		typedef int (evsel__sb_cb_t)(union perf_event event, void data);

		@@ -112,7 +113,7 @@ struct evsel {
		bool merged_stat;
		bool reset_group;
		bool errored;
		unsigned long *per_pkg_mask;
		struct hashmap *per_pkg_mask;
		struct evsel *leader;
		struct list_head config_terms;
		int err;
		@@ -433,4 +434,5 @@ struct perf_env evsel__env(struct evsel evsel);

		int evsel__store_ids(struct evsel evsel, struct evlist evlist);

		void evsel__zero_per_pkg(struct evsel *evsel);
		#endif /* __PERF_EVSEL_H */

tools/perf/util/python-ext-sources

+1 −0

Original line number	Diff line number	Diff line
		@@ -36,3 +36,4 @@ util/symbol_fprintf.c
		util/units.c
		util/affinity.c
		util/rwsem.c
		util/hashmap.c

tools/perf/util/stat.c

+38 −9

Original line number	Diff line number	Diff line
		@@ -13,6 +13,7 @@
		#include "evlist.h"
		#include "evsel.h"
		#include "thread_map.h"
		#include "hashmap.h"
		#include <linux/zalloc.h>

		void update_stats(struct stats *stats, u64 val)
		@@ -277,18 +278,29 @@ void evlist__save_aggr_prev_raw_counts(struct evlist *evlist)
		}
		}

		static void zero_per_pkg(struct evsel *counter)
		static size_t pkg_id_hash(const void __key, void ctx __maybe_unused)
		{
		if (counter->per_pkg_mask)
		memset(counter->per_pkg_mask, 0, cpu__max_cpu());
		uint64_t key = (uint64_t ) __key;

		return *key & 0xffffffff;
		}

		static bool pkg_id_equal(const void __key1, const void __key2,
		void *ctx __maybe_unused)
		{
		uint64_t key1 = (uint64_t ) __key1;
		uint64_t key2 = (uint64_t ) __key2;

		return key1 == key2;
		}

		static int check_per_pkg(struct evsel *counter,
		struct perf_counts_values vals, int cpu, bool skip)
		{
		unsigned long *mask = counter->per_pkg_mask;
		struct hashmap *mask = counter->per_pkg_mask;
		struct perf_cpu_map *cpus = evsel__cpus(counter);
		int s;
		int s, d, ret = 0;
		uint64_t *key;

		*skip = false;

		@@ -299,7 +311,7 @@ static int check_per_pkg(struct evsel *counter,
		return 0;

		if (!mask) {
		mask = zalloc(cpu__max_cpu());
		mask = hashmap__new(pkg_id_hash, pkg_id_equal, NULL);
		if (!mask)
		return -ENOMEM;

		@@ -321,8 +333,25 @@ static int check_per_pkg(struct evsel *counter,
		if (s < 0)
		return -1;

		*skip = test_and_set_bit(s, mask) == 1;
		return 0;
		/*
		* On multi-die system, die_id > 0. On no-die system, die_id = 0.
		* We use hashmap(socket, die) to check the used socket+die pair.
		*/
		d = cpu_map__get_die(cpus, cpu, NULL).die;
		if (d < 0)
		return -1;

		key = malloc(sizeof(*key));
		if (!key)
		return -ENOMEM;

		*key = (uint64_t)d << 32 \| s;
		if (hashmap__find(mask, (void *)key, NULL))
		*skip = true;
		else
		ret = hashmap__add(mask, (void )key, (void )1);

		return ret;
		}

		static int
		@@ -422,7 +451,7 @@ int perf_stat_process_counter(struct perf_stat_config *config,
		}

		if (counter->per_pkg)
		zero_per_pkg(counter);
		evsel__zero_per_pkg(counter);

		ret = process_counter_maps(config, counter);
		if (ret)