OpenJDK / jdk / jdk
changeset 60133:dc2307a6511f
8249000: vm.gc.X should take selected JIT into account
Reviewed-by: kvn
line wrap: on
line diff
--- a/test/hotspot/jtreg/ProblemList-graal.txt Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/ProblemList-graal.txt Fri Jul 10 11:52:35 2020 -0700 @@ -229,6 +229,7 @@ compiler/loopopts/TestOverunrolling.java 8207267 generic-all compiler/jsr292/NonInlinedCall/InvokeTest.java 8207267 generic-all compiler/codegen/TestTrichotomyExpressions.java 8207267 generic-all +gc/stress/TestReclaimStringsLeaksMemory.java 8207267 generic-all runtime/exceptionMsgs/AbstractMethodError/AbstractMethodErrorTest.java 8222582 generic-all
--- a/test/hotspot/jtreg/compiler/gcbarriers/UnsafeIntrinsicsTest.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/compiler/gcbarriers/UnsafeIntrinsicsTest.java Fri Jul 10 11:52:35 2020 -0700 @@ -27,7 +27,7 @@ * @bug 8059022 * @modules java.base/jdk.internal.misc:+open * @summary Validate barriers after Unsafe getReference, CAS and swap (GetAndSet) - * @requires vm.gc.Z & !vm.graal.enabled + * @requires vm.gc.Z * @library /test/lib * @run main/othervm -XX:+UseZGC -XX:+UnlockDiagnosticVMOptions -XX:+ZVerifyViews -XX:ZCollectionInterval=1 -XX:-CreateCoredumpOnCrash -XX:CompileCommand=dontinline,*::mergeImpl* compiler.gcbarriers.UnsafeIntrinsicsTest */
--- a/test/hotspot/jtreg/compiler/loopopts/TestRangeCheckPredicatesControl.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/compiler/loopopts/TestRangeCheckPredicatesControl.java Fri Jul 10 11:52:35 2020 -0700 @@ -23,7 +23,7 @@ /* * @test - * @requires vm.gc.Z & !vm.graal.enabled + * @requires vm.gc.Z * @bug 8237859 * @summary A LoadP node has a wrong control input (too early) which results in an out-of-bounds read of an object array with ZGC. *
--- a/test/hotspot/jtreg/gc/CriticalNativeArgs.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/CriticalNativeArgs.java Fri Jul 10 11:52:35 2020 -0700 @@ -28,7 +28,8 @@ * @test CriticalNativeStressEpsilon * @bug 8199868 * @library / - * @requires (os.arch =="x86_64" | os.arch == "amd64" | os.arch=="x86" | os.arch=="i386") & vm.gc.Epsilon & !vm.graal.enabled + * @requires os.arch =="x86_64" | os.arch == "amd64" | os.arch=="x86" | os.arch=="i386" + * @requires vm.gc.Epsilon * @summary test argument unpacking nmethod wrapper of critical native method * @run main/othervm/native -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -Xcomp -Xmx256M -XX:+CriticalJNINatives gc.CriticalNativeArgs */ @@ -37,7 +38,8 @@ * @test CriticalNativeStressShenandoah * @bug 8199868 * @library / - * @requires (os.arch =="x86_64" | os.arch == "amd64" | os.arch=="x86" | os.arch=="i386") & vm.gc.Shenandoah & !vm.graal.enabled + * @requires os.arch =="x86_64" | os.arch == "amd64" | os.arch=="x86" | os.arch=="i386" + * @requires vm.gc.Shenandoah * @summary test argument unpacking nmethod wrapper of critical native method * @run main/othervm/native -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCMode=passive -XX:+ShenandoahDegeneratedGC -Xcomp -Xmx512M -XX:+CriticalJNINatives gc.CriticalNativeArgs * @run main/othervm/native -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCMode=passive -XX:-ShenandoahDegeneratedGC -Xcomp -Xmx512M -XX:+CriticalJNINatives gc.CriticalNativeArgs
--- a/test/hotspot/jtreg/gc/TestHumongousReferenceObject.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/TestHumongousReferenceObject.java Fri Jul 10 11:52:35 2020 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 2020, Oracle and/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 @@ -49,7 +49,7 @@ /* * @test TestHumongousReferenceObjectShenandoah * @summary Test that verifies that iteration over large, plain Java objects, that potentially cross region boundaries, with references in them works. - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @bug 8151499 8153734 * @modules java.base/jdk.internal.vm.annotation * @run main/othervm -XX:+EnableContended -XX:-RestrictContended -Xms128m -Xmx128m -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahRegionSize=8M -XX:ContendedPaddingWidth=8192 gc.TestHumongousReferenceObject
--- a/test/hotspot/jtreg/gc/TestSystemGC.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/TestSystemGC.java Fri Jul 10 11:52:35 2020 -0700 @@ -49,7 +49,7 @@ /* * @test TestSystemGCShenandoah - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @summary Runs System.gc() with different flags. * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC gc.TestSystemGC * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:+ExplicitGCInvokesConcurrent gc.TestSystemGC
--- a/test/hotspot/jtreg/gc/arguments/TestAlignmentToUseLargePages.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/arguments/TestAlignmentToUseLargePages.java Fri Jul 10 11:52:35 2020 -0700 @@ -51,8 +51,7 @@ /** * @test TestAlignmentToUseLargePagesShenandoah * @bug 8024396 - * @comment Graal does not support Shenandoah - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @run main/othervm -Xms71M -Xmx91M -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:+UseLargePages gc.arguments.TestAlignmentToUseLargePages * @run main/othervm -Xms71M -Xmx91M -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:-UseLargePages gc.arguments.TestAlignmentToUseLargePages */
--- a/test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsErgo.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/arguments/TestUseCompressedOopsErgo.java Fri Jul 10 11:52:35 2020 -0700 @@ -68,8 +68,7 @@ /* * @test TestUseCompressedOopsErgoShenandoah * @bug 8010722 - * @comment Graal does not support Shenandoah - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * @library / * @modules java.base/jdk.internal.misc
--- a/test/hotspot/jtreg/gc/class_unloading/TestClassUnloadingDisabled.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/class_unloading/TestClassUnloadingDisabled.java Fri Jul 10 11:52:35 2020 -0700 @@ -77,8 +77,7 @@ /* * @test TestClassUnloadingDisabledShenandoah * @bug 8114823 - * @comment Graal does not support Shenandoah - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @requires vm.opt.ExplicitGCInvokesConcurrent != true * @requires vm.opt.ClassUnloading != true * @library /test/lib
--- a/test/hotspot/jtreg/gc/epsilon/TestAlignment.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/epsilon/TestAlignment.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /** * @test TestAlignment - * @requires vm.gc.Epsilon & !vm.graal.enabled + * @requires vm.gc.Epsilon * @summary Check Epsilon runs fine with (un)usual alignments * @bug 8212005 * @run main/othervm -XX:+UnlockExperimentalVMOptions -Xmx128m -XX:+UseEpsilonGC -XX:+UseTLAB gc.epsilon.TestAlignment
--- a/test/hotspot/jtreg/gc/epsilon/TestAlwaysPretouch.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/epsilon/TestAlwaysPretouch.java Fri Jul 10 11:52:35 2020 -0700 @@ -23,7 +23,7 @@ /** * @test TestAlwaysPretouch - * @requires vm.gc.Epsilon & !vm.graal.enabled + * @requires vm.gc.Epsilon * @summary Basic sanity test for Epsilon * @run main/othervm -Xms128m -Xmx1g -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC gc.epsilon.TestAlwaysPretouch * @run main/othervm -Xms128m -Xmx1g -XX:-AlwaysPreTouch -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC gc.epsilon.TestAlwaysPretouch
--- a/test/hotspot/jtreg/gc/epsilon/TestArraycopyCheckcast.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/epsilon/TestArraycopyCheckcast.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /** * @test TestArraycopyCheckcast - * @requires vm.gc.Epsilon & !vm.graal.enabled + * @requires vm.gc.Epsilon * @summary Epsilon is able to handle checkcasted array copies * @library /test/lib * @bug 8215724
--- a/test/hotspot/jtreg/gc/epsilon/TestByteArrays.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/epsilon/TestByteArrays.java Fri Jul 10 11:52:35 2020 -0700 @@ -26,7 +26,7 @@ /** * @test TestByteArrays * @key randomness - * @requires vm.gc.Epsilon & !vm.graal.enabled + * @requires vm.gc.Epsilon * @summary Epsilon is able to allocate arrays, and does not corrupt their state * @library /test/lib *
--- a/test/hotspot/jtreg/gc/epsilon/TestClasses.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/epsilon/TestClasses.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /** * @test TestClasses - * @requires vm.gc.Epsilon & !vm.graal.enabled + * @requires vm.gc.Epsilon * @summary Epsilon is able to allocate a lot of classes * * @modules java.base/jdk.internal.org.objectweb.asm
--- a/test/hotspot/jtreg/gc/epsilon/TestDieDefault.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/epsilon/TestDieDefault.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /** * @test TestDieDefault - * @requires vm.gc.Epsilon & !vm.graal.enabled + * @requires vm.gc.Epsilon * @summary Epsilon GC should die on heap exhaustion * @library /test/lib * @run driver gc.epsilon.TestDieDefault
--- a/test/hotspot/jtreg/gc/epsilon/TestDieWithHeapDump.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/epsilon/TestDieWithHeapDump.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /** * @test TestDieWithHeapDump - * @requires vm.gc.Epsilon & !vm.graal.enabled + * @requires vm.gc.Epsilon * @summary Epsilon GC should die on heap exhaustion with error handler attached * @library /test/lib * @run driver gc.epsilon.TestDieWithHeapDump
--- a/test/hotspot/jtreg/gc/epsilon/TestDieWithOnError.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/epsilon/TestDieWithOnError.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /** * @test TestDieWithOnError - * @requires vm.gc.Epsilon & !vm.graal.enabled + * @requires vm.gc.Epsilon * @summary Epsilon GC should die on heap exhaustion with error handler attached * @library /test/lib * @run driver gc.epsilon.TestDieWithOnError
--- a/test/hotspot/jtreg/gc/epsilon/TestElasticTLAB.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/epsilon/TestElasticTLAB.java Fri Jul 10 11:52:35 2020 -0700 @@ -26,7 +26,7 @@ /** * @test TestElasticTLAB * @key randomness - * @requires vm.gc.Epsilon & !vm.graal.enabled + * @requires vm.gc.Epsilon * @summary Epsilon is able to work with/without elastic TLABs * @library /test/lib *
--- a/test/hotspot/jtreg/gc/epsilon/TestElasticTLABDecay.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/epsilon/TestElasticTLABDecay.java Fri Jul 10 11:52:35 2020 -0700 @@ -26,7 +26,7 @@ /** * @test TestElasticTLABDecay * @key randomness - * @requires vm.gc.Epsilon & !vm.graal.enabled + * @requires vm.gc.Epsilon * @summary Epsilon is able to work with/without elastic TLABs * @library /test/lib *
--- a/test/hotspot/jtreg/gc/epsilon/TestEpsilonEnabled.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/epsilon/TestEpsilonEnabled.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /** * @test TestAlwaysPretouch - * @requires vm.gc.Epsilon & !vm.graal.enabled + * @requires vm.gc.Epsilon * @summary Basic sanity test for Epsilon * @library /test/lib * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC gc.epsilon.TestEpsilonEnabled
--- a/test/hotspot/jtreg/gc/epsilon/TestHelloWorld.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/epsilon/TestHelloWorld.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /** * @test TestHelloWorld - * @requires vm.gc.Epsilon & !vm.graal.enabled + * @requires vm.gc.Epsilon * @summary Basic sanity test for Epsilon * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC gc.epsilon.TestHelloWorld */
--- a/test/hotspot/jtreg/gc/epsilon/TestLogTrace.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/epsilon/TestLogTrace.java Fri Jul 10 11:52:35 2020 -0700 @@ -26,7 +26,7 @@ /** * @test TestLogTrace - * @requires vm.gc.Epsilon & !vm.graal.enabled + * @requires vm.gc.Epsilon * @summary Test that tracing does not crash Epsilon * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -Xlog:gc*=trace gc.epsilon.TestLogTrace */
--- a/test/hotspot/jtreg/gc/epsilon/TestManyThreads.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/epsilon/TestManyThreads.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /** * @test TestManyThreads - * @requires vm.gc.Epsilon & !vm.graal.enabled + * @requires vm.gc.Epsilon * @summary Test allocations from many threads * * @run main/othervm -Xmx128m -Xss512k -XX:-UseTLAB -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC gc.epsilon.TestManyThreads
--- a/test/hotspot/jtreg/gc/epsilon/TestMaxTLAB.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/epsilon/TestMaxTLAB.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /** * @test TestMaxTLAB - * @requires vm.gc.Epsilon & !vm.graal.enabled + * @requires vm.gc.Epsilon * @summary Check EpsilonMaxTLAB options * @bug 8212177 *
--- a/test/hotspot/jtreg/gc/epsilon/TestMemoryMXBeans.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/epsilon/TestMemoryMXBeans.java Fri Jul 10 11:52:35 2020 -0700 @@ -26,7 +26,7 @@ /** * @test TestMemoryMXBeans - * @requires vm.gc.Epsilon & !vm.graal.enabled + * @requires vm.gc.Epsilon * @summary Test JMX memory beans * @modules java.base/jdk.internal.misc * java.management
--- a/test/hotspot/jtreg/gc/epsilon/TestMemoryPools.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/epsilon/TestMemoryPools.java Fri Jul 10 11:52:35 2020 -0700 @@ -26,7 +26,7 @@ /** * @test TestMemoryPools - * @requires vm.gc.Epsilon & !vm.graal.enabled + * @requires vm.gc.Epsilon * @summary Test JMX memory pools * @modules java.base/jdk.internal.misc * java.management
--- a/test/hotspot/jtreg/gc/epsilon/TestObjects.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/epsilon/TestObjects.java Fri Jul 10 11:52:35 2020 -0700 @@ -26,7 +26,7 @@ /** * @test TestObjects * @key randomness - * @requires vm.gc.Epsilon & !vm.graal.enabled + * @requires vm.gc.Epsilon * @summary Epsilon is able to allocate objects, and does not corrupt their state * @library /test/lib *
--- a/test/hotspot/jtreg/gc/epsilon/TestPrintHeapSteps.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/epsilon/TestPrintHeapSteps.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /** * @test TestPrintSteps - * @requires vm.gc.Epsilon & !vm.graal.enabled + * @requires vm.gc.Epsilon * @summary Tests -XX:EpsilonPrintHeapSteps works * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -Xlog:gc -XX:EpsilonPrintHeapSteps=0 gc.epsilon.TestPrintHeapSteps * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -Xlog:gc -XX:EpsilonPrintHeapSteps=1 gc.epsilon.TestPrintHeapSteps
--- a/test/hotspot/jtreg/gc/epsilon/TestRefArrays.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/epsilon/TestRefArrays.java Fri Jul 10 11:52:35 2020 -0700 @@ -26,7 +26,7 @@ /** * @test TestRefArrays * @key randomness - * @requires vm.gc.Epsilon & !vm.graal.enabled + * @requires vm.gc.Epsilon * @summary Epsilon is able to allocate arrays, and does not corrupt their state * @library /test/lib *
--- a/test/hotspot/jtreg/gc/epsilon/TestUpdateCountersSteps.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/epsilon/TestUpdateCountersSteps.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /** * @test TestUpdateCountersSteps - * @requires vm.gc.Epsilon & !vm.graal.enabled + * @requires vm.gc.Epsilon * @summary Test EpsilonUpdateCountersStep works * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -Xlog:gc -XX:EpsilonUpdateCountersStep=1 gc.epsilon.TestUpdateCountersSteps * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -Xlog:gc -XX:EpsilonUpdateCountersStep=10 gc.epsilon.TestUpdateCountersSteps
--- a/test/hotspot/jtreg/gc/metaspace/TestMetaspacePerfCounters.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/metaspace/TestMetaspacePerfCounters.java Fri Jul 10 11:52:35 2020 -0700 @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2019, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2020, Oracle and/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 @@ -81,7 +81,7 @@ /* @test TestMetaspacePerfCountersShenandoah * @bug 8014659 - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib / * @summary Tests that performance counters for metaspace and compressed class * space exists and works.
--- a/test/hotspot/jtreg/gc/shenandoah/TestAllocHumongousFragment.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/TestAllocHumongousFragment.java Fri Jul 10 11:52:35 2020 -0700 @@ -26,7 +26,7 @@ * @test TestAllocHumongousFragment * @summary Make sure Shenandoah can recover from humongous allocation fragmentation * @key randomness - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * * @run main/othervm -Xmx1g -Xms1g -Xlog:gc -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:ShenandoahTargetNumRegions=2048 @@ -54,7 +54,7 @@ * @test TestAllocHumongousFragment * @summary Make sure Shenandoah can recover from humongous allocation fragmentation * @key randomness - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * * @run main/othervm -Xmx1g -Xms1g -Xlog:gc -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:ShenandoahTargetNumRegions=2048 @@ -99,7 +99,7 @@ * @test TestAllocHumongousFragment * @summary Make sure Shenandoah can recover from humongous allocation fragmentation * @key randomness - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * * @run main/othervm -Xlog:gc -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g -XX:ShenandoahTargetNumRegions=2048
--- a/test/hotspot/jtreg/gc/shenandoah/TestAllocIntArrays.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/TestAllocIntArrays.java Fri Jul 10 11:52:35 2020 -0700 @@ -26,7 +26,7 @@ * @test TestAllocIntArrays * @summary Acceptance tests: collector can withstand allocation * @key randomness - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g @@ -54,7 +54,7 @@ * @test TestAllocIntArrays * @summary Acceptance tests: collector can withstand allocation * @key randomness - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g @@ -108,7 +108,7 @@ * @test TestAllocIntArrays * @summary Acceptance tests: collector can withstand allocation * @key randomness - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g
--- a/test/hotspot/jtreg/gc/shenandoah/TestAllocObjectArrays.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/TestAllocObjectArrays.java Fri Jul 10 11:52:35 2020 -0700 @@ -26,7 +26,7 @@ * @test TestAllocObjectArrays * @summary Acceptance tests: collector can withstand allocation * @key randomness - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g @@ -54,7 +54,7 @@ * @test TestAllocObjectArrays * @summary Acceptance tests: collector can withstand allocation * @key randomness - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g @@ -108,7 +108,7 @@ * @test TestAllocObjectArrays * @summary Acceptance tests: collector can withstand allocation * @key randomness - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g
--- a/test/hotspot/jtreg/gc/shenandoah/TestAllocObjects.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/TestAllocObjects.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /* * @test TestAllocObjects * @summary Acceptance tests: collector can withstand allocation - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions * -XX:+UseShenandoahGC -XX:ShenandoahGCMode=passive @@ -51,7 +51,7 @@ /* * @test TestAllocObjects * @summary Acceptance tests: collector can withstand allocation - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions * -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive @@ -118,7 +118,7 @@ /* * @test TestAllocObjects * @summary Acceptance tests: collector can withstand allocation - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions * -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
--- a/test/hotspot/jtreg/gc/shenandoah/TestArrayCopyCheckCast.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/TestArrayCopyCheckCast.java Fri Jul 10 11:52:35 2020 -0700 @@ -24,7 +24,7 @@ /* * @test TestArrayCopyCheckCast - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:TieredStopAtLevel=0 -Xmx16m TestArrayCopyCheckCast */
--- a/test/hotspot/jtreg/gc/shenandoah/TestArrayCopyStress.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/TestArrayCopyStress.java Fri Jul 10 11:52:35 2020 -0700 @@ -28,7 +28,7 @@ /* * @test TestArrayCopyStress * @key randomness - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:TieredStopAtLevel=0 -Xmx16m TestArrayCopyStress
--- a/test/hotspot/jtreg/gc/shenandoah/TestElasticTLAB.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/TestElasticTLAB.java Fri Jul 10 11:52:35 2020 -0700 @@ -26,7 +26,7 @@ * @test TestElasticTLAB * @key randomness * @summary Test that Shenandoah is able to work with elastic TLABs - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g -XX:-UseTLAB -XX:-ShenandoahElasticTLAB -XX:+ShenandoahVerify TestElasticTLAB
--- a/test/hotspot/jtreg/gc/shenandoah/TestEvilSyncBug.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/TestEvilSyncBug.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /* * @test TestEvilSyncBug * @summary Tests for crash/assert when attaching init thread during shutdown - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * @modules java.base/jdk.internal.misc * java.management
--- a/test/hotspot/jtreg/gc/shenandoah/TestGCThreadGroups.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/TestGCThreadGroups.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /** * @test TestGCThreadGroups * @summary Test Shenandoah GC uses concurrent/parallel threads correctly - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions * -XX:+UseShenandoahGC -XX:ShenandoahGCMode=passive @@ -37,7 +37,7 @@ /** * @test TestGCThreadGroups * @summary Test Shenandoah GC uses concurrent/parallel threads correctly - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions * -XX:+UseShenandoahGC @@ -79,7 +79,7 @@ /** * @test TestGCThreadGroups * @summary Test Shenandoah GC uses concurrent/parallel threads correctly - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions * -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
--- a/test/hotspot/jtreg/gc/shenandoah/TestHeapUncommit.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/TestHeapUncommit.java Fri Jul 10 11:52:35 2020 -0700 @@ -26,7 +26,7 @@ * @test TestHeapUncommit * @summary Acceptance tests: collector can withstand allocation * @key randomness - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * * @run main/othervm -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahUncommit -XX:ShenandoahUncommitDelay=0 @@ -54,7 +54,7 @@ * @test TestHeapUncommit * @summary Acceptance tests: collector can withstand allocation * @key randomness - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * * @run main/othervm -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahUncommit -XX:ShenandoahUncommitDelay=0 @@ -88,7 +88,7 @@ * @test TestHeapUncommit * @summary Acceptance tests: collector can withstand allocation * @key randomness - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * * @run main/othervm -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahUncommit -XX:ShenandoahUncommitDelay=0 @@ -108,7 +108,8 @@ /* * @test TestHeapUncommit * @key randomness - * @requires vm.gc.Shenandoah & !vm.graal.enabled & (vm.bits == "64") + * @requires vm.gc.Shenandoah + * @requires vm.bits == "64" * @library /test/lib * * @run main/othervm -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahUncommit -XX:ShenandoahUncommitDelay=0 -XX:+UseLargePages
--- a/test/hotspot/jtreg/gc/shenandoah/TestHumongousThreshold.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/TestHumongousThreshold.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /* * @test TestHumongousThreshold * @key randomness - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g @@ -71,7 +71,8 @@ /* * @test TestHumongousThreshold * @key randomness - * @requires vm.gc.Shenandoah & !vm.graal.enabled & (vm.bits == "64") + * @requires vm.gc.Shenandoah + * @requires vm.bits == "64" * @library /test/lib * * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g
--- a/test/hotspot/jtreg/gc/shenandoah/TestLargeObjectAlignment.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/TestLargeObjectAlignment.java Fri Jul 10 11:52:35 2020 -0700 @@ -26,7 +26,8 @@ * @test TestLargeObjectAlignment * @summary Shenandoah crashes with -XX:ObjectAlignmentInBytes=16 * @key randomness - * @requires vm.gc.Shenandoah & !vm.graal.enabled & (vm.bits == "64") + * @requires vm.gc.Shenandoah + * @requires vm.bits == "64" * @library /test/lib * * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ObjectAlignmentInBytes=16 -Xint TestLargeObjectAlignment
--- a/test/hotspot/jtreg/gc/shenandoah/TestLotsOfCycles.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/TestLotsOfCycles.java Fri Jul 10 11:52:35 2020 -0700 @@ -24,7 +24,7 @@ /* * @test TestLotsOfCycles - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm/timeout=480 -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions * -XX:+UseShenandoahGC -XX:ShenandoahGCMode=passive @@ -41,7 +41,7 @@ /* * @test TestLotsOfCycles - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm/timeout=480 -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions * -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive @@ -78,7 +78,7 @@ /* * @test TestLotsOfCycles - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm/timeout=480 -Xmx16m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions * -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
--- a/test/hotspot/jtreg/gc/shenandoah/TestObjItrWithHeapDump.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/TestObjItrWithHeapDump.java Fri Jul 10 11:52:35 2020 -0700 @@ -26,7 +26,7 @@ * @test TestObjIterWithHeapDump * @summary Test heap dump triggered heap object iteration * @bug 8225014 - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * @run driver TestObjItrWithHeapDump */
--- a/test/hotspot/jtreg/gc/shenandoah/TestParallelRefprocSanity.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/TestParallelRefprocSanity.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /* * @test TestParallelRefprocSanity * @summary Test that reference processing works with both parallel and non-parallel variants. - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g -Xms1g TestParallelRefprocSanity * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g -Xms1g -XX:-ParallelRefProcEnabled TestParallelRefprocSanity
--- a/test/hotspot/jtreg/gc/shenandoah/TestPeriodicGC.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/TestPeriodicGC.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /* * @test TestPeriodicGC * @summary Test that periodic GC is working - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * @run driver TestPeriodicGC */
--- a/test/hotspot/jtreg/gc/shenandoah/TestRefprocSanity.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/TestRefprocSanity.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /* * @test TestRefprocSanity * @summary Test that null references/referents work fine - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions * -XX:+UseShenandoahGC @@ -44,7 +44,7 @@ /* * @test TestRefprocSanity * @summary Test that null references/referents work fine - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions * -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
--- a/test/hotspot/jtreg/gc/shenandoah/TestRegionSampling.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/TestRegionSampling.java Fri Jul 10 11:52:35 2020 -0700 @@ -24,7 +24,7 @@ /* * @test TestRegionSampling - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahRegionSampling * -XX:+UseShenandoahGC -XX:ShenandoahGCMode=passive @@ -39,7 +39,7 @@ /* * @test TestRegionSampling - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahRegionSampling * -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=adaptive @@ -60,7 +60,7 @@ /* * @test TestRegionSampling - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ShenandoahRegionSampling * -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
--- a/test/hotspot/jtreg/gc/shenandoah/TestRetainObjects.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/TestRetainObjects.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /* * @test TestRetainObjects * @summary Acceptance tests: collector can deal with retained objects - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions * -XX:+UseShenandoahGC -XX:ShenandoahGCMode=passive @@ -51,7 +51,7 @@ /* * @test TestRetainObjects * @summary Acceptance tests: collector can deal with retained objects - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions * -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive @@ -93,7 +93,7 @@ /* * @test TestRetainObjects * @summary Acceptance tests: collector can deal with retained objects - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions * -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
--- a/test/hotspot/jtreg/gc/shenandoah/TestSieveObjects.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/TestSieveObjects.java Fri Jul 10 11:52:35 2020 -0700 @@ -26,7 +26,7 @@ * @test TestSieveObjects * @summary Acceptance tests: collector can deal with retained objects * @key randomness - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions @@ -54,7 +54,7 @@ * @test TestSieveObjects * @summary Acceptance tests: collector can deal with retained objects * @key randomness - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions @@ -98,7 +98,7 @@ * @test TestSieveObjects * @summary Acceptance tests: collector can deal with retained objects * @key randomness - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * * @run main/othervm -Xmx1g -Xms1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
--- a/test/hotspot/jtreg/gc/shenandoah/TestSmallHeap.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/TestSmallHeap.java Fri Jul 10 11:52:35 2020 -0700 @@ -24,7 +24,7 @@ /* * @test TestSmallHeap - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC TestSmallHeap * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx64m TestSmallHeap
--- a/test/hotspot/jtreg/gc/shenandoah/TestStringDedup.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/TestStringDedup.java Fri Jul 10 11:52:35 2020 -0700 @@ -26,7 +26,7 @@ * @test TestStringDedup * @summary Test Shenandoah string deduplication implementation * @key randomness - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * @modules java.base/jdk.internal.misc:open * @modules java.base/java.lang:open @@ -47,7 +47,7 @@ * @test TestStringDedup * @summary Test Shenandoah string deduplication implementation * @key randomness - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * @modules java.base/jdk.internal.misc:open * @modules java.base/java.lang:open @@ -70,7 +70,7 @@ * @test TestStringDedup * @summary Test Shenandoah string deduplication implementation * @key randomness - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * @modules java.base/jdk.internal.misc:open * @modules java.base/java.lang:open
--- a/test/hotspot/jtreg/gc/shenandoah/TestStringDedupStress.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/TestStringDedupStress.java Fri Jul 10 11:52:35 2020 -0700 @@ -26,7 +26,7 @@ * @test TestStringDedupStress * @summary Test Shenandoah string deduplication implementation * @key randomness - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * @modules java.base/jdk.internal.misc:open * @modules java.base/java.lang:open @@ -47,7 +47,7 @@ * @test TestStringDedupStress * @summary Test Shenandoah string deduplication implementation * @key randomness - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * @modules java.base/jdk.internal.misc:open * @modules java.base/java.lang:open @@ -78,7 +78,7 @@ * @test TestStringDedupStress * @summary Test Shenandoah string deduplication implementation * @key randomness - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * @modules java.base/jdk.internal.misc:open * @modules java.base/java.lang:open
--- a/test/hotspot/jtreg/gc/shenandoah/TestStringInternCleanup.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/TestStringInternCleanup.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /* * @test TestStringInternCleanup * @summary Check that Shenandoah cleans up interned strings - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -Xmx64m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ClassUnloadingWithConcurrentMark * -XX:+UseShenandoahGC -XX:ShenandoahGCMode=passive @@ -51,7 +51,7 @@ /* * @test TestStringInternCleanup * @summary Check that Shenandoah cleans up interned strings - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -Xmx64m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ClassUnloadingWithConcurrentMark * -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive @@ -78,7 +78,7 @@ /* * @test TestStringInternCleanup * @summary Check that Shenandoah cleans up interned strings - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -Xmx64m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+ClassUnloadingWithConcurrentMark * -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu
--- a/test/hotspot/jtreg/gc/shenandoah/TestVerifyJCStress.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/TestVerifyJCStress.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /* * @test TestVerifyJCStress * @summary Tests that we pass at least one jcstress-like test with all verification turned on - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @modules java.base/jdk.internal.misc * java.management * @@ -43,7 +43,7 @@ /* * @test TestVerifyJCStress * @summary Tests that we pass at least one jcstress-like test with all verification turned on - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @modules java.base/jdk.internal.misc * java.management * @@ -61,7 +61,7 @@ /* * @test TestVerifyJCStress * @summary Tests that we pass at least one jcstress-like test with all verification turned on - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @modules java.base/jdk.internal.misc * java.management *
--- a/test/hotspot/jtreg/gc/shenandoah/TestVerifyLevels.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/TestVerifyLevels.java Fri Jul 10 11:52:35 2020 -0700 @@ -24,7 +24,7 @@ /* * @test TestVerifyLevels - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:+UnlockDiagnosticVMOptions -Xmx128m -XX:+ShenandoahVerify -XX:ShenandoahVerifyLevel=0 TestVerifyLevels * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:+UnlockDiagnosticVMOptions -Xmx128m -XX:+ShenandoahVerify -XX:ShenandoahVerifyLevel=1 TestVerifyLevels
--- a/test/hotspot/jtreg/gc/shenandoah/TestWithLogLevel.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/TestWithLogLevel.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /* * @test TestWithLogLevel * @summary Test Shenandoah with different log levels - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xms256M -Xmx1G -Xlog:gc*=error TestWithLogLevel * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xms256M -Xmx1G -Xlog:gc*=warning TestWithLogLevel
--- a/test/hotspot/jtreg/gc/shenandoah/TestWrongArrayMember.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/TestWrongArrayMember.java Fri Jul 10 11:52:35 2020 -0700 @@ -24,7 +24,7 @@ /* * @test TestWrongArrayMember - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -Xmx128m -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC TestWrongArrayMember * @run main/othervm -Xmx128m -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu TestWrongArrayMember
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/BarrierInInfiniteLoop.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/compiler/BarrierInInfiniteLoop.java Fri Jul 10 11:52:35 2020 -0700 @@ -26,7 +26,7 @@ * @bug 8237837 8244721 * @summary Shenandoah: assert(mem == __null) failed: only one safepoint * @requires vm.flavor == "server" - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xcomp -XX:CompileOnly=BarrierInInfiniteLoop::test1 * -XX:CompileOnly=BarrierInInfiniteLoop::test2 -XX:CompileOnly=BarrierInInfiniteLoop::test3 -XX:CompileCommand=quiet BarrierInInfiniteLoop
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/CallMultipleCatchProjs.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/compiler/CallMultipleCatchProjs.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ * @test * @bug 8231405 * @summary barrier expansion breaks if barrier is right after call to rethrow stub - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -XX:CompileOnly=CallMultipleCatchProjs::test -Xcomp -Xverify:none -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC CallMultipleCatchProjs *
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/FoldIfAfterExpansion.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/compiler/FoldIfAfterExpansion.java Fri Jul 10 11:52:35 2020 -0700 @@ -24,7 +24,7 @@ /** * @test 8238385 * @summary CTW: C2 (Shenandoah) compilation fails with "Range check dependent CastII node was not removed" - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @modules java.base/jdk.internal.misc:+open * * @run main/othervm -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -XX:-TieredCompilation -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/LRBRightAfterMemBar.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/compiler/LRBRightAfterMemBar.java Fri Jul 10 11:52:35 2020 -0700 @@ -26,7 +26,7 @@ * @bug 8237007 * @summary Shenandoah: assert(_base == Tuple) failure during C2 compilation * @requires vm.flavor == "server" - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:-BackgroundCompilation -XX:+UseShenandoahGC LRBRightAfterMemBar *
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestC1ArrayCopyNPE.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestC1ArrayCopyNPE.java Fri Jul 10 11:52:35 2020 -0700 @@ -24,7 +24,7 @@ /* @test TestC1ArrayCopyNPE * @summary test C1 arraycopy intrinsic - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @run main/othervm -XX:TieredStopAtLevel=1 -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive TestC1ArrayCopyNPE */
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestC1VectorizedMismatch.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestC1VectorizedMismatch.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /* @test TestC1VectorizedMismatch * @summary test C1 vectorized mismatch intrinsic * @key randomness - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * * @run main/othervm -XX:TieredStopAtLevel=1 -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive TestC1VectorizedMismatch
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestClone.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestClone.java Fri Jul 10 11:52:35 2020 -0700 @@ -24,7 +24,7 @@ /* * @test TestClone * @summary Test clone barriers work correctly - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xms1g -Xmx1g * -XX:+UseShenandoahGC @@ -50,7 +50,7 @@ /* * @test TestClone * @summary Test clone barriers work correctly - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xms1g -Xmx1g * -XX:+UseShenandoahGC @@ -81,7 +81,7 @@ /* * @test TestClone * @summary Test clone barriers work correctly - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xms1g -Xmx1g * -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive @@ -107,7 +107,8 @@ /* * @test TestClone * @summary Test clone barriers work correctly - * @requires vm.gc.Shenandoah & !vm.graal.enabled & (vm.bits == "64") + * @requires vm.gc.Shenandoah + * @requires vm.bits == "64" * * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xms1g -Xmx1g * -XX:-UseCompressedOops @@ -138,7 +139,8 @@ /* * @test TestClone * @summary Test clone barriers work correctly - * @requires vm.gc.Shenandoah & !vm.graal.enabled & (vm.bits == "64") + * @requires vm.gc.Shenandoah + * @requires vm.bits == "64" * * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xms1g -Xmx1g * -XX:-UseCompressedOops @@ -174,7 +176,8 @@ /* * @test TestClone * @summary Test clone barriers work correctly - * @requires vm.gc.Shenandoah & !vm.graal.enabled & (vm.bits == "64") + * @requires vm.gc.Shenandoah + * @requires vm.bits == "64" * * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xms1g -Xmx1g * -XX:-UseCompressedOops
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestExpandedWBLostNullCheckDep.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestExpandedWBLostNullCheckDep.java Fri Jul 10 11:52:35 2020 -0700 @@ -24,7 +24,7 @@ /** * @test TestExpandedWBLostNullCheckDep * @summary Logic that moves a null check in the expanded barrier may cause a memory access that doesn't depend on the barrier to bypass the null check - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @requires vm.flavor == "server" * @run main/othervm -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:-TieredCompilation * -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestMaybeNullUnsafeAccess.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestMaybeNullUnsafeAccess.java Fri Jul 10 11:52:35 2020 -0700 @@ -24,7 +24,7 @@ /** * @test TestMaybeNullUnsafeAccess * @summary cast before unsafe access moved in dominating null check null path causes crash - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @modules java.base/jdk.internal.misc:+open * * @run main/othervm -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -XX:-TieredCompilation
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestNullCheck.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestNullCheck.java Fri Jul 10 11:52:35 2020 -0700 @@ -24,7 +24,8 @@ /** * @test TestNullCheck * @summary implicit null check on brooks pointer must not cause crash - * @requires vm.gc.Shenandoah & !vm.graal.enabled & (vm.bits == "64") + * @requires vm.gc.Shenandoah + * @requires vm.bits == "64" * @run main/othervm -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:-TieredCompilation * -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC * -Xmx4G -XX:HeapBaseMinAddress=0x800000000 TestNullCheck
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestReferenceCAS.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestReferenceCAS.java Fri Jul 10 11:52:35 2020 -0700 @@ -29,7 +29,7 @@ /* * @test TestReferenceCAS * @summary Shenandoah reference CAS test - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @modules java.base/jdk.internal.misc:+open * * @run main/othervm -Diters=20000 -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:ShenandoahGCHeuristics=aggressive -XX:+UseShenandoahGC TestReferenceCAS @@ -42,7 +42,8 @@ /* * @test TestReferenceCAS * @summary Shenandoah reference CAS test - * @requires vm.gc.Shenandoah & !vm.graal.enabled & (vm.bits == "64") + * @requires vm.gc.Shenandoah + * @requires vm.bits == "64" * @modules java.base/jdk.internal.misc:+open * * @run main/othervm -Diters=20000 -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:ShenandoahGCHeuristics=aggressive -XX:+UseShenandoahGC -XX:-UseCompressedOops TestReferenceCAS
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestShenandoahCmpPAfterCall.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestShenandoahCmpPAfterCall.java Fri Jul 10 11:52:35 2020 -0700 @@ -26,7 +26,7 @@ * @bug 8244663 * @summary Shenandoah: C2 assertion fails in Matcher::collect_null_checks * @requires vm.flavor == "server" - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:-TieredCompilation -XX:-BackgroundCompilation -XX:-UseOnStackReplacement * -XX:CompileCommand=dontinline,TestShenandoahCmpPAfterCall::not_inlined TestShenandoahCmpPAfterCall
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestShenandoahLRBInOuterStripMinedLoop.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestShenandoahLRBInOuterStripMinedLoop.java Fri Jul 10 11:52:35 2020 -0700 @@ -26,7 +26,7 @@ * @bug 8247824 * @summary CTW: C2 (Shenandoah) compilation fails with SEGV in SBC2Support::pin_and_expand * @requires vm.flavor == "server" - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -XX:-BackgroundCompilation -XX:+UseShenandoahGC -XX:LoopMaxUnroll=0 TestShenandoahLRBInOuterStripMinedLoop *
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestUnsafeOffheapSwap.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestUnsafeOffheapSwap.java Fri Jul 10 11:52:35 2020 -0700 @@ -24,7 +24,7 @@ /** * @test TestUnsafeOffheapSwap * @summary Miscompilation in Unsafe off-heap swap routines - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @modules java.base/jdk.internal.misc:+open * * @run main/othervm -XX:-UseOnStackReplacement -XX:-BackgroundCompilation -XX:-TieredCompilation
--- a/test/hotspot/jtreg/gc/shenandoah/compiler/TestWriteBarrierClearControl.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/compiler/TestWriteBarrierClearControl.java Fri Jul 10 11:52:35 2020 -0700 @@ -24,7 +24,7 @@ /** * @test TestWriteBarrierClearControl * @summary Clearing control during final graph reshape causes memory barrier to loose dependency on null check - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @requires vm.flavor == "server" * @run main/othervm -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:-TieredCompilation * -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC
--- a/test/hotspot/jtreg/gc/shenandoah/jni/TestJNICritical.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/jni/TestJNICritical.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /* @test TestJNICritical * @summary test JNI critical arrays support in Shenandoah * @key randomness - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * * @run main/othervm/native -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:+ShenandoahVerify TestJNICritical
--- a/test/hotspot/jtreg/gc/shenandoah/jni/TestJNIGlobalRefs.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/jni/TestJNIGlobalRefs.java Fri Jul 10 11:52:35 2020 -0700 @@ -24,7 +24,7 @@ /* @test TestJNIGlobalRefs * @summary Test JNI Global Refs with Shenandoah - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm/native -Xmx1g -Xlog:gc -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions * -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive @@ -34,7 +34,7 @@ /* @test TestJNIGlobalRefs * @summary Test JNI Global Refs with Shenandoah - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm/native -Xmx1g -Xlog:gc -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions * -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive
--- a/test/hotspot/jtreg/gc/shenandoah/jni/TestPinnedGarbage.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/jni/TestPinnedGarbage.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /* @test TestPinnedGarbage * @summary Test that garbage in the pinned region does not crash VM * @key randomness - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * * @run main/othervm/native -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx512m @@ -42,7 +42,7 @@ /* @test TestPinnedGarbage * @summary Test that garbage in the pinned region does not crash VM * @key randomness - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * * @run main/othervm/native -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx512m
--- a/test/hotspot/jtreg/gc/shenandoah/jvmti/TestHeapDump.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/jvmti/TestHeapDump.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /** * @test TestHeapDump * @summary Tests JVMTI heap dumps - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @compile TestHeapDump.java * @run main/othervm/native/timeout=300 -agentlib:TestHeapDump -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx128m -XX:ShenandoahGCHeuristics=aggressive TestHeapDump * @@ -34,7 +34,8 @@ /** * @test TestHeapDump * @summary Tests JVMTI heap dumps - * @requires vm.gc.Shenandoah & !vm.graal.enabled & (vm.bits == "64") + * @requires vm.gc.Shenandoah + * @requires vm.bits == "64" * @compile TestHeapDump.java * @run main/othervm/native/timeout=300 -agentlib:TestHeapDump -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx128m -XX:ShenandoahGCHeuristics=aggressive -XX:-UseCompressedOops TestHeapDump */ @@ -42,7 +43,7 @@ /** * @test TestHeapDump * @summary Tests JVMTI heap dumps - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @compile TestHeapDump.java * @run main/othervm/native/timeout=300 -agentlib:TestHeapDump -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx128m -XX:ShenandoahGCHeuristics=aggressive -XX:+UseStringDeduplication TestHeapDump */
--- a/test/hotspot/jtreg/gc/shenandoah/mxbeans/TestChurnNotifications.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/mxbeans/TestChurnNotifications.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /* * @test TestChurnNotifications * @summary Check that MX notifications are reported for all cycles - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -Xmx128m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions * -XX:+UseShenandoahGC -XX:ShenandoahGCMode=passive @@ -41,7 +41,7 @@ /* * @test TestChurnNotifications * @summary Check that MX notifications are reported for all cycles - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -Xmx128m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions * -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive @@ -67,7 +67,7 @@ /* * @test TestChurnNotifications * @summary Check that MX notifications are reported for all cycles - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -Xmx128m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions * -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
--- a/test/hotspot/jtreg/gc/shenandoah/mxbeans/TestMemoryMXBeans.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/mxbeans/TestMemoryMXBeans.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /** * @test TestMemoryMXBeans * @summary Test JMX memory beans - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @modules java.base/jdk.internal.misc * java.management * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g TestMemoryMXBeans -1 1024
--- a/test/hotspot/jtreg/gc/shenandoah/mxbeans/TestMemoryPools.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/mxbeans/TestMemoryPools.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /** * @test TestMemoryPools * @summary Test JMX memory pools - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @modules java.base/jdk.internal.misc * java.management * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx1g -Xms1g TestMemoryPools
--- a/test/hotspot/jtreg/gc/shenandoah/mxbeans/TestPauseNotifications.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/mxbeans/TestPauseNotifications.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /* * @test TestPauseNotifications * @summary Check that MX notifications are reported for all cycles - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -Xmx128m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions * -XX:+UseShenandoahGC -XX:ShenandoahGCMode=passive @@ -41,7 +41,7 @@ /* * @test TestPauseNotifications * @summary Check that MX notifications are reported for all cycles - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -Xmx128m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions * -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive @@ -63,7 +63,7 @@ /* * @test TestPauseNotifications * @summary Check that MX notifications are reported for all cycles - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -Xmx128m -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions * -XX:+UseShenandoahGC -XX:ShenandoahGCMode=iu -XX:ShenandoahGCHeuristics=aggressive
--- a/test/hotspot/jtreg/gc/shenandoah/oom/TestAllocLargeObj.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/oom/TestAllocLargeObj.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /** * @test TestAllocLargeObj * @summary Test allocation of small object to result OOM, but not to crash JVM - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * @run driver TestAllocLargeObj */
--- a/test/hotspot/jtreg/gc/shenandoah/oom/TestAllocLargerThanHeap.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/oom/TestAllocLargerThanHeap.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /** * @test TestAllocLargerThanHeap * @summary Test that allocation of the object larger than heap fails predictably - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * @run driver TestAllocLargerThanHeap */
--- a/test/hotspot/jtreg/gc/shenandoah/oom/TestAllocSmallObj.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/oom/TestAllocSmallObj.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /** * @test TestAllocSmallObj * @summary Test allocation of small object to result OOM, but not to crash JVM - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * @run driver TestAllocSmallObj */
--- a/test/hotspot/jtreg/gc/shenandoah/oom/TestClassLoaderLeak.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/oom/TestClassLoaderLeak.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /** * @test TestClassLoaderLeak * @summary Test OOME in due to classloader leak - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * @run driver TestClassLoaderLeak */
--- a/test/hotspot/jtreg/gc/shenandoah/oom/TestThreadFailure.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/oom/TestThreadFailure.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /** * @test TestThreadFailure * @summary Test OOME in separate thread is recoverable - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * @run driver TestThreadFailure */
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestAlwaysPreTouch.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/options/TestAlwaysPreTouch.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /* * @test TestAlwaysPreTouch * @summary Check that Shenandoah's AlwaysPreTouch does not fire asserts - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:+AlwaysPreTouch -Xmx1g TestAlwaysPreTouch * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:+AlwaysPreTouch -XX:ConcGCThreads=2 -Xmx1g TestAlwaysPreTouch
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestArgumentRanges.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/options/TestArgumentRanges.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /* * @test TestArgumentRanges * @summary Test that Shenandoah arguments are checked for ranges where applicable - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * @modules java.base/jdk.internal.misc * java.management
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestClassUnloadingArguments.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/options/TestClassUnloadingArguments.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /* * @test TestClassUnloadingArguments * @summary Test that loop mining arguments are sane - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * @run driver TestClassUnloadingArguments */
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestCodeCacheRootStyles.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/options/TestCodeCacheRootStyles.java Fri Jul 10 11:52:35 2020 -0700 @@ -23,7 +23,7 @@ */ /* @test TestCodeCacheRootStyles - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions * -XX:+UseShenandoahGC -XX:ShenandoahCodeRootsStyle=0 TestCodeCacheRootStyles * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestCriticalControlThreadPriority.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/options/TestCriticalControlThreadPriority.java Fri Jul 10 11:52:35 2020 -0700 @@ -26,7 +26,7 @@ * @test TestCriticalControlThreadPriority * @summary Check that ShenandoahCriticalControlThreadPriority works * @bug 8217343 - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:-ShenandoahCriticalControlThreadPriority -Xmx1g TestCriticalControlThreadPriority * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:+ShenandoahCriticalControlThreadPriority -Xmx1g TestCriticalControlThreadPriority
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestEnabled.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/options/TestEnabled.java Fri Jul 10 11:52:35 2020 -0700 @@ -26,14 +26,14 @@ /* * @test TestEnabled - * @requires vm.gc.Shenandoah & vm.gc == "null" & !vm.graal.enabled + * @requires vm.gc.Shenandoah & vm.gc == "null" * @run main/othervm -Dexpected=false -Xmx64m TestEnabled * @run main/othervm -Dexpected=true -Xmx64m -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC TestEnabled */ /* * @test TestEnabledAlready - * @requires vm.gc.Shenandoah & vm.gc == "Shenandoah" & !vm.graal.enabled + * @requires vm.gc.Shenandoah & vm.gc == "Shenandoah" * @run main/othervm -Dexpected=true -Xmx64m TestEnabled */ public class TestEnabled {
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestExplicitGC.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/options/TestExplicitGC.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /* * @test TestExplicitGC * @summary Test that Shenandoah reacts to explicit GC flags appropriately - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * @modules java.base/jdk.internal.misc * java.management
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestExplicitGCNoConcurrent.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/options/TestExplicitGCNoConcurrent.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /* * @test TestExplicitGCNoConcurrent * @summary Test that Shenandoah reacts to explicit GC flags appropriately - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * @modules java.base/jdk.internal.misc * java.management
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestHeuristicsUnlock.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/options/TestHeuristicsUnlock.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /* * @test TestHeuristicsUnlock * @summary Test that Shenandoah heuristics are unlocked properly - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * @modules java.base/jdk.internal.misc * java.management
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestHumongousMoves.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/options/TestHumongousMoves.java Fri Jul 10 11:52:35 2020 -0700 @@ -26,7 +26,7 @@ * @test TestHumongousMoves * @summary Check Shenandoah reacts on setting humongous moves correctly * @key randomness - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -Xmx1g -Xms1g
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestHumongousThresholdArgs.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/options/TestHumongousThresholdArgs.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /* * @test TestHumongousThresholdArgs * @summary Test that Shenandoah humongous threshold args are checked - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * @modules java.base/jdk.internal.misc * java.management
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestLoopMiningArguments.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/options/TestLoopMiningArguments.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /* * @test TestLoopMiningArguments * @summary Test that loop mining arguments are sane - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @requires vm.flavor == "server" * @library /test/lib * @run driver TestLoopMiningArguments
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestModeUnlock.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/options/TestModeUnlock.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /* * @test TestModeUnlock * @summary Test that Shenandoah modes are unlocked properly - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * @modules java.base/jdk.internal.misc * java.management
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestObjectAlignment.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/options/TestObjectAlignment.java Fri Jul 10 11:52:35 2020 -0700 @@ -24,7 +24,7 @@ /* * @test TestObjectAlignment - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC TestObjectAlignment * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -Xmx16m TestObjectAlignment @@ -38,7 +38,8 @@ /* * @test TestObjectAlignment - * @requires vm.gc.Shenandoah & !vm.graal.enabled & (vm.bits == "64") + * @requires vm.gc.Shenandoah + * @requires vm.bits == "64" * * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ObjectAlignmentInBytes=16 TestObjectAlignment * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ObjectAlignmentInBytes=16 -Xmx16m TestObjectAlignment
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestPacing.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/options/TestPacing.java Fri Jul 10 11:52:35 2020 -0700 @@ -24,7 +24,7 @@ /* * @test TestPacing - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:-ShenandoahPacing -Xmx128m TestPacing * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:+ShenandoahPacing -Xmx128m TestPacing
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestParallelRegionStride.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/options/TestParallelRegionStride.java Fri Jul 10 11:52:35 2020 -0700 @@ -24,7 +24,7 @@ /* * @test TestParallelRegionStride - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahParallelRegionStride=1 -Xmx128m TestParallelRegionStride * @run main/othervm -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahParallelRegionStride=10 -Xmx128m TestParallelRegionStride
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestRegionSizeArgs.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/options/TestRegionSizeArgs.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /* * @test TestRegionSizeArgs * @summary Test that Shenandoah region size args are checked - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * @modules java.base/jdk.internal.misc * java.management
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestSelectiveBarrierFlags.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/options/TestSelectiveBarrierFlags.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /* @test TestSelectiveBarrierFlags * @summary Test selective barrier enabling works, by aggressively compiling HelloWorld with combinations * of barrier flags - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * @run driver TestSelectiveBarrierFlags -Xint * @run driver TestSelectiveBarrierFlags -Xbatch -XX:CompileThreshold=100 -XX:TieredStopAtLevel=1
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestSingleThreaded.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/options/TestSingleThreaded.java Fri Jul 10 11:52:35 2020 -0700 @@ -24,7 +24,7 @@ /* @test TestSingleThreaded * @summary test single worker threaded Shenandoah - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @run main/othervm -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions * -XX:+UseShenandoahGC -XX:ShenandoahGCHeuristics=aggressive * -XX:ParallelGCThreads=1 -XX:ConcGCThreads=1 TestSingleThreaded
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestThreadCounts.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/options/TestThreadCounts.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /* * @test TestThreadCounts * @summary Test that Shenandoah GC thread counts are handled well - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * @modules java.base/jdk.internal.misc * java.management
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestThreadCountsOverride.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/options/TestThreadCountsOverride.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /* * @test TestThreadCountsOverride * @summary Test that Shenandoah GC thread counts are overridable - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * @modules java.base/jdk.internal.misc * java.management
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierDisable.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierDisable.java Fri Jul 10 11:52:35 2020 -0700 @@ -24,7 +24,7 @@ /* @test TestWrongBarrierDisable * @summary Test that disabling wrong barriers fails early - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * @run driver TestWrongBarrierDisable */
--- a/test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierEnable.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/shenandoah/options/TestWrongBarrierEnable.java Fri Jul 10 11:52:35 2020 -0700 @@ -24,7 +24,7 @@ /* @test TestWrongBarrierEnable * @summary Test that disabling wrong barriers fails early - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @library /test/lib * @run driver TestWrongBarrierEnable */
--- a/test/hotspot/jtreg/gc/startup_warnings/TestShenandoah.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/startup_warnings/TestShenandoah.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /* * @test TestShenandoah -* @requires vm.gc.Shenandoah & !vm.graal.enabled +* @requires vm.gc.Shenandoah * @bug 8006398 * @summary Test that the Shenandoah collector does not print a warning message * @library /test/lib
--- a/test/hotspot/jtreg/gc/stress/CriticalNativeStress.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/stress/CriticalNativeStress.java Fri Jul 10 11:52:35 2020 -0700 @@ -33,7 +33,8 @@ * @key randomness * @bug 8199868 * @library / /test/lib - * @requires (os.arch =="x86_64" | os.arch == "amd64" | os.arch=="x86" | os.arch=="i386") & vm.gc.Epsilon & !vm.graal.enabled + * @requires os.arch =="x86_64" | os.arch == "amd64" | os.arch=="x86" | os.arch=="i386" + * @requires vm.gc.Epsilon * @summary test argument pinning by nmethod wrapper of critical native method * @run main/othervm/native -XX:+UnlockExperimentalVMOptions -XX:+UseEpsilonGC -Xcomp -Xmx1G -XX:+CriticalJNINatives gc.stress.CriticalNativeStress */ @@ -43,7 +44,8 @@ * @key randomness * @bug 8199868 * @library / /test/lib - * @requires (os.arch =="x86_64" | os.arch == "amd64" | os.arch=="x86" | os.arch=="i386") & vm.gc.Shenandoah & !vm.graal.enabled + * @requires os.arch =="x86_64" | os.arch == "amd64" | os.arch=="x86" | os.arch=="i386" + * @requires vm.gc.Shenandoah * @summary test argument pinning by nmethod wrapper of critical native method * @run main/othervm/native -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCMode=passive -XX:-ShenandoahDegeneratedGC -Xcomp -Xmx512M -XX:+CriticalJNINatives gc.stress.CriticalNativeStress * @run main/othervm/native -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions -XX:+UseShenandoahGC -XX:ShenandoahGCMode=passive -XX:+ShenandoahDegeneratedGC -Xcomp -Xmx512M -XX:+CriticalJNINatives gc.stress.CriticalNativeStress
--- a/test/hotspot/jtreg/gc/stress/TestReclaimStringsLeaksMemory.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/stress/TestReclaimStringsLeaksMemory.java Fri Jul 10 11:52:35 2020 -0700 @@ -27,7 +27,8 @@ * @test TestReclaimStringsLeaksMemory * @bug 8180048 * @summary Ensure that during a Full GC interned string memory is reclaimed completely. - * @requires vm.gc=="null" & !vm.graal.enabled & !vm.debug + * @requires vm.gc == "null" + * @requires !vm.debug * @library /test/lib * @modules java.base/jdk.internal.misc * @run driver gc.stress.TestReclaimStringsLeaksMemory
--- a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithShenandoah.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithShenandoah.java Fri Jul 10 11:52:35 2020 -0700 @@ -30,8 +30,8 @@ * @test TestGCBasherWithShenandoah * @key stress * @library / - * @requires vm.gc.Shenandoah & !vm.graal.enabled - * @requires vm.flavor == "server" & !vm.emulatedClient & !vm.graal.enabled + * @requires vm.gc.Shenandoah + * @requires vm.flavor == "server" & !vm.emulatedClient * @summary Stress the Shenandoah GC by trying to make old objects more likely to be garbage than young objects. * * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions @@ -49,8 +49,8 @@ * @test TestGCBasherWithShenandoah * @key stress * @library / - * @requires vm.gc.Shenandoah & !vm.graal.enabled - * @requires vm.flavor == "server" & !vm.emulatedClient & !vm.graal.enabled + * @requires vm.gc.Shenandoah + * @requires vm.flavor == "server" & !vm.emulatedClient * @summary Stress the Shenandoah GC by trying to make old objects more likely to be garbage than young objects. * * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions @@ -72,8 +72,8 @@ * @test TestGCBasherWithShenandoah * @key stress * @library / - * @requires vm.gc.Shenandoah & !vm.graal.enabled - * @requires vm.flavor == "server" & !vm.emulatedClient & !vm.graal.enabled + * @requires vm.gc.Shenandoah + * @requires vm.flavor == "server" & !vm.emulatedClient * @summary Stress the Shenandoah GC by trying to make old objects more likely to be garbage than young objects. * * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions @@ -94,8 +94,8 @@ * @test TestGCBasherWithShenandoah * @key stress * @library / - * @requires vm.gc.Shenandoah & !vm.graal.enabled - * @requires vm.flavor == "server" & !vm.emulatedClient & !vm.graal.enabled + * @requires vm.gc.Shenandoah + * @requires vm.flavor == "server" & !vm.emulatedClient * @summary Stress the Shenandoah GC by trying to make old objects more likely to be garbage than young objects. * * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions @@ -117,8 +117,8 @@ * @test TestGCBasherWithShenandoah * @key stress * @library / - * @requires vm.gc.Shenandoah & !vm.graal.enabled - * @requires vm.flavor == "server" & !vm.emulatedClient & !vm.graal.enabled + * @requires vm.gc.Shenandoah + * @requires vm.flavor == "server" & !vm.emulatedClient * @summary Stress the Shenandoah GC by trying to make old objects more likely to be garbage than young objects. * * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions @@ -136,7 +136,7 @@ * @key stress * @library / * @requires vm.gc.Shenandoah - * @requires vm.flavor == "server" & !vm.emulatedClient & !vm.graal.enabled & vm.opt.ClassUnloading != false + * @requires vm.flavor == "server" & !vm.emulatedClient & vm.opt.ClassUnloading != false * @summary Stress Shenandoah GC with nmethod barrier forced deoptimization enabled. * * @run main/othervm/timeout=200 -Xlog:gc*=info,nmethod+barrier=trace -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions @@ -157,7 +157,7 @@ * @key stress * @library / * @requires vm.gc.Shenandoah - * @requires vm.flavor == "server" & !vm.emulatedClient & !vm.graal.enabled & vm.opt.ClassUnloading != false + * @requires vm.flavor == "server" & !vm.emulatedClient & vm.opt.ClassUnloading != false * @summary Stress Shenandoah GC with nmethod barrier forced deoptimization enabled. * * @run main/othervm/timeout=200 -Xlog:gc*=info,nmethod+barrier=trace -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions @@ -183,7 +183,7 @@ * @key stress * @library / * @requires vm.gc.Shenandoah - * @requires vm.flavor == "server" & !vm.emulatedClient & !vm.graal.enabled & vm.opt.ClassUnloading != false + * @requires vm.flavor == "server" & !vm.emulatedClient & vm.opt.ClassUnloading != false * @summary Stress Shenandoah GC with nmethod barrier forced deoptimization enabled. * * @run main/othervm/timeout=200 -Xlog:gc*=info,nmethod+barrier=trace -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions @@ -208,7 +208,7 @@ * @key stress * @library / * @requires vm.gc.Shenandoah - * @requires vm.flavor == "server" & !vm.emulatedClient & !vm.graal.enabled & vm.opt.ClassUnloading != false + * @requires vm.flavor == "server" & !vm.emulatedClient & vm.opt.ClassUnloading != false * @summary Stress Shenandoah GC with nmethod barrier forced deoptimization enabled. * * @run main/othervm/timeout=200 -Xlog:gc*=info,nmethod+barrier=trace -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions @@ -234,7 +234,7 @@ * @key stress * @library / * @requires vm.gc.Shenandoah - * @requires vm.flavor == "server" & !vm.emulatedClient & !vm.graal.enabled & vm.opt.ClassUnloading != false + * @requires vm.flavor == "server" & !vm.emulatedClient & vm.opt.ClassUnloading != false * @summary Stress Shenandoah GC with nmethod barrier forced deoptimization enabled. * * @run main/othervm/timeout=200 -Xlog:gc*=info,nmethod+barrier=trace -Xmx1g -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
--- a/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithZ.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/stress/gcbasher/TestGCBasherWithZ.java Fri Jul 10 11:52:35 2020 -0700 @@ -31,7 +31,7 @@ * @key stress * @library / * @requires vm.gc.Z - * @requires vm.flavor == "server" & !vm.emulatedClient & !vm.graal.enabled + * @requires vm.flavor == "server" & !vm.emulatedClient * @summary Stress ZGC * @run main/othervm/timeout=200 -Xlog:gc*=info -Xmx384m -server -XX:+UseZGC gc.stress.gcbasher.TestGCBasherWithZ 120000 */ @@ -41,10 +41,10 @@ * @key stress * @library / * @requires vm.gc.Z - * @requires vm.flavor == "server" & !vm.emulatedClient & !vm.graal.enabled & vm.opt.ClassUnloading != false + * @requires vm.flavor == "server" & !vm.emulatedClient & vm.opt.ClassUnloading != false * @summary Stress ZGC with nmethod barrier forced deoptimization enabled. * @run main/othervm/timeout=200 -Xlog:gc*=info,nmethod+barrier=trace -Xmx384m -server -XX:+UseZGC - * -XX:+UnlockDiagnosticVMOptions -XX:+DeoptimizeNMethodBarriersALot -XX:-Inline + * -XX:+UnlockDiagnosticVMOptions -XX:+DeoptimizeNMethodBarriersALot -XX:-Inline * gc.stress.gcbasher.TestGCBasherWithZ 120000 */ public class TestGCBasherWithZ {
--- a/test/hotspot/jtreg/gc/stress/gclocker/TestGCLockerWithShenandoah.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/stress/gclocker/TestGCLockerWithShenandoah.java Fri Jul 10 11:52:35 2020 -0700 @@ -27,7 +27,7 @@ /* * @test TestGCLockerWithShenandoah * @library / - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @summary Stress Shenandoah's JNI handling by calling GetPrimitiveArrayCritical while concurrently filling up old gen. * * @run main/native/othervm/timeout=200 -Xlog:gc*=info -Xms1500m -Xmx1500m -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions
--- a/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithShenandoah.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithShenandoah.java Fri Jul 10 11:52:35 2020 -0700 @@ -27,7 +27,7 @@ * @test TestGCOldWithShenandoah * @key stress randomness * @library / /test/lib - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @summary Stress the GC by trying to make old objects more likely to be garbage than young objects. * * @run main/othervm/timeout=600 -Xmx384M -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions @@ -55,7 +55,7 @@ * @test TestGCOldWithShenandoah * @key stress randomness * @library / /test/lib - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @summary Stress the GC by trying to make old objects more likely to be garbage than young objects. * * @run main/othervm -Xmx384M -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions @@ -90,7 +90,7 @@ * @test TestGCOldWithShenandoah * @key stress randomness * @library / /test/lib - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @summary Stress the GC by trying to make old objects more likely to be garbage than young objects. * * @run main/othervm -Xmx384M -XX:+UnlockDiagnosticVMOptions -XX:+UnlockExperimentalVMOptions
--- a/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithZ.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/stress/gcold/TestGCOldWithZ.java Fri Jul 10 11:52:35 2020 -0700 @@ -28,7 +28,7 @@ * @test TestGCOldWithZ * @key randomness * @library / /test/lib - * @requires vm.gc.Z & !vm.graal.enabled + * @requires vm.gc.Z * @summary Stress the Z * @run main/othervm -Xmx384M -XX:+UseZGC gc.stress.gcold.TestGCOldWithZ 50 1 20 10 10000 * @run main/othervm -Xmx256m -XX:+UseZGC gc.stress.gcold.TestGCOldWithZ 50 5 20 1 5000
--- a/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithShenandoah.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/stress/systemgc/TestSystemGCWithShenandoah.java Fri Jul 10 11:52:35 2020 -0700 @@ -28,7 +28,7 @@ * @test TestSystemGCWithShenandoah * @key stress * @library / - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @summary Stress the Shenandoah GC full GC by allocating objects of different lifetimes concurrently with System.gc(). * * @run main/othervm/timeout=300 -Xlog:gc*=info -Xmx512m -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions @@ -45,7 +45,7 @@ * @test TestSystemGCWithShenandoah * @key stress * @library / - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @summary Stress the Shenandoah GC full GC by allocating objects of different lifetimes concurrently with System.gc(). * * @run main/othervm/timeout=300 -Xlog:gc*=info -Xmx512m -XX:+UnlockExperimentalVMOptions -XX:+UnlockDiagnosticVMOptions
--- a/test/hotspot/jtreg/gc/z/TestAllocateHeapAt.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/z/TestAllocateHeapAt.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /* * @test TestAllocateHeapAt - * @requires vm.gc.Z & os.family == "linux" & !vm.graal.enabled + * @requires vm.gc.Z & os.family == "linux" * @summary Test ZGC with -XX:AllocateHeapAt * @library /test/lib * @run main/othervm gc.z.TestAllocateHeapAt . true
--- a/test/hotspot/jtreg/gc/z/TestAlwaysPreTouch.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/z/TestAlwaysPreTouch.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /* * @test TestAlwaysPreTouch - * @requires vm.gc.Z & !vm.graal.enabled + * @requires vm.gc.Z * @summary Test ZGC parallel pre-touch * @run main/othervm -XX:+UseZGC -Xlog:gc* -XX:-AlwaysPreTouch -Xms128M -Xmx128M gc.z.TestAlwaysPreTouch * @run main/othervm -XX:+UseZGC -Xlog:gc* -XX:+AlwaysPreTouch -XX:ParallelGCThreads=1 -Xms2M -Xmx128M gc.z.TestAlwaysPreTouch
--- a/test/hotspot/jtreg/gc/z/TestGarbageCollectorMXBean.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/z/TestGarbageCollectorMXBean.java Fri Jul 10 11:52:35 2020 -0700 @@ -23,7 +23,7 @@ /** * @test TestGarbageCollectorMXBean - * @requires vm.gc.Z & !vm.graal.enabled + * @requires vm.gc.Z * @summary Test ZGC garbage collector MXBean * @modules java.management * @run main/othervm -XX:+UseZGC -Xms256M -Xmx512M -Xlog:gc TestGarbageCollectorMXBean 256 512
--- a/test/hotspot/jtreg/gc/z/TestHighUsage.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/z/TestHighUsage.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /* * @test TestHighUsage - * @requires vm.gc.Z & !vm.graal.enabled + * @requires vm.gc.Z * @summary Test ZGC "High Usage" rule * @library /test/lib * @run main/othervm gc.z.TestHighUsage
--- a/test/hotspot/jtreg/gc/z/TestMemoryMXBean.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/z/TestMemoryMXBean.java Fri Jul 10 11:52:35 2020 -0700 @@ -23,7 +23,7 @@ /** * @test TestMemoryMXBean - * @requires vm.gc.Z & !vm.graal.enabled + * @requires vm.gc.Z * @summary Test ZGC heap memory MXBean * @modules java.management * @run main/othervm -XX:+UseZGC -Xms128M -Xmx256M -Xlog:gc* TestMemoryMXBean 128 256
--- a/test/hotspot/jtreg/gc/z/TestMemoryManagerMXBean.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/z/TestMemoryManagerMXBean.java Fri Jul 10 11:52:35 2020 -0700 @@ -23,7 +23,7 @@ /** * @test TestMemoryManagerMXBean - * @requires vm.gc.Z & !vm.graal.enabled + * @requires vm.gc.Z * @summary Test ZGC memory manager MXBean * @modules java.management * @run main/othervm -XX:+UseZGC -Xmx128M TestMemoryManagerMXBean
--- a/test/hotspot/jtreg/gc/z/TestPageCacheFlush.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/z/TestPageCacheFlush.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /* * @test TestPageCacheFlush - * @requires vm.gc.Z & !vm.graal.enabled + * @requires vm.gc.Z * @summary Test ZGC page cache flushing * @library /test/lib * @run driver gc.z.TestPageCacheFlush
--- a/test/hotspot/jtreg/gc/z/TestSmallHeap.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/z/TestSmallHeap.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,7 +25,7 @@ /* * @test TestSmallHeap - * @requires vm.gc.Z & !vm.graal.enabled + * @requires vm.gc.Z * @summary Test ZGC with small heaps * @library / /test/lib * @run driver gc.z.TestSmallHeap 8M 16M 32M 64M 128M 256M 512M 1024M
--- a/test/hotspot/jtreg/gc/z/TestUncommit.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/gc/z/TestUncommit.java Fri Jul 10 11:52:35 2020 -0700 @@ -25,21 +25,21 @@ /* * @test TestUncommit - * @requires vm.gc.Z & !vm.graal.enabled + * @requires vm.gc.Z * @summary Test ZGC uncommit unused memory * @run main/othervm -XX:+UseZGC -Xlog:gc*,gc+heap=debug,gc+stats=off -Xms128M -Xmx512M -XX:ZUncommitDelay=10 gc.z.TestUncommit true 2 */ /* * @test TestUncommit - * @requires vm.gc.Z & !vm.graal.enabled + * @requires vm.gc.Z * @summary Test ZGC uncommit unused memory * @run main/othervm -XX:+UseZGC -Xlog:gc*,gc+heap=debug,gc+stats=off -Xms512M -Xmx512M -XX:ZUncommitDelay=10 gc.z.TestUncommit false 1 */ /* * @test TestUncommit - * @requires vm.gc.Z & !vm.graal.enabled + * @requires vm.gc.Z * @summary Test ZGC uncommit unused memory * @run main/othervm -XX:+UseZGC -Xlog:gc*,gc+heap=debug,gc+stats=off -Xms128M -Xmx512M -XX:ZUncommitDelay=10 -XX:-ZUncommit gc.z.TestUncommit false 1 */
--- a/test/hotspot/jtreg/runtime/cds/appcds/TestZGCWithCDS.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/runtime/cds/appcds/TestZGCWithCDS.java Fri Jul 10 11:52:35 2020 -0700 @@ -28,8 +28,6 @@ * @requires vm.gc.Z * @requires vm.gc.Serial * @requires vm.gc == null - * @comment Graal does not support ZGC - * @requires !vm.graal.enabled * @library /test/lib /test/hotspot/jtreg/runtime/cds/appcds * @compile test-classes/Hello.java * @run driver TestZGCWithCDS
--- a/test/hotspot/jtreg/serviceability/dcmd/gc/HeapDumpCompressedTest.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/hotspot/jtreg/serviceability/dcmd/gc/HeapDumpCompressedTest.java Fri Jul 10 11:52:35 2020 -0700 @@ -72,7 +72,7 @@ /* * @test - * @requires vm.gc.Z & !vm.graal.enabled + * @requires vm.gc.Z * @summary Test of diagnostic command GC.heap_dump with gzipped output (Z GC) * @library /test/lib * @modules java.base/jdk.internal.misc @@ -84,7 +84,7 @@ /* * @test - * @requires vm.gc.Shenandoah & !vm.graal.enabled + * @requires vm.gc.Shenandoah * @summary Test of diagnostic command GC.heap_dump with gzipped output (Shenandoah GC) * @library /test/lib * @modules java.base/jdk.internal.misc @@ -96,7 +96,7 @@ /* * @test - * @requires vm.gc.Epsilon & !vm.graal.enabled + * @requires vm.gc.Epsilon * @summary Test of diagnostic command GC.heap_dump with gzipped output (Epsilon GC) * @library /test/lib * @modules java.base/jdk.internal.misc
--- a/test/jtreg-ext/requires/VMProps.java Fri Jul 10 11:49:58 2020 -0700 +++ b/test/jtreg-ext/requires/VMProps.java Fri Jul 10 11:52:35 2020 -0700 @@ -268,18 +268,36 @@ return CPUInfo.getFeatures().toString(); } + private boolean isGcSupportedByGraal(GC gc) { + switch (gc) { + case Serial: + case Parallel: + case G1: + return true; + case Epsilon: + case Z: + case Shenandoah: + return false; + default: + throw new IllegalStateException("Unknown GC " + gc.name()); + } + } + /** * For all existing GC sets vm.gc.X property. * Example vm.gc.G1=true means: * VM supports G1 * User either set G1 explicitely (-XX:+UseG1GC) or did not set any GC + * G1 can be selected, i.e. it doesn't conflict with other VM flags * * @param map - property-value pairs */ protected void vmGC(SafeMap map) { + var isGraalEnabled = Compiler.isGraalEnabled(); for (GC gc: GC.values()) { map.put("vm.gc." + gc.name(), () -> "" + (gc.isSupported() + && (!isGraalEnabled || isGcSupportedByGraal(gc)) && (gc.isSelected() || GC.isSelectedErgonomically()))); } }