Received: by 2002:a05:6a10:8395:0:0:0:0 with SMTP id n21csp597638pxh; Wed, 10 Nov 2021 06:37:53 -0800 (PST) X-Google-Smtp-Source: ABdhPJw4qYPyVRpnLPQAvZ/4TIT6UaJqpFVCNNduAMz0BlnyAhaK5offGziDPGVX8Ktoz7lFg0i3 X-Received: by 2002:a05:6a00:a8e:b0:480:ab08:1568 with SMTP id b14-20020a056a000a8e00b00480ab081568mr205183pfl.28.1636555073603; Wed, 10 Nov 2021 06:37:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1636555073; cv=none; d=google.com; s=arc-20160816; b=fa06DFG8LtU17h6K59QGgeu1eV7hM+qZYy/tA8unAHR1X/enP/3GYXIsjQIs9b3KBx tt4QLbv9HtXuCo1FTgvJRJdm1IykdDHFZsFizO78/BmEOs3WBt3WyKzoyuFJs6btNZZn +QlPx5j8tbUfU35oyf2P1nUNjJjGAiSTelQ9tJR5go5XbguaPoqMR/FpezDCNaDIKBS/ BT4LEbgC1IXR72UT2k4AYHY5sliy0EQOCsDrNPj5KiX7sqgzzKO8ERkl0TqviVixvL+C sfAKagVP0JVn5Z9iZlHjOCYGI88KF524CU687WsfTBVPCEyP6Ldn0YXzKRmQCdC6DBjA vehg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:in-reply-to:content-disposition:mime-version :references:message-id:subject:cc:to:from:date:dkim-signature; bh=XzTh+Q15aMwIcAcypgPtn2F/6DAjnMg723kzP00nSZs=; b=lNfBYK6NnpLtO2LaXNK6Mkn0wiNH95D+dBMX8H1WGcFXzI20t9qB573L6Q5t21rYhJ b2W5KbJwBy8562A5fJaa/wTWnFySgO9aL0ApqoWrqZL4kp+mDf1aWiXx8yc/8b1OZODM eDggmKzE3W06O9NupGBVPC8CO1nq8Da8Lj8LPYMOYnL6SNDd3INxQrIGwEBMjDdS1iHB 5ddkXf/h1egFSkZ3PHnrgLCwN1Waw+gnXINpFkbw/jJz/rtAIOKYvul+orU9L53zmCmw cVgAb8klollbpKkuxVczZBOMP5I9h7hVhCo2J6p4Icccq3SXPmfNfjyJG4oTTD/SYsTg yCLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=GrA13iVa; 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=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id s12si32658402pgf.139.2021.11.10.06.37.38; Wed, 10 Nov 2021 06:37:53 -0800 (PST) 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=@redhat.com header.s=mimecast20190719 header.b=GrA13iVa; 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=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232251AbhKJOiG (ORCPT + 99 others); Wed, 10 Nov 2021 09:38:06 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:42139 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232241AbhKJOiC (ORCPT ); Wed, 10 Nov 2021 09:38:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1636554914; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=XzTh+Q15aMwIcAcypgPtn2F/6DAjnMg723kzP00nSZs=; b=GrA13iVaFYhIEwK2JPG5WBDMhWS9HlxJe92/9eXtlZmWm44ejDOqvaj0nBCB3icEM5yzzG UW5Ne9I6Qmb5bxUUDAwsDIQXRjivLyQvfiktINPidJoSXlztsj/Xf+6iF1VU2mNumTxjxQ WpwPoaD2qs7mYsDltq/hMzDdTs2PlJQ= Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-510-B0S4NSCuM_iB7lwwqZM67A-1; Wed, 10 Nov 2021 09:35:13 -0500 X-MC-Unique: B0S4NSCuM_iB7lwwqZM67A-1 Received: by mail-ed1-f69.google.com with SMTP id h13-20020a05640250cd00b003e35ea5357fso2512264edb.2 for ; Wed, 10 Nov 2021 06:35:12 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=XzTh+Q15aMwIcAcypgPtn2F/6DAjnMg723kzP00nSZs=; b=Hzp/C4QSLuVsaDHjYgMG6C2v8HWWRXtuBW0jkYVDg1x+THqx8/gAThVNOh0czJRwa3 6JIX51I268B7yVJFpBmeaI63j56J1ec4wvEUkfpLicXhsZXe1DcbEkoFLBo46IUAbtVB HnmFch3k+x8duTz7kZj7xVmwrLnGZqGjss4uqadX9kX5K4vJx1E1DV4Xu6ikICIoH0X8 +jFZT+OqmAe+oFZiPLwFOr4MZP4IjQPNxTEJrR97mI5tGXPymS0TN5mHMp3erveSpxeK 1Rap3pAFxjRDzstmJDfqAuxtqa7ECuL5LVqRtD25FnC0rpAFwmOlOrREEAIj4meYEaWB RsEA== X-Gm-Message-State: AOAM532r448u/P3HAKSNW/GAlTlI0kQ97OtgtZoUC9AStjOfkMdqasM+ af1rqkfbX6q8tS5AaDg9Ags5j2M4Bbv1399e7o2ZztWpFJl3paOG6W3j7snr7Zkztykf+thzYtx PXZyDVZXemU5vwfp6hFwE1jjG X-Received: by 2002:a05:6402:40d4:: with SMTP id z20mr83399edb.210.1636554911695; Wed, 10 Nov 2021 06:35:11 -0800 (PST) X-Received: by 2002:a05:6402:40d4:: with SMTP id z20mr83351edb.210.1636554911502; Wed, 10 Nov 2021 06:35:11 -0800 (PST) Received: from krava ([83.240.60.218]) by smtp.gmail.com with ESMTPSA id sd28sm12700414ejc.37.2021.11.10.06.35.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Nov 2021 06:35:11 -0800 (PST) Date: Wed, 10 Nov 2021 15:35:09 +0100 From: Jiri Olsa To: Ian Rogers Cc: Andi Kleen , 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 , Madhavan Srinivasan , Song Liu , Wan Jiabing , Yury Norov , Changbin Du , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 6/7] perf expr: Add metric literals for topology. Message-ID: References: <20211105170943.3479315-1-irogers@google.com> <20211105170943.3479315-7-irogers@google.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Wed, Nov 10, 2021 at 06:19:04AM -0800, Ian Rogers wrote: > On Wed, Nov 10, 2021 at 4:56 AM Jiri Olsa wrote: > > > > On Fri, Nov 05, 2021 at 10:09:42AM -0700, Ian Rogers wrote: > > > Allow the number of cpus, cores, dies and packages to be queried by a > > > metric expression. > > > > > > Signed-off-by: Ian Rogers > > > --- > > > tools/perf/tests/expr.c | 12 +++++++++++- > > > tools/perf/util/expr.c | 27 +++++++++++++++++++++++++++ > > > 2 files changed, 38 insertions(+), 1 deletion(-) > > > > > > diff --git a/tools/perf/tests/expr.c b/tools/perf/tests/expr.c > > > index 9ee2dc91c27b..0c09ccc76665 100644 > > > --- a/tools/perf/tests/expr.c > > > +++ b/tools/perf/tests/expr.c > > > @@ -66,7 +66,7 @@ int test__expr(struct test *t __maybe_unused, int subtest __maybe_unused) > > > { > > > struct expr_id_data *val_ptr; > > > const char *p; > > > - double val; > > > + double val, num_cpus, num_cores, num_dies, num_packages; > > > int ret; > > > struct expr_parse_ctx *ctx; > > > > > > @@ -161,6 +161,16 @@ int test__expr(struct test *t __maybe_unused, int subtest __maybe_unused) > > > NULL, ctx) == 0); > > > TEST_ASSERT_VAL("find ids", hashmap__size(ctx->ids) == 0); > > > > > > + /* Test toplogy constants appear well ordered. */ > > > + expr__ctx_clear(ctx); > > > + TEST_ASSERT_VAL("#num_cpus", expr__parse(&num_cpus, ctx, "#num_cpus") == 0); > > > + TEST_ASSERT_VAL("#num_cores", expr__parse(&num_cores, ctx, "#num_cores") == 0); > > > + TEST_ASSERT_VAL("#num_cpus >= #num_cores", num_cpus >= num_cores); > > > + TEST_ASSERT_VAL("#num_dies", expr__parse(&num_dies, ctx, "#num_dies") == 0); > > > + TEST_ASSERT_VAL("#num_cores >= #num_dies", num_cores >= num_dies); > > > + TEST_ASSERT_VAL("#num_packages", expr__parse(&num_packages, ctx, "#num_packages") == 0); > > > + TEST_ASSERT_VAL("#num_dies >= #num_packages", num_dies >= num_packages); > > > + > > > expr__ctx_free(ctx); > > > > > > return 0; > > > diff --git a/tools/perf/util/expr.c b/tools/perf/util/expr.c > > > index 7464739c2890..15af8b8ef5e7 100644 > > > --- a/tools/perf/util/expr.c > > > +++ b/tools/perf/util/expr.c > > > @@ -5,6 +5,8 @@ > > > #include > > > #include > > > #include "metricgroup.h" > > > +#include "cpumap.h" > > > +#include "cputopo.h" > > > #include "debug.h" > > > #include "expr.h" > > > #include "expr-bison.h" > > > @@ -375,9 +377,34 @@ double expr_id_data__value(const struct expr_id_data *data) > > > > > > double expr__get_literal(const char *literal) > > > { > > > + static struct cpu_topology *topology; > > > + > > > if (!strcmp("#smt_on", literal)) > > > return smt_on() > 0 ? 1.0 : 0.0; > > > > > > + if (!strcmp("#num_cpus", literal)) > > > + return cpu__max_present_cpu(); > > > + > > > + /* > > > + * Assume that topology strings are consistent, such as CPUs "0-1" > > > + * wouldn't be listed as "0,1", and so after deduplication the number of > > > + * these strings gives an indication of the number of packages, dies, > > > + * etc. > > > + */ > > > + if (!topology) { > > > + topology = cpu_topology__new(); > > > > any chance we could propagate expr_scanner_ctx in here and store topology > > to it and release it at the end? I think we have several places like this, > > so it'd be nice not to make more if it's possible ;-) > > The topology here is static and so will only get computed once per > execution rather than once pre expression parse. I was worried about > the cost of recomputing the topology for something like 'perf stat -I > 1000 -M ...' in which case the static will do less recomputation. can't we have the topology created/release on the top fo the parsing and released after all expressions are parsed? or we could come up with some generic way to handle this kind of release jirka > > Thanks, > Ian > > > thanks, > > jirka > > > > > + if (!topology) { > > > + pr_err("Error creating CPU topology"); > > > + return NAN; > > > + } > > > + } > > > + if (!strcmp("#num_packages", literal)) > > > + return topology->package_cpus_lists; > > > + if (!strcmp("#num_dies", literal)) > > > + return topology->die_cpus_lists; > > > + if (!strcmp("#num_cores", literal)) > > > + return topology->core_cpus_lists; > > > + > > > pr_err("Unrecognized literal '%s'", literal); > > > return NAN; > > > } > > > -- > > > 2.34.0.rc0.344.g81b53c2807-goog > > > > > >