Skip to content

Implement ROMMethodInfo caching support and stack walker integration #22918

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+411 −233
Open

Implement ROMMethodInfo caching support and stack walker integration #22918

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e5e7b7e
Part 1 of stack walker ROM method cache
gacholio Aug 12, 2025
07d9c6d
Implement ROMMethodInfo caching support in mapcache
Nov 11, 2025
f7946db
fixup
Nov 25, 2025
54734e9
Add third entry point getROMMethodInfoForOSRFrame
Nov 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions runtime/codert_vm/jswalk.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,9 @@ UDATA jitWalkStackFrames(J9StackWalkState *walkState)
walkState->dropToCurrentFrame = jitDropToCurrentFrame;

while ((walkState->jitInfo = jitGetExceptionTable(walkState)) != NULL) {
#if defined(J9MAPCACHE_DEBUG)
memset(&walkState->romMethodInfo, 0, sizeof(walkState->romMethodInfo));
#endif /* J9MAPCACHE_DEBUG */
walkState->stackMap = NULL;
walkState->inlineMap = NULL;
walkState->bp = walkState->unwindSP + getJitTotalFrameSize(walkState->jitInfo);
Expand Down Expand Up @@ -212,6 +215,9 @@ UDATA jitWalkStackFrames(J9StackWalkState *walkState)
lswRecord(walkState, LSW_TYPE_METHOD, walkState->method);
lswRecord(walkState, LSW_TYPE_JIT_FRAME_INFO, walkState);
#endif
//initializeBasicROMMethodInfo(walkState, J9_ROM_METHOD_FROM_RAM_METHOD(walkState->method));
getROMMethodInfoForBytecodePC(walkState, J9_ROM_METHOD_FROM_RAM_METHOD(walkState->method), walkState->bytecodePCOffset);

if ((rc = walkFrame(walkState)) != J9_STACKWALK_KEEP_ITERATING) {
return rc;
}
Expand Down Expand Up @@ -250,6 +256,8 @@ UDATA jitWalkStackFrames(J9StackWalkState *walkState)
#ifdef J9VM_INTERP_LINEAR_STACKWALK_TRACING
lswRecord(walkState, LSW_TYPE_JIT_FRAME_INFO, walkState);
#endif
//initializeBasicROMMethodInfo(walkState, J9_ROM_METHOD_FROM_RAM_METHOD(walkState->method));
getROMMethodInfoForBytecodePC(walkState, J9_ROM_METHOD_FROM_RAM_METHOD(walkState->method), walkState->bytecodePCOffset);
if ((rc = walkFrame(walkState)) != J9_STACKWALK_KEEP_ITERATING) {
return rc;
}
Expand Down Expand Up @@ -1977,6 +1985,10 @@ jitWalkOSRFrame(J9StackWalkState *walkState, J9OSRFrame *osrFrame)
UDATA *localSlots = ((UDATA*)(osrFrame + 1)) + maxStack;
UDATA *nextFrame = localSlots + numberOfLocals;
J9MonitorEnterRecord *enterRecord = osrFrame->monitorEnterRecords;
J9ROMMethod *romMethod = J9_ROM_METHOD_FROM_RAM_METHOD(method);

//initializeBasicROMMethodInfo(walkState, romMethod);
getROMMethodInfoForOSRFrame(walkState, osrFrame);

#ifdef J9VM_INTERP_STACKWALK_TRACING
{
Expand All @@ -1987,6 +1999,7 @@ jitWalkOSRFrame(J9StackWalkState *walkState, J9OSRFrame *osrFrame)
walkState->method = stateMethod;
}
#endif

walkBytecodeFrameSlots(walkState, method, offsetPC,
localSlots - 1, pendingStackHeight,
nextFrame - 1, numberOfLocals, TRUE);
Expand Down
5 changes: 3 additions & 2 deletions runtime/oti/j9modifiers_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,9 @@
/* Composite Flag checks */

#define J9ROMCLASS_IS_PRIMITIVE_OR_ARRAY(romClass) _J9ROMCLASS_SUNMODIFIER_IS_ANY_SET((romClass), J9AccClassArray | J9AccClassInternalPrimitiveType)
#define J9ROMMETHOD_IS_NON_EMPTY_OBJECT_CONSTRUCTOR(romMethod) \
((((romMethod)->modifiers) & (J9AccMethodObjectConstructor | J9AccEmptyMethod)) == J9AccMethodObjectConstructor)
#define J9ROMMETHOD_MODIFIERS_IS_NON_EMPTY_OBJECT_CONSTRUCTOR(modifiers) \
(((modifiers) & (J9AccMethodObjectConstructor | J9AccEmptyMethod)) == J9AccMethodObjectConstructor)
#define J9ROMMETHOD_IS_NON_EMPTY_OBJECT_CONSTRUCTOR(romMethod) J9ROMMETHOD_MODIFIERS_IS_NON_EMPTY_OBJECT_CONSTRUCTOR((romMethod)->modifiers)

/* Class instances are allocated via the new bytecode */
#define J9ROMCLASS_ALLOCATES_VIA_NEW(romClass) \
Expand Down
35 changes: 27 additions & 8 deletions runtime/oti/j9nonbuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1147,12 +1147,32 @@ typedef struct J9CudaGlobals {
jmethodID runnable_run;
} J9CudaGlobals;

#define J9_MAP_CACHE_SLOTS 2

typedef struct J9MapCacheEntry {
/* Cache slot sizes must all be multiples of 2 */
#define J9_STACKMAP_CACHE_SLOTS 2
#define J9_LOCALMAP_CACHE_SLOTS 2
#define J9_ARGBITS_CACHE_SLOTS 2

/* Flag values for J9ROMMethodInfo */
#define J9MAPCACHE_STACKMAP_CACHED 1
#define J9MAPCACHE_LOCALMAP_CACHED 2
#define J9MAPCACHE_ARGBITS_CACHED 4
#define J9MAPCACHE_METHOD_IS_CONSTRUCTOR 8
#define J9MAPCACHE_VALID 128

/* J9ROMMethodInfo must be a multiple of 8 bytes in size */
typedef struct J9ROMMethodInfo {
void *key;
U_32 bits[J9_MAP_CACHE_SLOTS];
} J9MapCacheEntry;
U_32 stackmap[J9_STACKMAP_CACHE_SLOTS];
U_32 localmap[J9_ARGBITS_CACHE_SLOTS];
U_32 argbits[J9_ARGBITS_CACHE_SLOTS];
U_32 modifiers;
U_16 tempCount;
U_8 argCount;
U_8 flags;
#if !defined(J9VM_ENV_DATA64)
U_32 padTo64;
#endif /* !defined(J9VM_ENV_DATA64) */
} J9ROMMethodInfo;

#if defined(J9VM_OPT_SHARED_CLASSES)

Expand Down Expand Up @@ -2824,6 +2844,7 @@ typedef struct J9StackWalkState {
void* stackMap;
void* inlineMap;
UDATA loopBreaker;
J9ROMMethodInfo romMethodInfo; /* 64-bit aligned */
/* The size of J9StackWalkState must be a multiple of 8 because it is inlined into
* J9VMThread where alignment assumotions are being made.
*/
Expand Down Expand Up @@ -3756,9 +3777,7 @@ typedef struct J9ClassLoader {
UDATA initClassPathEntryCount;
UDATA asyncGetCallTraceUsed;
omrthread_monitor_t mapCacheMutex;
struct J9HashTable* localmapCache;
struct J9HashTable* argsbitsCache;
struct J9HashTable* stackmapCache;
struct J9HashTable* romMethodInfoCache;
#if defined(J9VM_OPT_JFR)
J9HashTable *typeIDs;
#endif /* defined(J9VM_OPT_JFR) */
Expand Down
46 changes: 28 additions & 18 deletions runtime/oti/stackmap_api.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,30 +196,40 @@ j9stackmap_StackBitsForPC(J9PortLibrary * portLib, UDATA pc, J9ROMClass * romCla
UDATA * (* getBuffer) (void * userData),
void (* releaseBuffer) (void * userData));

/* ---------------- mapcache.cpp ---------------- */

/* ------------------- mapcache.cpp ----------------- */
/**
* @brief
* @param walkState
* @param romMethod
*/
void
initializeBasicROMMethodInfo(J9StackWalkState *walkState, J9ROMMethod *romMethod);

/* These are cache wrapper functions with the same parameters as the j9localmap_ versions,
* with VM and J9ClassLoader added on the end.
/**
* @brief
* @param walkState
* @param romMethod
*/
void
getROMMethodInfoForROMMethod(J9StackWalkState *walkState, J9ROMMethod *romMethod);

IDATA
j9cached_StackBitsForPC(UDATA pc, J9ROMClass * romClass, J9ROMMethod * romMethod,
U_32 * resultArrayBase, UDATA resultArraySize,
void * userData,
UDATA * (* getBuffer) (void * userData),
void (* releaseBuffer) (void * userData),
J9JavaVM *vm, J9ClassLoader *classLoader);

/**
* @brief
* @param walkState
* @param romMethod
* @param pc
*/
void
j9cached_ArgBitsForPC0(J9ROMClass *romClass, J9ROMMethod *romMethod, U_32 *resultArrayBase, J9JavaVM *vm, J9ClassLoader *classLoader);
getROMMethodInfoForBytecodePC(J9StackWalkState *walkState, J9ROMMethod *romMethod, UDATA pc);

IDATA
j9cached_LocalBitsForPC(J9ROMClass * romClass, J9ROMMethod * romMethod, UDATA pc, U_32 * resultArrayBase,
void * userData,
UDATA * (* getBuffer) (void * userData),
void (* releaseBuffer) (void * userData),
J9JavaVM *vm, J9ClassLoader * classLoader);
/**
* @brief
* @param walkState
* @param osrFrame
*/
void
getROMMethodInfoForOSRFrame(J9StackWalkState *walkState, J9OSRFrame *osrFrame);

#ifdef __cplusplus
}
Expand Down
Loading