Skip to content

Commit

Permalink
Add Xgc options for suballocator heap size and quick allocation
Browse files Browse the repository at this point in the history 
1. Use VMEM_ALLOC_QUICK by default for allocateRegion in
   allocate_memory32
2. Adds -Xgc:suballocatorQuickAllocDisable option that
   disables the default VMEM_ALLOC_QUICK
3. Adds -Xgc:suballocatorIncrementSize option that replaces the
   HEAP_SIZE_BYTES macro and controls the heap increment size
4. Adds sanity.functional tests

Addresses: eclipse-omr/omr#7190
Signed-off-by: Nathan Henderson <nathan.henderson@ibm.com>
  • Loading branch information
@ThanHenderson @zl-wang
ThanHenderson authored and zl-wang committed Nov 8, 2024
1 parent a0e11ad commit 8f53da9
Show file tree
Hide file tree
Showing 2 changed files with 80 additions and 11 deletions.
26 changes: 26 additions & 0 deletions runtime/gc_modron_startup/mmparseXgc.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1448,6 +1448,32 @@ gcParseXgcArguments(J9JavaVM *vm, char *optArg)
continue;
}

/* Check if there is a request to set the suballocator reservation increment size. */
if (try_scan(&scan_start, "suballocatorIncrementSize=")) {
if (!scan_udata_memory_size_helper(vm, &scan_start, &extensions->suballocatorIncrementSize, "suballocatorIncrementSize=")) {
returnValue = JNI_EINVAL;
break;
}
if (0 == extensions->suballocatorIncrementSize) {
j9nls_printf(PORTLIB, J9NLS_ERROR, J9NLS_GC_OPTIONS_VALUE_MUST_BE_ABOVE, "-Xgc:suballocatorIncrementSize=", (UDATA)0);
returnValue = JNI_EINVAL;
break;
}
continue;
}

/* Check if there is a request to enable the mmap-based allocation for the suballocator (Linux only). */
if (try_scan(&scan_start, "suballocatorQuickAllocEnable")) {
extensions->suballocatorQuickAlloc = true;
continue;
}

/* Check if there is a request to disable the mmap-based allocation for the suballocator (Linux only). */
if (try_scan(&scan_start, "suballocatorQuickAllocDisable")) {
extensions->suballocatorQuickAlloc = false;
continue;
}

/* for testing and service reasons, split heaps is currently restricted to Win32 only */
#if defined(J9VM_GC_GENERATIONAL) && (defined(WIN32) && !defined(WIN64))
/* see if we are supposed to enable split heaps */
Expand Down
65 changes: 54 additions & 11 deletions test/functional/cmdLineTests/gcsuballoctests/gcsuballoctests.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,11 @@

<!DOCTYPE suite SYSTEM "cmdlinetester.dtd">

<suite id="J9 GC Tests" timeout="60">

<!-- Following tests are for compressedrefs platforms.
Because -Xgc:suballocatorInitialSize= and -Xgc:suballocatorCommitSize= options are defined only for compressedrefs. -->
<suite id="J9 GC Suballocator Tests" timeout="60">

<!-- Following tests are for compressedrefs platforms because -Xgc:suballocatorInitialSize=,
-Xgc:suballocatorCommitSize=, -Xgc:suballocatorIncrementSize=, -Xgc:suballocatorQuickAllocDisable
and -Xgc:suballocatorQuickAllocEnable options are used only for compressedrefs. -->

<test id="-Xgc:suballocatorInitialSize=100m">
<command>$EXE$ -Xgc:suballocatorInitialSize=100m -version</command>
Expand All @@ -48,25 +49,55 @@
<output regex="no" type="failure">JVMDUMP006I</output>
<output regex="no" type="failure">Processing dump event</output>
</test>


<test id="-Xgc:suballocatorIncrementSize=100m">
<command>$EXE$ -Xgc:suballocatorIncrementSize=100m -version</command>
<output regex="no" type="success">version</output>
<output regex="yes" caseSensitive="yes" javaUtilPattern="yes" type="required">(Semeru|OpenJDK|Java\(TM\) SE) Runtime</output>
<output regex="no" type="failure">Exception</output>
<output regex="no" type="failure">Error</output>
<output regex="no" type="failure">JVMDUMP006I</output>
<output regex="no" type="failure">Processing dump event</output>
</test>

<test id="-Xgc:suballocatorQuickAllocEnable">
<command>$EXE$ -Xgc:suballocatorQuickAllocEnable -version</command>
<output regex="no" type="success">version</output>
<output regex="yes" caseSensitive="yes" javaUtilPattern="yes" type="required">(Semeru|OpenJDK|Java\(TM\) SE) Runtime</output>
<output regex="no" type="failure">Exception</output>
<output regex="no" type="failure">Error</output>
<output regex="no" type="failure">JVMDUMP006I</output>
<output regex="no" type="failure">Processing dump event</output>
</test>

