Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 406FFC433F5 for ; Thu, 7 Oct 2021 16:58:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 24E8061248 for ; Thu, 7 Oct 2021 16:58:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243149AbhJGRAl (ORCPT ); Thu, 7 Oct 2021 13:00:41 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35180 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S243097AbhJGRAZ (ORCPT ); Thu, 7 Oct 2021 13:00:25 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3813AC061798 for ; Thu, 7 Oct 2021 09:58:11 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id y16-20020a2586d0000000b005b752db8f97so8593367ybm.18 for ; Thu, 07 Oct 2021 09:58:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=tQGtWWtTqRuXJEGeXnD2fMFCcf930vEI3hAIZRuUuTM=; b=DI71ZP8nkwzUGGVqhR1N+ZnV9QTgS7kvddK78nZe8m9DdCl1q5b3CE5gu0erlKA2ag 2ARPpuh7J+JRSiSeJ7ZRs1IdXtwfdQJsHYAJasGX/eBj02AJ82AuHNubht/mB8aamXcp 5MdvIdRb+5bQ+37MbnlMZzNTKKt1o5kp2EvEzXmZBBk4E0lWBI0orXWhy+9FZeWtsPQ0 DtKoFfqFdXvvjQ/yVY06MkRE1bKXnlSlKCiWT+Enpf0z+guCciGSpPmtYSIrtRjIFZ5P Hh/iKUoxUnFlM3NaNIyvex+iCobLyL4GzlJka9tVztzl0C+6lLtxjDpe5g1dNdkjfzDx eOog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=tQGtWWtTqRuXJEGeXnD2fMFCcf930vEI3hAIZRuUuTM=; b=Zvyf1v9HBX916Pwlw1rGxRSEJOfU5ie9/BdHGwlI0M5pUgcHgp8DNLquc6E8t7b+5x Jd9ErOLnvLtT2dCuyPfsV8azz5Yh8SsmDb3PMr2qD/btVC9NTGCYQMISQTjpDpojuxsP 52xKR1RALRBCGM1x47b09MQHGQVy+HMRr3x1uuTt/RCoQA3Rg99c2IMzCBQ7aQj5iKh7 A+HV98FjnZpfYL3fX9IoVOrlIAXOSzmQvDYhOM3pf/pfilEiUddYPKzQN+qUyC7UHWIJ hdr4Dkof0JFMm7rBiWQwgU67a/Rt4fcrg2NxU4YGQzMwWPdsp3jubb9U+zlHi9dFtRzi 8KwA== X-Gm-Message-State: AOAM531rydO3Hq6dTbU/LJl9c5Ggm7cr5IX4xvGCXULw+Obufis08Ako JFIF9Mz7MY6Un3YR4iD/hozdTB//e5xL X-Google-Smtp-Source: ABdhPJzv9QcmgN+d7/FOJgHqpbf99Dhu8lZzenGcjlRBLAKd75dVgdZdzlqactoMY/tzLqTfbSbYc1vxx1fs X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:fe85:5e36:cb6f:76bc]) (user=irogers job=sendgmr) by 2002:a25:50ca:: with SMTP id e193mr6238555ybb.135.1633625890267; Thu, 07 Oct 2021 09:58:10 -0700 (PDT) Date: Thu, 7 Oct 2021 09:56:43 -0700 In-Reply-To: <20211007165647.3514803-1-irogers@google.com> Message-Id: <20211007165647.3514803-18-irogers@google.com> Mime-Version: 1.0 References: <20211007165647.3514803-1-irogers@google.com> X-Mailer: git-send-email 2.33.0.882.g93a45727a2-goog Subject: [PATCH 17/21] perf expr: Add subset utility. From: Ian Rogers To: Andi Kleen , Jiri Olsa , Jin Yao , Namhyung Kim , John Garry , Kajol Jain , "Paul A . Clarke" , Arnaldo Carvalho de Melo , Riccardo Mancini , Kan Liang , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Kees Cook , Sami Tolvanen , Nick Desaulniers , Andrew Morton , Jacob Keller , Zhen Lei , ToastC , Joakim Zhang , Felix Fietkau , Jiapeng Chong , Song Liu , Fabian Hemmer , Alexander Antonov , Nicholas Fraser , Adrian Hunter , Denys Zagorui , Wan Jiabing , Thomas Richter , Sumanth Korikkar , Heiko Carstens , Changbin Du , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org Cc: Stephane Eranian , Ian Rogers Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org Add a helper that returns true if all the IDs in needles are present in haystack. Later this will be used in sharing events between metrics. Signed-off-by: Ian Rogers --- tools/perf/util/expr.c | 15 +++++++++++++++ tools/perf/util/expr.h | 2 ++ 2 files changed, 17 insertions(+) diff --git a/tools/perf/util/expr.c b/tools/perf/util/expr.c index 5657222aaa25..77c6ad81a923 100644 --- a/tools/perf/util/expr.c +++ b/tools/perf/util/expr.c @@ -211,6 +211,21 @@ int expr__get_id(struct expr_parse_ctx *ctx, const char *id, return hashmap__find(ctx->ids, id, (void **)data) ? 0 : -1; } +bool expr__subset_of_ids(struct expr_parse_ctx *haystack, + struct expr_parse_ctx *needles) +{ + struct hashmap_entry *cur; + size_t bkt; + struct expr_id_data *data; + + hashmap__for_each_entry(needles->ids, cur, bkt) { + if (expr__get_id(haystack, cur->key, &data)) + return false; + } + return true; +} + + int expr__resolve_id(struct expr_parse_ctx *ctx, const char *id, struct expr_id_data **datap) { diff --git a/tools/perf/util/expr.h b/tools/perf/util/expr.h index c6e534f633c3..cf81f9166dbb 100644 --- a/tools/perf/util/expr.h +++ b/tools/perf/util/expr.h @@ -43,6 +43,8 @@ int expr__add_id_val(struct expr_parse_ctx *ctx, const char *id, double val); int expr__add_ref(struct expr_parse_ctx *ctx, struct metric_ref *ref); int expr__get_id(struct expr_parse_ctx *ctx, const char *id, struct expr_id_data **data); +bool expr__subset_of_ids(struct expr_parse_ctx *haystack, + struct expr_parse_ctx *needles); int expr__resolve_id(struct expr_parse_ctx *ctx, const char *id, struct expr_id_data **datap); -- 2.33.0.882.g93a45727a2-goog