Commit cef7af25 authored by Fabian Hemmer's avatar Fabian Hemmer Committed by Arnaldo Carvalho de Melo
Browse files

perf tools: Add OCaml demangling 



Detect symbols generated by the OCaml compiler based on their prefix.

Demangle OCaml symbols, returning a newly allocated string (like the
existing Java demangling functionality).

Move a helper function (hex) from tests/code-reading.c to util/string.c

To test:

  echo 'Printf.printf "%d\n" (Random.int 42)' > test.ml
  perf record ocamlopt.opt test.ml
  perf report -d ocamlopt.opt

Signed-off-by: default avatarFabian Hemmer <copy@copy.sh>
Acked-by: default avatarNamhyung Kim <namhyung@kernel.org>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Peter Zijlstra <peterz@infradead.org>
LPU-Reference: 20210203211537.b25ytjb6dq5jfbwx@nyu
Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 48859e52

tools/perf/tests/Build

+1 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ perf-y += time-utils-test.o 
perf-y += genelf.o

perf-y += api-io.o

perf-y += demangle-java-test.o

perf-y += demangle-ocaml-test.o

perf-y += pfm.o

perf-y += parse-metric.o

perf-y += pe-file-parsing.o

tools/perf/tests/builtin-test.c

+4 −0
Original line number Diff line number Diff line
@@ -338,6 +338,10 @@ static struct test generic_tests[] = { 
		.desc = "Demangle Java",

		.func = test__demangle_java,

	},

	{

		.desc = "Demangle OCaml",

		.func = test__demangle_ocaml,

	},

	{

		.desc = "Parse and process metrics",

		.func = test__parse_metric,

tools/perf/tests/code-reading.c

+1 −9
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "event.h"

#include "record.h"

#include "util/mmap.h"

#include "util/string2.h"

#include "util/synthetic-events.h"

#include "thread.h"
@@ -41,15 +42,6 @@ struct state { 
	size_t done_cnt;

};



static unsigned int hex(char c)

{

	if (c >= '0' && c <= '9')

		return c - '0';

	if (c >= 'a' && c <= 'f')

		return c - 'a' + 10;

	return c - 'A' + 10;

}



static size_t read_objdump_chunk(const char **line, unsigned char **buf,

				 size_t *buf_len)

{

tools/perf/tests/demangle-ocaml-test.c

0 → 100644
+43 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <string.h>

#include <stdlib.h>

#include <stdio.h>

#include "tests.h"

#include "session.h"

#include "debug.h"

#include "demangle-ocaml.h"



int test__demangle_ocaml(struct test *test __maybe_unused, int subtest __maybe_unused)

{

	int ret = TEST_OK;

	char *buf = NULL;

	size_t i;



	struct {

		const char *mangled, *demangled;

	} test_cases[] = {

		{ "main",

		  NULL },

		{ "camlStdlib__array__map_154",

		  "Stdlib.array.map" },

		{ "camlStdlib__anon_fn$5bstdlib$2eml$3a334$2c0$2d$2d54$5d_1453",

		  "Stdlib.anon_fn[stdlib.ml:334,0--54]" },

		{ "camlStdlib__bytes__$2b$2b_2205",

		  "Stdlib.bytes.++" },

	};



	for (i = 0; i < sizeof(test_cases) / sizeof(test_cases[0]); i++) {

		buf = ocaml_demangle_sym(test_cases[i].mangled);

		if ((buf == NULL && test_cases[i].demangled != NULL)

				|| (buf != NULL && test_cases[i].demangled == NULL)

				|| (buf != NULL && strcmp(buf, test_cases[i].demangled))) {

			pr_debug("FAILED: %s: %s != %s\n", test_cases[i].mangled,

				 buf == NULL ? "(null)" : buf,

				 test_cases[i].demangled == NULL ? "(null)" : test_cases[i].demangled);

			ret = TEST_FAIL;

		}

		free(buf);

	}



	return ret;

}

tools/perf/tests/tests.h

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ int test__time_utils(struct test *t, int subtest); 
int test__jit_write_elf(struct test *test, int subtest);

int test__api_io(struct test *test, int subtest);

int test__demangle_java(struct test *test, int subtest);

int test__demangle_ocaml(struct test *test, int subtest);

int test__pfm(struct test *test, int subtest);

const char *test__pfm_subtest_get_desc(int subtest);

int test__pfm_subtest_get_nr(void);