perf tools: Move branch structs to branch.h

We already have it, move those there from events.h so that we untangle
the header dependencies a bit more.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: https://lkml.kernel.org/n/tip-pnbkqo8jxbi49d4f3yd3b5w3@git.kernel.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 8a249c73
#ifndef _PERF_BRANCH_H
#define _PERF_BRANCH_H 1
#include <stdio.h>
#include <stdint.h>
#include "../perf.h"
#include <linux/perf_event.h>
#include <linux/types.h>
struct branch_flags {
u64 mispred:1;
u64 predicted:1;
u64 in_tx:1;
u64 abort:1;
u64 cycles:16;
u64 type:4;
u64 reserved:40;
};
struct branch_entry {
u64 from;
u64 to;
struct branch_flags flags;
};
struct branch_stack {
u64 nr;
struct branch_entry entries[0];
};
struct branch_type_stat {
bool branch_to;
......@@ -13,8 +36,6 @@ struct branch_type_stat {
u64 cross_2m;
};
struct branch_flags;
void branch_type_count(struct branch_type_stat *st, struct branch_flags *flags,
u64 from, u64 to);
......
......@@ -161,26 +161,7 @@ struct ip_callchain {
u64 ips[0];
};
struct branch_flags {
u64 mispred:1;
u64 predicted:1;
u64 in_tx:1;
u64 abort:1;
u64 cycles:16;
u64 type:4;
u64 reserved:40;
};
struct branch_entry {
u64 from;
u64 to;
struct branch_flags flags;
};
struct branch_stack {
u64 nr;
struct branch_entry entries[0];
};
struct branch_stack;
enum {
PERF_IP_FLAG_BRANCH = 1ULL << 0,
......
......@@ -12,6 +12,7 @@
#include <stdio.h>
#include <byteswap.h>
#include <libgen.h>
#include "branch.h"
#include "build-id.h"
#include "event.h"
#include "path.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment