Commit 055c67ed authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf tools: Move event synthesizing routines to separate .c file 

For better grouping, in time we may end up making most of these static,
i.e. generalizing the 'perf record' synthesizing code so that based on
the target it can do the right thing and call the needed synthesizers.

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-s9zxxhk40s95pjng9panet16@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 5cac8ea3

tools/perf/builtin-record.c

+0 −9
Original line number Diff line number Diff line
@@ -1181,15 +1181,6 @@ static void workload_exec_failed_signal(int signo __maybe_unused, 
static void snapshot_sig_handler(int sig);

static void alarm_sig_handler(int sig);



int __weak

perf_event__synth_time_conv(const struct perf_event_mmap_page *pc __maybe_unused,

			    struct perf_tool *tool __maybe_unused,

			    perf_event__handler_t process __maybe_unused,

			    struct machine *machine __maybe_unused)

{

	return 0;

}



static const struct perf_event_mmap_page *

perf_evlist__pick_pc(struct evlist *evlist)

{

tools/perf/util/Build

+1 −0
Original line number Diff line number Diff line
@@ -86,6 +86,7 @@ perf-y += stat-display.o 
perf-y += record.o

perf-y += srcline.o

perf-y += srccode.o

perf-y += synthetic-events.o

perf-y += data.o

perf-y += tsc.o

perf-y += cloexec.o

tools/perf/util/cs-etm.c

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ 
#include "thread.h"

#include "thread-stack.h"

#include <tools/libc_compat.h>

#include "util/synthetic-events.h"



#define MAX_TIMESTAMP (~0ULL)

tools/perf/util/event.c

+1 −1107

File changed.

Preview size limit exceeded, changes collapsed.

tools/perf/util/evsel.c

+0 −278
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ 
#include "trace-event.h"

#include "stat.h"

#include "string2.h"

#include "util/synthetic-events.h"

#include "memswap.h"

#include "util.h"

#include "../perf-sys.h"
@@ -2421,283 +2420,6 @@ int perf_evsel__parse_sample_timestamp(struct evsel *evsel, 
	return 0;

}



size_t perf_event__sample_event_size(const struct perf_sample *sample, u64 type,

				     u64 read_format)

{

	size_t sz, result = sizeof(struct perf_record_sample);



	if (type & PERF_SAMPLE_IDENTIFIER)

		result += sizeof(u64);



	if (type & PERF_SAMPLE_IP)

		result += sizeof(u64);



	if (type & PERF_SAMPLE_TID)

		result += sizeof(u64);



	if (type & PERF_SAMPLE_TIME)

		result += sizeof(u64);



	if (type & PERF_SAMPLE_ADDR)

		result += sizeof(u64);



	if (type & PERF_SAMPLE_ID)

		result += sizeof(u64);



	if (type & PERF_SAMPLE_STREAM_ID)

		result += sizeof(u64);



	if (type & PERF_SAMPLE_CPU)

		result += sizeof(u64);



	if (type & PERF_SAMPLE_PERIOD)

		result += sizeof(u64);



	if (type & PERF_SAMPLE_READ) {

		result += sizeof(u64);

		if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED)

			result += sizeof(u64);

		if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING)

			result += sizeof(u64);

		/* PERF_FORMAT_ID is forced for PERF_SAMPLE_READ */

		if (read_format & PERF_FORMAT_GROUP) {

			sz = sample->read.group.nr *

			     sizeof(struct sample_read_value);

			result += sz;

		} else {

			result += sizeof(u64);

		}

	}



	if (type & PERF_SAMPLE_CALLCHAIN) {

		sz = (sample->callchain->nr + 1) * sizeof(u64);

		result += sz;

	}



	if (type & PERF_SAMPLE_RAW) {

		result += sizeof(u32);

		result += sample->raw_size;

	}



	if (type & PERF_SAMPLE_BRANCH_STACK) {

		sz = sample->branch_stack->nr * sizeof(struct branch_entry);

		sz += sizeof(u64);

		result += sz;

	}



	if (type & PERF_SAMPLE_REGS_USER) {

		if (sample->user_regs.abi) {

			result += sizeof(u64);

			sz = hweight64(sample->user_regs.mask) * sizeof(u64);

			result += sz;

		} else {

			result += sizeof(u64);

		}

	}



	if (type & PERF_SAMPLE_STACK_USER) {

		sz = sample->user_stack.size;

		result += sizeof(u64);

		if (sz) {

			result += sz;

			result += sizeof(u64);

		}

	}



	if (type & PERF_SAMPLE_WEIGHT)

		result += sizeof(u64);



	if (type & PERF_SAMPLE_DATA_SRC)

		result += sizeof(u64);



	if (type & PERF_SAMPLE_TRANSACTION)

		result += sizeof(u64);



	if (type & PERF_SAMPLE_REGS_INTR) {

		if (sample->intr_regs.abi) {

			result += sizeof(u64);

			sz = hweight64(sample->intr_regs.mask) * sizeof(u64);

			result += sz;

		} else {

			result += sizeof(u64);

		}

	}



	if (type & PERF_SAMPLE_PHYS_ADDR)

		result += sizeof(u64);



	return result;

}



