tools/perf/builtin-script.c | 3 +- tools/perf/builtin-stat.c | 25 ++- tools/perf/pmu-events/empty-pmu-events.c | 128 +++++------ tools/perf/pmu-events/jevents.py | 3 + tools/perf/tests/expand-cgroup.c | 24 +-- tools/perf/tests/parse-metric.c | 16 +- tools/perf/tests/pmu-events.c | 30 +-- tools/perf/util/cgroup.c | 23 +- tools/perf/util/cgroup.h | 3 +- tools/perf/util/evlist.c | 3 + tools/perf/util/evlist.h | 6 + tools/perf/util/expr.c | 6 +- tools/perf/util/hwmon_pmu.c | 2 +- tools/perf/util/metricgroup.c | 261 ++++------------------- tools/perf/util/metricgroup.h | 10 +- tools/perf/util/parse-events.c | 31 ++- tools/perf/util/parse-events.h | 2 +- tools/perf/util/pmu.c | 37 +++- tools/perf/util/print-events.c | 133 ++++++++++++ tools/perf/util/print-events.h | 2 + tools/perf/util/python.c | 123 ++++++++++- tools/perf/util/spark.c | 8 +- tools/perf/util/spark.h | 1 + tools/perf/util/stat-display.c | 16 +- tools/perf/util/stat-shadow.c | 13 +- tools/perf/util/stat.h | 12 +- 26 files changed, 473 insertions(+), 448 deletions(-)