Cleanups and Shenandoah-specific changes.

Author: christianhaeubl

README.md

@@ -81,7 +81,10 @@ In some code parts, `Unimplemented()` serves as a placeholder for GC-specific fu
   - `src/hotspot/share/gc/shared/hSpaceCounters.cpp`
   - `src/hotspot/share/gc/shared/ageTable.cpp`
 
-Besides that, the length of 0 for `GCThreadLocalData` in `src/hotspot/share/gc/shared/gcThreadLocalData.hpp` is a placeholder as well.
+Besides that, there are a few places where values are hardcoded at the moment.
+Those need to be replaced with the correct GC-specific values:
+- the length of `GCThreadLocalData` in `src/hotspot/share/gc/shared/gcThreadLocalData.hpp` is hardcoded to 0
+- `log_of_heap_region_grain_bytes` in `src/hotspot/svm/svmToGC.cpp` is hardcoded to 20
 
 ## Build
 

src/hotspot/SubMakefile

@@ -101,7 +101,7 @@ DEBUG_LEVEL_FILE_SUFFIX.debug := -debug
 DEBUG_LEVEL_FILE_SUFFIX := $(DEBUG_LEVEL_FILE_SUFFIX.$(DEBUG_LEVEL))
 
 BUILD_DIR := $(BUILD_ROOT)/$(DEBUG_LEVEL)-$(COMPRESSED_REFERENCES_SUFFIX)$(TARGET_EXT)
-TARGET_FILE := $(BUILD_ROOT)/libsvmgc$(DEBUG_LEVEL_FILE_SUFFIX)-$(COMPRESSED_REFERENCES_SUFFIX)$(TARGET_EXT)
+TARGET_FILE := $(BUILD_ROOT)/libshenandoahgc$(DEBUG_LEVEL_FILE_SUFFIX)-$(COMPRESSED_REFERENCES_SUFFIX)$(TARGET_EXT)
 
 CPP_FILES_TO_EXCLUDE.amd64 := aarch64
 CPP_FILES_TO_EXCLUDE.aarch64 := x86

src/hotspot/share/runtime/mutex.cpp

