On Wed, Jan 14, 2026 at 7:57 AM James Clark <james.clark@linaro.org> wrote:
>
> At least one of these were put here to avoid a Python binding linking
> issue which is no longer present. Put them back in their correct
> location to avoid confusion about which file to add a new evsel__*
> function to later.
>
> Link: https://lore.kernel.org/all/ZEbAS2yx2fguW60w@kernel.org/
> Signed-off-by: James Clark <james.clark@linaro.org>
Reviewed-by: Ian Rogers <irogers@google.com>
Thanks,
Ian
> ---
> tools/perf/util/evsel.c | 40 ++++++++++++++++++++++++++++++++++++++++
> tools/perf/util/pmu.c | 40 ----------------------------------------
> 2 files changed, 40 insertions(+), 40 deletions(-)
>
> diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
> index ec6552a6f667..21878e9bd029 100644
> --- a/tools/perf/util/evsel.c
> +++ b/tools/perf/util/evsel.c
> @@ -1314,6 +1314,35 @@ struct evsel_config_term *__evsel__get_config_term(struct evsel *evsel, enum evs
> return found_term;
> }
>
> +/*
> + * Set @config_name to @val as long as the user hasn't already set or cleared it
> + * by passing a config term on the command line.
> + *
> + * @val is the value to put into the bits specified by @config_name rather than
> + * the bit pattern. It is shifted into position by this function, so to set
> + * something to true, pass 1 for val rather than a pre shifted value.
> + */
> +#define field_prep(_mask, _val) (((_val) << (ffsll(_mask) - 1)) & (_mask))
> +void evsel__set_config_if_unset(struct evsel *evsel, const char *config_name,
> + u64 val)
> +{
> + u64 user_bits = 0, bits;
> + struct evsel_config_term *term = evsel__get_config_term(evsel, CFG_CHG);
> +
> + if (term)
> + user_bits = term->val.cfg_chg;
> +
> + bits = perf_pmu__format_bits(evsel->pmu, config_name);
> +
> + /* Do nothing if the user changed the value */
> + if (bits & user_bits)
> + return;
> +
> + /* Otherwise replace it */
> + evsel->core.attr.config &= ~bits;
> + evsel->core.attr.config |= field_prep(bits, val);
> +}
> +
> void __weak arch_evsel__set_sample_weight(struct evsel *evsel)
> {
> evsel__set_sample_bit(evsel, WEIGHT);
> @@ -4098,6 +4127,17 @@ void evsel__set_leader(struct evsel *evsel, struct evsel *leader)
> evsel->core.leader = &leader->core;
> }
>
> +bool evsel__is_aux_event(const struct evsel *evsel)
> +{
> + struct perf_pmu *pmu;
> +
> + if (evsel->needs_auxtrace_mmap)
> + return true;
> +
> + pmu = evsel__find_pmu(evsel);
> + return pmu && pmu->auxtrace;
> +}
> +
> int evsel__source_count(const struct evsel *evsel)
> {
> struct evsel *pos;
> diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
> index e87c12946d71..e3a1f26213ec 100644
> --- a/tools/perf/util/pmu.c
> +++ b/tools/perf/util/pmu.c
> @@ -1362,46 +1362,6 @@ void perf_pmu__warn_invalid_formats(struct perf_pmu *pmu)
> }
> }
>
> -bool evsel__is_aux_event(const struct evsel *evsel)
> -{
> - struct perf_pmu *pmu;
> -
> - if (evsel->needs_auxtrace_mmap)
> - return true;
> -
> - pmu = evsel__find_pmu(evsel);
> - return pmu && pmu->auxtrace;
> -}
> -
> -/*
> - * Set @config_name to @val as long as the user hasn't already set or cleared it
> - * by passing a config term on the command line.
> - *
> - * @val is the value to put into the bits specified by @config_name rather than
> - * the bit pattern. It is shifted into position by this function, so to set
> - * something to true, pass 1 for val rather than a pre shifted value.
> - */
> -#define field_prep(_mask, _val) (((_val) << (ffsll(_mask) - 1)) & (_mask))
> -void evsel__set_config_if_unset(struct evsel *evsel, const char *config_name,
> - u64 val)
> -{
> - u64 user_bits = 0, bits;
> - struct evsel_config_term *term = evsel__get_config_term(evsel, CFG_CHG);
> -
> - if (term)
> - user_bits = term->val.cfg_chg;
> -
> - bits = perf_pmu__format_bits(evsel->pmu, config_name);
> -
> - /* Do nothing if the user changed the value */
> - if (bits & user_bits)
> - return;
> -
> - /* Otherwise replace it */
> - evsel->core.attr.config &= ~bits;
> - evsel->core.attr.config |= field_prep(bits, val);
> -}
> -
> static struct perf_pmu_format *
> pmu_find_format(const struct list_head *formats, const char *name)
> {
>
> --
> 2.34.1
>