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

@@ -1,7 +1,8 @@
  /*
   * Copyright (c) 2017, 2018, 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.

@@ -82,72 +83,62 @@
   *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=adaptive
   *      TestRetainObjects
   */
  
  /*
-  * @test id=static
+  * @test id=generational
   * @summary Acceptance tests: collector can deal with retained objects
   * @requires vm.gc.Shenandoah
   *
   * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
-  *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=static
+  *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=adaptive -XX:ShenandoahGCMode=generational
+  *      -XX:+ShenandoahVerify
   *      TestRetainObjects
-  */
- 
- /*
-  * @test id=compact
-  * @summary Acceptance tests: collector can deal with retained objects
-  * @requires vm.gc.Shenandoah
   *
   * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
-  *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=compact
+  *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=adaptive -XX:ShenandoahGCMode=generational
+  *      -XX:+ShenandoahOOMDuringEvacALot -XX:+ShenandoahVerify
+  *      TestRetainObjects
+  *
+  * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
+  *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=adaptive -XX:ShenandoahGCMode=generational
+  *      -XX:+ShenandoahAllocFailureALot -XX:+ShenandoahVerify
+  *      TestRetainObjects
+  *
+  * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
+  *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=adaptive -XX:ShenandoahGCMode=generational
   *      TestRetainObjects
   */
  
  /*
-  * @test id=no-tlab
+  * @test id=static
   * @summary Acceptance tests: collector can deal with retained objects
   * @requires vm.gc.Shenandoah
   *
   * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
-  *      -XX:+UseShenandoahGC
-  *      -XX:-UseTLAB -XX:+ShenandoahVerify
+  *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=static
   *      TestRetainObjects
   */
  
  /*
-  * @test id=iu-aggressive
+  * @test id=compact
   * @summary Acceptance tests: collector can deal with retained objects
   * @requires vm.gc.Shenandoah
   *
   * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
-  *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
-  *      -XX:+ShenandoahOOMDuringEvacALot
-  *      TestRetainObjects
-  *
-  * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
-  *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
-  *      -XX:+ShenandoahAllocFailureALot
-  *      TestRetainObjects
-  *
-  * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
-  *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
+  *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=compact
   *      TestRetainObjects
   */
  
  /*
-  * @test id=iu
+  * @test id=no-tlab
   * @summary Acceptance tests: collector can deal with retained objects
   * @requires vm.gc.Shenandoah
   *
   * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
-  *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
-  *      -XX:+ShenandoahVerify
-  *      TestRetainObjects
-  *
-  * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
-  *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
+  *      -XX:+UseShenandoahGC
+  *      -XX:-UseTLAB -XX:+ShenandoahVerify
   *      TestRetainObjects
   */
  
  public class TestRetainObjects {