@@ -119,13 +119,13 @@ void Mutex::lock_contended(Thread* self) {
     if (thread->has_status_vm()) {
       while (true) {
         // do a transition to native thread status so that we can safely block below without preventing a safepoint
-        SVMGlobalData::_transition_vm_to_native(heap_base, thread);
+        SVMGlobalData::_transition_vm_to_native(thread);
 
         _lock.lock();
 
         // do a transition back to VM state so that this thread can be sure that no safepoints are happening concurrently
         assert(thread->has_status_native_or_safepoint(), "must be");
-        if (SVMGlobalData::_try_fast_transition_native_to_vm(heap_base, thread)) {
+        if (SVMGlobalData::_try_fast_transition_native_to_vm(thread)) {
           // The fast path succeeded, so we have the lock and we are back in VM state.
           assert(thread->has_status_vm(), "must be");
           break;
@@ -134,7 +134,7 @@ void Mutex::lock_contended(Thread* self) {
           // try to lock it again after the safepoint ends. Otherwise, we could end up with a deadlock between this thread
           // and the VM thread.
           _lock.unlock();
-          SVMGlobalData::_slow_transition_native_to_vm(heap_base, thread);
+          SVMGlobalData::_slow_transition_native_to_vm(thread);
           assert(thread->has_status_vm(), "must be");
         }
       }

src/hotspot/share/runtime/thread.hpp

@@ -45,7 +45,7 @@
 #endif
 #ifdef SVM
 #include "svmIsolateThread.hpp"
-#include "exports/sharedGCStructs.hpp"
+#include "exports/sharedGCStructs.h"
 #endif // SVM
 
 

src/hotspot/svm/exports/sharedGCStructs.hpp

@@ -37,7 +37,7 @@
 #include "runtime/smallRegisterMap.inline.hpp"
 #include "runtime/stackChunkFrameStream.inline.hpp"
 #ifdef SVM
-#include "exports/sharedGCStructs.hpp"
+#include "exports/sharedGCStructs.h"
 #include "svmCodeReferenceMapDecoder.hpp"
 #endif // SVM
 

src/hotspot/svm/share/oops/stackChunkOop.cpp

@@ -62,7 +62,7 @@ namespace svm_gc {
 
 class VM_Operation;
 
-// The layout of this class must match the NativeVMOperationData on the Java-side.
+// The layout of this class must match the NativeGCVMOperationData on the Java-side.
 // It must always be allocated as a part of a VM_Operation (i.e., it must never exist on its own)
 // and it must not contain a vtable. The blackbox fields are only accessed on native-image side.
 class VM_OperationData {

src/hotspot/svm/share/runtime/vmOperation.hpp

@@ -104,7 +104,7 @@ void VMThread::execute(VM_Operation* op) {
 
   assert(isolate_thread == nullptr || isolate_thread->has_status_vm(), "isolate thread must be in VM state");
   if (isolate_thread != nullptr && !current_thread->is_VM_thread()) {
-    SVMGlobalData::_transition_vm_to_native(heap_base, isolate_thread);
+    SVMGlobalData::_transition_vm_to_native(isolate_thread);
   }
 
   VM_OperationData *op_data = op->data();
@@ -131,7 +131,7 @@ void VMThread::execute(VM_Operation* op) {
 
       if (isolate_thread != nullptr) {
         // The fast transition is always possible because no one can request a safepoint while the VM operation thread is blocked.
-        bool in_vm = SVMGlobalData::_try_fast_transition_native_to_vm(heap_base, isolate_thread);
+        bool in_vm = SVMGlobalData::_try_fast_transition_native_to_vm(isolate_thread);
         assert(in_vm && isolate_thread->has_status_vm(), "must be back in VM state");
       }
 
@@ -141,7 +141,7 @@ void VMThread::execute(VM_Operation* op) {
     } else {
       if (isolate_thread != nullptr) {
         // The fast transition is always possible because no one can request a safepoint while the VM operation thread is blocked.
-        bool in_vm = SVMGlobalData::_try_fast_transition_native_to_vm(heap_base, isolate_thread);
+        bool in_vm = SVMGlobalData::_try_fast_transition_native_to_vm(isolate_thread);
         assert(in_vm && isolate_thread->has_status_vm(), "must be back in VM state");
       }
 

src/hotspot/svm/share/runtime/vmThread.cpp

@@ -25,7 +25,7 @@
 
 #include "code/compressedStream.hpp"
 #include "compiler/oopMap.hpp"
-#include "exports/sharedGCStructs.hpp"
+#include "exports/sharedGCStructs.h"
 #include "svmCodeReferenceMapDecoder.hpp"
 
 /**

src/hotspot/svm/svmCodeReferenceMapDecoder.cpp

@@ -35,6 +35,8 @@ char** SVMIsolateData::_argv = 0;
 size_t SVMIsolateData::_max_heap_address_space_size = 0;
 
 char* SVMIsolateData::_heap_base = nullptr;
+typeArrayOop SVMIsolateData::_image_heap_region_types = nullptr;
+typeArrayOop SVMIsolateData::_image_heap_region_free_spaces = nullptr;
 objArrayOop SVMIsolateData::_static_object_fields = nullptr;
 typeArrayOop SVMIsolateData::_static_primitive_fields = nullptr;
 oop SVMIsolateData::_vm_operation_thread = nullptr;
@@ -46,6 +48,8 @@ bool SVMIsolateData::_during_teardown = false;
 size_t SVMGlobalData::_heap_base_alignment = 0;
 size_t SVMGlobalData::_null_regions_size = 0;
 size_t SVMGlobalData::_image_heap_size = 0;
+size_t SVMGlobalData::_image_heap_used = 0;
+size_t SVMGlobalData::_image_heap_waste = 0;
 char* SVMGlobalData::_image_build_hosted_args = 0;
 char* SVMGlobalData::_image_build_runtime_args = 0;
 
@@ -54,6 +58,8 @@ jlong SVMGlobalData::_container_memory_limit_in_bytes = 0;
 int SVMGlobalData::_container_active_processor_count = 0;
 
 SVMOffsets SVMGlobalData::_offsets;
+int SVMGlobalData::_closed_image_heap_regions = -1;
+int SVMGlobalData::_open_image_heap_regions = -1;
 SVMOopMap* SVMGlobalData::_thread_locals_reference_map = nullptr;
 bool SVMGlobalData::_use_string_inlining = false;
 bool SVMGlobalData::_closed_type_world = false;