Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759365AbbFBRNF (ORCPT ); Tue, 2 Jun 2015 13:13:05 -0400 Received: from e33.co.us.ibm.com ([32.97.110.151]:51146 "EHLO e33.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753867AbbFBRM4 (ORCPT ); Tue, 2 Jun 2015 13:12:56 -0400 From: Sukadev Bhattiprolu To: mingo@redhat.com, ak@linux.intel.com, Michael Ellerman , Jiri Olsa , Arnaldo Carvalho de Melo Cc: namhyung@kernel.org, linuxppc-dev@lists.ozlabs.org, Subject: [PATCH V13 00/14] perf, tools: Add support for PMU events in JSON format Date: Tue, 2 Jun 2015 10:12:00 -0700 Message-Id: <1433265135-20426-1-git-send-email-sukadev@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15060217-0009-0000-0000-00000B5A3B1B Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 4802 Lines: 120 CPUs support a large number of performance monitoring events (PMU events) and often these events are very specific to an architecture/model of the CPU. To use most of these PMU events with perf, we currently have to identify them by their raw codes: perf stat -e r100f2 sleep 1 This patchset allows architectures to specify these PMU events in JSON files located in 'tools/perf/pmu-events/arch/' of the mainline tree. The events from the JSON files for the architecture are then built into the perf binary. At run time, perf identifies the specific set of events for the CPU and creates "event aliases". These aliases allow users to specify events by "name" as: perf stat -e pm_1plus_ppc_cmpl sleep 1 The file, 'tools/perf/pmu-events/README' in [PATCH 14/14] gives more details. Note: - All known events tables for the architecture are included in the perf binary. - For architectures that don't have any JSON files, an empty mapping table is created and they should continue to build) Thanks to input from Andi Kleen, Jiri Olsa, Namhyung Kim and Ingo Molnar. These patches are available from: https://github.com:sukadev/linux.git Branch Description ------------------------------------------------------ json-v13 Source Code only json-files-3 x86 and Powerpc datafiles only json-v13-with-data Both code and data (build/test) NOTE: Only "source code" patches (i.e those in json-v13) are being emailed. Please pull the "data files" from the json-files-3 branch. Changelog[v13] Version: Individual patches have their own history :-) that I am preserving. Patchset version (v13) is for overall patchset and is somewhat arbitrary. - Added support for "categories" of events to perf - Add mapfile, jevents build dependency on pmu-events.c - Silence jevents when parsing JSON files unless V=1 is specified - Cleanup error messages - Fix memory leak with ->cpuid - Rebase to Arnaldo's tree - Allow overriding CPUID via environment variable - Support long descriptions for events - Handle header line in mapfile.csv - Cleanup JSON files (trim PublicDescription if identical to/prefix of BriefDescription field) Andi Kleen (12): perf, tools: Add jsmn `jasmine' JSON parser perf, tools, jevents: Program to convert JSON file to C style file perf, tools: Allow events with dot perf, tools: Support CPU id matching for x86 v2 perf, tools: Support alias descriptions perf, tools: Query terminal width and use in perf list perf, tools: Add a --no-desc flag to perf list perf, tools: Group alias perf list by section perf, tools: Add override support for event list CPUID perf, tools: Support long descriptions with perf list -v perf, tools: Add support for event list topics perf, tools: Handle header line in mapfile Sukadev Bhattiprolu (1): perf, tools: Use pmu_events_map table to create event aliases tools/perf/Documentation/perf-list.txt | 8 +- tools/perf/Makefile.perf | 25 +- tools/perf/arch/powerpc/util/header.c | 11 + tools/perf/arch/x86/util/header.c | 24 +- tools/perf/builtin-list.c | 15 +- tools/perf/pmu-events/Build | 11 + tools/perf/pmu-events/README | 67 +++ tools/perf/pmu-events/jevents.c | 714 ++++++++++++++++++++++++++++++++ tools/perf/pmu-events/jevents.h | 18 + tools/perf/pmu-events/jsmn.c | 313 ++++++++++++++ tools/perf/pmu-events/jsmn.h | 67 +++ tools/perf/pmu-events/json.c | 162 ++++++++ tools/perf/pmu-events/json.h | 39 ++ tools/perf/pmu-events/pmu-events.h | 37 ++ tools/perf/util/cache.h | 1 + tools/perf/util/header.h | 3 +- tools/perf/util/pager.c | 15 + tools/perf/util/parse-events.c | 4 +- tools/perf/util/parse-events.h | 2 +- tools/perf/util/parse-events.l | 5 +- tools/perf/util/pmu.c | 230 ++++++++-- tools/perf/util/pmu.h | 6 +- 22 files changed, 1725 insertions(+), 52 deletions(-) create mode 100644 tools/perf/pmu-events/Build create mode 100644 tools/perf/pmu-events/README create mode 100644 tools/perf/pmu-events/jevents.c create mode 100644 tools/perf/pmu-events/jevents.h create mode 100644 tools/perf/pmu-events/jsmn.c create mode 100644 tools/perf/pmu-events/jsmn.h create mode 100644 tools/perf/pmu-events/json.c create mode 100644 tools/perf/pmu-events/json.h create mode 100644 tools/perf/pmu-events/pmu-events.h -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/