8370263: [lworld] Fix compile commands after JDK-8369437

Reviewed-by: thartmann

Author: chhagedorn

test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestC2CCalls.java

@@ -43,8 +43,8 @@
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run main/othervm/timeout=300 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                               -XX:-UseBimorphicInlining -Xbatch
- *                               -XX:CompileCommand=compileonly,TestC2CCalls*::test*
- *                               -XX:CompileCommand=dontinline,TestC2CCalls*::test*
+ *                               -XX:CompileCommand=compileonly,*TestC2CCalls*::test*
+ *                               -XX:CompileCommand=dontinline,*TestC2CCalls*::test*
  *                               compiler.valhalla.inlinetypes.TestC2CCalls
  */
 
@@ -58,8 +58,8 @@
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run main/othervm/timeout=300 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                               -XX:-UseBimorphicInlining -Xbatch -XX:-ProfileInterpreter
- *                               -XX:CompileCommand=compileonly,TestC2CCalls*::test*
- *                               -XX:CompileCommand=dontinline,TestC2CCalls*::test*
+ *                               -XX:CompileCommand=compileonly,*TestC2CCalls*::test*
+ *                               -XX:CompileCommand=dontinline,*TestC2CCalls*::test*
  *                               compiler.valhalla.inlinetypes.TestC2CCalls
  */
 
@@ -73,8 +73,8 @@
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run main/othervm/timeout=300 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                              -XX:-UseBimorphicInlining -Xbatch
- *                              -XX:CompileCommand=compileonly,TestC2CCalls::test*
- *                              -XX:CompileCommand=dontinline,TestC2CCalls*::test*
+ *                              -XX:CompileCommand=compileonly,*TestC2CCalls::test*
+ *                              -XX:CompileCommand=dontinline,*TestC2CCalls*::test*
  *                              compiler.valhalla.inlinetypes.TestC2CCalls
  */
 
@@ -88,8 +88,8 @@
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run main/othervm/timeout=300 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                               -XX:-UseBimorphicInlining -Xbatch -XX:-ProfileInterpreter
- *                               -XX:CompileCommand=compileonly,TestC2CCalls::test*
- *                               -XX:CompileCommand=dontinline,TestC2CCalls*::test*
+ *                               -XX:CompileCommand=compileonly,*TestC2CCalls::test*
+ *                               -XX:CompileCommand=dontinline,*TestC2CCalls*::test*
  *                               compiler.valhalla.inlinetypes.TestC2CCalls
  */
 

test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestOopsInReturnConvention.java

@@ -30,8 +30,8 @@
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run main/othervm/timeout=300 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                               -Xbatch -XX:-TieredCompilation
- *                               -XX:CompileCommand=dontinline,TestOopsInReturnConvention::callee
- *                               -XX:CompileCommand=dontinline,TestOopsInReturnConvention*::verify
+ *                               -XX:CompileCommand=dontinline,*TestOopsInReturnConvention*::callee
+ *                               -XX:CompileCommand=dontinline,*TestOopsInReturnConvention*::verify
  *                               compiler.valhalla.inlinetypes.TestOopsInReturnConvention Interpreted
  */
 
@@ -44,8 +44,8 @@
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run main/othervm/timeout=300 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                   -Xbatch
- *                   -XX:CompileCommand=dontinline,TestOopsInReturnConvention::callee
- *                   -XX:CompileCommand=dontinline,TestOopsInReturnConvention*::verify
+ *                   -XX:CompileCommand=dontinline,*TestOopsInReturnConvention*::callee
+ *                   -XX:CompileCommand=dontinline,*TestOopsInReturnConvention*::verify
  *                   compiler.valhalla.inlinetypes.TestOopsInReturnConvention C1
  */
 
@@ -58,8 +58,8 @@
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run main/othervm/timeout=300 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                               -Xbatch
- *                               -XX:CompileCommand=dontinline,TestOopsInReturnConvention::callee
- *                               -XX:CompileCommand=dontinline,TestOopsInReturnConvention*::verify
+ *                               -XX:CompileCommand=dontinline,*TestOopsInReturnConvention*::callee
+ *                               -XX:CompileCommand=dontinline,*TestOopsInReturnConvention*::verify
  *                               compiler.valhalla.inlinetypes.TestOopsInReturnConvention C2
  */
 
