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=-16.8 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=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 E4D85C63697 for ; Thu, 19 Nov 2020 15:30:18 +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 37D5B24695 for ; Thu, 19 Nov 2020 15:30:18 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="2tFDmhiZ"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="MZAAWdRN" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 37D5B24695 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:MIME-Version:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:References:In-Reply-To:Message-Id:Date:Subject:To: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=GKbl71GrsBpv/c78lQEYgCncaTzUV144XA16b5zpcoY=; b=2tFDmhiZHgYrxl3qrUru7G6R/r qZFk7vR1CJ/y1szYqesHp3dwomDseCWE4KQCZ5T/J7dqf8DZcC7pbGLyr+Q8OK2MF3QZWq+quplo5 DQFoV/id2BaJZZFyJu3Vd362dVdDDYUKKOjYLXqUMChsTLX462B2j4PSUYoDcv6YgqANkaaOzjvZK aPdcqO0YQj1gJgEsKmsstNUmF/+p8yKejelpw6hylkR1xLhVxl9ETqVADbzRO2lUGTdxTvPCj97jK JMoK5p0Hymn8eaArPlFXbO3GY5emN2Ly7r2UEIM7U9Qbwa8f+GefdjLftm7X0FtgSXsvxEBMaJd7y qiofqNlA==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kflsV-0005yf-E9; Thu, 19 Nov 2020 15:29:43 +0000 Received: from mail-pf1-x441.google.com ([2607:f8b0:4864:20::441]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kfloe-0004Nn-Ib for linux-arm-kernel@lists.infradead.org; Thu, 19 Nov 2020 15:25:58 +0000 Received: by mail-pf1-x441.google.com with SMTP id g7so4822820pfc.2 for ; Thu, 19 Nov 2020 07:25:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=eryxeHiT/KAiiehli8L2CTDZzn3NZF9ONjOE5TeFEnY=; b=MZAAWdRNUNIOzvxmmP8KXuqqfOb77EQoiC7N8URwtWbA2xYlrgxSBJm2R858TnbITz csuI7Xoa15s/xqB5q05QA2HmsXcc0t6IHoZkIeY9PA3bDgYsi78fa3gXW0fqMt+6nBoe GPbJo4pYi0TL4Ps43wnGH+97FnRbNdFm0yOoa3Aw8U+1ceU315C4fh4TBZjmnPahv+ck SmqMFHNjiZZ2JUC1F/pyuN4AwVgjyavlGSWNrwhenC+8zh1vT+qtUDsFLzvNhqy1Ufj9 MfSQG5WiXs6mOr/KowyQbzvczHDCD+H3eUly9yuGR318+hz3K4JQXMwGTFylbcrcuAbz 85aA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=eryxeHiT/KAiiehli8L2CTDZzn3NZF9ONjOE5TeFEnY=; b=jbcb5q0Cc/mIlalYza1ByqhYp2WSHx2C1djAQu5PInzk864YtVMe7/OljOBWYDCUPC 6/jEK8SjRdZR6LvZyJluim0aluouSeXh7kdhxj2hquGK6t2Gk1DyIOYinEi2HLuUqpKK r25kxvc47P1bU1YEstbaelcH/iYSLivfTVh5hH6jCtcRPaHATlorxJdfcnwxp0FUTk66 nWeMFG9BpfN38LL1/404kpY6jNXjYPB4zdcH2dJUvGLR2JF5j4QsazliBItWUgYDryre I/AQSkuNMtjvtupLXIOtf7kU5pzTR728SE2/aZWpEz87Rv3xRBeAUT+9rtQ/42HLQXqZ YhCg== X-Gm-Message-State: AOAM5328hr7a74fBLQD/Uaqe7LkQ6Ilc6T8ws1w1jxJeYILwuJnEznQk f+Im+IeK9bfvilyWIpTGoCSPXQ== X-Google-Smtp-Source: ABdhPJzPAmmCs4kh1UJ5ecGJmST0qv0tBkNJ71nexwuD/JbbmXrqsX/Q39s+LchXBpC/dEFiNbh5MA== X-Received: by 2002:aa7:9a5b:0:b029:197:c897:23b4 with SMTP id x27-20020aa79a5b0000b0290197c89723b4mr1703530pfj.77.1605799542382; Thu, 19 Nov 2020 07:25:42 -0800 (PST) Received: from localhost ([45.137.216.7]) by smtp.gmail.com with ESMTPSA id f1sm118013pfc.56.2020.11.19.07.25.41 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 19 Nov 2020 07:25:41 -0800 (PST) From: Leo Yan To: Arnaldo Carvalho de Melo , Andre Przywara , Dave Martin , James Clark , Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Al Grant , Wei Li , John Garry , Will Deacon , Mathieu Poirier , linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v9 12/16] perf arm-spe: Add new function arm_spe_pkt_desc_op_type() Date: Thu, 19 Nov 2020 23:24:37 +0800 Message-Id: <20201119152441.6972-13-leo.yan@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20201119152441.6972-1-leo.yan@linaro.org> References: <20201119152441.6972-1-leo.yan@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201119_102544_800636_CD75858C X-CRM114-Status: GOOD ( 18.69 ) 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: Leo Yan MIME-Version: 1.0 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 The operation type packet is complex and contains subclass; the parsing flow causes deep indentation; for more readable, this patch introduces a new function arm_spe_pkt_desc_op_type() which is used for operation type parsing. Signed-off-by: Leo Yan Reviewed-by: Andre Przywara --- .../arm-spe-decoder/arm-spe-pkt-decoder.c | 79 +++++++++++-------- 1 file changed, 45 insertions(+), 34 deletions(-) diff --git a/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c b/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c index 88bcf7e5be76..d6c060f119b4 100644 --- a/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c +++ b/tools/perf/util/arm-spe-decoder/arm-spe-pkt-decoder.c @@ -321,6 +321,50 @@ static int arm_spe_pkt_desc_event(const struct arm_spe_pkt *packet, return err; } +static int arm_spe_pkt_desc_op_type(const struct arm_spe_pkt *packet, + char *buf, size_t buf_len) +{ + u64 payload = packet->payload; + int err = 0; + + switch (packet->index) { + case 0: + arm_spe_pkt_out_string(&err, &buf, &buf_len, + payload & 0x1 ? "COND-SELECT" : "INSN-OTHER"); + break; + case 1: + arm_spe_pkt_out_string(&err, &buf, &buf_len, + payload & 0x1 ? "ST" : "LD"); + + if (payload & 0x2) { + if (payload & 0x4) + arm_spe_pkt_out_string(&err, &buf, &buf_len, " AT"); + if (payload & 0x8) + arm_spe_pkt_out_string(&err, &buf, &buf_len, " EXCL"); + if (payload & 0x10) + arm_spe_pkt_out_string(&err, &buf, &buf_len, " AR"); + } else if (payload & 0x4) { + arm_spe_pkt_out_string(&err, &buf, &buf_len, " SIMD-FP"); + } + break; + case 2: + arm_spe_pkt_out_string(&err, &buf, &buf_len, "B"); + + if (payload & 0x1) + arm_spe_pkt_out_string(&err, &buf, &buf_len, " COND"); + if (payload & 0x2) + arm_spe_pkt_out_string(&err, &buf, &buf_len, " IND"); + + break; + default: + /* Unknown index */ + err = -1; + break; + } + + return err; +} + static int arm_spe_pkt_desc_addr(const struct arm_spe_pkt *packet, char *buf, size_t buf_len) { @@ -404,40 +448,7 @@ int arm_spe_pkt_desc(const struct arm_spe_pkt *packet, char *buf, err = arm_spe_pkt_desc_event(packet, buf, buf_len); break; case ARM_SPE_OP_TYPE: - switch (idx) { - case 0: - arm_spe_pkt_out_string(&err, &buf, &blen, - payload & 0x1 ? "COND-SELECT" : "INSN-OTHER"); - break; - case 1: - arm_spe_pkt_out_string(&err, &buf, &blen, - payload & 0x1 ? "ST" : "LD"); - - if (payload & 0x2) { - if (payload & 0x4) - arm_spe_pkt_out_string(&err, &buf, &blen, " AT"); - if (payload & 0x8) - arm_spe_pkt_out_string(&err, &buf, &blen, " EXCL"); - if (payload & 0x10) - arm_spe_pkt_out_string(&err, &buf, &blen, " AR"); - } else if (payload & 0x4) { - arm_spe_pkt_out_string(&err, &buf, &blen, " SIMD-FP"); - } - break; - case 2: - arm_spe_pkt_out_string(&err, &buf, &blen, "B"); - - if (payload & 0x1) - arm_spe_pkt_out_string(&err, &buf, &blen, " COND"); - if (payload & 0x2) - arm_spe_pkt_out_string(&err, &buf, &blen, " IND"); - - break; - default: - /* Unknown index */ - err = -1; - break; - } + err = arm_spe_pkt_desc_op_type(packet, buf, buf_len); break; case ARM_SPE_DATA_SOURCE: case ARM_SPE_TIMESTAMP: -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel