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 X-Spam-Level: X-Spam-Status: No, score=-14.0 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 autolearn=unavailable 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 C4A87C433E0 for ; Fri, 8 Jan 2021 18:11:54 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 5703223A69 for ; Fri, 8 Jan 2021 18:11:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5703223A69 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org 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=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=24WcHATqX4My1QIU12lQ6R8ZbVkLvjgs2ddVI9yg1b8=; b=QA/zF39sNK5swc1tLRk8PBl63 vUNkHP1sIF1ze/qxJhX0o9WRF19QARqM0rN8DeBR6a3x4jQq7Qqchh6/Ky/JNX0U7uPpjjTcFJ25S WusrQBnDeG3UpjrhmZlAFnhhMdN+U314tdfbP5vVFI8NZurMh4mcli8oerFM3znJph19T9LbAd506 0LoF/iFXveccQl6/Buq0GzlTMPPYMSTt1ujeh+seBLhx97U+tk8pkpZEUnEa2VnM8Nx5Q/CaEu2kz ++kILEjXgNE3zxltEFvLlJ4an6dy0b5JzSDynT55c82Thtyj4gciuLbBKOhp2MawpvjLswviUSy44 94fr+JNYQ==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kxwDJ-0003Pe-JL; Fri, 08 Jan 2021 18:10:17 +0000 Received: from mail-wr1-x434.google.com ([2a00:1450:4864:20::434]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kxwCu-0003Ok-Fg for linux-arm-kernel@lists.infradead.org; Fri, 08 Jan 2021 18:09:53 +0000 Received: by mail-wr1-x434.google.com with SMTP id m5so9845100wrx.9 for ; Fri, 08 Jan 2021 10:09:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=2IbKiK/oN0P8hq8HD/CB7DWifHFW8YC+ivJjR0jmvkc=; b=VAoj70RMoc94jq9LrcCZxLi50Lxghn26vl+q+0rOAk97j5kOpdskPxkV7YmBCZfW08 D/L3q0xOSeuUebbIoconytkgbYohn2Si43yUaqeoWx9VdC7hy7rK37RnIbv9iDfo7RKk XlK1QLxoQYzoUhmbjdfHPMiSMIBLwy96fqCG5M2evTPxcEp/OVLqFfjNMLa4quwGbQwV CPkA2sSyCVd4Tkarh2fBMIzi2GiUieQVirT2aX+SOGqeisZN0dxsvLRbTDtHVpoGKHw7 k1CKp1O8iBUoOrEQehTcMjrrTCZItE1j2DOMaUlbhih/9hijK2GLhoqLhUQoFQoIcvWF +e0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=2IbKiK/oN0P8hq8HD/CB7DWifHFW8YC+ivJjR0jmvkc=; b=KC6As0Eb+xonqu2bcVWnAUH8KPGjg9Ee3JSzCJB7kb/1SPnuzXo1NohoyJWnhjZy7k hJjMFqK49hQ3UTyYeNcXiu9oPiNr3k1OTfkfhcE0TZ2d0HmCAEk+/Z76QI4WDU8fPUHp tVToCQWGLFUePin/J1k6U57v2GEwNHAxfRwF27rkKf4b6nZpJf376IpKu66xoPnVNm9h 12R07aPoG/ghJr6axZnUW8M1vrIetxGcK+1zVnELgtnpSzaEfKDdHmUIUqNFNoa+HvAy 1mLRYun+sVk1QMZ6MAoKj5m1+BsMGqXeZIuYSa3061D/Kce7PahttTFbXtkMywGyj4i6 hjlg== X-Gm-Message-State: AOAM530CMq9vKQmMieVAE8NbYoXrtqJESy+lH/cD1f78/GrVe0Bp2rhl G81gFhIc+6pmLvTIaJvGB05DySwTgf5hFnFNQqtMdA== X-Google-Smtp-Source: ABdhPJzk6Ad8zcisTWrHoOev20gPJmK38ezUKLlGJxiNHmMG20qleMjHa+gnOk9WlwkWBefTgUUxIKmR1nh7g6I8VzM= X-Received: by 2002:a5d:4587:: with SMTP id p7mr4671668wrq.178.1610129389412; Fri, 08 Jan 2021 10:09:49 -0800 (PST) MIME-Version: 1.0 References: <20210108142752.27872-1-james.clark@arm.com> In-Reply-To: <20210108142752.27872-1-james.clark@arm.com> From: Mike Leach Date: Fri, 8 Jan 2021 18:09:38 +0000 Message-ID: Subject: Re: [PATCH] perf tools: Update OpenCSD to v1.0.0 To: James Clark X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210108_130952_579587_9297A1AA X-CRM114-Status: GOOD ( 23.23 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Al Grant , Mathieu Poirier , Suzuki K Poulose , Peter Zijlstra , Jiri Olsa , Coresight ML , John Garry , Linux Kernel Mailing List , Arnaldo Carvalho de Melo , linux-perf-users@vger.kernel.org, Alexander Shishkin , Ingo Molnar , Leo Yan , Namhyung Kim , Will Deacon , linux-arm-kernel Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi James, I have tested this with OpenCSD v1.0.0 + Linux 5.11-rc2. Reviewed-by: Mike Leach Tested-by: Mike Leach On Fri, 8 Jan 2021 at 14:28, James Clark wrote: > > Replace the OCSD_INSTR switch statement with an if to > fix compilation error about unhandled values and avoid > this issue again in the future. > > Add new OCSD_GEN_TRC_ELEM_SYNC_MARKER and > OCSD_GEN_TRC_ELEM_MEMTRANS enum values to fix unhandled > value compilation error. Currently they are ignored. > > Increase the minimum version number to v1.0.0 now > that new enum values are used that are only present > in this version. > > Signed-off-by: James Clark > Cc: John Garry > Cc: Will Deacon > Cc: Mathieu Poirier > Cc: Leo Yan > Cc: Suzuki K Poulose > Cc: Mike Leach > Cc: Al Grant > Cc: Peter Zijlstra > Cc: Ingo Molnar > Cc: Arnaldo Carvalho de Melo > Cc: Mark Rutland > Cc: Alexander Shishkin > Cc: Jiri Olsa > Cc: Namhyung Kim > --- > tools/build/feature/test-libopencsd.c | 4 ++-- > tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 15 ++++----------- > 2 files changed, 6 insertions(+), 13 deletions(-) > > diff --git a/tools/build/feature/test-libopencsd.c b/tools/build/feature/test-libopencsd.c > index 1547bc2c0950..52c790b0317b 100644 > --- a/tools/build/feature/test-libopencsd.c > +++ b/tools/build/feature/test-libopencsd.c > @@ -4,9 +4,9 @@ > /* > * Check OpenCSD library version is sufficient to provide required features > */ > -#define OCSD_MIN_VER ((0 << 16) | (14 << 8) | (0)) > +#define OCSD_MIN_VER ((1 << 16) | (0 << 8) | (0)) > #if !defined(OCSD_VER_NUM) || (OCSD_VER_NUM < OCSD_MIN_VER) > -#error "OpenCSD >= 0.14.0 is required" > +#error "OpenCSD >= 1.0.0 is required" > #endif > > int main(void) > diff --git a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c > index cd007cc9c283..3f4bc4050477 100644 > --- a/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c > +++ b/tools/perf/util/cs-etm-decoder/cs-etm-decoder.c > @@ -419,19 +419,10 @@ cs_etm_decoder__buffer_range(struct cs_etm_queue *etmq, > packet->last_instr_subtype = elem->last_i_subtype; > packet->last_instr_cond = elem->last_instr_cond; > > - switch (elem->last_i_type) { > - case OCSD_INSTR_BR: > - case OCSD_INSTR_BR_INDIRECT: > + if (elem->last_i_type == OCSD_INSTR_BR || elem->last_i_type == OCSD_INSTR_BR_INDIRECT) > packet->last_instr_taken_branch = elem->last_instr_exec; > - break; > - case OCSD_INSTR_ISB: > - case OCSD_INSTR_DSB_DMB: > - case OCSD_INSTR_WFI_WFE: > - case OCSD_INSTR_OTHER: > - default: > + else > packet->last_instr_taken_branch = false; > - break; > - } > > packet->last_instr_size = elem->last_instr_sz; > > @@ -572,6 +563,8 @@ static ocsd_datapath_resp_t cs_etm_decoder__gen_trace_elem_printer( > case OCSD_GEN_TRC_ELEM_EVENT: > case OCSD_GEN_TRC_ELEM_SWTRACE: > case OCSD_GEN_TRC_ELEM_CUSTOM: > + case OCSD_GEN_TRC_ELEM_SYNC_MARKER: > + case OCSD_GEN_TRC_ELEM_MEMTRANS: > default: > break; > } > -- > 2.28.0 > -- Mike Leach Principal Engineer, ARM Ltd. Manchester Design Centre. UK _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel