test/hotspot/jtreg/gc/shenandoah/TestHeapUncommit.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.

*** 61,10 ***
--- 62,15 ---
   *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=adaptive
   *      -XX:+ShenandoahVerify
   *      TestHeapUncommit
   *
   * @run main/othervm -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahUncommit -XX:ShenandoahUncommitDelay=0
+  *      -XX:+UseShenandoahGC
+  *      -XX:-UseTLAB -XX:+ShenandoahVerify
+  *      TestHeapUncommit
+  *
+  * @run main/othervm -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahUncommit -XX:ShenandoahUncommitDelay=0
   *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=adaptive
   *      TestHeapUncommit
   *
   * @run main/othervm -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahUncommit -XX:ShenandoahUncommitDelay=0
   *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=static

*** 75,15 ***
   *      TestHeapUncommit
   *
   * @run main/othervm -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahUncommit -XX:ShenandoahUncommitDelay=0
   *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive
   *      TestHeapUncommit
   *
   * @run main/othervm -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahUncommit -XX:ShenandoahUncommitDelay=0
!  *      -XX:+UseShenandoahGC
   *      -XX:-UseTLAB -XX:+ShenandoahVerify
   *      TestHeapUncommit
   */
  
  /*
   * @test id=iu
   * @summary Acceptance tests: collector can withstand allocation
--- 81,32 ---
   *      TestHeapUncommit
   *
   * @run main/othervm -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahUncommit -XX:ShenandoahUncommitDelay=0
   *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive
   *      TestHeapUncommit
+  */
+ 
+ /*
+  * @test id=generational
+  * @summary Acceptance tests: collector can withstand allocation
+  * @key randomness
+  * @requires vm.gc.Shenandoah
+  * @library /test/lib
+  *
+  * @run main/othervm -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahUncommit -XX:ShenandoahUncommitDelay=0
+  *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=adaptive -XX:ShenandoahGCMode=generational
+  *      -XX:+ShenandoahVerify
+  *      TestHeapUncommit
   *
   * @run main/othervm -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahUncommit -XX:ShenandoahUncommitDelay=0
!  *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=adaptive -XX:ShenandoahGCMode=generational
   *      -XX:-UseTLAB -XX:+ShenandoahVerify
   *      TestHeapUncommit
+  *
+  * @run main/othervm -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahUncommit -XX:ShenandoahUncommitDelay=0
+  *      -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=adaptive -XX:ShenandoahGCMode=generational
+  *      TestHeapUncommit
   */
  
  /*
   * @test id=iu
   * @summary Acceptance tests: collector can withstand allocation

*** 117,15 ***
   *      -XX:+ShenandoahVerify
   *      TestHeapUncommit
   *
   * @run main/othervm -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahUncommit -XX:ShenandoahUncommitDelay=0 -XX:+UseLargePages
   *      -XX:+UseShenandoahGC
   *      TestHeapUncommit
   *
   * @run main/othervm -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahUncommit -XX:ShenandoahUncommitDelay=0 -XX:+UseLargePages
   *      -XX:+UseShenandoahGC
-  *      -XX:-UseTLAB -XX:+ShenandoahVerify
   *      TestHeapUncommit
   */
  
  import java.util.Random;
  import jdk.test.lib.Utils;
--- 140,15 ---
   *      -XX:+ShenandoahVerify
   *      TestHeapUncommit
   *
   * @run main/othervm -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahUncommit -XX:ShenandoahUncommitDelay=0 -XX:+UseLargePages
   *      -XX:+UseShenandoahGC
+  *      -XX:-UseTLAB -XX:+ShenandoahVerify
   *      TestHeapUncommit
   *
   * @run main/othervm -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahUncommit -XX:ShenandoahUncommitDelay=0 -XX:+UseLargePages
   *      -XX:+UseShenandoahGC
   *      TestHeapUncommit
   */
  
  import java.util.Random;
  import jdk.test.lib.Utils;