cvm/overlay: (2/2) Fix G1ClassUnloadingHWM test

Update TestG1ClassUnloadingHWM.java and WhiteBox.java to follow the JDK17 hotspot GC logging model.

Add maxMetaspaceAllocationSize() to WhiteBox.java and use it in TestG1ClassUnloadingHWM.java to align with JDK17 hotspot behavior.

Author: duanyangjing

cvm.mk

@@ -447,6 +447,7 @@ endif
 	$(call overlay_single,jdk8u,hotspot/test/gc/arguments/TestInitialTenuringThreshold.java, $(JDK8_SRCROOT))
 	$(call overlay_single,jdk8u,hotspot/test/gc/arguments/TestUnrecognizedVMOptionsHandling.java, $(JDK8_SRCROOT))
 	$(call overlay_single,jdk8u,hotspot/test/gc/arguments/TestUseCompressedOopsErgoTools.java, $(JDK8_SRCROOT))
+	$(call overlay_single,jdk8u,hotspot/test/gc/class_unloading/TestG1ClassUnloadingHWM.java, $(JDK8_SRCROOT))
 	$(call overlay_single,jdk8u,hotspot/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java, $(JDK8_SRCROOT))
 	$(call overlay_single,jdk8u,hotspot/test/gc/startup_warnings/TestDefaultMaxRAMFraction.java, $(JDK8_SRCROOT))
 

cvm/conf/jtreg_hotspot8_excludes_aarch64.list

@@ -25,7 +25,6 @@ compiler/tiered/LevelTransitionTest.java
 gc/6941923/Test6941923.java
 gc/arguments/TestSurvivorAlignmentInBytesOption.java
 gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java
-gc/class_unloading/TestG1ClassUnloadingHWM.java
 gc/ergonomics/TestDynamicNumberOfGCThreads.java
 gc/g1/TestEagerReclaimHumongousRegionsClearMarkBits.java
 gc/g1/TestG1TraceEagerReclaimHumongousObjects.java

cvm/conf/jtreg_hotspot8_excludes_x64.list

@@ -19,7 +19,6 @@ compiler/tiered/LevelTransitionTest.java
 gc/6941923/Test6941923.java
 gc/arguments/TestSurvivorAlignmentInBytesOption.java
 gc/class_unloading/TestCMSClassUnloadingEnabledHWM.java
-gc/class_unloading/TestG1ClassUnloadingHWM.java
 gc/ergonomics/TestDynamicNumberOfGCThreads.java
 gc/g1/TestEagerReclaimHumongousRegionsClearMarkBits.java
 gc/g1/TestG1TraceEagerReclaimHumongousObjects.java

cvm/overlay/jdk8u/hotspot/test/gc/class_unloading/TestG1ClassUnloadingHWM.java

@@ -51,8 +51,7 @@ private static OutputAnalyzer run(boolean enableUnloading) throws Exception {
       "-Xmn" + YoungGenSize,
       "-XX:+UseG1GC",
       "-XX:" + (enableUnloading ? "+" : "-") + "ClassUnloadingWithConcurrentMark",
-      "-XX:+PrintHeapAtGC",
-      "-XX:+PrintGCDetails",
+      "-Xlog:gc",
       TestG1ClassUnloadingHWM.AllocateBeyondMetaspaceSize.class.getName(),
       "" + MetaspaceSize,
       "" + YoungGenSize);
@@ -71,16 +70,16 @@ public static void testWithoutG1ClassUnloading() throws Exception {
     // -XX:-ClassUnloadingWithConcurrentMark is used, so we expect a full GC instead of a concurrent cycle.
     OutputAnalyzer out = runWithoutG1ClassUnloading();
 
-    out.shouldMatch(".*Full GC.*");
-    out.shouldNotMatch(".*initial-mark.*");
+    out.shouldMatch(".*Pause Full.*");
+    out.shouldNotMatch(".*Pause Young \\(Concurrent Start\\).*");
   }
 
   public static void testWithG1ClassUnloading() throws Exception {
     // -XX:+ClassUnloadingWithConcurrentMark is used, so we expect a concurrent cycle instead of a full GC.
     OutputAnalyzer out = runWithG1ClassUnloading();
 
-    out.shouldMatch(".*initial-mark.*");
-    out.shouldNotMatch(".*Full GC.*");
+    out.shouldMatch(".*Pause Young \\(Concurrent Start\\).*");
+    out.shouldNotMatch(".*Pause Full.*");
   }
 
   public static void main(String args[]) throws Exception {
@@ -101,12 +100,17 @@ public static void main(String [] args) throws Exception {
       // Allocate past the MetaspaceSize limit
       long metaspaceSize = Long.parseLong(args[0]);
       long allocationBeyondMetaspaceSize  = metaspaceSize * 2;
-      long metaspace = wb.allocateMetaspace(null, allocationBeyondMetaspaceSize);
+
+      // There is a cap on how large a single metaspace allocation can get. So we may have to allocate in blocks.
+      final long max = wb.maxMetaspaceAllocationSize();
+      while (allocationBeyondMetaspaceSize > 0) {
+        long s = max < allocationBeyondMetaspaceSize ? max : allocationBeyondMetaspaceSize;
+        wb.allocateMetaspace(null, s);
+        allocationBeyondMetaspaceSize -= s;
+      }
 
       long youngGenSize = Long.parseLong(args[1]);
       triggerYoungGCs(youngGenSize);
-
-      wb.freeMetaspace(null, metaspace, metaspace);
     }
 
     public static void triggerYoungGCs(long youngGenSize) {

cvm/overlay/jdk8u/hotspot/test/testlibrary/whitebox/sun/hotspot/WhiteBox.java

@@ -184,6 +184,7 @@ public boolean enqueueMethodForCompilation(Executable method, int compLevel, int
   public native void freeCodeBlob(long address);
   public native Object[] getCodeBlob(long address);
   public native long allocateMetaspace(ClassLoader classLoader, long size);
+  public native long maxMetaspaceAllocationSize();
   public native void freeMetaspace(ClassLoader classLoader, long addr, long size);
   public native long incMetaspaceCapacityUntilGC(long increment);
   public native long metaspaceCapacityUntilGC();