Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp2129196pxb; Sun, 17 Oct 2021 06:37:35 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxncnAMVSxzJVdS1H+3j4fX45YxBZm2uDk7fgsrRlgNlDLPTfBI0olhDfswoHMoaXRo2xMW X-Received: by 2002:a17:902:c410:b0:13e:cfac:45ad with SMTP id k16-20020a170902c41000b0013ecfac45admr22361650plk.68.1634477855414; Sun, 17 Oct 2021 06:37:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1634477855; cv=none; d=google.com; s=arc-20160816; b=l6pMOkf46XyfLPxYgLZxG5yd2FLk/jVzsx7KMUklCAufNb+fvKbUyCb/DBM6+gBPzV HhGYVyirizLeHilXqfx3CRaz+6Y6Yhm4HIH7pQsxbbVSwEfTEGhZlhKP8SdYKw3+Q84t zOL/R0dLrP/u7PpI0chQ5vlXwPDsV7AU4SUXTTJejgBwOMKJvlvXKV6NGxTqKges+I/o w5PhlYy+X77wOVkr0Xza1REsbucoQVBxslBRjWNJld9LJaRbwzA9kySlywcbSxg0C15y +OfL2XRVLgK1PDVmFVVXF09Do0lZZ/dYn1y8X0zue7KpV3lVgCHlyrPHr3viDEnXnpto Ib5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=ehHQEfD5QF795LiWNu1NX0B6LCS/5JtCJ4EKdRcTYBI=; b=gIx3Iol/DNoKW3+Any2z6kAgeY22Q7uyF5d6gwSXmpcjkKWdnAYhSvUdWPGkNw9h1X 5ZjVNpg8hAt+adqfYpeU0qMRBFnwnL9EZeyyzJcbEFQ6tTT034511PXCKhvej6WezuuG Xh8AcGnugaWkp6/b0Gbfp4FaTl86K4krELA27l0ltwYph7b1B9bdGri7Vc0SF6QX6xRr 7yxS53HtFHOdSi1akX4rwQ57ONs+1yNLuET2b+eST8klhx/IuINsup9+ja5bq1wGXDGL Yk+PAkkT/ZuYbqmeCOq9o+ltj9tsJITt7qhGiSiU3O5fT+6aeJkyofGSvrYdTCMZqW9I 1gbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=j90US0DF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f4si18220065pgl.598.2021.10.17.06.37.22; Sun, 17 Oct 2021 06:37:35 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=j90US0DF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S242405AbhJORZF (ORCPT + 99 others); Fri, 15 Oct 2021 13:25:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40236 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S242272AbhJORYi (ORCPT ); Fri, 15 Oct 2021 13:24:38 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 82868C0613E3 for ; Fri, 15 Oct 2021 10:22:19 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id i83-20020a256d56000000b005b706d1417bso11969830ybc.6 for ; Fri, 15 Oct 2021 10:22:19 -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=ehHQEfD5QF795LiWNu1NX0B6LCS/5JtCJ4EKdRcTYBI=; b=j90US0DFz1tmT/Uu1SLfE7Lv7Ue6pjlkJRmZkFtPKlbes51pt3GqiGcNwSBmlLmb+L HjFBduRPbQjsUXGhNFbHthZyPyr7Gcg2TLnzlDsqd7iWoKMiIHf1dfJ+suwLBUbJBa2V DnH1Rf1+PzyLZDc0bjpp2oZb5qN2MIXnFQ5EQQKzCdvX5sNcJqr3KyEiVSOP9cC25bzc JhN2TliQHI57R2r2VUXL5ibwviudL2OmYby9IYXjFv2/ir685UoMLqfX4vTjy0N27hpg e9Ei2pVdiQktA7FxFfh0Fjljpe+Rf2vybj2fklDpLChxrHL4jlig8DpnVQUcIqNIlHoc DFPg== 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=ehHQEfD5QF795LiWNu1NX0B6LCS/5JtCJ4EKdRcTYBI=; b=urRPqezMNvgjP0zwbzbjsqVYmhYQor0Q9LJhnKRKYH7DktN8yVFWn1iBqDa3hC9sbV VvBR7A2w+w1BKVCQwEdHpy+52s2J1QeR/J0pd0/YIyKDJNur8rFY4mTKff6zefmaxerl qokIM0xetHg3JpOiNqlm5Pk5mx1ze7I4KvO0XkxVZ5KQ3FcnLIRdUe8DIZRz953wm38r gZ9wGfGKEY78SYS7Vny3QYbTGuzfkLxwF2/c4sk0ow1Htj4u1fxG5fWXVXiVEt1QbpqD 5vtl3Ln3fQIT7kZ+Uq2MAg3ImxHxyaajA8zTtG6TqZozgIYtj53f2XoSBPs8eyfqIO0e j0LQ== X-Gm-Message-State: AOAM532vyzJnJ8gUTyhZuniflZycgZ0p5sjgOQx3A8zrXEMt3daDeYI1 /xnC7yBP5bIUkVQ95vVldSJ30yJKEm2B X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:69bc:7451:58ad:6585]) (user=irogers job=sendgmr) by 2002:a25:478b:: with SMTP id u133mr14382110yba.422.1634318538682; Fri, 15 Oct 2021 10:22:18 -0700 (PDT) Date: Fri, 15 Oct 2021 10:21:28 -0700 In-Reply-To: <20211015172132.1162559-1-irogers@google.com> Message-Id: <20211015172132.1162559-18-irogers@google.com> Mime-Version: 1.0 References: <20211015172132.1162559-1-irogers@google.com> X-Mailer: git-send-email 2.33.0.1079.g6e70778dc9-goog Subject: [PATCH v2 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, Andrew Kilroy Cc: Stephane Eranian , Ian Rogers Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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. Acked-by: Andi Kleen 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.1079.g6e70778dc9-goog