@@ -73,8 +73,8 @@
  * @run main/othervm/timeout=300 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                               -Xbatch -XX:-TieredCompilation
  *                               -XX:+IgnoreUnrecognizedVMOptions -XX:+StressCallingConvention
- *                               -XX:CompileCommand=dontinline,TestOopsInReturnConvention::callee
- *                               -XX:CompileCommand=dontinline,TestOopsInReturnConvention*::verify
+ *                               -XX:CompileCommand=dontinline,*TestOopsInReturnConvention*::callee
+ *                               -XX:CompileCommand=dontinline,*TestOopsInReturnConvention*::verify
  *                                compiler.valhalla.inlinetypes.TestOopsInReturnConvention Interpreted
  */
 
@@ -87,8 +87,8 @@
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run main/othervm/timeout=300 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                               -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:+StressCallingConvention
- *                               -XX:CompileCommand=dontinline,TestOopsInReturnConvention::callee
- *                               -XX:CompileCommand=dontinline,TestOopsInReturnConvention*::verify
+ *                               -XX:CompileCommand=dontinline,*TestOopsInReturnConvention*::callee
+ *                               -XX:CompileCommand=dontinline,*TestOopsInReturnConvention*::verify
  *                               compiler.valhalla.inlinetypes.TestOopsInReturnConvention C1
  */
 
@@ -101,8 +101,8 @@
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run main/othervm/timeout=300 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                               -Xbatch -XX:-TieredCompilation -XX:+IgnoreUnrecognizedVMOptions -XX:+StressCallingConvention
- *                               -XX:CompileCommand=dontinline,TestOopsInReturnConvention::callee
- *                               -XX:CompileCommand=dontinline,TestOopsInReturnConvention*::verify
+ *                               -XX:CompileCommand=dontinline,*TestOopsInReturnConvention*::callee
+ *                               -XX:CompileCommand=dontinline,*TestOopsInReturnConvention*::verify
  *                               compiler.valhalla.inlinetypes.TestOopsInReturnConvention C2
  */
 
@@ -116,8 +116,8 @@
  * @run main/othervm/timeout=300 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                               -Xbatch -XX:-TieredCompilation
  *                               -XX:+IgnoreUnrecognizedVMOptions -XX:-PreloadClasses
- *                               -XX:CompileCommand=dontinline,TestOopsInReturnConvention::callee
- *                               -XX:CompileCommand=dontinline,TestOopsInReturnConvention*::verify
+ *                               -XX:CompileCommand=dontinline,*TestOopsInReturnConvention*::callee
+ *                               -XX:CompileCommand=dontinline,*TestOopsInReturnConvention*::verify
  *                               compiler.valhalla.inlinetypes.TestOopsInReturnConvention Interpreted
  */
 
@@ -131,8 +131,8 @@
  * @run main/othervm/timeout=300 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                               -Xbatch
  *                               -XX:+IgnoreUnrecognizedVMOptions -XX:-PreloadClasses
- *                               -XX:CompileCommand=dontinline,TestOopsInReturnConvention::callee
- *                               -XX:CompileCommand=dontinline,TestOopsInReturnConvention*::verify
+ *                               -XX:CompileCommand=dontinline,*TestOopsInReturnConvention*::callee
+ *                               -XX:CompileCommand=dontinline,*TestOopsInReturnConvention*::verify
  *                               compiler.valhalla.inlinetypes.TestOopsInReturnConvention C1
  */
 
@@ -146,8 +146,8 @@
  * @run main/othervm/timeout=300 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                               -Xbatch -XX:-TieredCompilation
  *                               -XX:+IgnoreUnrecognizedVMOptions -XX:-PreloadClasses
- *                               -XX:CompileCommand=dontinline,TestOopsInReturnConvention::callee
- *                               -XX:CompileCommand=dontinline,TestOopsInReturnConvention*::verify
+ *                               -XX:CompileCommand=dontinline,*TestOopsInReturnConvention*::callee
+ *                               -XX:CompileCommand=dontinline,*TestOopsInReturnConvention*::verify
  *                               compiler.valhalla.inlinetypes.TestOopsInReturnConvention C2
  */
 

