From patchwork Wed Apr 4 18:59:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: dann frazier X-Patchwork-Id: 895104 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id 40GZyf0F0Gz9ryk; Thu, 5 Apr 2018 04:59:54 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1f3ndL-0002X0-DK; Wed, 04 Apr 2018 18:59:47 +0000 Received: from complete.lackof.org ([198.49.126.79]) by huckleberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1f3ndJ-0002Wn-82 for kernel-team@lists.ubuntu.com; Wed, 04 Apr 2018 18:59:45 +0000 Received: from localhost (unknown [67.133.97.99]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by complete.lackof.org (Postfix) with ESMTPSA id 387DF33E006D for ; Wed, 4 Apr 2018 12:59:42 -0600 (MDT) Date: Wed, 4 Apr 2018 12:59:41 -0600 From: dann frazier To: kernel-team@lists.ubuntu.com Subject: [PULL][Bionic] Restructure perf vendor event support for arm64 Message-ID: <20180404185941.GA24853@xps13.dannf> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.9.4 (2018-02-28) X-Virus-Scanned: clamav-milter 0.99.2 at complete.lackof.org X-Virus-Status: Clean X-Spam-Status: No, score=0.3 required=5.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, UNPARSEABLE_RELAY autolearn=no autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on complete.lackof.org X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" This PR comprises all clean cherry picks from upstream that restructures arm64 perf vendor event support, followed by a fix to enable that support for ThunderX2 B0 silicon. The latter could be backported without the restructuring - indeed, that's what I plan to submit for artful - however I think this larger backport is a better approach for bionic. We'll very likely need to add support for other arm64 platforms throughout the support life of bionic, and that will be easier/safer if we're on the other side of this transition. BugLink: https://bugs.launchpad.net/bugs/1760712 The following changes since commit e4a338d3e1f71c4cb11abc41fd571a6d9dc0ef67: UBUNTU: Ubuntu-4.15.0-14.15 (2018-04-02 16:09:51 -0300) are available in the Git repository at: git://git.launchpad.net/~dannf/ubuntu/+source/linux/+git/linux lp1760712-bionic for you to fetch changes up to 03c09f02d96a3a19e4cdc22b5c99c9c3c41bb339: perf vendor events arm64: Enable JSON events for ThunderX2 B0 (2018-04-03 12:18:32 -0600) ---------------------------------------------------------------- Ganapatrao Kulkarni (1): perf vendor events arm64: Enable JSON events for ThunderX2 B0 John Garry (11): perf vendor events: Drop incomplete multiple mapfile support perf vendor events: Fix error code in json_events() perf vendor events: Drop support for unused topic directories perf vendor events: Add support for pmu events vendor subdirectory perf vendor events arm64: Relocate ThunderX2 JSON to cavium subdirectory perf vendor events arm64: Relocate Cortex A53 JSONs to arm subdirectory perf vendor events: Add support for arch standard events perf vendor events arm64: Add armv8-recommended.json perf vendor events arm64: Fixup ThunderX2 to use recommended events perf vendor events arm64: fixup A53 to use recommended events perf vendor events arm64: add HiSilicon hip08 JSON file William Cohen (1): perf vendor events aarch64: Add JSON metrics for ARM Cortex-A53 Processor tools/perf/pmu-events/Build | 2 + tools/perf/pmu-events/README | 15 +- .../arch/arm64/arm/cortex-a53/branch.json | 25 ++ .../pmu-events/arch/arm64/arm/cortex-a53/bus.json | 8 + .../arch/arm64/arm/cortex-a53/cache.json | 27 ++ .../arch/arm64/arm/cortex-a53/memory.json | 12 + .../arch/arm64/arm/cortex-a53/other.json | 28 ++ .../arch/arm64/arm/cortex-a53/pipeline.json | 52 +++ .../pmu-events/arch/arm64/armv8-recommended.json | 452 +++++++++++++++++++++ .../arch/arm64/cavium/thunderx2-imp-def.json | 62 --- .../arch/arm64/cavium/thunderx2/core-imp-def.json | 32 ++ .../arch/arm64/hisilicon/hip08/core-imp-def.json | 122 ++++++ tools/perf/pmu-events/arch/arm64/mapfile.csv | 5 +- tools/perf/pmu-events/jevents.c | 291 ++++++++++--- 14 files changed, 1019 insertions(+), 114 deletions(-) create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a53/branch.json create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a53/bus.json create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a53/cache.json create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a53/memory.json create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a53/other.json create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cortex-a53/pipeline.json create mode 100644 tools/perf/pmu-events/arch/arm64/armv8-recommended.json delete mode 100644 tools/perf/pmu-events/arch/arm64/cavium/thunderx2-imp-def.json create mode 100644 tools/perf/pmu-events/arch/arm64/cavium/thunderx2/core-imp-def.json create mode 100644 tools/perf/pmu-events/arch/arm64/hisilicon/hip08/core-imp-def.json