[Tarantool-patches] [PATCH luajit v3 3/5] memprof: dump traceno if allocate from trace
Mikhail Shishatskiy
m.shishatskiy at tarantool.org
Fri Aug 20 10:05:44 MSK 2021
When LuaJIT executes a trace, the trace number is stored in
the virtual machine state. So, we can treat this number as
an allocation event source in memprof and report allocation events
from traces as well.
Previously, all the allocations from traces were marked as INTERNAL.
This patch introduces the functionality described above by adding
a new allocation source type named ASOURCE_TRACE. If at the moment
when allocation event occurs VM state indicates that trace executed,
trace number streamed to a binary file:
| loc-trace := trace-addr trace-no
| trace-addr := <ULEB128>
| trace-no := <ULEB128>
Also, the memory profiler parser is adjusted to recognize this
source type by extending <loc> structure: field <traceno>,
representing trace number, is added.
Part of tarantool/tarantool#5814
---
Issue: https://github.com/tarantool/tarantool/issues/5814
Luajit branch: https://github.com/tarantool/luajit/tree/shishqa/gh-5814-group-allocations-on-trace-by-trace-number
tarantool branch: https://github.com/tarantool/tarantool/tree/shishqa/gh-5814-group-allocations-on-trace-by-trace-number
src/Makefile.dep.original | 2 +-
src/lj_memprof.c | 35 +++++++++++++++++++++++++++++++++--
src/lj_memprof.h | 15 ++++++++++-----
tools/memprof/parse.lua | 22 ++++++++++++++--------
4 files changed, 58 insertions(+), 16 deletions(-)
diff --git a/src/Makefile.dep.original b/src/Makefile.dep.original
index f3672413..ee6bafb2 100644
--- a/src/Makefile.dep.original
+++ b/src/Makefile.dep.original
@@ -146,7 +146,7 @@ lj_mcode.o: lj_mcode.c lj_obj.h lua.h luaconf.h lj_def.h lj_arch.h \
lj_gc.h lj_err.h lj_errmsg.h lj_jit.h lj_ir.h lj_mcode.h lj_trace.h \
lj_dispatch.h lj_bc.h lj_traceerr.h lj_vm.h
lj_memprof.o: lj_memprof.c lj_arch.h lua.h luaconf.h lj_memprof.h \
- lj_def.h lj_wbuf.h lj_obj.h lj_frame.h lj_bc.h lj_debug.h
+ lj_def.h lj_wbuf.h lj_obj.h lj_frame.h lj_bc.h lj_debug.h lj_dispatch.h
lj_meta.o: lj_meta.c lj_obj.h lua.h luaconf.h lj_def.h lj_arch.h lj_gc.h \
lj_err.h lj_errmsg.h lj_buf.h lj_str.h lj_tab.h lj_meta.h lj_frame.h \
lj_bc.h lj_vm.h lj_strscan.h lj_strfmt.h lj_lib.h
diff --git a/src/lj_memprof.c b/src/lj_memprof.c
index 2c1ef3b8..fb99829d 100644
--- a/src/lj_memprof.c
+++ b/src/lj_memprof.c
@@ -19,6 +19,10 @@
#include "lj_frame.h"
#include "lj_debug.h"
+#if LJ_HASJIT
+#include "lj_dispatch.h"
+#endif
+
/* --------------------------------- Symtab --------------------------------- */
static const unsigned char ljs_header[] = {'l', 'j', 's', LJS_CURRENT_VERSION,
@@ -146,6 +150,31 @@ static void memprof_write_func(struct memprof *mp, uint8_t aevent)
lua_assert(0);
}
+#if LJ_HASJIT
+
+static void memprof_write_trace(struct memprof *mp, uint8_t aevent)
+{
+ struct lj_wbuf *out = &mp->out;
+ const global_State *g = mp->g;
+ const jit_State *J = G2J(g);
+ const TraceNo traceno = g->vmstate;
+ const GCtrace *trace = traceref(J, traceno);
+ lj_wbuf_addbyte(out, aevent | ASOURCE_TRACE);
+ lj_wbuf_addu64(out, (uintptr_t)trace->mcode);
+ lj_wbuf_addu64(out, (uint64_t)traceno);
+}
+
+#else
+
+static void memprof_write_trace(struct memprof *mp, uint8_t aevent)
+{
+ UNUSED(mp);
+ UNUSED(aevent);
+ lua_assert(0);
+}
+
+#endif
+
static void memprof_write_hvmstate(struct memprof *mp, uint8_t aevent)
{
lj_wbuf_addbyte(&mp->out, aevent | ASOURCE_INT);
@@ -168,9 +197,11 @@ static const memprof_writer memprof_writers[] = {
** But since traces must follow the semantics of the original code,
** behaviour of Lua and JITted code must match 1:1 in terms of allocations,
** which makes using memprof with enabled JIT virtually redundant.
- ** Hence use the stub below.
+ ** But if one wants to investigate allocations with JIT enabled,
+ ** memprof_write_trace() dumps trace number to the binary output.
+ ** It can be useful to compare with with jit.v or jit.dump outputs.
*/
- memprof_write_hvmstate /* LJ_VMST_TRACE */
+ memprof_write_trace /* LJ_VMST_TRACE */
};
static void memprof_write_caller(struct memprof *mp, uint8_t aevent)
diff --git a/src/lj_memprof.h b/src/lj_memprof.h
index 3417475d..6a35385d 100644
--- a/src/lj_memprof.h
+++ b/src/lj_memprof.h
@@ -51,9 +51,10 @@
*/
#define SYMTAB_LFUNC ((uint8_t)0)
+#define SYMTAB_TRACE ((uint8_t)1)
#define SYMTAB_FINAL ((uint8_t)0x80)
-#define LJM_CURRENT_FORMAT_VERSION 0x01
+#define LJM_CURRENT_FORMAT_VERSION 0x02
/*
** Event stream format:
@@ -69,11 +70,14 @@
** event-realloc := event-header loc? oaddr osize naddr nsize
** event-free := event-header loc? oaddr osize
** event-header := <BYTE>
-** loc := loc-lua | loc-c
+** loc := loc-lua | loc-c | loc-trace
** loc-lua := sym-addr line-no
** loc-c := sym-addr
+** loc-trace := trace-addr trace-no
** sym-addr := <ULEB128>
** line-no := <ULEB128>
+** trace-addr := <ULEB128>
+** trace-no := <ULEB128>
** oaddr := <ULEB128>
** naddr := <ULEB128>
** osize := <ULEB128>
@@ -88,10 +92,10 @@
** version: [VVVVVVVV]
** * VVVVVVVV: Byte interpreted as a plain integer version number
**
-** event-header: [FUUUSSEE]
+** event-header: [FUUSSSEE]
** * EE : 2 bits for representing allocation event type (AEVENT_*)
-** * SS : 2 bits for representing allocation source type (ASOURCE_*)
-** * UUU : 3 unused bits
+** * SSS : 3 bits for representing allocation source type (ASOURCE_*)
+** * UU : 2 unused bits
** * F : 0 for regular events, 1 for epilogue's *F*inal header
** (if F is set to 1, all other bits are currently ignored)
*/
@@ -105,6 +109,7 @@
#define ASOURCE_INT ((uint8_t)(1 << 2))
#define ASOURCE_LFUNC ((uint8_t)(2 << 2))
#define ASOURCE_CFUNC ((uint8_t)(3 << 2))
+#define ASOURCE_TRACE ((uint8_t)(4 << 2))
#define LJM_EPILOGUE_HEADER 0x80
diff --git a/tools/memprof/parse.lua b/tools/memprof/parse.lua
index 12e2758f..adc7c072 100644
--- a/tools/memprof/parse.lua
+++ b/tools/memprof/parse.lua
@@ -11,7 +11,7 @@ local lshift = bit.lshift
local string_format = string.format
local LJM_MAGIC = "ljm"
-local LJM_CURRENT_VERSION = 1
+local LJM_CURRENT_VERSION = 0x02
local LJM_EPILOGUE_HEADER = 0x80
@@ -24,8 +24,11 @@ local AEVENT_MASK = 0x3
local ASOURCE_INT = lshift(1, 2)
local ASOURCE_LFUNC = lshift(2, 2)
local ASOURCE_CFUNC = lshift(3, 2)
+local ASOURCE_TRACE = lshift(4, 2)
-local ASOURCE_MASK = lshift(0x3, 2)
+local ASOURCE_MASK = lshift(0x7, 2)
+
+local EV_HEADER_MAX = ASOURCE_TRACE + AEVENT_REALLOC
local M = {}
@@ -59,20 +62,23 @@ local function link_to_previous(heap_chunk, e, nsize)
end
end
-local function id_location(addr, line)
- return string_format("f%#xl%d", addr, line), {
+local function id_location(addr, line, traceno)
+ return string_format("f%#xl%dt%d", addr, line, traceno), {
addr = addr,
line = line,
+ traceno = traceno,
}
end
local function parse_location(reader, asource)
if asource == ASOURCE_INT then
- return id_location(0, 0)
+ return id_location(0, 0, 0)
elseif asource == ASOURCE_CFUNC then
- return id_location(reader:read_uleb128(), 0)
+ return id_location(reader:read_uleb128(), 0, 0)
elseif asource == ASOURCE_LFUNC then
- return id_location(reader:read_uleb128(), reader:read_uleb128())
+ return id_location(reader:read_uleb128(), reader:read_uleb128(), 0)
+ elseif asource == ASOURCE_TRACE then
+ return id_location(reader:read_uleb128(), 0, reader:read_uleb128())
end
error("Unknown asource "..asource)
end
@@ -140,7 +146,7 @@ local parsers = {
}
local function ev_header_is_valid(evh)
- return evh <= 0x0f or evh == LJM_EPILOGUE_HEADER
+ return evh <= EV_HEADER_MAX or evh == LJM_EPILOGUE_HEADER
end
-- Splits event header into event type (aka aevent = allocation
--
2.32.0
More information about the Tarantool-patches
mailing list