Merge pull request #20461 from LinHu2016/off-heap-incremental1

Cmake build update for off-heap
eclipse-openj9 · Nov 1, 2024 · 17b3391 · 17b3391
2 parents 6e11a68 + d78ca01
commit 17b3391
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 14 deletions.
diff --git a/runtime/cmake/caches/aix_ppc-64.cmake b/runtime/cmake/caches/aix_ppc-64.cmake
@@ -21,18 +21,20 @@
 ################################################################################
 
 #TODO: Env vars should be auto detected by platform
+
+# Prevent CMake from automatically creating export lists for shared libraries
+set(CMAKE_XL_CreateExportList "" CACHE INTERNAL "")
+
 set(J9VM_ARCH_POWER ON CACHE BOOL "")
 set(J9VM_ENV_DATA64 ON CACHE BOOL "")
 set(J9VM_ENV_DLPAR ON CACHE BOOL "")
 set(J9VM_ENV_HAS_FPU ON CACHE BOOL "")
 set(J9VM_ENV_SHARED_LIBS_CALLEE_GLOBAL_TABLE_SETUP OFF CACHE BOOL "")
 set(J9VM_ENV_SHARED_LIBS_USE_GLOBAL_TABLE ON CACHE BOOL "")
 
-# Prevent CMake from automatically creating export lists for shared libraries
-set(CMAKE_XL_CreateExportList "" CACHE INTERNAL "")
-
-set(J9VM_GC_TLH_PREFETCH_FTA OFF CACHE BOOL "")
+set(J9VM_GC_SPARSE_HEAP_ALLOCATION ON CACHE BOOL "")
 set(J9VM_GC_SUBPOOLS_ALIAS ON CACHE BOOL "")
+set(J9VM_GC_TLH_PREFETCH_FTA OFF CACHE BOOL "")
 set(J9VM_INTERP_ATOMIC_FREE_JNI ON CACHE BOOL "")
 set(J9VM_INTERP_ATOMIC_FREE_JNI_USES_FLUSH ON CACHE BOOL "")
 set(J9VM_INTERP_TWO_PASS_EXCLUSIVE ON CACHE BOOL "")

diff --git a/runtime/cmake/caches/linux_390-64.cmake b/runtime/cmake/caches/linux_390-64.cmake
@@ -26,6 +26,7 @@ set(J9VM_ENV_DATA64 ON CACHE BOOL "")
 set(J9VM_ENV_LITTLE_ENDIAN OFF CACHE BOOL "")
 set(J9VM_ENV_SHARED_LIBS_CALLEE_GLOBAL_TABLE_SETUP ON CACHE BOOL  "")
 set(J9VM_ENV_SHARED_LIBS_USE_GLOBAL_TABLE ON CACHE BOOL "")
+set(J9VM_GC_SPARSE_HEAP_ALLOCATION ON CACHE BOOL "")
 
 set(J9VM_JIT_RUNTIME_INSTRUMENTATION ON CACHE BOOL "")
 set(J9VM_JIT_TRANSACTION_DIAGNOSTIC_THREAD_BLOCK ON CACHE BOOL "")

diff --git a/runtime/cmake/caches/linux_aarch64.cmake b/runtime/cmake/caches/linux_aarch64.cmake
@@ -24,12 +24,12 @@ set(J9VM_ARCH_AARCH64 ON CACHE BOOL "")
 set(J9VM_ENV_HAS_FPU ON CACHE BOOL "")
 set(J9VM_ENV_LITTLE_ENDIAN ON CACHE BOOL "")
 set(J9VM_ENV_DATA64 ON CACHE BOOL "")
+set(J9VM_GC_ENABLE_DOUBLE_MAP OFF CACHE BOOL "")
+set(J9VM_GC_SPARSE_HEAP_ALLOCATION ON CACHE BOOL "")
 
 set(J9VM_INTERP_ATOMIC_FREE_JNI ON CACHE BOOL "")
 set(J9VM_INTERP_ATOMIC_FREE_JNI_USES_FLUSH ON CACHE BOOL "")
 set(J9VM_INTERP_TWO_PASS_EXCLUSIVE ON CACHE BOOL "")
