1berry/openjdk
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

8229377: [JVMCI] Improve InstalledCode.invalidate for large code caches

Browse Source 
Reviewed-by: kvn
This commit is contained in:
Tom Rodriguez 2019-12-11 17:17:58 -08:00
parent d8d4cd6508
commit 00ba4ea7b3
3 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/hotspot/share/jvmci/jvmciEnv.cpp
View File

@ -1493,10 +1493,8 @@ void JVMCIEnv::invalidate_nmethod_mirror(JVMCIObject mirror, JVMCI_TRAPS) {
nmethodLocker nml(nm); nmethodLocker nml(nm);
if (nm->is_alive()) { if (nm->is_alive()) {
// Invalidating the HotSpotNmethod means we want the nmethod // Invalidating the HotSpotNmethod means we want the nmethod to be deoptimized.
// to be deoptimized. Deoptimization::deoptimize_all_marked(nm);
nm->mark_for_deoptimization();
Deoptimization::deoptimize_all_marked();
} }
// A HotSpotNmethod instance can only reference a single nmethod // A HotSpotNmethod instance can only reference a single nmethod

21
src/hotspot/share/runtime/deoptimization.cpp
View File

@ -814,22 +814,23 @@ class DeoptimizeMarkedClosure : public HandshakeClosure {
} }
}; };
void Deoptimization::deoptimize_all_marked() { void Deoptimization::deoptimize_all_marked(nmethod* nmethod_only) {
ResourceMark rm; ResourceMark rm;
DeoptimizationMarker dm; DeoptimizationMarker dm;
if (SafepointSynchronize::is_at_safepoint()) { // Make the dependent methods not entrant
DeoptimizeMarkedClosure deopt; if (nmethod_only != NULL) {
// Make the dependent methods not entrant nmethod_only->mark_for_deoptimization();
nmethod_only->make_not_entrant();
} else {
MutexLocker mu(SafepointSynchronize::is_at_safepoint() ? NULL : CodeCache_lock, Mutex::_no_safepoint_check_flag);
CodeCache::make_marked_nmethods_not_entrant(); CodeCache::make_marked_nmethods_not_entrant();
}
DeoptimizeMarkedClosure deopt;
if (SafepointSynchronize::is_at_safepoint()) {
Threads::java_threads_do(&deopt); Threads::java_threads_do(&deopt);
} else { } else {
// Make the dependent methods not entrant
{
MutexLocker mu(CodeCache_lock, Mutex::_no_safepoint_check_flag);
CodeCache::make_marked_nmethods_not_entrant();
}
DeoptimizeMarkedClosure deopt;
Handshake::execute(&deopt); Handshake::execute(&deopt);
} }
} }

10
src/hotspot/share/runtime/deoptimization.hpp
View File

@ -137,13 +137,13 @@ class Deoptimization : AllStatic {
Unpack_LIMIT = 4 Unpack_LIMIT = 4
}; };
static void deoptimize_all_marked(); // Make all nmethods that are marked_for_deoptimization not_entrant and deoptimize any live
// activations using those nmethods. If an nmethod is passed as an argument then it is
// marked_for_deoptimization and made not_entrant. Otherwise a scan of the code cache is done to
// find all marked nmethods and they are made not_entrant.
static void deoptimize_all_marked(nmethod* nmethod_only = NULL);
private: private:
// Checks all compiled methods. Invalid methods are deleted and
// corresponding activations are deoptimized.
static int deoptimize_dependents();
// Revoke biased locks at deopt. // Revoke biased locks at deopt.
static void revoke_from_deopt_handler(JavaThread* thread, frame fr, RegisterMap* map); static void revoke_from_deopt_handler(JavaThread* thread, frame fr, RegisterMap* map);