test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestUnloadedInlineTypeArray.java

@@ -44,8 +44,8 @@
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
  * @run main/othervm -Xcomp -XX:-UseArrayFlattening
- *                   -XX:CompileCommand=compileonly,TestUnloadedInlineTypeArray::test*
- *                   TestUnloadedInlineTypeArray
+ *                   -XX:CompileCommand=compileonly,*TestUnloadedInlineTypeArray::test*
+ *                   compiler.valhalla.inlinetypes.TestUnloadedInlineTypeArray
  */
 
 /*
@@ -56,7 +56,7 @@
  * @enablePreview
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
- * @run main/othervm -Xcomp TestUnloadedInlineTypeArray
+ * @run main/othervm -Xcomp compiler.valhalla.inlinetypes.TestUnloadedInlineTypeArray
  */
 
 /*
@@ -68,7 +68,7 @@
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
  * @run main/othervm -Xcomp -XX:-UseArrayFlattening
- *                   TestUnloadedInlineTypeArray
+ *                   compiler.valhalla.inlinetypes.TestUnloadedInlineTypeArray
  */
 
 /*
@@ -80,8 +80,8 @@
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
  * @run main/othervm -Xcomp -XX:-TieredCompilation
- *                   -XX:CompileCommand=compileonly,TestUnloadedInlineTypeArray::test*
- *                   TestUnloadedInlineTypeArray
+ *                   -XX:CompileCommand=compileonly,*TestUnloadedInlineTypeArray::test*
+ *                   compiler.valhalla.inlinetypes.TestUnloadedInlineTypeArray
  */
 
 /*
@@ -93,8 +93,8 @@
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
  * @run main/othervm -Xcomp -XX:-TieredCompilation -XX:-UseArrayFlattening
- *                   -XX:CompileCommand=compileonly,TestUnloadedInlineTypeArray::test*
- *                   TestUnloadedInlineTypeArray
+ *                   -XX:CompileCommand=compileonly,*TestUnloadedInlineTypeArray::test*
+ *                   compiler.valhalla.inlinetypes.TestUnloadedInlineTypeArray
  */
 
 /*
@@ -106,7 +106,7 @@
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
  * @run main/othervm -Xcomp -XX:-TieredCompilation
- *                   TestUnloadedInlineTypeArray
+ *                   compiler.valhalla.inlinetypes.TestUnloadedInlineTypeArray
  */
 
 /*
@@ -118,9 +118,11 @@
  * @modules java.base/jdk.internal.value
  *          java.base/jdk.internal.vm.annotation
  * @run main/othervm -Xcomp -XX:-TieredCompilation -XX:-UseArrayFlattening
- *                   TestUnloadedInlineTypeArray
+ *                   compiler.valhalla.inlinetypes.TestUnloadedInlineTypeArray
  */
 
+package compiler.valhalla.inlinetypes;
+
 import jdk.test.lib.Asserts;
 
 import jdk.internal.value.ValueClass;

test/hotspot/jtreg/compiler/valhalla/inlinetypes/TestVirtualThreads.java

@@ -30,7 +30,7 @@
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
- *                   compiler.valhalla.inlinetypes.TestVirtualThreads
+ *                               compiler.valhalla.inlinetypes.TestVirtualThreads
  */
 
 /*
@@ -42,8 +42,8 @@
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
- *                   -Xbatch -XX:CompileCommand=compileonly,TestVirtualThreads*::*
- *                   compiler.valhalla.inlinetypes.TestVirtualThreads
+ *                               -Xbatch -XX:CompileCommand=compileonly,*TestVirtualThreads*::*
+ *                               compiler.valhalla.inlinetypes.TestVirtualThreads
  */
 
 /*
@@ -55,7 +55,7 @@
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
- *                               -Xbatch -XX:CompileCommand=compileonly,TestVirtualThreads*::test*
+ *                               -Xbatch -XX:CompileCommand=compileonly,*TestVirtualThreads*::test*
  *                                compiler.valhalla.inlinetypes.TestVirtualThreads
  */
 
