From patchwork Mon May 17 13:17:39 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Clark X-Patchwork-Id: 12261951 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7E930C433ED for ; Mon, 17 May 2021 13:23:42 +0000 (UTC) Received: from desiato.infradead.org (desiato.infradead.org [90.155.92.199]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 473E761059 for ; Mon, 17 May 2021 13:23:42 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 473E761059 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=desiato.20200630; h=Sender:Content-Transfer-Encoding :Content-Type:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:Cc:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=1rRdSKHrFCN7DIuHPKH+7aIXAl6+68GL7/7746E/5Z0=; b=X8y+LwNTtgc8pPaOmhLt1H9H3 4t7I7iIbfUH/WKV0ZdI+3EVw+IXP2gN8OuELVrwHMpS8aFIuwbfNxEER0F8DCW5S/ltFZpm3scDFs mJSWrXoCF9qbAZ1NTmTJ3E3PrJVKPM3MVj8fIUdYHcwaJ3gw0M60QKfLMEcIcQQ2ZV1dcBM4SvMxK TJFMOJdi0tH+DrqhkwbeE7WKZGoF8ms5v1aM2JBtWWBHzHBy4NqMwH32zvea+44Ik4bYV5NExHEh8 x6LBO4QrPecOwMrWsmhz/hZloXKCiLTgK/sdaceYtPu8sdfPu7NnO+ne1r28rRuGZ4tYc+eno0jcL kwghL1dAQ==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lidAo-00F2yO-Fn; Mon, 17 May 2021 13:20:43 +0000 Received: from bombadil.infradead.org ([2607:7c80:54:e::133]) by desiato.infradead.org with esmtps (Exim 4.94 #2 (Red Hat Linux)) id 1lid8O-00F2RT-9f for linux-arm-kernel@desiato.infradead.org; Mon, 17 May 2021 13:18:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=Mqyu9X2yWXIp8RanQvOe8ZWqkYe3J6TbXzGkLxxe5IQ=; b=HWrDVJpALNNedppdbzgomTXWzn JTfavsLIupycgv5yWQkCAbeD5oUGOKT4olrLvVfxEmihykqdcMl6jmUE02o9uKER9BbB8glKdPCJd 7OiEmmNdgSY7OzsxkbUS+KtP4Jup6c5hXlzYawfR/eaRxJ1qhJTmcVrnucHKv8xG/OpPzFs4oT8RA qxYz166auF0U5Zb12Pa8vzALb37UsU/6R7cR1J9Ie757ScNOmawWZzyaW801u/hNj6s1IAfeDpR/j XL1Kn25Jy0DbSv/Ri73UN68JqMEyw4/QFZzHGKN5CdvvB+DhHSjo6rF0UlbZpXIz3asVdVQsUUQYo xmbBsHbQ==; Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lid8F-00DnAD-2M for linux-arm-kernel@lists.infradead.org; Mon, 17 May 2021 13:18:10 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 8C9BF13D5; Mon, 17 May 2021 06:17:59 -0700 (PDT) Received: from e121896.arm.com (unknown [10.57.3.96]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id B050D3F73B; Mon, 17 May 2021 06:17:56 -0700 (PDT) From: James Clark To: acme@kernel.org, mathieu.poirier@linaro.org, coresight@lists.linaro.org, leo.yan@linaro.org Cc: al.grant@arm.com, branislav.rankov@arm.com, denik@chromium.org, suzuki.poulose@arm.com, anshuman.khandual@arm.com, James Clark , Mike Leach , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , John Garry , Will Deacon , linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 1/3] perf cs-etm: Move synth_opts initialisation Date: Mon, 17 May 2021 16:17:39 +0300 Message-Id: <20210517131741.3027-2-james.clark@arm.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210517131741.3027-1-james.clark@arm.com> References: <20210517131741.3027-1-james.clark@arm.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210517_061803_180714_70EBEB08 X-CRM114-Status: GOOD ( 10.26 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Move initialisation of synth_opts earlier in the function so that synth_opts can be used at an earlier stage in a later commit. Reviewed-by: Leo Yan Signed-off-by: James Clark --- tools/perf/util/cs-etm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c index 153fb8393e6e..a752fe06f170 100644 --- a/tools/perf/util/cs-etm.c +++ b/tools/perf/util/cs-etm.c @@ -2819,6 +2819,14 @@ int cs_etm__process_auxtrace_info(union perf_event *event, if (err) goto err_free_etm; + if (session->itrace_synth_opts->set) { + etm->synth_opts = *session->itrace_synth_opts; + } else { + itrace_synth_opts__set_default(&etm->synth_opts, + session->itrace_synth_opts->default_no_sample); + etm->synth_opts.callchain = false; + } + etm->session = session; etm->machine = &session->machines.host; @@ -2863,14 +2871,6 @@ int cs_etm__process_auxtrace_info(union perf_event *event, return 0; } - if (session->itrace_synth_opts->set) { - etm->synth_opts = *session->itrace_synth_opts; - } else { - itrace_synth_opts__set_default(&etm->synth_opts, - session->itrace_synth_opts->default_no_sample); - etm->synth_opts.callchain = false; - } - err = cs_etm__synth_events(etm, session); if (err) goto err_delete_thread;