perf jit: add source line info support (598b7c69) · Commits · 戴 / test

tools/perf/jvmti/jvmti_agent.c

+16 −16

Original line number	Diff line number	Diff line
		@@ -374,20 +374,20 @@ jvmti_write_code(void agent, char const sym,

		int
		jvmti_write_debug_info(void agent, uint64_t code, const char file,
		jvmtiAddrLocationMap const *map,
		jvmtiLineNumberEntry *li, jint num)
		jvmti_line_info_t *li, int nr_lines)
		{
		static const char *prev_str = "\xff";
		struct jr_code_debug_info rec;
		size_t sret, len, size, flen;
		size_t padding_count;
		uint64_t addr;
		const char *fn = file;
		FILE *fp = agent;
		int i;

		/*
		* no entry to write
		*/
		if (!num)
		if (!nr_lines)
		return 0;

		if (!fp) {
		@@ -401,17 +401,18 @@ jvmti_write_debug_info(void agent, uint64_t code, const char file,
		size = sizeof(rec);
		rec.p.timestamp = perf_get_timestamp();
		rec.code_addr = (uint64_t)(uintptr_t)code;
		rec.nr_entry = num;
		rec.nr_entry = nr_lines;

		/*
		* on disk source line info layout:
		* uint64_t : addr
		* int : line number
		* int : column discriminator
		* file[] : source file name
		* padding : pad to multiple of 8 bytes
		*/
		size += num * (sizeof(uint64_t) + sizeof(int));
		size += flen + (num - 1) * 2;
		size += nr_lines * sizeof(struct debug_entry);
		size += flen * nr_lines;
		/*
		* pad to 8 bytes
		*/
		@@ -429,28 +430,27 @@ jvmti_write_debug_info(void agent, uint64_t code, const char file,
		if (sret != 1)
		goto error;

		for (i = 0; i < num; i++) {
		uint64_t addr;
		for (i = 0; i < nr_lines; i++) {

		addr = (uint64_t)map[i].start_address;
		addr = (uint64_t)li[i].pc;
		len = sizeof(addr);
		sret = fwrite_unlocked(&addr, len, 1, fp);
		if (sret != 1)
		goto error;

		len = sizeof(int);
		len = sizeof(li[0].line_number);
		sret = fwrite_unlocked(&li[i].line_number, len, 1, fp);
		if (sret != 1)
		goto error;

		if (i == 0) {
		sret = fwrite_unlocked(file, flen, 1, fp);
		} else {
		sret = fwrite_unlocked(prev_str, 2, 1, fp);
		}
		len = sizeof(li[0].discrim);
		sret = fwrite_unlocked(&li[i].discrim, len, 1, fp);
		if (sret != 1)
		goto error;

		sret = fwrite_unlocked(fn, flen, 1, fp);
		if (sret != 1)
		goto error;
		}
		if (padding_count)
		sret = fwrite_unlocked(pad_bytes, padding_count, 1, fp);

tools/perf/jvmti/jvmti_agent.h

+9 −2

Original line number	Diff line number	Diff line
		@@ -11,16 +11,23 @@
		extern "C" {
		#endif

		typedef struct {
		unsigned long pc;
		int line_number;
		int discrim; /* discriminator -- 0 for now */
		} jvmti_line_info_t;

		void *jvmti_open(void);
		int jvmti_close(void *agent);
		int jvmti_write_code(void agent, char const symbol_name,
		uint64_t vma, void const *code,
		const unsigned int code_size);

		int jvmti_write_debug_info(void *agent,
		uint64_t code,
		const char *file,
		jvmtiAddrLocationMap const *map,
		jvmtiLineNumberEntry *tab, jint nr);
		jvmti_line_info_t *li,
		int nr_lines);

		#if defined(__cplusplus)
		}

tools/perf/jvmti/libjvmti.c

+109 −13

Original line number	Diff line number	Diff line
		@@ -4,6 +4,7 @@
		#include <stdlib.h>
		#include <err.h>
		#include <jvmti.h>
		#include <jvmticmlr.h>
		#include <limits.h>

		#include "jvmti_agent.h"
		@@ -11,6 +12,100 @@
		static int has_line_numbers;
		void *jvmti_agent;

		static jvmtiError
		do_get_line_numbers(jvmtiEnv jvmti, void pc, jmethodID m, jint bci,
		jvmti_line_info_t tab, jint nr)
		{
		jint i, lines = 0;
		jint nr_lines = 0;
		jvmtiLineNumberEntry *loc_tab = NULL;
		jvmtiError ret;

		ret = (*jvmti)->GetLineNumberTable(jvmti, m, &nr_lines, &loc_tab);
		if (ret != JVMTI_ERROR_NONE)
		return ret;

		for (i = 0; i < nr_lines; i++) {
		if (loc_tab[i].start_location < bci) {
		tab[lines].pc = (unsigned long)pc;
		tab[lines].line_number = loc_tab[i].line_number;
		tab[lines].discrim = 0; /* not yet used */
		lines++;
		} else {
		break;
		}
		}
		(jvmti)->Deallocate(jvmti, (unsigned char )loc_tab);
		*nr = lines;
		return JVMTI_ERROR_NONE;
		}

		static jvmtiError
		get_line_numbers(jvmtiEnv jvmti, const void compile_info, jvmti_line_info_t *tab, int nr_lines)
		{
		const jvmtiCompiledMethodLoadRecordHeader *hdr;
		jvmtiCompiledMethodLoadInlineRecord *rec;
		jvmtiLineNumberEntry *lne = NULL;
		PCStackInfo *c;
		jint nr, ret;
		int nr_total = 0;
		int i, lines_total = 0;

		if (!(tab && nr_lines))
		return JVMTI_ERROR_NULL_POINTER;

		/*
		* Phase 1 -- get the number of lines necessary
		*/
		for (hdr = compile_info; hdr != NULL; hdr = hdr->next) {
		if (hdr->kind == JVMTI_CMLR_INLINE_INFO) {
		rec = (jvmtiCompiledMethodLoadInlineRecord *)hdr;
		for (i = 0; i < rec->numpcs; i++) {
		c = rec->pcinfo + i;
		nr = 0;
		/*
		* unfortunately, need a tab to get the number of lines!
		*/
		ret = (*jvmti)->GetLineNumberTable(jvmti, c->methods[0], &nr, &lne);
		if (ret == JVMTI_ERROR_NONE) {
		/* free what was allocated for nothing */
		(jvmti)->Deallocate(jvmti, (unsigned char )lne);
		nr_total += (int)nr;
		}
		}
		}
		}

		if (nr_total == 0)
		return JVMTI_ERROR_NOT_FOUND;

		/*
		* Phase 2 -- allocate big enough line table
		*/
		tab = malloc(nr_total sizeof(**tab));
		if (!*tab)
		return JVMTI_ERROR_OUT_OF_MEMORY;

		for (hdr = compile_info; hdr != NULL; hdr = hdr->next) {
		if (hdr->kind == JVMTI_CMLR_INLINE_INFO) {
		rec = (jvmtiCompiledMethodLoadInlineRecord *)hdr;
		for (i = 0; i < rec->numpcs; i++) {
		c = rec->pcinfo + i;
		nr = 0;
		ret = do_get_line_numbers(jvmti, c->pc,
		c->methods[0],
		c->bcis[0],
		*tab + lines_total,
		&nr);
		if (ret == JVMTI_ERROR_NONE)
		lines_total += nr;
		}
		}
		}
		*nr_lines = lines_total;
		return JVMTI_ERROR_NONE;
		}

		static void JNICALL
		compiled_method_load_cb(jvmtiEnv *jvmti,
		jmethodID method,
		@@ -18,9 +113,9 @@ compiled_method_load_cb(jvmtiEnv *jvmti,
		void const *code_addr,
		jint map_length,
		jvmtiAddrLocationMap const *map,
		void const *compile_info __unused)
		const void *compile_info)
		{
		jvmtiLineNumberEntry *tab = NULL;
		jvmti_line_info_t *line_tab = NULL;
		jclass decl_class;
		char *class_sign = NULL;
		char *func_name = NULL;
		@@ -29,7 +124,7 @@ compiled_method_load_cb(jvmtiEnv *jvmti,
		char fn[PATH_MAX];
		uint64_t addr = (uint64_t)(uintptr_t)code_addr;
		jvmtiError ret;
		jint nr_lines = 0;
		int nr_lines = 0; /* in line_tab[] */
		size_t len;

		ret = (*jvmti)->GetMethodDeclaringClass(jvmti, method,
		@@ -40,17 +135,17 @@ compiled_method_load_cb(jvmtiEnv *jvmti,
		}

		if (has_line_numbers && map && map_length) {

		ret = (*jvmti)->GetLineNumberTable(jvmti, method, &nr_lines, &tab);
		ret = get_line_numbers(jvmti, compile_info, &line_tab, &nr_lines);
		if (ret != JVMTI_ERROR_NONE) {
		warnx("jvmti: cannot get line table for method");
		} else {
		ret = (*jvmti)->GetSourceFileName(jvmti, decl_class, &file_name);
		if (ret != JVMTI_ERROR_NONE) {
		warnx("jvmti: cannot get source filename ret=%d", ret);
		nr_lines = 0;
		}
		}

		ret = (*jvmti)->GetSourceFileName(jvmti, decl_class, &file_name);
		if (ret != JVMTI_ERROR_NONE) {
		warnx("jvmti: cannot get source filename ret=%d", ret);
		goto error;
		}

		ret = (*jvmti)->GetClassSignature(jvmti, decl_class,
		@@ -92,13 +187,14 @@ compiled_method_load_cb(jvmtiEnv *jvmti,
		/*
		* write source line info record if we have it
		*/
		if (jvmti_write_debug_info(jvmti_agent, addr, fn, map, tab, nr_lines))
		if (jvmti_write_debug_info(jvmti_agent, addr, fn, line_tab, nr_lines))
		warnx("jvmti: write_debug_info() failed");

		len = strlen(func_name) + strlen(class_sign) + strlen(func_sign) + 2;
		{
		char str[len];
		snprintf(str, len, "%s%s%s", class_sign, func_name, func_sign);

		if (jvmti_write_code(jvmti_agent, str, addr, code_addr, code_size))
		warnx("jvmti: write_code() failed");
		}
		@@ -106,8 +202,8 @@ error:
		(jvmti)->Deallocate(jvmti, (unsigned char )func_name);
		(jvmti)->Deallocate(jvmti, (unsigned char )func_sign);
		(jvmti)->Deallocate(jvmti, (unsigned char )class_sign);
		(jvmti)->Deallocate(jvmti, (unsigned char )tab);
		(jvmti)->Deallocate(jvmti, (unsigned char )file_name);
		free(line_tab);
		}

		static void JNICALL

tools/perf/util/Build

+3 −0

Original line number	Diff line number	Diff line
		@@ -108,8 +108,11 @@ libperf-$(CONFIG_LZMA) += lzma.o
		libperf-y += demangle-java.o
		libperf-$(CONFIG_LIBELF) += jitdump.o
		libperf-$(CONFIG_LIBELF) += genelf.o
		libperf-$(CONFIG_LIBELF) += genelf_debug.o

		CFLAGS_config.o += -DETC_PERFCONFIG="BUILD_STR($(ETC_PERFCONFIG_SQ))"
		# avoid compiler warnings in 32-bit mode
		CFLAGS_genelf_debug.o += -Wno-packed

		$(OUTPUT)util/parse-events-flex.c: util/parse-events.l $(OUTPUT)util/parse-events-bison.c
		$(call rule_mkdir)

tools/perf/util/genelf.c

+11 −4

Original line number	Diff line number	Diff line
		@@ -156,7 +156,8 @@ gen_build_id(struct buildid_note note, unsigned long load_addr, const void cod
		*/
		int
		jit_write_elf(int fd, uint64_t load_addr, const char *sym,
		const void *code, int csize)
		const void *code, int csize,
		void *debug, int nr_debug_entries)
		{
		Elf *e;
		Elf_Data *d;
		@@ -385,10 +386,16 @@ jit_write_elf(int fd, uint64_t load_addr, const char *sym,
		shdr->sh_size = sizeof(bnote);
		shdr->sh_entsize = 0;

		if (debug && nr_debug_entries) {
		retval = jit_add_debug_info(e, load_addr, debug, nr_debug_entries);
		if (retval)
		goto error;
		} else {
		if (elf_update(e, ELF_C_WRITE) < 0) {
		warnx("elf_update 4 failed");
		goto error;
		}
		}

		retval = 0;
		error:

Admin message