-
-set(J9VM_GC_ENABLE_DOUBLE_MAP OFF CACHE BOOL "")
 set(J9VM_INTERP_SIG_QUIT_THREAD_USES_SEMAPHORES OFF CACHE BOOL "")
 set(J9VM_JIT_NEW_DUAL_HELPERS OFF CACHE BOOL "")
 set(J9VM_OPT_ZERO ON CACHE BOOL "")

diff --git a/runtime/cmake/caches/linux_ppc-64_le.cmake b/runtime/cmake/caches/linux_ppc-64_le.cmake
@@ -28,6 +28,7 @@ set(J9VM_ENV_LITTLE_ENDIAN ON CACHE BOOL "")
 set(J9VM_ENV_SHARED_LIBS_CALLEE_GLOBAL_TABLE_SETUP ON CACHE BOOL "")
 set(J9VM_ENV_SHARED_LIBS_USE_GLOBAL_TABLE ON CACHE BOOL "")
 set(J9VM_ENV_USE_GCC ON CACHE BOOL "")
+set(J9VM_GC_SPARSE_HEAP_ALLOCATION ON CACHE BOOL "")
 
 set(J9VM_INTERP_ATOMIC_FREE_JNI ON CACHE BOOL "")
 set(J9VM_INTERP_ATOMIC_FREE_JNI_USES_FLUSH ON CACHE BOOL "")

diff --git a/runtime/cmake/caches/linux_riscv64.cmake b/runtime/cmake/caches/linux_riscv64.cmake
@@ -26,6 +26,7 @@ set(J9VM_ENV_LITTLE_ENDIAN ON CACHE BOOL "")
 set(J9VM_ENV_DATA64 ON CACHE BOOL "")
 
 set(J9VM_GC_ENABLE_DOUBLE_MAP OFF CACHE BOOL "")
+set(J9VM_GC_SPARSE_HEAP_ALLOCATION ON CACHE BOOL "")
 set(J9VM_INTERP_SIG_QUIT_THREAD_USES_SEMAPHORES OFF CACHE BOOL "")
 
 set(J9VM_MODULE_CODERT_VM OFF CACHE BOOL "")

diff --git a/runtime/cmake/caches/linux_x86-64.cmake b/runtime/cmake/caches/linux_x86-64.cmake
@@ -25,6 +25,7 @@ set(J9VM_ARCH_X86 ON CACHE BOOL "")
 set(J9VM_ENV_DATA64 ON CACHE BOOL "")
 set(J9VM_ENV_HAS_FPU ON CACHE BOOL "")
 set(J9VM_ENV_LITTLE_ENDIAN ON CACHE BOOL "")
+set(J9VM_GC_SPARSE_HEAP_ALLOCATION ON CACHE BOOL "")
 
 set(J9VM_INTERP_ATOMIC_FREE_JNI ON CACHE BOOL "")
 set(J9VM_INTERP_ATOMIC_FREE_JNI_USES_FLUSH ON CACHE BOOL "")

diff --git a/runtime/cmake/caches/osx_aarch64.cmake b/runtime/cmake/caches/osx_aarch64.cmake
@@ -26,6 +26,7 @@ set(J9VM_ENV_HAS_FPU ON CACHE BOOL "")
 set(J9VM_ENV_LITTLE_ENDIAN ON CACHE BOOL "")
 
 set(J9VM_GC_ENABLE_DOUBLE_MAP OFF CACHE BOOL "")
+set(J9VM_GC_SPARSE_HEAP_ALLOCATION ON CACHE BOOL "")
 
 set(J9VM_INTERP_ATOMIC_FREE_JNI ON CACHE BOOL "")
 set(J9VM_INTERP_ATOMIC_FREE_JNI_USES_FLUSH OFF CACHE BOOL "")

