Skip to content

8369147: Various issues with new tests added by JDK-8316694 #27659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+16 −36
Open

8369147: Various issues with new tests added by JDK-8316694 #27659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions test/hotspot/jtreg/ProblemList.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,17 +79,6 @@ compiler/c2/TestVerifyConstraintCasts.java 8355574 generic-all

compiler/c2/aarch64/TestStaticCallStub.java 8359963 linux-aarch64,macosx-aarch64

compiler/whitebox/DeoptimizeRelocatedNMethod.java#G1 8369147 generic-all
compiler/whitebox/DeoptimizeRelocatedNMethod.java#Parallel 8369147 generic-all
compiler/whitebox/DeoptimizeRelocatedNMethod.java#Serial 8369147 generic-all
compiler/whitebox/DeoptimizeRelocatedNMethod.java#ZGC 8369147 generic-all
compiler/whitebox/RelocateNMethod.java#G1 8369147 generic-all
compiler/whitebox/RelocateNMethod.java#Parallel 8369147 generic-all
compiler/whitebox/RelocateNMethod.java#Serial 8369147 generic-all
compiler/whitebox/RelocateNMethod.java#ZGC 8369147 generic-all
compiler/whitebox/StressNMethodRelocation.java 8369147,8369148,8369149 generic-all
serviceability/jvmti/NMethodRelocation/NMethodRelocationTest.java 8369150,8369151 generic-all

#############################################################################

# :hotspot_gc
Expand Down
17 changes: 6 additions & 11 deletions test/hotspot/jtreg/compiler/whitebox/DeoptimizeRelocatedNMethod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@
* @bug 8316694
* @library /test/lib /
* @modules java.base/jdk.internal.misc java.management
* @requires vm.opt.DeoptimizeALot != true
* @requires vm.gc.Serial
* @requires vm.opt.DeoptimizeALot != true & vm.gc.Serial
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggestion:

@requires vm.gc == "null" | vm.gc == "Serial"

* @build jdk.test.whitebox.WhiteBox
* @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbatch -XX:+SegmentedCodeCache -XX:+UseSerialGC
Expand All @@ -40,8 +39,7 @@
* @bug 8316694
* @library /test/lib /
* @modules java.base/jdk.internal.misc java.management
* @requires vm.opt.DeoptimizeALot != true
* @requires vm.gc.Parallel
* @requires vm.opt.DeoptimizeALot != true & vm.gc.Parallel
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@requires vm.gc == "null" | vm.gc == "Parallel"

* @build jdk.test.whitebox.WhiteBox
* @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbatch -XX:+SegmentedCodeCache -XX:+UseParallelGC
Expand All @@ -53,8 +51,7 @@
* @bug 8316694
* @library /test/lib /
* @modules java.base/jdk.internal.misc java.management
* @requires vm.opt.DeoptimizeALot != true
* @requires vm.gc.G1
* @requires vm.opt.DeoptimizeALot != true & vm.gc.G1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@requires vm.gc == "null" | vm.gc == "G1"

* @build jdk.test.whitebox.WhiteBox
* @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbatch -XX:+SegmentedCodeCache -XX:+UseG1GC
Expand All @@ -66,8 +63,7 @@
* @bug 8316694
* @library /test/lib /
* @modules java.base/jdk.internal.misc java.management
* @requires vm.opt.DeoptimizeALot != true
* @requires vm.gc.Shenandoah
* @requires vm.opt.DeoptimizeALot != true & vm.gc.Shenandoah
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@requires vm.gc == "null" | vm.gc == "Shenandoah"

* @build jdk.test.whitebox.WhiteBox
* @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbatch -XX:+SegmentedCodeCache -XX:+UseShenandoahGC
Expand All @@ -79,8 +75,7 @@
* @bug 8316694
* @library /test/lib /
* @modules java.base/jdk.internal.misc java.management
* @requires vm.opt.DeoptimizeALot != true
* @requires vm.gc.Z
* @requires vm.opt.DeoptimizeALot != true & vm.gc.Z
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@requires vm.gc == "null" | vm.gc == "Z"

