test/hotspot/jtreg/gc/metaspace/TestMetaspacePerfCounters.java

@@ -45,12 +45,12 @@
   *          space exists and works.
   * @modules java.base/jdk.internal.misc
   *          java.compiler
   *          java.management/sun.management
   *          jdk.internal.jvmstat/sun.jvmstat.monitor
-  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-UseCompressedOops -XX:-UseCompressedClassPointers -XX:+UsePerfData -XX:+UseSerialGC gc.metaspace.TestMetaspacePerfCounters
-  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCompressedOops -XX:+UseCompressedClassPointers -XX:+UsePerfData -XX:+UseSerialGC gc.metaspace.TestMetaspacePerfCounters
+  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-UseCompressedOops -XX:+UsePerfData -XX:+UseSerialGC gc.metaspace.TestMetaspacePerfCounters
+  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCompressedOops -XX:+UsePerfData -XX:+UseSerialGC gc.metaspace.TestMetaspacePerfCounters
   */
  
  /* @test TestMetaspacePerfCountersParallel
   * @bug 8014659
   * @requires vm.gc.Parallel

@@ -59,12 +59,12 @@
   *          space exists and works.
   * @modules java.base/jdk.internal.misc
   *          java.compiler
   *          java.management/sun.management
   *          jdk.internal.jvmstat/sun.jvmstat.monitor
-  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-UseCompressedOops -XX:-UseCompressedClassPointers -XX:+UsePerfData -XX:+UseParallelGC gc.metaspace.TestMetaspacePerfCounters
-  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCompressedOops -XX:+UseCompressedClassPointers -XX:+UsePerfData -XX:+UseParallelGC gc.metaspace.TestMetaspacePerfCounters
+  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-UseCompressedOops -XX:+UsePerfData -XX:+UseParallelGC gc.metaspace.TestMetaspacePerfCounters
+  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCompressedOops -XX:+UsePerfData -XX:+UseParallelGC gc.metaspace.TestMetaspacePerfCounters
   */
  
  /* @test TestMetaspacePerfCountersG1
   * @bug 8014659
   * @requires vm.gc.G1

@@ -73,12 +73,12 @@
   *          space exists and works.
   * @modules java.base/jdk.internal.misc
   *          java.compiler
   *          java.management/sun.management
   *          jdk.internal.jvmstat/sun.jvmstat.monitor
-  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-UseCompressedOops -XX:-UseCompressedClassPointers -XX:+UsePerfData -XX:+UseG1GC gc.metaspace.TestMetaspacePerfCounters
-  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCompressedOops -XX:+UseCompressedClassPointers -XX:+UsePerfData -XX:+UseG1GC gc.metaspace.TestMetaspacePerfCounters
+  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-UseCompressedOops -XX:+UsePerfData -XX:+UseG1GC gc.metaspace.TestMetaspacePerfCounters
+  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCompressedOops -XX:+UsePerfData -XX:+UseG1GC gc.metaspace.TestMetaspacePerfCounters
   */
  
  /* @test TestMetaspacePerfCountersShenandoah
   * @bug 8014659
   * @requires vm.gc.Shenandoah

@@ -87,12 +87,12 @@
   *          space exists and works.
   * @modules java.base/jdk.internal.misc
   *          java.compiler
   *          java.management/sun.management
   *          jdk.internal.jvmstat/sun.jvmstat.monitor
-  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-UseCompressedOops -XX:-UseCompressedClassPointers -XX:+UsePerfData -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC gc.metaspace.TestMetaspacePerfCounters
-  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCompressedOops -XX:+UseCompressedClassPointers -XX:+UsePerfData -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC gc.metaspace.TestMetaspacePerfCounters
+  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:-UseCompressedOops -XX:+UsePerfData -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC gc.metaspace.TestMetaspacePerfCounters
+  * @run main/othervm -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCompressedOops -XX:+UsePerfData -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC gc.metaspace.TestMetaspacePerfCounters
   */
  public class TestMetaspacePerfCounters {
      public static Class<?> fooClass = null;
      private static final String[] counterNames = {"minCapacity", "maxCapacity", "capacity", "used"};
      private static final List<GarbageCollectorMXBean> gcBeans = ManagementFactoryHelper.getGarbageCollectorMXBeans();

@@ -172,11 +172,11 @@
          byte[] byteCode = InMemoryJavaCompiler.compile(name, source);
          return ByteCodeLoader.load(name, byteCode);
      }
  
      private static boolean isUsingCompressedClassPointers() {
-         return Platform.is64bit() && InputArguments.contains("-XX:+UseCompressedClassPointers");
+         return Platform.is64bit();
      }
  
      private static long getMinCapacity(String ns) throws Exception {
          return PerfCounters.findByName(ns + ".minCapacity").longValue();
      }