From patchwork Thu May 13 14:35:18 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Clark X-Patchwork-Id: 12255881 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.4 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 BB5D9C43460 for ; Thu, 13 May 2021 14:38:03 +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 81F6061073 for ; Thu, 13 May 2021 14:38:03 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 81F6061073 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=MLiBNZgwRVSiwJB+qy77/tOjCB0TS44KBs4rMChv6wo=; b=G+vfsDzf3w4o1BkIzpnFlWNFN IUbU6Hu2l3SaLlPqWW6SCusqCCT/tOcIh9bVWSTQNhwZU96w4PnHCfYnjHVIWDDiHuvNcmJv1OGjd 4occaT1Y6jc5YaEtFNH6ggspiPja0C9LKzBe5cJSOTPrREPpk+nY0/I5nT1qeqv+So2HRKHJpyn0G BVRPC4/bEe4kz+lphqKlwvGcd4lrn6pwAbsm2Q5dwJZysN2gh3xd8DL8cdffjHQvI0Fvl6LNaVeUo 7SaVq8qZYq55Y8LkUQSBh8l75QuJb7e+RW/9zyvrxKoeTCbt5k+BbF5gn6GY9yvpqGif8Hkn+BjPi DLrK+boWg==; Received: from localhost ([::1] helo=desiato.infradead.org) by desiato.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lhCRW-005lCs-8L; Thu, 13 May 2021 14:36:03 +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 1lhCRD-005l9M-Qv for linux-arm-kernel@desiato.infradead.org; Thu, 13 May 2021 14:35:43 +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=keky1vqzDxkfisHGaM249TdRXbMnvonTiTkO93pU49k=; b=pcA91P6U6YirLAD/iRNjpWUtVP F9iR6hoVtnlJJaiBycF0ng12uLpkxH2CYa/5Uop6c+nTvYDtBQ/PlU2AJR6IoaH7zfKhsnhzljZ7d YHj8ZLTTJSmqNsYYyi5Dk5cg6nB1H0Ey/oxAuZdr7/CEmBkxof+91VJuBTvjve3Usd0zSBuIYeURQ 38tkadB64IjGH2Rs3OV6YICB/g6KUq++U0V7XDqYtcO39/yAHHn4BGXB4X8ycOVz9lZMCytaohhdS m2i9Cap8zfehyPFAhnrSV2xct89PYG17+Dupk/Kqow7KPNXNv79qctk/QRqDxYKkQBQbzTtPeonlN oc1UuBmg==; Received: from foss.arm.com ([217.140.110.172]) by bombadil.infradead.org with esmtp (Exim 4.94 #2 (Red Hat Linux)) id 1lhCRB-00BKAH-9k for linux-arm-kernel@lists.infradead.org; Thu, 13 May 2021 14:35:42 +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 8AF1C1713; Thu, 13 May 2021 07:35:35 -0700 (PDT) Received: from e121896.arm.com (unknown [10.57.81.122]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id B27713F73B; Thu, 13 May 2021 07:35:32 -0700 (PDT) From: James Clark To: 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 , Mathieu Poirier , linux-arm-kernel@lists.infradead.org, linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 1/3] perf cs-etm: Move synth_opts initialisation Date: Thu, 13 May 2021 17:35:18 +0300 Message-Id: <20210513143520.22694-2-james.clark@arm.com> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20210513143520.22694-1-james.clark@arm.com> References: <20210513143520.22694-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-20210513_073541_401594_8F6A2DCE X-CRM114-Status: UNSURE ( 9.88 ) X-CRM114-Notice: Please train this message. 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. 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;