@@ -69,7 +69,7 @@
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                               -Xbatch -XX:CompileCommand=dontinline,*::dontinline
- *                               -XX:CompileCommand=compileonly,TestVirtualThreads*::test*
+ *                               -XX:CompileCommand=compileonly,*TestVirtualThreads*::test*
  *                               -XX:CompileCommand=dontinline,*::test*
  *                               compiler.valhalla.inlinetypes.TestVirtualThreads
  */
@@ -84,7 +84,7 @@
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                               -Xbatch -XX:CompileCommand=dontinline,*::dontinline
- *                               -XX:CompileCommand=compileonly,TestVirtualThreads*::test*
+ *                               -XX:CompileCommand=compileonly,*TestVirtualThreads*::test*
  *                               -XX:CompileCommand=dontinline,*::*Helper
  *                               compiler.valhalla.inlinetypes.TestVirtualThreads
  */
@@ -99,7 +99,7 @@
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                               -Xbatch -XX:CompileCommand=dontinline,*::dontinline
- *                               -XX:CompileCommand=compileonly,TestVirtualThreads*::test*
+ *                               -XX:CompileCommand=compileonly,*TestVirtualThreads*::test*
  *                               -XX:CompileCommand=exclude,*::*Helper
  *                               compiler.valhalla.inlinetypes.TestVirtualThreads
  */
@@ -113,7 +113,7 @@
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
- *                               -Xcomp -XX:CompileCommand=compileonly,TestVirtualThreads*::*
+ *                               -Xcomp -XX:CompileCommand=compileonly,*TestVirtualThreads*::*
  *                               compiler.valhalla.inlinetypes.TestVirtualThreads
  */
 
@@ -126,7 +126,7 @@
  * @build jdk.test.whitebox.WhiteBox
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
- *                               -Xcomp -XX:CompileCommand=compileonly,TestVirtualThreads*::test*
+ *                               -Xcomp -XX:CompileCommand=compileonly,*TestVirtualThreads*::test*
  *                               compiler.valhalla.inlinetypes.TestVirtualThreads
  */
 
@@ -140,7 +140,7 @@
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                               -Xcomp -XX:CompileCommand=dontinline,*::dontinline
- *                               -XX:CompileCommand=compileonly,TestVirtualThreads*::test*
+ *                               -XX:CompileCommand=compileonly,*TestVirtualThreads*::test*
  *                               -XX:CompileCommand=dontinline,*::test*
  *                                compiler.valhalla.inlinetypes.TestVirtualThreads
  */
@@ -155,7 +155,7 @@
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                               -Xcomp -XX:CompileCommand=dontinline,*::dontinline
- *                               -XX:CompileCommand=compileonly,TestVirtualThreads*::test*
+ *                               -XX:CompileCommand=compileonly,*TestVirtualThreads*::test*
  *                               -XX:CompileCommand=dontinline,*::*Helper
  *                               compiler.valhalla.inlinetypes.TestVirtualThreads
  */
@@ -170,7 +170,7 @@
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                               -Xcomp -XX:CompileCommand=dontinline,*::dontinline
- *                               -XX:CompileCommand=compileonly,TestVirtualThreads*::test*
+ *                               -XX:CompileCommand=compileonly,*TestVirtualThreads*::test*
  *                               -XX:CompileCommand=exclude,*::*Helper
  *                               compiler.valhalla.inlinetypes.TestVirtualThreads
  */
@@ -185,7 +185,7 @@
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                               -Xbatch -XX:CompileCommand=dontinline,*::*
- *                               -XX:CompileCommand=compileonly,TestVirtualThreads*::*
+ *                               -XX:CompileCommand=compileonly,*TestVirtualThreads*::*
  *                                compiler.valhalla.inlinetypes.TestVirtualThreads 250000
  */
 
@@ -199,7 +199,7 @@
  * @run driver jdk.test.lib.helpers.ClassFileInstaller jdk.test.whitebox.WhiteBox
  * @run main/othervm/timeout=600 -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
  *                               -Xcomp -XX:CompileCommand=dontinline,*::*
- *                               -XX:CompileCommand=compileonly,TestVirtualThreads*::*
+ *                               -XX:CompileCommand=compileonly,*TestVirtualThreads*::*
  *                               compiler.valhalla.inlinetypes.TestVirtualThreads 250000
  */