Use current aligned chunk size in TestObjectAllocationInNewTLABEvent.

Author: peter-hofer

substratevm/src/com.oracle.svm.test/src/com/oracle/svm/test/jfr/TestObjectAllocationInNewTLABEvent.java

@@ -31,15 +31,16 @@
 import org.junit.Test;
 
 import com.oracle.svm.core.NeverInline;
+import com.oracle.svm.core.genscavenge.HeapParameters;
 import com.oracle.svm.core.jfr.JfrEvent;
+import com.oracle.svm.core.util.UnsignedUtils;
 
 import jdk.jfr.consumer.RecordedClass;
 import jdk.jfr.consumer.RecordedEvent;
 import jdk.jfr.consumer.RecordedThread;
 
 public class TestObjectAllocationInNewTLABEvent extends JfrTest {
     private static final int K = 1024;
-    private static final int DEFAULT_ALIGNED_HEAP_CHUNK_SIZE = 1024 * K;
 
     @Override
     public String[] getTestedEvents() {
@@ -48,6 +49,8 @@ public String[] getTestedEvents() {
 
     @Override
     public void validateEvents() throws Throwable {
+        final int alignedHeapChunkSize = UnsignedUtils.safeToInt(HeapParameters.getAlignedHeapChunkSize());
+
         boolean foundBigByteArray = false;
         boolean foundSmallByteArray = false;
         boolean foundBigCharArray = false;
@@ -64,16 +67,16 @@ public void validateEvents() throws Throwable {
             String className = event.<RecordedClass> getValue("objectClass").getName();
 
             // >= To account for size of reference
-            if (allocationSize >= 2 * DEFAULT_ALIGNED_HEAP_CHUNK_SIZE && tlabSize >= 2 * DEFAULT_ALIGNED_HEAP_CHUNK_SIZE) {
+            if (allocationSize >= 2 * alignedHeapChunkSize && tlabSize >= 2 * alignedHeapChunkSize) {
                 // verify previous owner
                 if (className.equals(char[].class.getName())) {
                     foundBigCharArray = true;
                 } else if (className.equals(byte[].class.getName())) {
                     foundBigByteArray = true;
                 }
-            } else if (allocationSize >= K && tlabSize == DEFAULT_ALIGNED_HEAP_CHUNK_SIZE && className.equals(byte[].class.getName())) {
+            } else if (allocationSize >= K && tlabSize == alignedHeapChunkSize && className.equals(byte[].class.getName())) {
                 foundSmallByteArray = true;
-            } else if (tlabSize == DEFAULT_ALIGNED_HEAP_CHUNK_SIZE && className.equals(Helper.class.getName())) {
+            } else if (tlabSize == alignedHeapChunkSize && className.equals(Helper.class.getName())) {
                 foundInstance = true;
             }
         }
@@ -86,17 +89,19 @@ public void validateEvents() throws Throwable {
 
     @Test
     public void test() throws Exception {
+        final int alignedHeapChunkSize = UnsignedUtils.safeToInt(HeapParameters.getAlignedHeapChunkSize());
+
         // Allocate large arrays (always need a new TLAB).
-        allocateByteArray(2 * DEFAULT_ALIGNED_HEAP_CHUNK_SIZE);
-        allocateCharArray(DEFAULT_ALIGNED_HEAP_CHUNK_SIZE);
+        allocateByteArray(2 * alignedHeapChunkSize);
+        allocateCharArray(alignedHeapChunkSize);
 
         // Exhaust TLAB with small arrays.
-        for (int i = 0; i < DEFAULT_ALIGNED_HEAP_CHUNK_SIZE / K; i++) {
+        for (int i = 0; i < alignedHeapChunkSize / K; i++) {
             allocateByteArray(K);
         }
 
         // Exhaust TLAB with instances.
-        for (int i = 0; i < DEFAULT_ALIGNED_HEAP_CHUNK_SIZE; i++) {
+        for (int i = 0; i < alignedHeapChunkSize; i++) {
             allocateInstance();
         }
     }