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

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

*** 75,26 ***
   *      -Dtarget=100
   *      TestGCThreadGroups
   */
  
  /**
!  * @test id=iu
   * @summary Test Shenandoah GC uses concurrent/parallel threads correctly
   * @requires vm.gc.Shenandoah
   *
   * @run main/othervm -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
!  *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
   *      -XX:ConcGCThreads=2 -XX:ParallelGCThreads=4
!  *      -Dtarget=1000
   *      TestGCThreadGroups
   *
   * @run main/othervm -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
!  *      -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
!  *      -XX:ConcGCThreads=2 -XX:ParallelGCThreads=4
!  *      -Dtarget=1000
   *      TestGCThreadGroups
! */
  
  public class TestGCThreadGroups {
  
      static final long TARGET_MB = Long.getLong("target", 10_000); // 10 Gb allocation, around 1K cycles to handle
      static final long STRIDE = 100_000;
--- 76,26 ---
   *      -Dtarget=100
   *      TestGCThreadGroups
   */
  
  /**
!  * @test id=generational
   * @summary Test Shenandoah GC uses concurrent/parallel threads correctly
   * @requires vm.gc.Shenandoah
   *
   * @run main/othervm -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
!  *      -XX:+UseShenandoahGC
   *      -XX:ConcGCThreads=2 -XX:ParallelGCThreads=4
!  *      -Dtarget=1000 -XX:ShenandoahGCMode=generational
   *      TestGCThreadGroups
   *
   * @run main/othervm -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
!  *      -XX:+UseShenandoahGC
!  *      -XX:-UseDynamicNumberOfGCThreads
!  *      -Dtarget=1000 -XX:ShenandoahGCMode=generational
   *      TestGCThreadGroups
!  */
  
  public class TestGCThreadGroups {
  
      static final long TARGET_MB = Long.getLong("target", 10_000); // 10 Gb allocation, around 1K cycles to handle
      static final long STRIDE = 100_000;