<test id="-Xgc:suballocatorQuickAllocDisable">
<command>$EXE$ -Xgc:suballocatorQuickAllocDisable -version</command>
<output regex="no" type="success">version</output>
<output regex="yes" caseSensitive="yes" javaUtilPattern="yes" type="required">(Semeru|OpenJDK|Java\(TM\) SE) Runtime</output>
<output regex="no" type="failure">Exception</output>
<output regex="no" type="failure">Error</output>
<output regex="no" type="failure">JVMDUMP006I</output>
<output regex="no" type="failure">Processing dump event</output>
</test>

<test id="-Xgc:suballocatorCommitSize=300m">
<command>$EXE$ -Xgc:suballocatorCommitSize=300m -version</command>
<!-- JVMJ9GC057E -Xgc:suballocatorCommitSize= must be no greater than -Xgc:suballocatorInitialSize= -->
<output regex="no" type="success">JVMJ9GC057E</output>
<!-- JVMJ9VM015W Initialization error for library j9gc26(2): Failed to initialize -->
<!-- JVMJ9VM015W Initialization error for library j9gc29(2): Failed to initialize -->
<output regex="no" type="required">JVMJ9VM015W</output>
<output regex="no" caseSensitive="no" type="required">Could not create the Java Virtual Machine.</output>
<output regex="no" type="failure">version</output>
<output regex="yes" caseSensitive="yes" javaUtilPattern="yes" type="failure">(Semeru|OpenJDK|Java\(TM\) SE) Runtime</output>
<output regex="no" type="failure">JVMDUMP006I</output>
<output regex="no" type="failure">Processing dump event</output>
</test>

<test id="-Xgc:suballocatorCommitSize=0">
<command>$EXE$ -Xgc:suballocatorCommitSize=0 -version</command>
<!-- JVMJ9GC036E -Xgc:suballocatorCommitSize= value must be above 0 -->
<output regex="no" type="success">JVMJ9GC036E</output>
<!-- JVMJ9VM015W Initialization error for library j9gc26(2): Failed to initialize -->
<!-- JVMJ9VM015W Initialization error for library j9gc29(2): Failed to initialize -->
<output regex="no" type="required">JVMJ9VM015W</output>
<output regex="no" caseSensitive="no" type="required">Could not create the Java Virtual Machine.</output>
<output regex="no" type="failure">version</output>
Expand All @@ -79,7 +110,20 @@
<command>$EXE$ -Xgc:suballocatorInitialSize=0 -version</command>
<!-- JVMJ9GC036E -Xgc:suballocatorInitialSize= value must be above 0 -->
<output regex="no" type="success">JVMJ9GC036E</output>
<!-- JVMJ9VM015W Initialization error for library j9gc26(2): Failed to initialize -->
<!-- JVMJ9VM015W Initialization error for library j9gc29(2): Failed to initialize -->
<output regex="no" type="required">JVMJ9VM015W</output>
<output regex="no" caseSensitive="no" type="required">Could not create the Java Virtual Machine.</output>
<output regex="no" type="failure">version</output>
<output regex="yes" caseSensitive="yes" javaUtilPattern="yes" type="failure">(Semeru|OpenJDK|Java\(TM\) SE) Runtime</output>
<output regex="no" type="failure">JVMDUMP006I</output>
<output regex="no" type="failure">Processing dump event</output>
</test>

<test id="-Xgc:suballocatorIncrementSize=0">
<command>$EXE$ -Xgc:suballocatorIncrementSize=0 -version</command>
<!-- JVMJ9GC036E -Xgc:suballocatorIncrementSize= value must be above 0 -->
<output regex="no" type="success">JVMJ9GC036E</output>
<!-- JVMJ9VM015W Initialization error for library j9gc29(2): Failed to initialize -->
<output regex="no" type="required">JVMJ9VM015W</output>
<output regex="no" caseSensitive="no" type="required">Could not create the Java Virtual Machine.</output>
<output regex="no" type="failure">version</output>
Expand All @@ -92,7 +136,7 @@
<command>$EXE$ -Xgc:suballocatorCommitSize=512m -Xgc:suballocatorInitialSize=256m -version</command>
<!-- JVMJ9GC057E -Xgc:suballocatorCommitSize= must be no greater than -Xgc:suballocatorInitialSize= -->
<output regex="no" type="success">JVMJ9GC057E</output>
<!-- JVMJ9VM015W Initialization error for library j9gc26(2): Failed to initialize -->
<!-- JVMJ9VM015W Initialization error for library j9gc29(2): Failed to initialize -->
<output regex="no" type="required">JVMJ9VM015W</output>
<output regex="no" caseSensitive="no" type="required">Could not create the Java Virtual Machine.</output>
<output regex="no" type="failure">version</output>
Expand Down Expand Up @@ -176,4 +220,3 @@
</test>

</suite>

0 comments on commit 8f53da9

Please sign in to comment.