diff --git a/runtime/cmake/caches/osx_x86-64.cmake b/runtime/cmake/caches/osx_x86-64.cmake
@@ -21,10 +21,11 @@
 ################################################################################
 
 set(J9VM_ARCH_X86 ON CACHE BOOL "")
-set(J9VM_GC_ENABLE_DOUBLE_MAP ON CACHE BOOL "")
 set(J9VM_ENV_DATA64 ON CACHE BOOL "")
 set(J9VM_ENV_HAS_FPU ON CACHE BOOL "")
 set(J9VM_ENV_LITTLE_ENDIAN ON CACHE BOOL "")
+set(J9VM_GC_ENABLE_DOUBLE_MAP ON CACHE BOOL "")
+set(J9VM_GC_SPARSE_HEAP_ALLOCATION ON CACHE BOOL "")
 
 set(J9VM_INTERP_ATOMIC_FREE_JNI ON CACHE BOOL "")
 set(J9VM_INTERP_ATOMIC_FREE_JNI_USES_FLUSH ON CACHE BOOL "")

diff --git a/runtime/cmake/caches/win_x86-64.cmake b/runtime/cmake/caches/win_x86-64.cmake
@@ -24,22 +24,23 @@ set(J9VM_ARCH_X86 ON CACHE BOOL "")
 set(J9VM_ENV_DATA64 ON CACHE BOOL "")
 set(J9VM_ENV_HAS_FPU OFF CACHE INTERNAL "")
 set(J9VM_ENV_LITTLE_ENDIAN ON CACHE BOOL "")
+set(J9VM_GC_SPARSE_HEAP_ALLOCATION ON CACHE BOOL "")
 
 set(J9VM_INTERP_ATOMIC_FREE_JNI ON CACHE BOOL "")
 set(J9VM_INTERP_ATOMIC_FREE_JNI_USES_FLUSH ON CACHE BOOL "")
 set(J9VM_INTERP_SIG_USR2 OFF CACHE BOOL "")
 set(J9VM_INTERP_TWO_PASS_EXCLUSIVE ON CACHE BOOL "")
 set(J9VM_INTERP_USE_UNSAFE_HELPER OFF CACHE BOOL "")
-set(J9VM_MODULE_GDB OFF CACHE BOOL "")
-set(J9VM_MODULE_GDB_PLUGIN OFF CACHE BOOL "")
-set(J9VM_MODULE_WINDBG ON CACHE BOOL "")
 set(J9VM_MODULE_CODEGEN_IA32 ON CACHE BOOL "")
 set(J9VM_MODULE_CODERT_IA32 ON CACHE BOOL "")
+set(J9VM_MODULE_GDB OFF CACHE BOOL "")
+set(J9VM_MODULE_GDB_PLUGIN OFF CACHE BOOL "")
 set(J9VM_MODULE_JIT_IA32 ON CACHE BOOL "")
 set(J9VM_MODULE_JITRT_IA32 ON CACHE BOOL "")
 set(J9VM_MODULE_MASM2GAS ON CACHE BOOL "")
-set(J9VM_OPT_SWITCH_STACKS_FOR_SIGNAL_HANDLER ON CACHE BOOL "")
+set(J9VM_MODULE_WINDBG ON CACHE BOOL "")
 set(J9VM_OPT_NATIVE_CHARACTER_CONVERTER ON CACHE BOOL "")
+set(J9VM_OPT_SWITCH_STACKS_FOR_SIGNAL_HANDLER ON CACHE BOOL "")
 set(J9VM_THR_ASYNC_NAME_UPDATE OFF CACHE BOOL "")
 
 set(OMR_GC_CONCURRENT_SCAVENGER ON CACHE BOOL "")

