Merge tag 'powerpc-6.13-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[J-linux.git] / tools / perf / util / parse-events.h

diff --git a/tools/perf/util/parse-events.h b/tools/perf/util/parse-events.h
index 10cc9c433116d673f99ad3e153fca24cb9fb659e..3f4334ec62317205b551cdc97ffa483980d4f701 100644 (file)
--- a/tools/perf/util/parse-events.h
+++ b/tools/perf/util/parse-events.h
@@ -127,6 +127,12 @@ struct parse_events_term {
         * value is assumed to be 1. An event name also has no value.
         */
        bool no_value;
+       /**
+        * @alternate_hw_config: config is the event name but num is an
+        * alternate PERF_TYPE_HARDWARE config value which is often nice for the
+        * sake of quick matching.
+        */
+       bool alternate_hw_config;
 };
 
 struct parse_events_error {
@@ -162,6 +168,8 @@ struct parse_events_state {
        bool                       wild_card_pmus;
 };
 
+const char *parse_events__term_type_str(enum parse_events__term_type term_type);
+
 bool parse_events__filter_pmu(const struct parse_events_state *parse_state,
                              const struct perf_pmu *pmu);
 void parse_events__shrink_config_terms(void);
@@ -221,9 +229,6 @@ int parse_events_add_numeric(struct parse_events_state *parse_state,
                             u32 type, u64 config,
                             const struct parse_events_terms *head_config,
                             bool wildcard);
-int parse_events_add_tool(struct parse_events_state *parse_state,
-                         struct list_head *list,
-                         int tool_event);
 int parse_events_add_cache(struct list_head *list, int *idx, const char *name,
                           struct parse_events_state *parse_state,
                           struct parse_events_terms *parsed_terms);
@@ -238,7 +243,7 @@ struct evsel *parse_events__add_event(int idx, struct perf_event_attr *attr,
                                      struct perf_pmu *pmu);
 
 int parse_events_multi_pmu_add(struct parse_events_state *parse_state,
-                              const char *event_name,
+                              const char *event_name, u64 hw_config,
                               const struct parse_events_terms *const_parsed_terms,
                               struct list_head **listp, void *loc);