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=-8.7 required=3.0 tests=DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,DKIM_VALID,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, 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 64116C4360F for ; Thu, 4 Apr 2019 23:26:11 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 3080A20882 for ; Thu, 4 Apr 2019 23:26:11 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="sM8iyeXc"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Cvfoo7sH" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3080A20882 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-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=bombadil.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=EgbOHYhwUGR2UGs3mkAGjx7ECq4F6mPd/XCKGpieqfw=; b=sM8iyeXc3fts4kDJESb8y0uW+M RNcqPI88Y0WNwOSNqyt630qtSP7aOn01DPiM5HdEhPkAfPR+Y0CnsIHczztqWueQn3Xf8PBs3Zba6 29UXBHD7D/+kpNHVqmvV/hrPr0kQjsvjw1a4ECNZ7xI14kPX3cXt8a5bpsvpBLL43U+PWLE81XkoD yo0JqkPcFcs+ajU9ANaJ/R09gMO9EgxpXxS5or5vK4HrRwQ6hczNKJaNw5H/dFOftDmq9knHQfVH4 oNaSDzTmoknyxGBUtuGeKiIzsxjEGgXIX5+kCnwXvEVfX7/40ZezXW86WXV07l4vMIDnIyhXwEJER Z8wQub8Q==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hCBkC-0007rD-4u; Thu, 04 Apr 2019 23:26:04 +0000 Received: from mail-pl1-x642.google.com ([2607:f8b0:4864:20::642]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hCBk1-0007dv-J8 for linux-arm-kernel@lists.infradead.org; Thu, 04 Apr 2019 23:25:55 +0000 Received: by mail-pl1-x642.google.com with SMTP id b65so1946889plb.6 for ; Thu, 04 Apr 2019 16:25:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=pCFplwOQ1V6syt22TVMFsi+FnnScCeTibsJISzGk2dA=; b=Cvfoo7sHaJhH/VYUIV20JualJXCcNJn+l/NnoArIyNqahMemKh7mA4XjmlJ7AAfVX/ 51t0VtZ+K8iWVNX2ewUtE6Cku83GQJRG6fowpe+nW0gFB6Lepjx03KDAEHNcm6doORFS 4G7+wfw3pkZiDGT3YqYoGCGwPrH3PoOM2g+Dnk2FmOiSpvu/U0Z6T745mM1XEsKUt8vO NXFY7NnCXTiZwmcdA8Ytwamgmk5N3/qSLltDBtaeo4wgAoe8VYcHmD46XjA7M8xPttcl s8cN07OulOJDBQDTlY/JjRqKutmh+IklN9gxMC7PHFy2pCJlcXGwN5r4DXm8DCST/W81 jmpw== 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=pCFplwOQ1V6syt22TVMFsi+FnnScCeTibsJISzGk2dA=; b=IwBfn5VT6XWTbRDZvEd91wHKiFCK4Iyezb38BAUZyqbljtrT8vqPH1nrdCqLO9Tm3Q VhR2vTjP2xd/xtiu+xvP1t07cQ1hyZDRt+sq1Kx3LqLlRPO7Uo3R2vxaxpQQVwmPHBOe /mma6R/d3LozTwR1BXzTGldiBBn6A6Kiau2h6ojCGmtP2VR2etEN7YpMsT3gpRnPVKk/ L5fmfwDqZaQmeuFUm5EtU6jNHT0+ERXWA61P6JTWUBAVUS8MFASQrnIoTmxovHCdDDsS +AkzGpSEQ+vcmcOvMPVcjtnisr0vx92AbO0N0cOLW3VXu8LWMx5zvUghK4fSEV5fT2xz M+Bw== X-Gm-Message-State: APjAAAW6BtHBlb7v9QhRVFQDkRWITXvPT3U8ofiV8dZVnijzb0zkfQU1 mY+fAMaLJ04TrZuzZ7LYTClkds6e X-Google-Smtp-Source: APXvYqw9XN565FHAlKSSX9Le67yexrv1sMt2Q2LohH1ZbLbz368n8fLg9PjlxXgtC2+jSNxNG7ibzw== X-Received: by 2002:a17:902:e110:: with SMTP id cc16mr9406903plb.147.1554420350860; Thu, 04 Apr 2019 16:25:50 -0700 (PDT) Received: from fainelli-desktop.igp.broadcom.net ([192.19.223.250]) by smtp.gmail.com with ESMTPSA id e23sm28750036pfd.11.2019.04.04.16.25.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Apr 2019 16:25:50 -0700 (PDT) From: Florian Fainelli To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 1/2] arm64: perf: Group common ARMv8 v3 PMU events in a macro Date: Thu, 4 Apr 2019 16:25:44 -0700 Message-Id: <20190404232545.2627-2-f.fainelli@gmail.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20190404232545.2627-1-f.fainelli@gmail.com> References: <20190404232545.2627-1-f.fainelli@gmail.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190404_162553_628148_3707AB9B X-CRM114-Status: GOOD ( 12.93 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mark Rutland , Florian Fainelli , Peter Zijlstra , Catalin Marinas , Will Deacon , "open list:PERFORMANCE EVENTS SUBSYSTEM" , Arnaldo Carvalho de Melo , Alexander Shishkin , Ingo Molnar , Namhyung Kim , Jiri Olsa 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+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org In preparation for adding processor specific attributes, group the ARMv8 PMU v3 common events into a macro that can be re-used to fill up an array of attributes. Signed-off-by: Florian Fainelli --- arch/arm64/kernel/perf_event.c | 123 +++++++++++++++++---------------- 1 file changed, 63 insertions(+), 60 deletions(-) diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c index 4addb38bc250..2d30922692b1 100644 --- a/arch/arm64/kernel/perf_event.c +++ b/arch/arm64/kernel/perf_event.c @@ -234,67 +234,70 @@ ARMV8_EVENT_ATTR(sample_feed, ARMV8_SPE_PERFCTR_SAMPLE_FEED); ARMV8_EVENT_ATTR(sample_filtrate, ARMV8_SPE_PERFCTR_SAMPLE_FILTRATE); ARMV8_EVENT_ATTR(sample_collision, ARMV8_SPE_PERFCTR_SAMPLE_COLLISION); +#define ARMV8_PMUV3_EVENT_ATTRS \ + &armv8_event_attr_sw_incr.attr.attr, \ + &armv8_event_attr_l1i_cache_refill.attr.attr, \ + &armv8_event_attr_l1i_tlb_refill.attr.attr, \ + &armv8_event_attr_l1d_cache_refill.attr.attr, \ + &armv8_event_attr_l1d_cache.attr.attr, \ + &armv8_event_attr_l1d_tlb_refill.attr.attr, \ + &armv8_event_attr_ld_retired.attr.attr, \ + &armv8_event_attr_st_retired.attr.attr, \ + &armv8_event_attr_inst_retired.attr.attr, \ + &armv8_event_attr_exc_taken.attr.attr, \ + &armv8_event_attr_exc_return.attr.attr, \ + &armv8_event_attr_cid_write_retired.attr.attr, \ + &armv8_event_attr_pc_write_retired.attr.attr, \ + &armv8_event_attr_br_immed_retired.attr.attr, \ + &armv8_event_attr_br_return_retired.attr.attr, \ + &armv8_event_attr_unaligned_ldst_retired.attr.attr, \ + &armv8_event_attr_br_mis_pred.attr.attr, \ + &armv8_event_attr_cpu_cycles.attr.attr, \ + &armv8_event_attr_br_pred.attr.attr, \ + &armv8_event_attr_mem_access.attr.attr, \ + &armv8_event_attr_l1i_cache.attr.attr, \ + &armv8_event_attr_l1d_cache_wb.attr.attr, \ + &armv8_event_attr_l2d_cache.attr.attr, \ + &armv8_event_attr_l2d_cache_refill.attr.attr, \ + &armv8_event_attr_l2d_cache_wb.attr.attr, \ + &armv8_event_attr_bus_access.attr.attr, \ + &armv8_event_attr_memory_error.attr.attr, \ + &armv8_event_attr_inst_spec.attr.attr, \ + &armv8_event_attr_ttbr_write_retired.attr.attr, \ + &armv8_event_attr_bus_cycles.attr.attr, \ + &armv8_event_attr_l1d_cache_allocate.attr.attr, \ + &armv8_event_attr_l2d_cache_allocate.attr.attr, \ + &armv8_event_attr_br_retired.attr.attr, \ + &armv8_event_attr_br_mis_pred_retired.attr.attr, \ + &armv8_event_attr_stall_frontend.attr.attr, \ + &armv8_event_attr_stall_backend.attr.attr, \ + &armv8_event_attr_l1d_tlb.attr.attr, \ + &armv8_event_attr_l1i_tlb.attr.attr, \ + &armv8_event_attr_l2i_cache.attr.attr, \ + &armv8_event_attr_l2i_cache_refill.attr.attr, \ + &armv8_event_attr_l3d_cache_allocate.attr.attr, \ + &armv8_event_attr_l3d_cache_refill.attr.attr, \ + &armv8_event_attr_l3d_cache.attr.attr, \ + &armv8_event_attr_l3d_cache_wb.attr.attr, \ + &armv8_event_attr_l2d_tlb_refill.attr.attr, \ + &armv8_event_attr_l2i_tlb_refill.attr.attr, \ + &armv8_event_attr_l2d_tlb.attr.attr, \ + &armv8_event_attr_l2i_tlb.attr.attr, \ + &armv8_event_attr_remote_access.attr.attr, \ + &armv8_event_attr_ll_cache.attr.attr, \ + &armv8_event_attr_ll_cache_miss.attr.attr, \ + &armv8_event_attr_dtlb_walk.attr.attr, \ + &armv8_event_attr_itlb_walk.attr.attr, \ + &armv8_event_attr_ll_cache_rd.attr.attr, \ + &armv8_event_attr_ll_cache_miss_rd.attr.attr, \ + &armv8_event_attr_remote_access_rd.attr.attr, \ + &armv8_event_attr_sample_pop.attr.attr, \ + &armv8_event_attr_sample_feed.attr.attr, \ + &armv8_event_attr_sample_filtrate.attr.attr, \ + &armv8_event_attr_sample_collision.attr.attr, \ + static struct attribute *armv8_pmuv3_event_attrs[] = { - &armv8_event_attr_sw_incr.attr.attr, - &armv8_event_attr_l1i_cache_refill.attr.attr, - &armv8_event_attr_l1i_tlb_refill.attr.attr, - &armv8_event_attr_l1d_cache_refill.attr.attr, - &armv8_event_attr_l1d_cache.attr.attr, - &armv8_event_attr_l1d_tlb_refill.attr.attr, - &armv8_event_attr_ld_retired.attr.attr, - &armv8_event_attr_st_retired.attr.attr, - &armv8_event_attr_inst_retired.attr.attr, - &armv8_event_attr_exc_taken.attr.attr, - &armv8_event_attr_exc_return.attr.attr, - &armv8_event_attr_cid_write_retired.attr.attr, - &armv8_event_attr_pc_write_retired.attr.attr, - &armv8_event_attr_br_immed_retired.attr.attr, - &armv8_event_attr_br_return_retired.attr.attr, - &armv8_event_attr_unaligned_ldst_retired.attr.attr, - &armv8_event_attr_br_mis_pred.attr.attr, - &armv8_event_attr_cpu_cycles.attr.attr, - &armv8_event_attr_br_pred.attr.attr, - &armv8_event_attr_mem_access.attr.attr, - &armv8_event_attr_l1i_cache.attr.attr, - &armv8_event_attr_l1d_cache_wb.attr.attr, - &armv8_event_attr_l2d_cache.attr.attr, - &armv8_event_attr_l2d_cache_refill.attr.attr, - &armv8_event_attr_l2d_cache_wb.attr.attr, - &armv8_event_attr_bus_access.attr.attr, - &armv8_event_attr_memory_error.attr.attr, - &armv8_event_attr_inst_spec.attr.attr, - &armv8_event_attr_ttbr_write_retired.attr.attr, - &armv8_event_attr_bus_cycles.attr.attr, - &armv8_event_attr_l1d_cache_allocate.attr.attr, - &armv8_event_attr_l2d_cache_allocate.attr.attr, - &armv8_event_attr_br_retired.attr.attr, - &armv8_event_attr_br_mis_pred_retired.attr.attr, - &armv8_event_attr_stall_frontend.attr.attr, - &armv8_event_attr_stall_backend.attr.attr, - &armv8_event_attr_l1d_tlb.attr.attr, - &armv8_event_attr_l1i_tlb.attr.attr, - &armv8_event_attr_l2i_cache.attr.attr, - &armv8_event_attr_l2i_cache_refill.attr.attr, - &armv8_event_attr_l3d_cache_allocate.attr.attr, - &armv8_event_attr_l3d_cache_refill.attr.attr, - &armv8_event_attr_l3d_cache.attr.attr, - &armv8_event_attr_l3d_cache_wb.attr.attr, - &armv8_event_attr_l2d_tlb_refill.attr.attr, - &armv8_event_attr_l2i_tlb_refill.attr.attr, - &armv8_event_attr_l2d_tlb.attr.attr, - &armv8_event_attr_l2i_tlb.attr.attr, - &armv8_event_attr_remote_access.attr.attr, - &armv8_event_attr_ll_cache.attr.attr, - &armv8_event_attr_ll_cache_miss.attr.attr, - &armv8_event_attr_dtlb_walk.attr.attr, - &armv8_event_attr_itlb_walk.attr.attr, - &armv8_event_attr_ll_cache_rd.attr.attr, - &armv8_event_attr_ll_cache_miss_rd.attr.attr, - &armv8_event_attr_remote_access_rd.attr.attr, - &armv8_event_attr_sample_pop.attr.attr, - &armv8_event_attr_sample_feed.attr.attr, - &armv8_event_attr_sample_filtrate.attr.attr, - &armv8_event_attr_sample_collision.attr.attr, + ARMV8_PMUV3_EVENT_ATTRS NULL, }; -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel