Merge pull request #18865 from amicic/balanced_copyscansize

Detach copy-cache size bounds from TLH size bounds for Balanced
eclipse-openj9 · Feb 1, 2024 · eb1c385 · eb1c385
2 parents ac66d8c + c9b9477
commit eb1c385
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/runtime/gc_vlhgc/CopyForwardScheme.cpp b/runtime/gc_vlhgc/CopyForwardScheme.cpp
@@ -261,7 +261,7 @@ MM_CopyForwardScheme::initialize(MM_EnvironmentVLHGC *env)
  UDATA minCacheCount = threadCount * cachesPerThread;
 
  /* Estimate how many caches we might need to describe the entire heap */
- UDATA heapCaches = extensions->memoryMax / extensions->tlhMaximumSize;
+ UDATA heapCaches = extensions->memoryMax / extensions->scavengerScanCacheMaximumSize;
 
  /* use whichever value is higher */
  UDATA totalCacheCount = OMR_MAX(minCacheCount, heapCaches);
@@ -297,8 +297,8 @@ MM_CopyForwardScheme::initialize(MM_EnvironmentVLHGC *env)
  }
 
  /* Set the min/max sizes for copy scan cache allocation when allocating a general purpose area (does not include non-standard sized objects) */
- _minCacheSize = _extensions->tlhMinimumSize;
- _maxCacheSize = _extensions->tlhMaximumSize;
+ _minCacheSize = _extensions->scavengerScanCacheMinimumSize;
+ _maxCacheSize = _extensions->scavengerScanCacheMaximumSize;
 
  /* Cached pointer to the inter region remembered set */
  _interRegionRememberedSet = MM_GCExtensions::getExtensions(env)->interRegionRememberedSet;

diff --git a/runtime/gc_vlhgc/CopyScanCacheChunkVLHGCInHeap.cpp b/runtime/gc_vlhgc/CopyScanCacheChunkVLHGCInHeap.cpp
@@ -31,7 +31,7 @@
 uintptr_t
 MM_CopyScanCacheChunkVLHGCInHeap::numberOfCachesInChunk(MM_EnvironmentVLHGC *env)
 {
- uintptr_t tlhMinimumSize = MM_GCExtensions::getExtensions(env)->tlhMinimumSize;
+ uintptr_t tlhMinimumSize = MM_GCExtensions::getExtensions(env)->scavengerScanCacheMinimumSize;
  uintptr_t sizeToAllocate = sizeof(MM_CopyScanCacheChunkVLHGCInHeap);
  uintptr_t numberOfCaches = 1;