* @build jdk.test.whitebox.WhiteBox
* @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -Xbatch -XX:+SegmentedCodeCache -XX:+UseZGC
Expand Down Expand Up @@ -118,7 +113,7 @@ public static void main(String [] args) throws Exception {
NMethod origNmethod = NMethod.get(method, false);

// Relocate nmethod and mark old for cleanup
WHITE_BOX.relocateNMethodFromMethod(method, BlobType.MethodProfiled.id);
WHITE_BOX.relocateNMethodFromMethod(method, BlobType.MethodNonProfiled.id);

// Trigger GC to clean up old nmethod
WHITE_BOX.fullGC();
Expand Down
17 changes: 6 additions & 11 deletions test/hotspot/jtreg/compiler/whitebox/RelocateNMethod.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@
* @library /test/lib /
* @modules java.base/jdk.internal.misc java.management
*
* @requires vm.opt.DeoptimizeALot != true
* @requires vm.gc.Serial
* @requires vm.opt.DeoptimizeALot != true & vm.gc.Serial
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same here as in test/hotspot/jtreg/compiler/whitebox/DeoptimizeRelocatedNMethod.java

*
* @build jdk.test.whitebox.WhiteBox
* @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
Expand All @@ -45,8 +44,7 @@
* @library /test/lib /
* @modules java.base/jdk.internal.misc java.management
*
* @requires vm.opt.DeoptimizeALot != true
* @requires vm.gc.Parallel
* @requires vm.opt.DeoptimizeALot != true & vm.gc.Parallel
*
* @build jdk.test.whitebox.WhiteBox
* @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
Expand All @@ -61,8 +59,7 @@
* @library /test/lib /
* @modules java.base/jdk.internal.misc java.management
*
* @requires vm.opt.DeoptimizeALot != true
* @requires vm.gc.G1
* @requires vm.opt.DeoptimizeALot != true & vm.gc.G1
*
* @build jdk.test.whitebox.WhiteBox
* @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
Expand All @@ -77,8 +74,7 @@
* @library /test/lib /
* @modules java.base/jdk.internal.misc java.management
*
* @requires vm.opt.DeoptimizeALot != true
* @requires vm.gc.Shenandoah
* @requires vm.opt.DeoptimizeALot != true & vm.gc.Shenandoah
*
* @build jdk.test.whitebox.WhiteBox
* @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
Expand All @@ -93,8 +89,7 @@
* @library /test/lib /
* @modules java.base/jdk.internal.misc java.management
*
* @requires vm.opt.DeoptimizeALot != true
* @requires vm.gc.Z
* @requires vm.opt.DeoptimizeALot != true & vm.gc.Z
*
* @build jdk.test.whitebox.WhiteBox
* @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
Expand Down Expand Up @@ -132,7 +127,7 @@ protected void test() throws Exception {
checkCompiled();
NMethod origNmethod = NMethod.get(method, false);

WHITE_BOX.relocateNMethodFromMethod(method, BlobType.MethodProfiled.id);
WHITE_BOX.relocateNMethodFromMethod(method, BlobType.MethodNonProfiled.id);

WHITE_BOX.fullGC();

Expand Down
5 changes: 3 additions & 2 deletions test/hotspot/jtreg/compiler/whitebox/StressNMethodRelocation.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,11 @@
* @library /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @requires vm.compiler2.enabled & vm.opt.SegmentedCodeCache != false & vm.opt.TieredCompilation != false
* @build jdk.test.whitebox.WhiteBox
* @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+SegmentedCodeCache -XX:+UnlockExperimentalVMOptions
* @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I prefer @eastig suggestion to limit run time instead of increase timeout.

* -XX:+SegmentedCodeCache -XX:+TieredCompilation -XX:+UnlockExperimentalVMOptions
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure you need to specify -XX:+SegmentedCodeCache -XX:+TieredCompilation because you require them to be enabled to run test. Please, test that.

* -XX:+NMethodRelocation compiler.whitebox.StressNMethodRelocation
*/

Expand Down
2 changes: 1 addition & 1 deletion test/hotspot/jtreg/serviceability/jvmti/NMethodRelocation/NMethodRelocationTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
*
* @bug 8316694
* @summary Verify that nmethod relocation posts the correct JVMTI events
* @requires vm.jvmti
* @requires vm.jvmti & vm.gc.Serial
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

  • @requires vm.gc == "null" | vm.gc == "Serial"

* @library /test/lib /test/hotspot/jtreg
* @build jdk.test.whitebox.WhiteBox
* @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
Expand Down