From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0258CC433EF for ; Tue, 23 Nov 2021 22:48:28 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235597AbhKWWvg (ORCPT ); Tue, 23 Nov 2021 17:51:36 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37606 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229580AbhKWWve (ORCPT ); Tue, 23 Nov 2021 17:51:34 -0500 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 EC210C061574 for ; Tue, 23 Nov 2021 14:48:25 -0800 (PST) Received: by mail-yb1-xb4a.google.com with SMTP id h134-20020a25d08c000000b005f5cd3befbbso1043191ybg.10 for ; Tue, 23 Nov 2021 14:48:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=date:message-id:mime-version:subject:from:to:cc; bh=r7AhAqgjV2rKTWwkAzKHbn6CM2swTuumTBUvYfOAdxA=; b=ZgVd9XTPz7nDwBpf1v6JnKCnSivUNdHsi3cr1pyS4WrhRUVI/pLBE5topWef+eIVbr DPOLJ1UvI8lGcbK9qqB2MSpXpYI9DuEg8dUopYbpaQn8e4z1MiQnwsC3kDgeCR2VfMLf /rBPx/HeWInbOyOJGuJFJye6RUbm0Al0Nc/DLSUSSVumWVuL05EpTaD7CrnbucRfJdT8 p322GXCEQSY4AEt9GoUOIXKc5FhFgXHHvtBaOI8b73iDwLkEJ7jMlafGHDQVKr8A6cX8 qvDZrbZGuU6v/bytURBO3RGhglKLmpxYduq2ObzhqAsxrJq7GWBK4vw8GYaCcdDZcmuL FTJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=r7AhAqgjV2rKTWwkAzKHbn6CM2swTuumTBUvYfOAdxA=; b=DPkL1xAWijTOMR/vliknp1l+9TLn2hncXPWHOSzjP+UnEJlPRkOg5ppicr7IBByeIv RyRBhPets3Huj0E8Tr/EnbLCMDw9QawL0XCePw9VYMehSwlVCzGiBwiL9hiRZW3qkfAS GBWC5mUq8TnwD03lCuhliNOYEY7xzibEHrE5/pYXFGfONzlAPr8Of6HggNvzNsnwdCwO YKKL3AJkQkXH7he/wreIv8XNumHn7NHMPKmxf2x2xMWPuzaMGwLxH4bTcRE/yMDF9i1P GinXDiTsP/J9YVSRltXDYIP7F3VNQJw8fFnHHWRS740SASC4azkbpF/2iREoceKY7Tyt Eb+Q== X-Gm-Message-State: AOAM531aKFSJ2b1OFtePLm4WB341RxLitdbfc/QAqgvuquGwFNTAg3Z/ mKwLgPQ+U3UNbF6PXY874gVwj12cQxAw X-Google-Smtp-Source: ABdhPJxam15LwRrevFaVgC2Lj9OBCN3w/yYA4YqlDr3OMiYJWOAxiwp2EwqoBGkORLzaDhtuFVUlnV4FfWbW X-Received: from irogers.svl.corp.google.com ([2620:15c:2cd:202:dbab:a6fe:1e3a:91fa]) (user=irogers job=sendgmr) by 2002:a25:bacd:: with SMTP id a13mr11424123ybk.216.1637707705207; Tue, 23 Nov 2021 14:48:25 -0800 (PST) Date: Tue, 23 Nov 2021 14:48:19 -0800 Message-Id: <20211123224821.3258649-1-irogers@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.34.0.rc2.393.gf8c9666880-goog Subject: [PATCH 1/3] perf expr: Add debug logging for literals From: Ian Rogers To: Andi Kleen , Jiri Olsa , Namhyung Kim , John Garry , Kajol Jain , "Paul A . Clarke" , Arnaldo Carvalho de Melo , Kan Liang , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Konstantin Khlebnikov , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Cc: eranian@google.com, Ian Rogers Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Useful for diagnosing problems with metrics. Signed-off-by: Ian Rogers --- tools/perf/util/expr.c | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/tools/perf/util/expr.c b/tools/perf/util/expr.c index 1d532b9fed29..cdbab4f959fe 100644 --- a/tools/perf/util/expr.c +++ b/tools/perf/util/expr.c @@ -395,12 +395,17 @@ double expr_id_data__source_count(const struct expr_id_data *data) double expr__get_literal(const char *literal) { static struct cpu_topology *topology; + double result = NAN; - if (!strcmp("#smt_on", literal)) - return smt_on() > 0 ? 1.0 : 0.0; + if (!strcmp("#smt_on", literal)) { + result = smt_on() > 0 ? 1.0 : 0.0; + goto out; + } - if (!strcmp("#num_cpus", literal)) - return cpu__max_present_cpu(); + if (!strcmp("#num_cpus", literal)) { + result = cpu__max_present_cpu(); + goto out; + } /* * Assume that topology strings are consistent, such as CPUs "0-1" @@ -415,13 +420,21 @@ double expr__get_literal(const char *literal) 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; + if (!strcmp("#num_packages", literal)) { + result = topology->package_cpus_lists; + goto out; + } + if (!strcmp("#num_dies", literal)) { + result = topology->die_cpus_lists; + goto out; + } + if (!strcmp("#num_cores", literal)) { + result = topology->core_cpus_lists; + goto out; + } pr_err("Unrecognized literal '%s'", literal); - return NAN; +out: + pr_debug2("literal: %s = %f\n", literal, result); + return result; } -- 2.34.0.rc2.393.gf8c9666880-goog