[PATCH 01/59] libperf: Move pmu-events.h file to libperf

[Jiri Olsa <jolsa@redhat.com>]

Moving pmu-events.h under libperf to be exported as
<perf/pmu-events.h> header.

This is a preparation before moving the whole pmu-events
framework under libperf coming in following change.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 tools/lib/perf/include/perf/pmu-events.h | 59 ++++++++++++++++++++++++
 tools/perf/pmu-events/Build              |  2 +-
 tools/perf/pmu-events/jevents.c          |  6 +--
 tools/perf/pmu-events/pmu-events.h       | 59 ------------------------
 tools/perf/tests/expand-cgroup.c         |  2 +-
 tools/perf/tests/parse-metric.c          |  2 +-
 tools/perf/tests/pmu-events.c            |  2 +-
 tools/perf/util/amd-sample-raw.c         |  2 +-
 tools/perf/util/metricgroup.h            |  2 +-
 tools/perf/util/pmu.h                    |  2 +-
 tools/perf/util/s390-sample-raw.c        |  2 +-
 11 files changed, 70 insertions(+), 70 deletions(-)
 create mode 100644 tools/lib/perf/include/perf/pmu-events.h
 delete mode 100644 tools/perf/pmu-events/pmu-events.h

diff --git a/tools/lib/perf/include/perf/pmu-events.h b/tools/lib/perf/include/perf/pmu-events.h
new file mode 100644
index 000000000000..6efe73976440
--- /dev/null
+++ b/tools/lib/perf/include/perf/pmu-events.h
@@ -0,0 +1,59 @@
+/* SPDX-License-Identifier: GPL-2.0 */
+#ifndef PMU_EVENTS_H
+#define PMU_EVENTS_H
+
+enum aggr_mode_class {
+	PerChip = 1,
+	PerCore
+};
+
+/*
+ * Describe each PMU event. Each CPU has a table of PMU events.
+ */
+struct pmu_event {
+	const char *name;
+	const char *compat;
+	const char *event;
+	const char *desc;
+	const char *topic;
+	const char *long_desc;
+	const char *pmu;
+	const char *unit;
+	const char *perpkg;
+	const char *aggr_mode;
+	const char *metric_expr;
+	const char *metric_name;
+	const char *metric_group;
+	const char *deprecated;
+	const char *metric_constraint;
+};
+
+/*
+ *
+ * Map a CPU to its table of PMU events. The CPU is identified by the
+ * cpuid field, which is an arch-specific identifier for the CPU.
+ * The identifier specified in tools/perf/pmu-events/arch/xxx/mapfile
+ * must match the get_cpuid_str() in tools/perf/arch/xxx/util/header.c)
+ *
+ * The  cpuid can contain any character other than the comma.
+ */
+struct pmu_events_map {
+	const char *cpuid;
+	const char *version;
+	const char *type;		/* core, uncore etc */
+	const struct pmu_event *table;
+};
+
+struct pmu_sys_events {
+	const char *name;
+	const struct pmu_event *table;
+};
+
+/*
+ * Global table mapping each known CPU for the architecture to its
+ * table of PMU events.
+ */
+extern const struct pmu_events_map pmu_events_map[];
+extern const struct pmu_sys_events pmu_sys_event_tables[];
+
+#endif
diff --git a/tools/perf/pmu-events/Build b/tools/perf/pmu-events/Build
index a055dee6a46a..5bc953ebdf25 100644
--- a/tools/perf/pmu-events/Build
+++ b/tools/perf/pmu-events/Build
@@ -1,7 +1,7 @@
 hostprogs := jevents
 
 jevents-y	+= json.o jsmn.o jevents.o
-HOSTCFLAGS_jevents.o	= -I$(srctree)/tools/include
+HOSTCFLAGS_jevents.o	= -I$(srctree)/tools/include -I$(srctree)/tools/lib/perf/include
 pmu-events-y	+= pmu-events.o
 JDIR		=  pmu-events/arch/$(SRCARCH)
 JSON		=  $(shell [ -d $(JDIR) ] &&				\
diff --git a/tools/perf/pmu-events/jevents.c b/tools/perf/pmu-events/jevents.c
index 2e7c4153875b..2815caf602f3 100644
--- a/tools/perf/pmu-events/jevents.c
+++ b/tools/perf/pmu-events/jevents.c
@@ -49,7 +49,7 @@
 #include <linux/list.h>
 #include "jsmn.h"
 #include "json.h"
-#include "pmu-events.h"
+#include <perf/pmu-events.h>
 
 int verbose;
 char *prog;
@@ -958,7 +958,7 @@ static void create_empty_mapping(const char *output_file)
 		_Exit(1);
 	}
 
-	fprintf(outfp, "#include \"pmu-events/pmu-events.h\"\n");
+	fprintf(outfp, "#include <perf/pmu-events.h>\n");
 	print_mapping_table_prefix(outfp);
 	print_mapping_table_suffix(outfp);
 	print_system_event_mapping_table_prefix(outfp);
@@ -1239,7 +1239,7 @@ int main(int argc, char *argv[])
 	}
 
 	/* Include pmu-events.h first */