diff --git a/runtime/cmake/caches/zos_390-64.cmake b/runtime/cmake/caches/zos_390-64.cmake
@@ -24,6 +24,7 @@ set(J9VM_ARCH_S390 ON CACHE BOOL "")
 set(J9VM_ENV_CALL_VIA_TABLE ON CACHE BOOL "")
 set(J9VM_ENV_DATA64 ON CACHE BOOL "")
 set(J9VM_ENV_LITTLE_ENDIAN OFF CACHE BOOL "")
+set(J9VM_GC_SPARSE_HEAP_ALLOCATION ON CACHE BOOL "")
 
 # We need to modify the c/c++ compile rules to tweak the order of options for a2e.
 # Namely we need to make sure that the nosearch flag appears before our include paths.

diff --git a/runtime/cmake/options.cmake b/runtime/cmake/options.cmake
@@ -60,6 +60,7 @@ j9vm_shadowed_option(J9VM_GC_DEBUG_ASSERTS "Specialized GC assertions are used i
 # become discontiguous whenever this flag is enabled. Since there won't be any empty arraylet leaves, then arrayoid NULL pointers are no longer required since
 # all data is stored in a unique region. It additionaly reduces footprint, mainly for JNI primitive array critical.
 j9vm_shadowed_option(J9VM_GC_ENABLE_DOUBLE_MAP OMR_GC_DOUBLE_MAP_ARRAYLETS "Allows LINUX and OSX systems to double map arrays that are stored as arraylets.")
+j9vm_shadowed_option(J9VM_GC_SPARSE_HEAP_ALLOCATION OMR_GC_SPARSE_HEAP_ALLOCATION "Allows large arrays to be allocated off-heap.")
 j9vm_shadowed_option(J9VM_GC_LARGE_OBJECT_AREA "Enable large object area (LOA) support")
 j9vm_shadowed_option(J9VM_GC_LEAF_BITS "Add leaf bit instance descriptions to classes")
 j9vm_shadowed_option(J9VM_GC_MINIMUM_OBJECT_SIZE "Guarantee a minimum size to all objects allocated")

diff --git a/runtime/gc_modron_startup/mmhelpers.cpp b/runtime/gc_modron_startup/mmhelpers.cpp
@@ -182,11 +182,11 @@ j9gc_hot_reference_field_required(J9JavaVM *javaVM)
 BOOLEAN
 j9gc_off_heap_allocation_enabled(J9JavaVM *javaVM)
 {
-#if defined(J9VM_GC_ENABLE_SPARSE_HEAP_ALLOCATION)
+#if defined(J9VM_GC_SPARSE_HEAP_ALLOCATION)
 	return MM_GCExtensions::getExtensions(javaVM)->isVirtualLargeObjectHeapEnabled;
-#else /* defined(J9VM_GC_ENABLE_SPARSE_HEAP_ALLOCATION) */
+#else /* defined(J9VM_GC_SPARSE_HEAP_ALLOCATION) */
 	return FALSE;
-#endif /* defined(J9VM_GC_ENABLE_SPARSE_HEAP_ALLOCATION) */
+#endif /* defined(J9VM_GC_SPARSE_HEAP_ALLOCATION) */
 }
 
 /**

diff --git a/runtime/include/j9cfg.h.in b/runtime/include/j9cfg.h.in
@@ -113,6 +113,7 @@ extern "C" {
 #cmakedefine J9VM_GC_DYNAMIC_CLASS_UNLOADING
 #cmakedefine J9VM_GC_DYNAMIC_NEW_SPACE_SIZING
 #cmakedefine J9VM_GC_ENABLE_DOUBLE_MAP
+#cmakedefine J9VM_GC_SPARSE_HEAP_ALLOCATION
 #cmakedefine J9VM_GC_FINALIZATION
 #cmakedefine J9VM_GC_FRAGMENTED_HEAP
 #cmakedefine J9VM_GC_GENERATIONAL