test/hotspot/jtreg/gc/shenandoah/TestDynamicSoftMaxHeapSize.java

@@ -1,7 +1,8 @@
  /*
   * Copyright (c) 2020, Red Hat, Inc. All rights reserved.
+  * Copyright Amazon.com Inc. or its affiliates. All Rights Reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.

@@ -61,51 +62,40 @@
   *      -Dtarget=10000
   *      TestDynamicSoftMaxHeapSize
   */
  
  /*
-  * @test id=static
+  * @test id=generational
   * @requires vm.gc.Shenandoah
   * @library /test/lib
   *
   * @run main/othervm -Xms16m -Xmx512m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
-  *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=static
+  *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=adaptive -XX:ShenandoahGCMode=generational
   *      -Dtarget=10000
   *      TestDynamicSoftMaxHeapSize
   */
  
  /*
-  * @test id=compact
-  * @requires vm.gc.Shenandoah
-  * @library /test/lib
-  *
-  * @run main/othervm -Xms16m -Xmx512m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
-  *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=compact
-  *      -Dtarget=1000
-  *     TestDynamicSoftMaxHeapSize
-  */
- 
- /*
-  * @test id=iu-aggressive
+  * @test id=static
   * @requires vm.gc.Shenandoah
   * @library /test/lib
   *
   * @run main/othervm -Xms16m -Xmx512m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
-  *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
-  *      -Dtarget=1000
+  *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=static
+  *      -Dtarget=10000
   *      TestDynamicSoftMaxHeapSize
   */
  
  /*
-  * @test id=iu
+  * @test id=compact
   * @requires vm.gc.Shenandoah
   * @library /test/lib
   *
   * @run main/othervm -Xms16m -Xmx512m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
-  *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
-  *      -Dtarget=10000
-  *      TestDynamicSoftMaxHeapSize
+  *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=compact
+  *      -Dtarget=1000
+  *     TestDynamicSoftMaxHeapSize
   */
  
  import java.util.Random;
  import jdk.test.lib.Utils;
  import jdk.test.lib.process.OutputAnalyzer;