Messages in this thread Patch in this message | | | Date | Wed, 29 Mar 2017 17:43:22 -0700 | From | Andi Kleen <> | Subject | Please pull Intel JSON event files updates |
| |
Hi Arnaldo,
This pull requests contains updates to the Intel PMU events JSON files, plus two one liner code fixes for the JSON files (also appended as patch)
The most remarkable change is support for Sandy Bridge to Skylake client uncore event list support, and some bug fixes for the Broadwell DE events.
The following changes since commit 3906a13a6b4e78fbc0def03a808f091f0dff1b44:
Merge tag 'perf-core-for-mingo-4.12-20170327' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux into perf/core (2017-03-28 07:44:43 +0200)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/ak/linux-misc perf/uncore-json-updates-1
for you to fetch changes up to f21fd835079d764384d79e939d715a3f46f45338:
perf, tools, intel: Add missing space in json descriptions (2017-03-29 17:39:36 -0700)
---------------------------------------------------------------- Andi Kleen (8): perf, tools, intel: Add missing UNC_M_DCLOCKTICKS for Broadwell DE uncore perf, tools, intel: Add V15 of Sandy Bridge uncore events perf, tools, intel: Add V18 of Ivy Bridge uncore events perf, tools, intel: Add V25 of Haswell uncore events perf, tools, intel: Add V18 of Broadwell uncore events perf, tools, intel: Add V25 of Skylake uncore events perf, tools, intel: Add uncore_arb JSON support perf, tools, intel: Add missing space in json descriptions
.../perf/pmu-events/arch/x86/broadwell/uncore.json | 278 +++++++++++++++ .../arch/x86/broadwellde/uncore-memory.json | 13 +- tools/perf/pmu-events/arch/x86/haswell/uncore.json | 374 +++++++++++++++++++++ .../perf/pmu-events/arch/x86/ivybridge/uncore.json | 314 +++++++++++++++++ .../pmu-events/arch/x86/sandybridge/uncore.json | 314 +++++++++++++++++ tools/perf/pmu-events/arch/x86/skylake/uncore.json | 254 ++++++++++++++ tools/perf/pmu-events/jevents.c | 2 + 7 files changed, 1546 insertions(+), 3 deletions(-) create mode 100644 tools/perf/pmu-events/arch/x86/broadwell/uncore.json create mode 100644 tools/perf/pmu-events/arch/x86/haswell/uncore.json create mode 100644 tools/perf/pmu-events/arch/x86/ivybridge/uncore.json create mode 100644 tools/perf/pmu-events/arch/x86/sandybridge/uncore.json create mode 100644 tools/perf/pmu-events/arch/x86/skylake/uncore.json
diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c index 81f2ef3b15cf..baa073f38334 100644 --- a/tools/perf/pmu-events/jevents.c +++ b/tools/perf/pmu-events/jevents.c @@ -195,6 +195,7 @@ static struct map { { "CBO", "uncore_cbox" }, { "QPI LL", "uncore_qpi" }, { "SBO", "uncore_sbox" }, + { "iMPH-U", "uncore_arb" }, {} }; @@ -468,6 +469,7 @@ int json_events(const char *fn, } addfield(map, &desc, ". ", "Unit: ", NULL); addfield(map, &desc, "", pmu, NULL); + addfield(map, &desc, "", " ", NULL); } else if (json_streq(map, field, "Filter")) { addfield(map, &filter, "", "", val); } else if (json_streq(map, field, "ScaleUnit")) {
| |