-	fprintf(eventsfp, "#include \"pmu-events/pmu-events.h\"\n");
+	fprintf(eventsfp, "#include <perf/pmu-events.h>\n");
 
 	/*
 	 * The mapfile allows multiple CPUids to point to the same JSON file,
diff --git a/tools/perf/pmu-events/pmu-events.h b/tools/perf/pmu-events/pmu-events.h
deleted file mode 100644
index 6efe73976440..000000000000
--- a/tools/perf/pmu-events/pmu-events.h
+++ /dev/null
@@ -1,59 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef PMU_EVENTS_H
-#define PMU_EVENTS_H
-
-enum aggr_mode_class {
-	PerChip = 1,
-	PerCore
-};
-
-/*
- * Describe each PMU event. Each CPU has a table of PMU events.
- */
-struct pmu_event {
-	const char *name;
-	const char *compat;
-	const char *event;
-	const char *desc;
-	const char *topic;
-	const char *long_desc;
-	const char *pmu;
-	const char *unit;
-	const char *perpkg;
-	const char *aggr_mode;
-	const char *metric_expr;
-	const char *metric_name;
-	const char *metric_group;
-	const char *deprecated;
-	const char *metric_constraint;
-};
-
-/*
- *
- * Map a CPU to its table of PMU events. The CPU is identified by the
- * cpuid field, which is an arch-specific identifier for the CPU.
- * The identifier specified in tools/perf/pmu-events/arch/xxx/mapfile
- * must match the get_cpuid_str() in tools/perf/arch/xxx/util/header.c)
- *
- * The  cpuid can contain any character other than the comma.
- */
-struct pmu_events_map {
-	const char *cpuid;
-	const char *version;
-	const char *type;		/* core, uncore etc */
-	const struct pmu_event *table;
-};
-
-struct pmu_sys_events {
-	const char *name;
-	const struct pmu_event *table;
-};
-
-/*
- * Global table mapping each known CPU for the architecture to its
- * table of PMU events.
- */
-extern const struct pmu_events_map pmu_events_map[];
-extern const struct pmu_sys_events pmu_sys_event_tables[];
-
-#endif
diff --git a/tools/perf/tests/expand-cgroup.c b/tools/perf/tests/expand-cgroup.c
index aaad51aba12f..61dec9783a1e 100644
--- a/tools/perf/tests/expand-cgroup.c
+++ b/tools/perf/tests/expand-cgroup.c
@@ -6,7 +6,7 @@
 #include "rblist.h"
 #include "metricgroup.h"
 #include "parse-events.h"
-#include "pmu-events/pmu-events.h"
+#include <perf/pmu-events.h>
 #include "pfm.h"
 #include <subcmd/parse-options.h>
 #include <stdio.h>
diff --git a/tools/perf/tests/parse-metric.c b/tools/perf/tests/parse-metric.c
index dfc797ecc750..23ed50c26368 100644
--- a/tools/perf/tests/parse-metric.c
+++ b/tools/perf/tests/parse-metric.c
@@ -5,7 +5,7 @@
 #include <perf/evlist.h>
 #include "metricgroup.h"
 #include "tests.h"
-#include "pmu-events/pmu-events.h"
+#include <perf/pmu-events.h>
 #include "evlist.h"
 #include "rblist.h"
 #include "debug.h"
diff --git a/tools/perf/tests/pmu-events.c b/tools/perf/tests/pmu-events.c
index 50b1299fe643..78b03909bfe7 100644
--- a/tools/perf/tests/pmu-events.c
+++ b/tools/perf/tests/pmu-events.c
@@ -8,7 +8,7 @@
 #include <linux/kernel.h>
 #include <linux/zalloc.h>
 #include "debug.h"
-#include "../pmu-events/pmu-events.h"
+#include <perf/pmu-events.h>
 #include "util/evlist.h"
 #include "util/expr.h"
 #include "util/parse-events.h"
diff --git a/tools/perf/util/amd-sample-raw.c b/tools/perf/util/amd-sample-raw.c
index d19d765195c5..742c4f437c0b 100644
--- a/tools/perf/util/amd-sample-raw.c
+++ b/tools/perf/util/amd-sample-raw.c
@@ -15,7 +15,7 @@
 #include "session.h"
 #include "evlist.h"
 #include "sample-raw.h"
-#include "pmu-events/pmu-events.h"
+#include <perf/pmu-events.h>
 
 static u32 cpu_family, cpu_model, ibs_fetch_type, ibs_op_type;
 
diff --git a/tools/perf/util/metricgroup.h b/tools/perf/util/metricgroup.h
index 2b42b778d1bf..8cc6b0b0cb90 100644
--- a/tools/perf/util/metricgroup.h
+++ b/tools/perf/util/metricgroup.h
@@ -5,7 +5,7 @@
 #include <linux/list.h>
 #include <linux/rbtree.h>
 #include <stdbool.h>
-#include "pmu-events/pmu-events.h"
+#include <perf/pmu-events.h>
 
 struct evlist;
 struct evsel;
diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h
index 15bbec3a9959..31a52ee963c8 100644
--- a/tools/perf/util/pmu.h
+++ b/tools/perf/util/pmu.h
@@ -8,7 +8,7 @@
 #include <linux/list.h>
 #include <stdbool.h>
 #include "parse-events.h"
-#include "pmu-events/pmu-events.h"
+#include <perf/pmu-events.h>
 
 struct evsel_config_term;
 struct perf_cpu_map;
diff --git a/tools/perf/util/s390-sample-raw.c b/tools/perf/util/s390-sample-raw.c
index cd3a34840389..92af45ea22f6 100644
--- a/tools/perf/util/s390-sample-raw.c
+++ b/tools/perf/util/s390-sample-raw.c
@@ -27,7 +27,7 @@
 #include "color.h"
 #include "sample-raw.h"
 #include "s390-cpumcf-kernel.h"
-#include "pmu-events/pmu-events.h"
+#include <perf/pmu-events.h>
 
 static size_t ctrset_size(struct cf_ctrset_entry *set)
 {
-- 
2.31.1