perf expr: Accumulate rather than replace in the context counts

Metrics will fill in the context to have mappings from an event to a
count. When counts are added they replace existing mappings which
generally shouldn't exist with aggregation. Switch to accumulating to
better support cases where perf stat's aggregation isn't used and we
may see a counter more than once.

Signed-off-by: Ian Rogers <irogers@google.com>
Link: https://lore.kernel.org/r/20250710235126.1086011-8-irogers@google.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>

diff --git a/tools/perf/util/expr.c b/tools/perf/util/expr.c
index 6413537442aa80a001b6fffef941f634302b4567..ca70a14c7cdfdad7d01ddbb337c62c55e9edd754 100644 (file)
--- a/tools/perf/util/expr.c
+++ b/tools/perf/util/expr.c
@@ -166,8 +166,12 @@ int expr__add_id_val_source_count(struct expr_parse_ctx *ctx, const char *id,
        data_ptr->kind = EXPR_ID_DATA__VALUE;
 
        ret = hashmap__set(ctx->ids, id, data_ptr, &old_key, &old_data);
-       if (ret)
+       if (ret) {
                free(data_ptr);
+       } else if (old_data) {
+               data_ptr->val.val += old_data->val.val;
+               data_ptr->val.source_count += old_data->val.source_count;
+       }
        free(old_key);
        free(old_data);
        return ret;