int perf_event__synthesize_sample(union perf_event *event, u64 type,

				  u64 read_format,

				  const struct perf_sample *sample)

{

	__u64 *array;

	size_t sz;

	/*

	 * used for cross-endian analysis. See git commit 65014ab3

	 * for why this goofiness is needed.

	 */

	union u64_swap u;



	array = event->sample.array;



	if (type & PERF_SAMPLE_IDENTIFIER) {

		*array = sample->id;

		array++;

	}



	if (type & PERF_SAMPLE_IP) {

		*array = sample->ip;

		array++;

	}



	if (type & PERF_SAMPLE_TID) {

		u.val32[0] = sample->pid;

		u.val32[1] = sample->tid;

		*array = u.val64;

		array++;

	}



	if (type & PERF_SAMPLE_TIME) {

		*array = sample->time;

		array++;

	}



	if (type & PERF_SAMPLE_ADDR) {

		*array = sample->addr;

		array++;

	}



	if (type & PERF_SAMPLE_ID) {

		*array = sample->id;

		array++;

	}



	if (type & PERF_SAMPLE_STREAM_ID) {

		*array = sample->stream_id;

		array++;

	}



	if (type & PERF_SAMPLE_CPU) {

		u.val32[0] = sample->cpu;

		u.val32[1] = 0;

		*array = u.val64;

		array++;

	}



	if (type & PERF_SAMPLE_PERIOD) {

		*array = sample->period;

		array++;

	}



	if (type & PERF_SAMPLE_READ) {

		if (read_format & PERF_FORMAT_GROUP)

			*array = sample->read.group.nr;

		else

			*array = sample->read.one.value;

		array++;



		if (read_format & PERF_FORMAT_TOTAL_TIME_ENABLED) {

			*array = sample->read.time_enabled;

			array++;

		}



		if (read_format & PERF_FORMAT_TOTAL_TIME_RUNNING) {

			*array = sample->read.time_running;

			array++;

		}



		/* PERF_FORMAT_ID is forced for PERF_SAMPLE_READ */

		if (read_format & PERF_FORMAT_GROUP) {

			sz = sample->read.group.nr *

			     sizeof(struct sample_read_value);

			memcpy(array, sample->read.group.values, sz);

			array = (void *)array + sz;

		} else {

			*array = sample->read.one.id;

			array++;

		}

	}



	if (type & PERF_SAMPLE_CALLCHAIN) {

		sz = (sample->callchain->nr + 1) * sizeof(u64);

		memcpy(array, sample->callchain, sz);

		array = (void *)array + sz;

	}



	if (type & PERF_SAMPLE_RAW) {

		u.val32[0] = sample->raw_size;

		*array = u.val64;

		array = (void *)array + sizeof(u32);



		memcpy(array, sample->raw_data, sample->raw_size);

		array = (void *)array + sample->raw_size;

	}



	if (type & PERF_SAMPLE_BRANCH_STACK) {

		sz = sample->branch_stack->nr * sizeof(struct branch_entry);

		sz += sizeof(u64);

		memcpy(array, sample->branch_stack, sz);

		array = (void *)array + sz;

	}



	if (type & PERF_SAMPLE_REGS_USER) {

		if (sample->user_regs.abi) {

			*array++ = sample->user_regs.abi;

			sz = hweight64(sample->user_regs.mask) * sizeof(u64);

			memcpy(array, sample->user_regs.regs, sz);

			array = (void *)array + sz;

		} else {

			*array++ = 0;

		}

	}



	if (type & PERF_SAMPLE_STACK_USER) {

		sz = sample->user_stack.size;

		*array++ = sz;

		if (sz) {

			memcpy(array, sample->user_stack.data, sz);

			array = (void *)array + sz;

			*array++ = sz;

		}

	}



	if (type & PERF_SAMPLE_WEIGHT) {

		*array = sample->weight;

		array++;

	}



	if (type & PERF_SAMPLE_DATA_SRC) {

		*array = sample->data_src;

		array++;

	}



	if (type & PERF_SAMPLE_TRANSACTION) {

		*array = sample->transaction;

		array++;

	}



	if (type & PERF_SAMPLE_REGS_INTR) {

		if (sample->intr_regs.abi) {

			*array++ = sample->intr_regs.abi;

			sz = hweight64(sample->intr_regs.mask) * sizeof(u64);

			memcpy(array, sample->intr_regs.regs, sz);

			array = (void *)array + sz;

		} else {

			*array++ = 0;

		}

	}



	if (type & PERF_SAMPLE_PHYS_ADDR) {

		*array = sample->phys_addr;

		array++;

	}



	return 0;

}



struct tep_format_field *perf_evsel__field(struct evsel *evsel, const char *name)

{

	return tep_find_field(evsel->tp_format, name);