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 55766C19F2D for ; Thu, 11 Aug 2022 06:27:09 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234187AbiHKG1I (ORCPT ); Thu, 11 Aug 2022 02:27:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60332 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234112AbiHKG0l (ORCPT ); Thu, 11 Aug 2022 02:26:41 -0400 Received: from mail-pg1-x52f.google.com (mail-pg1-x52f.google.com [IPv6:2607:f8b0:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 210E861123 for ; Wed, 10 Aug 2022 23:26:22 -0700 (PDT) Received: by mail-pg1-x52f.google.com with SMTP id 202so9560622pgc.8 for ; Wed, 10 Aug 2022 23:26:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=wwCjxnUlxiG5OvsukJtk7xNKA0LpoSPwzzyX9U3xmEg=; b=UnxetM0D5FHITGLFhucmJ/0kfSFq6Hn21E4hS5C4dULLY7xiZrAIJtH5Fg3EVJAi4U Ka+3Pjh8mGBl6K1A/5VZaKpJqS3CYiSD/ovWnXTqHDBUG5nCaWZss/2ptHVXBLeLn8H4 I78ADZv4Dr1X+oJ/kJeWWXpdHpADUYE+BD2EPuC2JGAVXRn//+P2RapOisTPA2hfDFfV 1L8xdtd5HceSIJAnf4cqA3PtBMUKjHavV0z0dXSYgrFlZgpGwvyGGBWUBobG56rUyyRe XZLod8WVjrfzN9VoqN3ElpcQbmduK6zrDYuuEqj3KH4WPyWZv5hz2MPuA0uqfsicUGEX MITQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=wwCjxnUlxiG5OvsukJtk7xNKA0LpoSPwzzyX9U3xmEg=; b=eEUgVaWVnvPjL0gmlcqMsUCOurMhgJhMl9NlYFjOkj8umzpwpSWLRk/3rWSctLYj/w Jo9E+S74rm2XRK+pQB/2tXksYWJ5Ud+MWLn4EInlrHWj4kU9yLVp3LArrkc+4cXz5J0w wUriknmGTsGTdjiI3Xe9fwmILXotbK1uovS8NMeA00Uj6aj3SKDUOGb5zmpFVlehAOew RfacJFrSucF3ty+pHH4O1pAE3+cq5JSrMlpVaBpHKrODBK14RWLxzpK4PuVAU2hzTA7S h/XQqu52V/vuRioz5zGQfwPIJOWpS+cfLsANzSS6zRmWCHibSGb63Q4XWeQevTrtOYyo 6MQg== X-Gm-Message-State: ACgBeo3991Cp2ERMxBZusLl3WLVaeHn51r5NyAkiiX5ktc0mOaUh4XEb IDKRo0Gyo+3w6YoM72V5sROQeQ== X-Google-Smtp-Source: AA6agR7WyjW5IXmsRPR1Qb6l3c+HU32i0tu+UACK0G0shue0qhbjF7xTHdoaNkl8BOpvHhpAywq5Mg== X-Received: by 2002:a63:170d:0:b0:415:f76d:45e1 with SMTP id x13-20020a63170d000000b00415f76d45e1mr25633830pgl.171.1660199181532; Wed, 10 Aug 2022 23:26:21 -0700 (PDT) Received: from leoy-yangtze.lan (n058152077182.netvigator.com. [58.152.77.182]) by smtp.gmail.com with ESMTPSA id o12-20020a17090a55cc00b001f506009036sm2766926pjm.49.2022.08.10.23.26.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Aug 2022 23:26:21 -0700 (PDT) From: Leo Yan To: Arnaldo Carvalho de Melo , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , John Garry , Will Deacon , James Clark , Mike Leach , Kajol Jain , Ali Saidi , Adrian Hunter , "Gustavo A. R. Silva" , Anshuman Khandual , Ian Rogers , Like Xu , German Gomez , Timothy Hayes , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: Leo Yan Subject: [PATCH v6 14/15] perf c2c: Use 'peer' as default display for Arm64 Date: Thu, 11 Aug 2022 14:24:50 +0800 Message-Id: <20220811062451.435810-15-leo.yan@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220811062451.435810-1-leo.yan@linaro.org> References: <20220811062451.435810-1-leo.yan@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-perf-users@vger.kernel.org Since Arm64 arch doesn't support HITMs flags, this patch changes to use 'peer' as default display if user doesn't specify any type; for other arches, it still uses 'tot' as default display type if user doesn't specify it. This patch changes to call perf_session__new() in an earlier place, so session environment can be initialized ahead and arch info can be used for setting display type. Suggested-by: Ali Saidi Signed-off-by: Leo Yan Acked-by: Ian Rogers Tested-by: Ali Saidi Reviewed-by: Ali Saidi --- tools/perf/builtin-c2c.c | 36 ++++++++++++++++++++++++------------ 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/tools/perf/builtin-c2c.c b/tools/perf/builtin-c2c.c index f7a961e55a92..653e13b5037e 100644 --- a/tools/perf/builtin-c2c.c +++ b/tools/perf/builtin-c2c.c @@ -2878,7 +2878,7 @@ static int setup_callchain(struct evlist *evlist) static int setup_display(const char *str) { - const char *display = str ?: "tot"; + const char *display = str; if (!strcmp(display, "tot")) c2c.display = DISPLAY_TOT_HITM; @@ -3068,27 +3068,39 @@ static int perf_c2c__report(int argc, const char **argv) data.path = input_name; data.force = symbol_conf.force; + session = perf_session__new(&data, &c2c.tool); + if (IS_ERR(session)) { + err = PTR_ERR(session); + pr_debug("Error creating perf session\n"); + goto out; + } + + /* + * Use the 'tot' as default display type if user doesn't specify it; + * since Arm64 platform doesn't support HITMs flag, use 'peer' as the + * default display type. + */ + if (!display) { + if (!strcmp(perf_env__arch(&session->header.env), "arm64")) + display = "peer"; + else + display = "tot"; + } + err = setup_display(display); if (err) - goto out; + goto out_session; err = setup_coalesce(coalesce, no_source); if (err) { pr_debug("Failed to initialize hists\n"); - goto out; + goto out_session; } err = c2c_hists__init(&c2c.hists, "dcacheline", 2); if (err) { pr_debug("Failed to initialize hists\n"); - goto out; - } - - session = perf_session__new(&data, &c2c.tool); - if (IS_ERR(session)) { - err = PTR_ERR(session); - pr_debug("Error creating perf session\n"); - goto out; + goto out_session; } session->itrace_synth_opts = &itrace_synth_opts; @@ -3096,7 +3108,7 @@ static int perf_c2c__report(int argc, const char **argv) err = setup_nodes(session); if (err) { pr_err("Failed setup nodes\n"); - goto out; + goto out_session; } err = mem2node__init(&c2c.mem2node, &session->header.env); -- 2.34.1