# HG changeset patch
# User never
# Date 1466638293 0
# Node ID ca66cfb4e62b5966a92132e7b9332d69fcb4e510
# Parent 13b6d5b963d0bf3baebc7e54196eef31f157cb55# Parent 7464b1552bf7176564b42311d8f0ad8d6f2b054b
Merge
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/arraycopy/TestArrayCopyNoInitDeopt.java
--- a/hotspot/test/compiler/arraycopy/TestArrayCopyNoInitDeopt.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/arraycopy/TestArrayCopyNoInitDeopt.java Wed Jun 22 23:31:33 2016 +0000
@@ -25,19 +25,17 @@
* @test
* @bug 8072016
* @summary Infinite deoptimization/recompilation cycles in case of arraycopy with tightly coupled allocation
- * @library /testlibrary /test/lib /compiler/whitebox /
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestArrayCopyNoInitDeopt
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main ClassFileInstaller jdk.test.lib.Platform
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * jdk.test.lib.Platform
* @run main/othervm -Xmixed -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:TypeProfileLevel=020
* TestArrayCopyNoInitDeopt
- *
*/
-
import sun.hotspot.WhiteBox;
import sun.hotspot.code.NMethod;
import jdk.test.lib.Platform;
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/ciReplay/TestSA.sh
--- a/hotspot/test/compiler/ciReplay/TestSA.sh Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/ciReplay/TestSA.sh Wed Jun 22 23:31:33 2016 +0000
@@ -29,6 +29,7 @@
## @ignore 8029528
## @summary testing of ciReplay with using generated by SA replay.txt
## @author igor.ignatyev@oracle.com
+## @requires vm.flightRecorder != true
## @run shell TestSA.sh
##
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/ciReplay/TestVM.sh
--- a/hotspot/test/compiler/ciReplay/TestVM.sh Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/ciReplay/TestVM.sh Wed Jun 22 23:31:33 2016 +0000
@@ -28,6 +28,7 @@
## @bug 8011675
## @summary testing of ciReplay with using generated by VM replay.txt
## @author igor.ignatyev@oracle.com
+## @requires vm.flightRecorder != true
## @run shell TestVM.sh
##
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/ciReplay/TestVM_no_comp_level.sh
--- a/hotspot/test/compiler/ciReplay/TestVM_no_comp_level.sh Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/ciReplay/TestVM_no_comp_level.sh Wed Jun 22 23:31:33 2016 +0000
@@ -28,6 +28,7 @@
## @bug 8011675
## @summary testing of ciReplay with using generated by VM replay.txt w/o comp_level
## @author igor.ignatyev@oracle.com
+## @requires vm.flightRecorder != true
## @run shell TestVM_no_comp_level.sh
##
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/compilercontrol/commandfile/CompileOnlyTest.java
--- a/hotspot/test/compiler/compilercontrol/commandfile/CompileOnlyTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/compilercontrol/commandfile/CompileOnlyTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -26,12 +26,12 @@
* @bug 8137167
* @summary Tests CompileCommand=compileonly
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
* @build compiler.compilercontrol.commandfile.CompileOnlyTest
* pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
* compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.commandfile.CompileOnlyTest
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/compilercontrol/commandfile/ExcludeTest.java
--- a/hotspot/test/compiler/compilercontrol/commandfile/ExcludeTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/compilercontrol/commandfile/ExcludeTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -26,12 +26,12 @@
* @bug 8137167
* @summary Tests CompileCommand=exclude
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
* @build compiler.compilercontrol.commandfile.ExcludeTest
* pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
* compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.commandfile.ExcludeTest
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/compilercontrol/commandfile/LogTest.java
--- a/hotspot/test/compiler/compilercontrol/commandfile/LogTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/compilercontrol/commandfile/LogTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -26,12 +26,12 @@
* @bug 8137167
* @summary Tests CompileCommand=log
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
* @build compiler.compilercontrol.commandfile.LogTest
* pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
* compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.commandfile.LogTest
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/compilercontrol/commandfile/PrintTest.java
--- a/hotspot/test/compiler/compilercontrol/commandfile/PrintTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/compilercontrol/commandfile/PrintTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -26,12 +26,12 @@
* @bug 8137167
* @summary Tests CompileCommand=print
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
* @build compiler.compilercontrol.commandfile.PrintTest
* pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
* compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.commandfile.PrintTest
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/compilercontrol/commands/CompileOnlyTest.java
--- a/hotspot/test/compiler/compilercontrol/commands/CompileOnlyTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/compilercontrol/commands/CompileOnlyTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -26,12 +26,12 @@
* @bug 8137167
* @summary Tests CompileCommand=compileonly
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
* @build compiler.compilercontrol.commands.CompileOnlyTest
* pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
* compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.commands.CompileOnlyTest
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/compilercontrol/commands/ExcludeTest.java
--- a/hotspot/test/compiler/compilercontrol/commands/ExcludeTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/compilercontrol/commands/ExcludeTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -26,12 +26,12 @@
* @bug 8137167
* @summary Tests CompileCommand=exclude
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
* @build compiler.compilercontrol.commands.ExcludeTest
* pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
* compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.commands.ExcludeTest
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/compilercontrol/commands/LogTest.java
--- a/hotspot/test/compiler/compilercontrol/commands/LogTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/compilercontrol/commands/LogTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -26,12 +26,12 @@
* @bug 8137167
* @summary Tests CompileCommand=log
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
* @build compiler.compilercontrol.commands.LogTest
* pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
* compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.commands.LogTest
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/compilercontrol/commands/PrintTest.java
--- a/hotspot/test/compiler/compilercontrol/commands/PrintTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/compilercontrol/commands/PrintTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -26,12 +26,12 @@
* @bug 8137167
* @summary Tests CompileCommand=print
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
* @build compiler.compilercontrol.commands.PrintTest
* pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
* compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.commands.PrintTest
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/compilercontrol/directives/CompileOnlyTest.java
--- a/hotspot/test/compiler/compilercontrol/directives/CompileOnlyTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/compilercontrol/directives/CompileOnlyTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -26,12 +26,12 @@
* @bug 8137167
* @summary Tests directives to be able to compile only specified methods
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
* @build compiler.compilercontrol.directives.CompileOnlyTest
* pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
* compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.directives.CompileOnlyTest
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/compilercontrol/directives/ExcludeTest.java
--- a/hotspot/test/compiler/compilercontrol/directives/ExcludeTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/compilercontrol/directives/ExcludeTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -26,12 +26,12 @@
* @bug 8137167
* @summary Tests directives to be able to exclude methods from compilation
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
* @build compiler.compilercontrol.directives.ExcludeTest
* pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
* compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.directives.ExcludeTest
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/compilercontrol/directives/LogTest.java
--- a/hotspot/test/compiler/compilercontrol/directives/LogTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/compilercontrol/directives/LogTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -26,12 +26,12 @@
* @bug 8137167
* @summary Tests directives to be able to turn on LogCompilation
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
* @build compiler.compilercontrol.directives.LogTest
* pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
* compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.directives.LogTest
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/compilercontrol/directives/PrintTest.java
--- a/hotspot/test/compiler/compilercontrol/directives/PrintTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/compilercontrol/directives/PrintTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -26,12 +26,12 @@
* @bug 8137167
* @summary Tests directives to be able to turn on print_assembly
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
* @build compiler.compilercontrol.directives.PrintTest
* pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
* compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.directives.PrintTest
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/compilercontrol/jcmd/AddAndRemoveTest.java
--- a/hotspot/test/compiler/compilercontrol/jcmd/AddAndRemoveTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/compilercontrol/jcmd/AddAndRemoveTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -26,12 +26,12 @@
* @bug 8137167
* @summary Tests directives to be able to add and remove directives
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
* @build compiler.compilercontrol.jcmd.AddAndRemoveTest
* pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
* compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.jcmd.AddAndRemoveTest
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/compilercontrol/jcmd/AddCompileOnlyTest.java
--- a/hotspot/test/compiler/compilercontrol/jcmd/AddCompileOnlyTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/compilercontrol/jcmd/AddCompileOnlyTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -26,12 +26,12 @@
* @bug 8137167
* @summary Tests jcmd to be able to add a directive to compile only specified methods
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
* @build compiler.compilercontrol.jcmd.AddCompileOnlyTest
* pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
* compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.jcmd.AddCompileOnlyTest
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/compilercontrol/jcmd/AddExcludeTest.java
--- a/hotspot/test/compiler/compilercontrol/jcmd/AddExcludeTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/compilercontrol/jcmd/AddExcludeTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -26,12 +26,12 @@
* @bug 8137167
* @summary Tests jcmd to be able to add a directive to exclude only specified methods
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
* @build compiler.compilercontrol.jcmd.AddExcludeTest
* pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
* compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.jcmd.AddExcludeTest
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/compilercontrol/jcmd/AddLogTest.java
--- a/hotspot/test/compiler/compilercontrol/jcmd/AddLogTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/compilercontrol/jcmd/AddLogTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -26,12 +26,12 @@
* @bug 8137167
* @summary Tests jcmd to be able to add a directive to log only specified methods
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
* @build compiler.compilercontrol.jcmd.AddLogTest
* pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
* compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.jcmd.AddLogTest
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/compilercontrol/jcmd/AddPrintAssemblyTest.java
--- a/hotspot/test/compiler/compilercontrol/jcmd/AddPrintAssemblyTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/compilercontrol/jcmd/AddPrintAssemblyTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -27,12 +27,12 @@
* @summary Tests jcmd to be able to add a directive to print assembly
* only for specified methods
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
* @build compiler.compilercontrol.jcmd.AddPrintAssemblyTest
* pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
* compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.jcmd.AddPrintAssemblyTest
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java
--- a/hotspot/test/compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/compilercontrol/jcmd/ClearDirectivesFileStackTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -27,12 +27,12 @@
* @ignore 8140405
* @summary Tests jcmd to be able to clear directives added via options
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
* @build compiler.compilercontrol.jcmd.ClearDirectivesFileStackTest
* pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
* compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.jcmd.ClearDirectivesFileStackTest
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/compilercontrol/jcmd/ClearDirectivesStackTest.java
--- a/hotspot/test/compiler/compilercontrol/jcmd/ClearDirectivesStackTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/compilercontrol/jcmd/ClearDirectivesStackTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -26,12 +26,12 @@
* @bug 8137167
* @summary Tests clear JCMD command
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
* @build compiler.compilercontrol.jcmd.ClearDirectivesStackTest
* pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
* compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.jcmd.ClearDirectivesStackTest
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/compilercontrol/jcmd/PrintDirectivesTest.java
--- a/hotspot/test/compiler/compilercontrol/jcmd/PrintDirectivesTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/compilercontrol/jcmd/PrintDirectivesTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -26,13 +26,13 @@
* @bug 8137167
* @summary Tests jcmd to be able to add a directive to compile only specified methods
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
* @requires vm.flavor != "minimal"
* @build compiler.compilercontrol.jcmd.PrintDirectivesTest
* pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
* compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.jcmd.PrintDirectivesTest
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/compilercontrol/jcmd/StressAddMultiThreadedTest.java
--- a/hotspot/test/compiler/compilercontrol/jcmd/StressAddMultiThreadedTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/compilercontrol/jcmd/StressAddMultiThreadedTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -27,13 +27,13 @@
* @summary Tests jcmd to be able to add a lot of huge directive files with
* parallel executed jcmds until timeout has reached
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
* @build compiler.compilercontrol.jcmd.StressAddMultiThreadedTest
* pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
* compiler.testlibrary.CompilerUtils
* compiler.compilercontrol.share.actions.*
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.jcmd.StressAddMultiThreadedTest
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/compilercontrol/logcompilation/LogTest.java
--- a/hotspot/test/compiler/compilercontrol/logcompilation/LogTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/compilercontrol/logcompilation/LogTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -26,12 +26,12 @@
* @bug 8137167
* @summary Tests LogCompilation executed standalone without log commands or directives
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
* @build compiler.compilercontrol.logcompilation.LogTest
* pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
* compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver compiler.compilercontrol.logcompilation.LogTest
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/compilercontrol/matcher/MethodMatcherTest.java
--- a/hotspot/test/compiler/compilercontrol/matcher/MethodMatcherTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/compilercontrol/matcher/MethodMatcherTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -21,6 +21,19 @@
* questions.
*/
+/*
+ * @test
+ * @bug 8135068
+ * @summary Tests CompilerCommand's method matcher
+ * @modules java.base/jdk.internal.misc
+ * @library /testlibrary /test/lib ../share /
+ * @build compiler.compilercontrol.matcher.MethodMatcherTest
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * -XX:+WhiteBoxAPI compiler.compilercontrol.matcher.MethodMatcherTest
+ */
+
package compiler.compilercontrol.matcher;
import jdk.test.lib.Pair;
@@ -36,18 +49,6 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-/*
- * @test
- * @bug 8135068
- * @summary Tests CompilerCommand's method matcher
- * @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/whitebox ../share /
- * @build compiler.compilercontrol.matcher.MethodMatcherTest
- * @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
- * -XX:+WhiteBoxAPI compiler.compilercontrol.matcher.MethodMatcherTest
- */
public class MethodMatcherTest {
private static final WhiteBox WB = WhiteBox.getWhiteBox();
private static final PoolHelper POOL = new PoolHelper();
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/compilercontrol/mixed/RandomCommandsTest.java
--- a/hotspot/test/compiler/compilercontrol/mixed/RandomCommandsTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/compilercontrol/mixed/RandomCommandsTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -26,12 +26,12 @@
* @bug 8137167
* @summary Randomly generates commands with random types
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
* @build compiler.compilercontrol.mixed.RandomCommandsTest
* pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
* compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver/timeout=600 compiler.compilercontrol.mixed.RandomCommandsTest
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/compilercontrol/mixed/RandomValidCommandsTest.java
--- a/hotspot/test/compiler/compilercontrol/mixed/RandomValidCommandsTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/compilercontrol/mixed/RandomValidCommandsTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -26,12 +26,12 @@
* @bug 8137167
* @summary Randomly generates valid commands with random types
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/testlibrary ../share /
+ * @library /testlibrary /test/lib ../share /
* @build compiler.compilercontrol.mixed.RandomValidCommandsTest
* pool.sub.* pool.subpack.* sun.hotspot.WhiteBox
* compiler.testlibrary.CompilerUtils compiler.compilercontrol.share.actions.*
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run driver/timeout=600 compiler.compilercontrol.mixed.RandomValidCommandsTest
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java
--- a/hotspot/test/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/cpuflags/TestAESIntrinsicsOnSupportedConfig.java Wed Jun 22 23:31:33 2016 +0000
@@ -21,24 +21,25 @@
* questions.
*
*/
+
+/*
+ * @test
+ * @library /testlibrary /test/lib /compiler/codegen/7184394 /
+ * @modules java.base/jdk.internal.misc
+ * java.management
+ * @ignore 8146128
+ * @build TestAESIntrinsicsOnSupportedConfig TestAESMain
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * -XX:+WhiteBoxAPI -Xbatch
+ * TestAESIntrinsicsOnSupportedConfig
+ */
+
import jdk.test.lib.OutputAnalyzer;
import jdk.test.lib.Platform;
import jdk.test.lib.ProcessTools;
-/*
- * @test
- * @library /testlibrary /test/lib /compiler/whitebox
- * /compiler/testlibrary /compiler/codegen/7184394
- * @modules java.base/jdk.internal.misc
- * java.management
- * @ignore 8146128
- * @build TestAESIntrinsicsOnSupportedConfig TestAESMain
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
- * -XX:+WhiteBoxAPI -Xbatch
- * TestAESIntrinsicsOnSupportedConfig
- */
public class TestAESIntrinsicsOnSupportedConfig extends AESIntrinsicsBase {
/**
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java
--- a/hotspot/test/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/cpuflags/TestAESIntrinsicsOnUnsupportedConfig.java Wed Jun 22 23:31:33 2016 +0000
@@ -22,22 +22,22 @@
*
*/
+/*
+ * @test
+ * @library /testlibrary /test/lib /compiler/codegen/7184394 /
+ * @modules java.base/jdk.internal.misc
+ * java.management
+ * @build TestAESIntrinsicsOnUnsupportedConfig TestAESMain
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * -XX:+WhiteBoxAPI -Xbatch TestAESIntrinsicsOnUnsupportedConfig
+ */
+
import jdk.test.lib.cli.predicate.NotPredicate;
import jdk.test.lib.OutputAnalyzer;
import jdk.test.lib.ProcessTools;
-/*
- * @test
- * @library /testlibrary /test/lib /compiler/whitebox
- * /compiler/testlibrary /compiler/codegen/7184394
- * @modules java.base/jdk.internal.misc
- * java.management
- * @build TestAESIntrinsicsOnUnsupportedConfig TestAESMain
- * @run main ClassFileInstaller
- * sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
- * -XX:+WhiteBoxAPI -Xbatch TestAESIntrinsicsOnUnsupportedConfig
- */
public class TestAESIntrinsicsOnUnsupportedConfig extends AESIntrinsicsBase {
private static final String INTRINSICS_NOT_AVAILABLE_MSG = "warning: AES "
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/floatingpoint/TestPow2.java
--- a/hotspot/test/compiler/floatingpoint/TestPow2.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/floatingpoint/TestPow2.java Wed Jun 22 23:31:33 2016 +0000
@@ -25,11 +25,12 @@
* @test
* @bug 8063086
* @summary X^2 special case for C2 yields different result than interpreter
- * @library /testlibrary /test/lib /compiler/whitebox /
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* @modules java.management
* @build TestPow2
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:-BackgroundCompilation -XX:-UseOnStackReplacement TestPow2
*
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/IntrinsicAvailableTest.java
--- a/hotspot/test/compiler/intrinsics/IntrinsicAvailableTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/IntrinsicAvailableTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -20,20 +20,15 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
-import java.lang.reflect.Executable;
-import java.util.concurrent.Callable;
-import java.util.Objects;
-import jdk.test.lib.*;
-import compiler.whitebox.CompilerWhiteBoxTest;
/*
* @test
* @bug 8130832
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/whitebox /compiler/testlibrary /
+ * @library /testlibrary /test/lib /
* @build IntrinsicAvailableTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
@@ -45,6 +40,14 @@
* -XX:-UseCRC32Intrinsics
* IntrinsicAvailableTest
*/
+
+import java.lang.reflect.Executable;
+import java.util.concurrent.Callable;
+import java.util.Objects;
+
+import jdk.test.lib.*;
+import compiler.whitebox.CompilerWhiteBoxTest;
+
public class IntrinsicAvailableTest extends CompilerWhiteBoxTest {
protected String VMName;
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/bmi/verifycode/AndnTestI.java
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/AndnTestI.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/AndnTestI.java Wed Jun 22 23:31:33 2016 +0000
@@ -24,12 +24,12 @@
/*
* @test
* @bug 8031321
- * @library /testlibrary /test/lib /compiler/whitebox / ..
+ * @library /testlibrary /test/lib / ..
* @modules java.base/jdk.internal.misc
* java.management
* @build AndnTestI
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/bootclasspath/othervm -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions AndnTestI
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/bmi/verifycode/AndnTestL.java
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/AndnTestL.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/AndnTestL.java Wed Jun 22 23:31:33 2016 +0000
@@ -24,12 +24,12 @@
/*
* @test
* @bug 8031321
- * @library /testlibrary /test/lib /compiler/whitebox / ..
+ * @library /testlibrary /test/lib / ..
* @modules java.base/jdk.internal.misc
* java.management
* @build AndnTestL
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/bootclasspath/othervm -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions AndnTestL
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/bmi/verifycode/BlsiTestI.java
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsiTestI.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsiTestI.java Wed Jun 22 23:31:33 2016 +0000
@@ -24,12 +24,12 @@
/*
* @test
* @bug 8031321
- * @library /testlibrary /test/lib /compiler/whitebox / ..
+ * @library /testlibrary /test/lib / ..
* @modules java.base/jdk.internal.misc
* java.management
* @build BlsiTestI
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions BlsiTestI
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/bmi/verifycode/BlsiTestL.java
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsiTestL.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsiTestL.java Wed Jun 22 23:31:33 2016 +0000
@@ -24,12 +24,12 @@
/*
* @test
* @bug 8031321
- * @library /testlibrary /test/lib /compiler/whitebox / ..
+ * @library /testlibrary /test/lib / ..
* @modules java.base/jdk.internal.misc
* java.management
* @build BlsiTestL
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions BlsiTestL
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsmskTestI.java Wed Jun 22 23:31:33 2016 +0000
@@ -24,12 +24,12 @@
/*
* @test
* @bug 8031321
- * @library /testlibrary /test/lib /compiler/whitebox / ..
+ * @library /testlibrary /test/lib / ..
* @modules java.base/jdk.internal.misc
* java.management
* @build BlsmskTestI
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions BlsmskTestI
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/bmi/verifycode/BlsmskTestL.java
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsmskTestL.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsmskTestL.java Wed Jun 22 23:31:33 2016 +0000
@@ -24,12 +24,12 @@
/*
* @test
* @bug 8031321
- * @library /testlibrary /test/lib /compiler/whitebox / ..
+ * @library /testlibrary /test/lib / ..
* @modules java.base/jdk.internal.misc
* java.management
* @build BlsmskTestL
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions BlsmskTestL
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/bmi/verifycode/BlsrTestI.java
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsrTestI.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsrTestI.java Wed Jun 22 23:31:33 2016 +0000
@@ -24,12 +24,12 @@
/*
* @test
* @bug 8031321
- * @library /testlibrary /test/lib /compiler/whitebox / ..
+ * @library /testlibrary /test/lib / ..
* @modules java.base/jdk.internal.misc
* java.management
* @build BlsrTestI
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions BlsrTestI
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/bmi/verifycode/BlsrTestL.java
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsrTestL.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/BlsrTestL.java Wed Jun 22 23:31:33 2016 +0000
@@ -24,12 +24,12 @@
/*
* @test
* @bug 8031321
- * @library /testlibrary /test/lib /compiler/whitebox / ..
+ * @library /testlibrary /test/lib / ..
* @modules java.base/jdk.internal.misc
* java.management
* @build BlsrTestL
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+IgnoreUnrecognizedVMOptions -XX:+UseBMI1Instructions BlsrTestL
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/bmi/verifycode/LZcntTestI.java
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/LZcntTestI.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/LZcntTestI.java Wed Jun 22 23:31:33 2016 +0000
@@ -24,12 +24,12 @@
/*
* @test
* @bug 8031321
- * @library /testlibrary /test/lib /compiler/whitebox / ..
+ * @library /testlibrary /test/lib / ..
* @modules java.base/jdk.internal.misc
* java.management
* @build LZcntTestI
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCountLeadingZerosInstruction LZcntTestI
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/bmi/verifycode/LZcntTestL.java
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/LZcntTestL.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/LZcntTestL.java Wed Jun 22 23:31:33 2016 +0000
@@ -24,12 +24,12 @@
/*
* @test
* @bug 8031321
- * @library /testlibrary /test/lib /compiler/whitebox / ..
+ * @library /testlibrary /test/lib / ..
* @modules java.base/jdk.internal.misc
* java.management
* @build LZcntTestL
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCountLeadingZerosInstruction LZcntTestL
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/bmi/verifycode/TZcntTestI.java
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/TZcntTestI.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/TZcntTestI.java Wed Jun 22 23:31:33 2016 +0000
@@ -24,12 +24,12 @@
/*
* @test
* @bug 8031321
- * @library /testlibrary /test/lib /compiler/whitebox / ..
+ * @library /testlibrary /test/lib / ..
* @modules java.base/jdk.internal.misc
* java.management
* @build TZcntTestI
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCountTrailingZerosInstruction TZcntTestI
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/bmi/verifycode/TZcntTestL.java
--- a/hotspot/test/compiler/intrinsics/bmi/verifycode/TZcntTestL.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/bmi/verifycode/TZcntTestL.java Wed Jun 22 23:31:33 2016 +0000
@@ -24,12 +24,12 @@
/*
* @test
* @bug 8031321
- * @library /testlibrary /test/lib /compiler/whitebox / ..
+ * @library /testlibrary /test/lib / ..
* @modules java.base/jdk.internal.misc
* java.management
* @build TZcntTestL
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -Xbatch -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:+IgnoreUnrecognizedVMOptions -XX:+UseCountTrailingZerosInstruction TZcntTestL
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/mathexact/sanity/AddExactIntTest.java
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/AddExactIntTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/AddExactIntTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -23,12 +23,12 @@
/*
* @test
- * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build AddExactIntTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
@@ -37,7 +37,7 @@
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
* -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics AddExactIntTest
- * @run main intrinsics.Verifier hs_neg.log hs.log
+ * @run driver compiler.testlibrary.intrinsics.Verifier hs_neg.log hs.log
*/
public class AddExactIntTest {
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/mathexact/sanity/AddExactLongTest.java
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/AddExactLongTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/AddExactLongTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -23,12 +23,12 @@
/*
* @test
- * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build AddExactLongTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
@@ -37,7 +37,7 @@
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
* -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics AddExactLongTest
- * @run main intrinsics.Verifier hs_neg.log hs.log
+ * @run driver compiler.testlibrary.intrinsics.Verifier hs_neg.log hs.log
*/
public class AddExactLongTest {
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/mathexact/sanity/DecrementExactIntTest.java
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/DecrementExactIntTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/DecrementExactIntTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -23,12 +23,12 @@
/*
* @test
- * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build DecrementExactIntTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
@@ -37,7 +37,7 @@
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
* -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics DecrementExactIntTest
- * @run main intrinsics.Verifier hs_neg.log hs.log
+ * @run driver compiler.testlibrary.intrinsics.Verifier hs_neg.log hs.log
*/
public class DecrementExactIntTest {
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/mathexact/sanity/DecrementExactLongTest.java
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/DecrementExactLongTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/DecrementExactLongTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -23,12 +23,12 @@
/*
* @test
- * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build DecrementExactLongTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
@@ -37,7 +37,7 @@
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
* -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics DecrementExactLongTest
- * @run main intrinsics.Verifier hs_neg.log hs.log
+ * @run driver compiler.testlibrary.intrinsics.Verifier hs_neg.log hs.log
*/
public class DecrementExactLongTest {
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/mathexact/sanity/IncrementExactIntTest.java
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/IncrementExactIntTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/IncrementExactIntTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -23,12 +23,12 @@
/*
* @test
- * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build IncrementExactIntTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
@@ -37,7 +37,7 @@
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
* -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics IncrementExactIntTest
- * @run main intrinsics.Verifier hs_neg.log hs.log
+ * @run driver compiler.testlibrary.intrinsics.Verifier hs_neg.log hs.log
*/
public class IncrementExactIntTest {
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/mathexact/sanity/IncrementExactLongTest.java
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/IncrementExactLongTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/IncrementExactLongTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -23,12 +23,12 @@
/*
* @test
- * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build IncrementExactLongTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
@@ -37,7 +37,7 @@
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
* -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics IncrementExactLongTest
- * @run main intrinsics.Verifier hs_neg.log hs.log
+ * @run driver compiler.testlibrary.intrinsics.Verifier hs_neg.log hs.log
*/
public class IncrementExactLongTest {
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/mathexact/sanity/IntrinsicBase.java
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/IntrinsicBase.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/IntrinsicBase.java Wed Jun 22 23:31:33 2016 +0000
@@ -22,12 +22,13 @@
*/
import jdk.test.lib.Platform;
-import intrinsics.Verifier;
import java.io.FileOutputStream;
import java.lang.reflect.Executable;
import java.util.Properties;
+
import compiler.whitebox.CompilerWhiteBoxTest;
+import compiler.testlibrary.intrinsics.Verifier;
public abstract class IntrinsicBase extends CompilerWhiteBoxTest {
protected String javaVmName;
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/mathexact/sanity/MultiplyExactIntTest.java
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/MultiplyExactIntTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/MultiplyExactIntTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -23,12 +23,12 @@
/*
* @test
- * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build MultiplyExactIntTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
@@ -37,7 +37,7 @@
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
* -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics MultiplyExactIntTest
- * @run main intrinsics.Verifier hs_neg.log hs.log
+ * @run driver compiler.testlibrary.intrinsics.Verifier hs_neg.log hs.log
*/
public class MultiplyExactIntTest {
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/mathexact/sanity/MultiplyExactLongTest.java
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/MultiplyExactLongTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/MultiplyExactLongTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -23,12 +23,12 @@
/*
* @test
- * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build MultiplyExactLongTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
@@ -37,7 +37,7 @@
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
* -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics MultiplyExactLongTest
- * @run main intrinsics.Verifier hs_neg.log hs.log
+ * @run driver compiler.testlibrary.intrinsics.Verifier hs_neg.log hs.log
*/
public class MultiplyExactLongTest {
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/mathexact/sanity/NegateExactIntTest.java
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/NegateExactIntTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/NegateExactIntTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -23,12 +23,12 @@
/*
* @test
- * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build NegateExactIntTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
@@ -37,7 +37,7 @@
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
* -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics NegateExactIntTest
- * @run main intrinsics.Verifier hs_neg.log hs.log
+ * @run driver compiler.testlibrary.intrinsics.Verifier hs_neg.log hs.log
*/
public class NegateExactIntTest {
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/mathexact/sanity/NegateExactLongTest.java
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/NegateExactLongTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/NegateExactLongTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -23,12 +23,12 @@
/*
* @test
- * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build NegateExactLongTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
@@ -37,7 +37,7 @@
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
* -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics NegateExactLongTest
- * @run main intrinsics.Verifier hs_neg.log hs.log
+ * @run driver compiler.testlibrary.intrinsics.Verifier hs_neg.log hs.log
*/
public class NegateExactLongTest {
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/mathexact/sanity/SubtractExactIntTest.java
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/SubtractExactIntTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/SubtractExactIntTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -23,12 +23,12 @@
/*
* @test
- * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build SubtractExactIntTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
@@ -37,8 +37,7 @@
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
* -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics SubtractExactIntTest
- * @run main intrinsics.Verifier hs_neg.log hs.log
-
+ * @run driver compiler.testlibrary.intrinsics.Verifier hs_neg.log hs.log
*/
public class SubtractExactIntTest {
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/mathexact/sanity/SubtractExactLongTest.java
--- a/hotspot/test/compiler/intrinsics/mathexact/sanity/SubtractExactLongTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/mathexact/sanity/SubtractExactLongTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -23,12 +23,12 @@
/*
* @test
- * @library /testlibrary /test/lib /compiler/whitebox / /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build SubtractExactLongTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
@@ -37,7 +37,7 @@
* -XX:+IgnoreUnrecognizedVMOptions -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,MathIntrinsic*::execMathMethod
* -XX:LogFile=hs.log -XX:+UseMathExactIntrinsics SubtractExactLongTest
- * @run main intrinsics.Verifier hs_neg.log hs.log
+ * @run driver compiler.testlibrary.intrinsics.Verifier hs_neg.log hs.log
*/
public class SubtractExactLongTest {
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/sha/cli/SHAOptionsBase.java
--- a/hotspot/test/compiler/intrinsics/sha/cli/SHAOptionsBase.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/sha/cli/SHAOptionsBase.java Wed Jun 22 23:31:33 2016 +0000
@@ -23,7 +23,7 @@
import jdk.test.lib.Platform;
import jdk.test.lib.cli.CommandLineOptionTest;
-import sha.predicate.IntrinsicPredicates;
+import compiler.testlibrary.sha.predicate.IntrinsicPredicates;
import java.util.function.BooleanSupplier;
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java
--- a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnSupportedCPU.java Wed Jun 22 23:31:33 2016 +0000
@@ -24,13 +24,13 @@
/**
* @test
* @bug 8035968
- * @summary Verify UseSHA1Intrinsics option processing on supported CPU,
- * @library /testlibrary /test/lib /compiler/testlibrary testcases
+ * @summary Verify UseSHA1Intrinsics option processing on supported CPU.
+ * @library /testlibrary /test/lib testcases /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestUseSHA1IntrinsicsOptionOnSupportedCPU
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestUseSHA1IntrinsicsOptionOnSupportedCPU
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java
--- a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA1IntrinsicsOptionOnUnsupportedCPU.java Wed Jun 22 23:31:33 2016 +0000
@@ -24,13 +24,13 @@
/**
* @test
* @bug 8035968
- * @summary Verify UseSHA1Intrinsics option processing on unsupported CPU,
- * @library /testlibrary /test/lib /compiler/testlibrary testcases
+ * @summary Verify UseSHA1Intrinsics option processing on unsupported CPU.
+ * @library /testlibrary /test/lib testcases /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestUseSHA1IntrinsicsOptionOnUnsupportedCPU
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* TestUseSHA1IntrinsicsOptionOnUnsupportedCPU
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnSupportedCPU.java
--- a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnSupportedCPU.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnSupportedCPU.java Wed Jun 22 23:31:33 2016 +0000
@@ -24,13 +24,13 @@
/**
* @test
* @bug 8035968
- * @summary Verify UseSHA256Intrinsics option processing on supported CPU,
- * @library /testlibrary /test/lib /compiler/testlibrary testcases
+ * @summary Verify UseSHA256Intrinsics option processing on supported CPU.
+ * @library /testlibrary /test/lib testcases /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestUseSHA256IntrinsicsOptionOnSupportedCPU
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* TestUseSHA256IntrinsicsOptionOnSupportedCPU
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java
--- a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA256IntrinsicsOptionOnUnsupportedCPU.java Wed Jun 22 23:31:33 2016 +0000
@@ -24,13 +24,13 @@
/**
* @test
* @bug 8035968
- * @summary Verify UseSHA256Intrinsics option processing on unsupported CPU,
- * @library /testlibrary /test/lib /compiler/testlibrary testcases
+ * @summary Verify UseSHA256Intrinsics option processing on unsupported CPU.
+ * @library /testlibrary /test/lib testcases /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestUseSHA256IntrinsicsOptionOnUnsupportedCPU
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* TestUseSHA256IntrinsicsOptionOnUnsupportedCPU
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java
--- a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnSupportedCPU.java Wed Jun 22 23:31:33 2016 +0000
@@ -25,12 +25,12 @@
* @test
* @bug 8035968
* @summary Verify UseSHA512Intrinsics option processing on supported CPU.
- * @library /testlibrary /test/lib /compiler/testlibrary testcases
+ * @library /testlibrary /test/lib testcases /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestUseSHA512IntrinsicsOptionOnSupportedCPU
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* TestUseSHA512IntrinsicsOptionOnSupportedCPU
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java
--- a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHA512IntrinsicsOptionOnUnsupportedCPU.java Wed Jun 22 23:31:33 2016 +0000
@@ -24,13 +24,13 @@
/**
* @test
* @bug 8035968
- * @summary Verify UseSHA512Intrinsics option processing on unsupported CPU,
- * @library /testlibrary /test/lib /compiler/testlibrary testcases
+ * @summary Verify UseSHA512Intrinsics option processing on unsupported CPU.
+ * @library /testlibrary /test/lib testcases /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestUseSHA512IntrinsicsOptionOnUnsupportedCPU
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* TestUseSHA512IntrinsicsOptionOnUnsupportedCPU
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java
--- a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnSupportedCPU.java Wed Jun 22 23:31:33 2016 +0000
@@ -24,13 +24,13 @@
/**
* @test
* @bug 8035968
- * @summary Verify UseSHA option processing on supported CPU,
- * @library /testlibrary /test/lib /compiler/testlibrary testcases
+ * @summary Verify UseSHA option processing on supported CPU.
+ * @library /testlibrary /test/lib testcases /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestUseSHAOptionOnSupportedCPU
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestUseSHAOptionOnSupportedCPU
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java
--- a/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/sha/cli/TestUseSHAOptionOnUnsupportedCPU.java Wed Jun 22 23:31:33 2016 +0000
@@ -25,12 +25,12 @@
* @test
* @bug 8035968
* @summary Verify UseSHA option processing on unsupported CPU.
- * @library /testlibrary /test/lib /compiler/testlibrary testcases
+ * @library /testlibrary /test/lib testcases /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestUseSHAOptionOnUnsupportedCPU
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestUseSHAOptionOnUnsupportedCPU
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHAIntrinsicsSpecificTestCaseForUnsupportedCPU.java
--- a/hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHAIntrinsicsSpecificTestCaseForUnsupportedCPU.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHAIntrinsicsSpecificTestCaseForUnsupportedCPU.java Wed Jun 22 23:31:33 2016 +0000
@@ -27,7 +27,7 @@
import jdk.test.lib.cli.predicate.AndPredicate;
import jdk.test.lib.cli.predicate.OrPredicate;
import jdk.test.lib.cli.predicate.NotPredicate;
-import sha.predicate.IntrinsicPredicates;
+import compiler.testlibrary.sha.predicate.IntrinsicPredicates;
/**
* Test case specific to UseSHA*Intrinsics options targeted to SPARC and AArch64
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForSupportedCPU.java
--- a/hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForSupportedCPU.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForSupportedCPU.java Wed Jun 22 23:31:33 2016 +0000
@@ -27,7 +27,7 @@
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
import jdk.test.lib.cli.predicate.OrPredicate;
-import sha.predicate.IntrinsicPredicates;
+import compiler.testlibrary.sha.predicate.IntrinsicPredicates;
/**
* UseSHA specific test case targeted to SPARC and AArch64 CPUs which
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForUnsupportedCPU.java
--- a/hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForUnsupportedCPU.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/sha/cli/testcases/UseSHASpecificTestCaseForUnsupportedCPU.java Wed Jun 22 23:31:33 2016 +0000
@@ -28,7 +28,7 @@
import jdk.test.lib.cli.predicate.AndPredicate;
import jdk.test.lib.cli.predicate.OrPredicate;
import jdk.test.lib.cli.predicate.NotPredicate;
-import sha.predicate.IntrinsicPredicates;
+import compiler.testlibrary.sha.predicate.IntrinsicPredicates;
/**
* UseSHA specific test case targeted to SPARC and AArch64 CPUs which don't
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/sha/sanity/SHASanityTestBase.java
--- a/hotspot/test/compiler/intrinsics/sha/sanity/SHASanityTestBase.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/sha/sanity/SHASanityTestBase.java Wed Jun 22 23:31:33 2016 +0000
@@ -21,7 +21,6 @@
* questions.
*/
-import intrinsics.Verifier;
import sun.hotspot.WhiteBox;
import java.io.FileOutputStream;
@@ -30,6 +29,8 @@
import java.util.Properties;
import java.util.function.BooleanSupplier;
+import compiler.testlibrary.intrinsics.Verifier;
+
/**
* Base class for sanity tests on SHA intrinsics support.
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java
--- a/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java Wed Jun 22 23:31:33 2016 +0000
@@ -25,12 +25,12 @@
* @test
* @bug 8035968
* @summary Verify that SHA-1 intrinsic is actually used.
- * @library /testlibrary /test/lib /compiler/testlibrary ../
+ * @library /testlibrary /test/lib / ../
* @modules java.base/jdk.internal.misc
* java.management
- * @build TestSHA intrinsics.Verifier TestSHA1Intrinsics
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @build TestSHA compiler.testlibrary.intrinsics.Verifier TestSHA1Intrinsics
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
* -XX:Tier4InvocationThreshold=500
@@ -48,9 +48,10 @@
* -XX:-UseSHA1Intrinsics
* -Dalgorithm=SHA-1 TestSHA1Intrinsics
* @run main/othervm -DverificationStrategy=VERIFY_INTRINSIC_USAGE
- * intrinsics.Verifier positive.log negative.log
+ * compiler.testlibrary.intrinsics.Verifier positive.log negative.log
*/
-import sha.predicate.IntrinsicPredicates;
+
+import compiler.testlibrary.sha.predicate.IntrinsicPredicates;
public class TestSHA1Intrinsics {
public static void main(String args[]) throws Exception {
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java
--- a/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java Wed Jun 22 23:31:33 2016 +0000
@@ -21,18 +21,16 @@
* questions.
*/
-import sha.predicate.IntrinsicPredicates;
-
/**
* @test
* @bug 8035968
* @summary Verify that SHA-1 multi block intrinsic is actually used.
- * @library /testlibrary /test/lib /compiler/testlibrary ../
+ * @library /testlibrary /test/lib / ../
* @modules java.base/jdk.internal.misc
* java.management
- * @build TestSHA intrinsics.Verifier TestSHA1MultiBlockIntrinsics
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @build TestSHA compiler.testlibrary.intrinsics.Verifier TestSHA1MultiBlockIntrinsics
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
* -XX:Tier4InvocationThreshold=500
@@ -58,9 +56,12 @@
* -XX:CompileOnly=sun/security/provider/SHA -XX:-UseSHA
* -Dalgorithm=SHA-1 TestSHA1MultiBlockIntrinsics
* @run main/othervm -DverificationStrategy=VERIFY_INTRINSIC_USAGE
- * intrinsics.Verifier positive.log positive_def.log
+ * compiler.testlibrary.intrinsics.Verifier positive.log positive_def.log
* negative.log
*/
+
+import compiler.testlibrary.sha.predicate.IntrinsicPredicates;
+
public class TestSHA1MultiBlockIntrinsics {
public static void main(String args[]) throws Exception {
new SHASanityTestBase(IntrinsicPredicates.SHA1_INTRINSICS_AVAILABLE,
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java
--- a/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java Wed Jun 22 23:31:33 2016 +0000
@@ -21,18 +21,16 @@
* questions.
*/
-import sha.predicate.IntrinsicPredicates;
-
/**
* @test
* @bug 8035968
* @summary Verify that SHA-256 intrinsic is actually used.
- * @library /testlibrary /test/lib /compiler/testlibrary ../
+ * @library /testlibrary /test/lib / ../
* @modules java.base/jdk.internal.misc
* java.management
- * @build TestSHA intrinsics.Verifier TestSHA256Intrinsics
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @build TestSHA compiler.testlibrary.intrinsics.Verifier TestSHA256Intrinsics
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
* -XX:Tier4InvocationThreshold=500
@@ -66,9 +64,12 @@
* -XX:-UseSHA256Intrinsics
* -Dalgorithm=SHA-256 TestSHA256Intrinsics
* @run main/othervm -DverificationStrategy=VERIFY_INTRINSIC_USAGE
- * intrinsics.Verifier positive_224.log positive_256.log
+ * compiler.testlibrary.intrinsics.Verifier positive_224.log positive_256.log
* negative_224.log negative_256.log
*/
+
+import compiler.testlibrary.sha.predicate.IntrinsicPredicates;
+
public class TestSHA256Intrinsics {
public static void main(String args[]) throws Exception {
new SHASanityTestBase(IntrinsicPredicates.SHA256_INTRINSICS_AVAILABLE,
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java
--- a/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java Wed Jun 22 23:31:33 2016 +0000
@@ -21,18 +21,16 @@
* questions.
*/
-import sha.predicate.IntrinsicPredicates;
-
/**
* @test
* @bug 8035968
* @summary Verify that SHA-256 multi block intrinsic is actually used.
- * @library /testlibrary /test/lib /compiler/testlibrary ../
+ * @library /testlibrary /test/lib / ../
* @modules java.base/jdk.internal.misc
* java.management
- * @build TestSHA intrinsics.Verifier TestSHA256MultiBlockIntrinsics
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @build TestSHA compiler.testlibrary.intrinsics.Verifier TestSHA256MultiBlockIntrinsics
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
* -XX:Tier4InvocationThreshold=500
@@ -82,10 +80,13 @@
* -XX:CompileOnly=sun/security/provider/SHA -XX:-UseSHA
* -Dalgorithm=SHA-256 TestSHA256MultiBlockIntrinsics
* @run main/othervm -DverificationStrategy=VERIFY_INTRINSIC_USAGE
- * intrinsics.Verifier positive_224.log positive_256.log
+ * compiler.testlibrary.intrinsics.Verifier positive_224.log positive_256.log
* positive_224_def.log positive_256_def.log negative_224.log
* negative_256.log
*/
+
+import compiler.testlibrary.sha.predicate.IntrinsicPredicates;
+
public class TestSHA256MultiBlockIntrinsics {
public static void main(String args[]) throws Exception {
new SHASanityTestBase(IntrinsicPredicates.SHA256_INTRINSICS_AVAILABLE,
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java
--- a/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java Wed Jun 22 23:31:33 2016 +0000
@@ -21,18 +21,16 @@
* questions.
*/
-import sha.predicate.IntrinsicPredicates;
-
/**
* @test
* @bug 8035968
* @summary Verify that SHA-512 intrinsic is actually used.
- * @library /testlibrary /test/lib /compiler/testlibrary ../
+ * @library /testlibrary /test/lib / ../
* @modules java.base/jdk.internal.misc
* java.management
- * @build TestSHA intrinsics.Verifier TestSHA512Intrinsics
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @build TestSHA compiler.testlibrary.intrinsics.Verifier TestSHA512Intrinsics
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
* -XX:Tier4InvocationThreshold=500
@@ -66,9 +64,12 @@
* -XX:-UseSHA512Intrinsics
* -Dalgorithm=SHA-512 TestSHA512Intrinsics
* @run main/othervm -DverificationStrategy=VERIFY_INTRINSIC_USAGE
- * intrinsics.Verifier positive_384.log positive_512.log
+ * compiler.testlibrary.intrinsics.Verifier positive_384.log positive_512.log
* negative_384.log negative_512.log
*/
+
+import compiler.testlibrary.sha.predicate.IntrinsicPredicates;
+
public class TestSHA512Intrinsics {
public static void main(String args[]) throws Exception {
new SHASanityTestBase(IntrinsicPredicates.SHA512_INTRINSICS_AVAILABLE,
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java
--- a/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java Wed Jun 22 23:31:33 2016 +0000
@@ -21,18 +21,16 @@
* questions.
*/
-import sha.predicate.IntrinsicPredicates;
-
/**
* @test
* @bug 8035968
* @summary Verify that SHA-512 multi block intrinsic is actually used.
- * @library /testlibrary /test/lib /compiler/testlibrary ../
+ * @library /testlibrary /test/lib / ../
* @modules java.base/jdk.internal.misc
* java.management
- * @build TestSHA intrinsics.Verifier TestSHA512MultiBlockIntrinsics
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @build TestSHA compiler.testlibrary.intrinsics.Verifier TestSHA512MultiBlockIntrinsics
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI -Xbatch -XX:CompileThreshold=500
* -XX:Tier4InvocationThreshold=500
@@ -82,10 +80,13 @@
* -XX:CompileOnly=sun/security/provider/SHA -XX:-UseSHA
* -Dalgorithm=SHA-512 TestSHA512MultiBlockIntrinsics
* @run main/othervm -DverificationStrategy=VERIFY_INTRINSIC_USAGE
- * intrinsics.Verifier positive_384.log positive_512.log
+ * compiler.testlibrary.intrinsics.Verifier positive_384.log positive_512.log
* positive_384_def.log positive_512_def.log negative_384.log
* negative_512.log
*/
+
+import compiler.testlibrary.sha.predicate.IntrinsicPredicates;
+
public class TestSHA512MultiBlockIntrinsics {
public static void main(String args[]) throws Exception {
new SHASanityTestBase(IntrinsicPredicates.SHA512_INTRINSICS_AVAILABLE,
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/jsr292/InvokerGC.java
--- a/hotspot/test/compiler/jsr292/InvokerGC.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/jsr292/InvokerGC.java Wed Jun 22 23:31:33 2016 +0000
@@ -25,7 +25,7 @@
* @test
* @bug 8067247
* @modules java.base/jdk.internal.misc
- * @library /test/lib /compiler/whitebox /
+ * @library /test/lib /
* @run main/bootclasspath/othervm -Xcomp -Xbatch
* -XX:CompileCommand=compileonly,InvokerGC::test
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rangechecks/TestExplicitRangeChecks.java
--- a/hotspot/test/compiler/rangechecks/TestExplicitRangeChecks.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rangechecks/TestExplicitRangeChecks.java Wed Jun 22 23:31:33 2016 +0000
@@ -26,10 +26,10 @@
* @bug 8073480
* @summary explicit range checks should be recognized by C2
* @modules java.base/jdk.internal.misc
- * @library /testlibrary /test/lib /compiler/whitebox /
+ * @library /testlibrary /test/lib /
* @build TestExplicitRangeChecks
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main ClassFileInstaller jdk.test.lib.Platform
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * jdk.test.lib.Platform
* @run main/othervm -ea -Xmixed -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:-BackgroundCompilation -XX:-UseOnStackReplacement -XX:CompileCommand=compileonly,TestExplicitRangeChecks.test* TestExplicitRangeChecks
*
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rangechecks/TestRangeCheckSmearing.java
--- a/hotspot/test/compiler/rangechecks/TestRangeCheckSmearing.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rangechecks/TestRangeCheckSmearing.java Wed Jun 22 23:31:33 2016 +0000
@@ -25,12 +25,12 @@
* @test
* @bug 8066103
* @summary C2's range check smearing allows out of bound array accesses
- * @library /testlibrary /test/lib /compiler/whitebox /
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestRangeCheckSmearing
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * @run main ClassFileInstaller jdk.test.lib.Platform
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * jdk.test.lib.Platform
* @run main/othervm -ea -Xmixed -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -XX:-BackgroundCompilation -XX:-UseOnStackReplacement TestRangeCheckSmearing
*
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rtm/cli/RTMLockingAwareTest.java
--- a/hotspot/test/compiler/rtm/cli/RTMLockingAwareTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rtm/cli/RTMLockingAwareTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -28,8 +28,8 @@
import jdk.test.lib.ExitCode;
import jdk.test.lib.cli.*;
import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
/**
* Base for all RTM-related CLI tests on options whose processing depends
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig.java
--- a/hotspot/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig.java Wed Jun 22 23:31:33 2016 +0000
@@ -27,12 +27,12 @@
* @bug 8031320
* @summary Verify PrintPreciseRTMLockingStatistics on CPUs with
* rtm support and on VM with rtm locking support,
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig
@@ -40,8 +40,8 @@
import jdk.test.lib.cli.*;
import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
public class TestPrintPreciseRTMLockingStatisticsOptionOnSupportedConfig
extends TestPrintPreciseRTMLockingStatisticsBase {
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java
--- a/hotspot/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rtm/cli/TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig.java Wed Jun 22 23:31:33 2016 +0000
@@ -27,12 +27,12 @@
* @bug 8031320
* @summary Verify PrintPreciseRTMLockingStatistics on CPUs without
* rtm support and/or unsupported VM.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig
@@ -40,8 +40,8 @@
import jdk.test.lib.cli.predicate.AndPredicate;
import jdk.test.lib.cli.predicate.NotPredicate;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
public class TestPrintPreciseRTMLockingStatisticsOptionOnUnsupportedConfig
extends TestPrintPreciseRTMLockingStatisticsBase {
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnSupportedConfig.java
--- a/hotspot/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnSupportedConfig.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnSupportedConfig.java Wed Jun 22 23:31:33 2016 +0000
@@ -27,12 +27,12 @@
* @bug 8031320
* @summary Verify RTMAbortRatio option processing on CPU with rtm
* support and on VM with rtm locking support.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestRTMAbortRatioOptionOnSupportedConfig
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestRTMAbortRatioOptionOnSupportedConfig
*/
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnUnsupportedConfig.java
--- a/hotspot/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnUnsupportedConfig.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rtm/cli/TestRTMAbortRatioOptionOnUnsupportedConfig.java Wed Jun 22 23:31:33 2016 +0000
@@ -27,20 +27,20 @@
* @bug 8031320
* @summary Verify RTMAbortRatio option processing on CPU without rtm
* support or on VM that does not support rtm locking.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestRTMAbortRatioOptionOnUnsupportedConfig
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestRTMAbortRatioOptionOnUnsupportedConfig
*/
import jdk.test.lib.cli.predicate.AndPredicate;
import jdk.test.lib.cli.predicate.NotPredicate;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
public class TestRTMAbortRatioOptionOnUnsupportedConfig
extends RTMGenericCommandLineOptionTest {
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnSupportedConfig.java
--- a/hotspot/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnSupportedConfig.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnSupportedConfig.java Wed Jun 22 23:31:33 2016 +0000
@@ -27,12 +27,12 @@
* @bug 8031320
* @summary Verify RTMTotalCountIncrRate option processing on CPU with
* rtm support and on VM with rtm locking support.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestRTMTotalCountIncrRateOptionOnSupportedConfig
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* TestRTMTotalCountIncrRateOptionOnSupportedConfig
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnUnsupportedConfig.java
--- a/hotspot/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnUnsupportedConfig.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rtm/cli/TestRTMTotalCountIncrRateOptionOnUnsupportedConfig.java Wed Jun 22 23:31:33 2016 +0000
@@ -24,20 +24,20 @@
import jdk.test.lib.cli.predicate.AndPredicate;
import jdk.test.lib.cli.predicate.NotPredicate;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
/**
* @test
* @bug 8031320
* @summary Verify RTMTotalCountIncrRate option processing on CPU without
* rtm support and/or on VM without rtm locking support.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestRTMTotalCountIncrRateOptionOnUnsupportedConfig
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* TestRTMTotalCountIncrRateOptionOnUnsupportedConfig
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnSupportedConfig.java
--- a/hotspot/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnSupportedConfig.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnSupportedConfig.java Wed Jun 22 23:31:33 2016 +0000
@@ -27,12 +27,12 @@
* @bug 8031320
* @summary Verify UseRTMDeopt option processing on CPUs with rtm support
* when rtm locking is supported by VM.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestUseRTMDeoptOptionOnSupportedConfig
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestUseRTMDeoptOptionOnSupportedConfig
*/
@@ -40,8 +40,8 @@
import jdk.test.lib.ExitCode;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
public class TestUseRTMDeoptOptionOnSupportedConfig
extends CommandLineOptionTest {
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java
--- a/hotspot/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rtm/cli/TestUseRTMDeoptOptionOnUnsupportedConfig.java Wed Jun 22 23:31:33 2016 +0000
@@ -27,12 +27,12 @@
* @bug 8031320
* @summary Verify UseRTMDeopt option processing on CPUs without rtm support
* or on VMs without rtm locking support.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestUseRTMDeoptOptionOnUnsupportedConfig
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestUseRTMDeoptOptionOnUnsupportedConfig
*/
@@ -41,8 +41,8 @@
import jdk.test.lib.cli.predicate.AndPredicate;
import jdk.test.lib.cli.predicate.NotPredicate;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
public class TestUseRTMDeoptOptionOnUnsupportedConfig
extends RTMGenericCommandLineOptionTest {
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnSupportedConfig.java
--- a/hotspot/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnSupportedConfig.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnSupportedConfig.java Wed Jun 22 23:31:33 2016 +0000
@@ -27,12 +27,12 @@
* @bug 8031320
* @summary Verify UseRTMForStackLocks option processing on CPU with
* rtm support when VM supports rtm locking.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestUseRTMForStackLocksOptionOnSupportedConfig
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* TestUseRTMForStackLocksOptionOnSupportedConfig
@@ -41,8 +41,8 @@
import jdk.test.lib.*;
import jdk.test.lib.cli.*;
import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
public class TestUseRTMForStackLocksOptionOnSupportedConfig
extends CommandLineOptionTest {
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java
--- a/hotspot/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rtm/cli/TestUseRTMForStackLocksOptionOnUnsupportedConfig.java Wed Jun 22 23:31:33 2016 +0000
@@ -27,12 +27,12 @@
* @bug 8031320
* @summary Verify UseRTMForStackLocks option processing on CPUs without
* rtm support and/or on VMs without rtm locking support.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestUseRTMForStackLocksOptionOnUnsupportedConfig
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI
* TestUseRTMForStackLocksOptionOnUnsupportedConfig
@@ -42,8 +42,8 @@
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
import jdk.test.lib.cli.predicate.NotPredicate;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
public class TestUseRTMForStackLocksOptionOnUnsupportedConfig
extends RTMGenericCommandLineOptionTest {
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java
--- a/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnSupportedConfig.java Wed Jun 22 23:31:33 2016 +0000
@@ -27,12 +27,12 @@
* @bug 8031320
* @summary Verify UseRTMLocking option processing on CPU with rtm support and
* on VM with rtm-locking support.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestUseRTMLockingOptionOnSupportedConfig
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestUseRTMLockingOptionOnSupportedConfig
*/
@@ -40,8 +40,8 @@
import jdk.test.lib.ExitCode;
import jdk.test.lib.cli.*;
import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
public class TestUseRTMLockingOptionOnSupportedConfig
extends CommandLineOptionTest {
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java
--- a/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedCPU.java Wed Jun 22 23:31:33 2016 +0000
@@ -27,12 +27,12 @@
* @bug 8031320
* @summary Verify UseRTMLocking option processing on CPU without
* rtm support.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestUseRTMLockingOptionOnUnsupportedCPU
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestUseRTMLockingOptionOnUnsupportedCPU
*/
@@ -41,8 +41,8 @@
import jdk.test.lib.cli.*;
import jdk.test.lib.cli.predicate.AndPredicate;
import jdk.test.lib.cli.predicate.NotPredicate;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
public class TestUseRTMLockingOptionOnUnsupportedCPU
extends CommandLineOptionTest {
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedVM.java
--- a/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedVM.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionOnUnsupportedVM.java Wed Jun 22 23:31:33 2016 +0000
@@ -27,12 +27,12 @@
* @bug 8031320
* @summary Verify UseRTMLocking option processing on CPU with rtm support
* in case when VM should not support this option.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestUseRTMLockingOptionOnUnsupportedVM
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestUseRTMLockingOptionOnUnsupportedVM
*/
@@ -41,8 +41,8 @@
import jdk.test.lib.cli.*;
import jdk.test.lib.cli.predicate.AndPredicate;
import jdk.test.lib.cli.predicate.NotPredicate;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
public class TestUseRTMLockingOptionOnUnsupportedVM
extends CommandLineOptionTest {
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java
--- a/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rtm/cli/TestUseRTMLockingOptionWithBiasedLocking.java Wed Jun 22 23:31:33 2016 +0000
@@ -27,12 +27,12 @@
* @bug 8031320
* @summary Verify processing of UseRTMLocking and UseBiasedLocking
* options combination on CPU and VM with rtm support.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestUseRTMLockingOptionWithBiasedLocking
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestUseRTMLockingOptionWithBiasedLocking
*/
@@ -40,8 +40,8 @@
import jdk.test.lib.*;
import jdk.test.lib.cli.*;
import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
public class TestUseRTMLockingOptionWithBiasedLocking
extends CommandLineOptionTest {
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rtm/locking/TestRTMAbortRatio.java
--- a/hotspot/test/compiler/rtm/locking/TestRTMAbortRatio.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rtm/locking/TestRTMAbortRatio.java Wed Jun 22 23:31:33 2016 +0000
@@ -27,11 +27,11 @@
* @bug 8031320
* @summary Verify that RTMAbortRatio affects amount of aborts before
* deoptimization.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestRTMAbortRatio
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestRTMAbortRatio
@@ -41,9 +41,9 @@
import jdk.test.lib.*;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
import jdk.internal.misc.Unsafe;
/**
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rtm/locking/TestRTMAbortThreshold.java
--- a/hotspot/test/compiler/rtm/locking/TestRTMAbortThreshold.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rtm/locking/TestRTMAbortThreshold.java Wed Jun 22 23:31:33 2016 +0000
@@ -27,11 +27,11 @@
* @bug 8031320
* @summary Verify that RTMAbortThreshold option affects
* amount of aborts after which abort ratio is calculated.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestRTMAbortThreshold
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestRTMAbortThreshold
@@ -41,9 +41,9 @@
import jdk.test.lib.*;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
/**
* Test verifies that on RTMAbortThreshold option actually affects how soon
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java
--- a/hotspot/test/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java Wed Jun 22 23:31:33 2016 +0000
@@ -29,12 +29,12 @@
* caused by reason other then rtm_state_change will reset
* method's RTM state. And if we don't use RTMDeopt, then
* RTM state remain the same after such deoptimization.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestRTMAfterNonRTMDeopt
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestRTMAfterNonRTMDeopt
*/
@@ -43,9 +43,9 @@
import jdk.test.lib.*;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
import jdk.internal.misc.Unsafe;
/**
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rtm/locking/TestRTMDeoptOnHighAbortRatio.java
--- a/hotspot/test/compiler/rtm/locking/TestRTMDeoptOnHighAbortRatio.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rtm/locking/TestRTMDeoptOnHighAbortRatio.java Wed Jun 22 23:31:33 2016 +0000
@@ -27,12 +27,12 @@
* @bug 8031320
* @summary Verify that on high abort ratio method will be recompiled
* without rtm locking.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestRTMDeoptOnHighAbortRatio
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestRTMDeoptOnHighAbortRatio
*/
@@ -41,9 +41,9 @@
import jdk.test.lib.*;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
/**
* Test verifies that on high abort ratio method wil be deoptimized with
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java
--- a/hotspot/test/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rtm/locking/TestRTMDeoptOnLowAbortRatio.java Wed Jun 22 23:31:33 2016 +0000
@@ -26,12 +26,12 @@
* @test
* @bug 8031320
* @summary Verify that on low abort ratio method will be recompiled.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestRTMDeoptOnLowAbortRatio
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestRTMDeoptOnLowAbortRatio
*/
@@ -40,9 +40,9 @@
import jdk.test.lib.*;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
import jdk.internal.misc.Unsafe;
/**
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rtm/locking/TestRTMLockingCalculationDelay.java
--- a/hotspot/test/compiler/rtm/locking/TestRTMLockingCalculationDelay.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rtm/locking/TestRTMLockingCalculationDelay.java Wed Jun 22 23:31:33 2016 +0000
@@ -27,12 +27,12 @@
* @bug 8031320
* @summary Verify that RTMLockingCalculationDelay affect when
* abort ratio calculation is started.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestRTMLockingCalculationDelay
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestRTMLockingCalculationDelay
*/
@@ -40,9 +40,9 @@
import jdk.test.lib.*;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
/**
* Test verifies that abort ratio calculation could be delayed using
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rtm/locking/TestRTMLockingThreshold.java
--- a/hotspot/test/compiler/rtm/locking/TestRTMLockingThreshold.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rtm/locking/TestRTMLockingThreshold.java Wed Jun 22 23:31:33 2016 +0000
@@ -27,12 +27,12 @@
* @bug 8031320
* @summary Verify that RTMLockingThreshold affects rtm state transition
* ProfileRTM => UseRTM.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestRTMLockingThreshold
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestRTMLockingThreshold
*/
@@ -41,9 +41,9 @@
import jdk.test.lib.*;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
import jdk.internal.misc.Unsafe;
/**
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rtm/locking/TestRTMRetryCount.java
--- a/hotspot/test/compiler/rtm/locking/TestRTMRetryCount.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rtm/locking/TestRTMRetryCount.java Wed Jun 22 23:31:33 2016 +0000
@@ -26,12 +26,12 @@
* @test
* @bug 8031320
* @summary Verify that RTMRetryCount affects actual amount of retries.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestRTMRetryCount
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestRTMRetryCount
*/
@@ -41,9 +41,9 @@
import jdk.test.lib.*;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
/**
* Test verifies that RTMRetryCount option actually affects amount of
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rtm/locking/TestRTMSpinLoopCount.java
--- a/hotspot/test/compiler/rtm/locking/TestRTMSpinLoopCount.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rtm/locking/TestRTMSpinLoopCount.java Wed Jun 22 23:31:33 2016 +0000
@@ -27,12 +27,12 @@
* @bug 8031320
* @summary Verify that RTMSpinLoopCount affects time spent
* between locking attempts.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestRTMSpinLoopCount
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestRTMSpinLoopCount
*/
@@ -41,9 +41,9 @@
import jdk.test.lib.*;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
/**
* Test verifies that RTMSpinLoopCount increase time spent between retries
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rtm/locking/TestRTMTotalCountIncrRate.java
--- a/hotspot/test/compiler/rtm/locking/TestRTMTotalCountIncrRate.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rtm/locking/TestRTMTotalCountIncrRate.java Wed Jun 22 23:31:33 2016 +0000
@@ -27,12 +27,12 @@
* @bug 8031320
* @summary Verify that RTMTotalCountIncrRate option affects
* RTM locking statistics.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestRTMTotalCountIncrRate
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestRTMTotalCountIncrRate
*/
@@ -43,9 +43,9 @@
import jdk.test.lib.*;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
/**
* Test verifies that with RTMTotalCountIncrRate=1 RTM locking statistics
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rtm/locking/TestUseRTMAfterLockInflation.java
--- a/hotspot/test/compiler/rtm/locking/TestUseRTMAfterLockInflation.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rtm/locking/TestUseRTMAfterLockInflation.java Wed Jun 22 23:31:33 2016 +0000
@@ -27,12 +27,12 @@
* @bug 8031320
* @summary Verify that rtm locking is used for stack locks before
* inflation and after it used for inflated locks.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestUseRTMAfterLockInflation
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestUseRTMAfterLockInflation
*/
@@ -42,9 +42,9 @@
import jdk.test.lib.*;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
/**
* Test verifies that RTM is used after lock inflation by executing compiled
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rtm/locking/TestUseRTMDeopt.java
--- a/hotspot/test/compiler/rtm/locking/TestUseRTMDeopt.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rtm/locking/TestUseRTMDeopt.java Wed Jun 22 23:31:33 2016 +0000
@@ -27,12 +27,12 @@
* @bug 8031320
* @summary Verify that UseRTMDeopt affects uncommon trap installation in
* copmpiled methods with synchronized block.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestUseRTMDeopt
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestUseRTMDeopt
*/
@@ -40,9 +40,9 @@
import jdk.test.lib.*;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
/**
* Test verifies that usage of UseRTMDeopt option affects uncommon traps usage
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rtm/locking/TestUseRTMForInflatedLocks.java
--- a/hotspot/test/compiler/rtm/locking/TestUseRTMForInflatedLocks.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rtm/locking/TestUseRTMForInflatedLocks.java Wed Jun 22 23:31:33 2016 +0000
@@ -26,12 +26,12 @@
* @test
* @bug 8031320
* @summary Verify that rtm locking is used for inflated locks.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestUseRTMForInflatedLocks
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestUseRTMForInflatedLocks
*/
@@ -41,9 +41,9 @@
import jdk.test.lib.*;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
/**
* Test verifies that RTM-based lock elision could be used for inflated locks
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rtm/locking/TestUseRTMForStackLocks.java
--- a/hotspot/test/compiler/rtm/locking/TestUseRTMForStackLocks.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rtm/locking/TestUseRTMForStackLocks.java Wed Jun 22 23:31:33 2016 +0000
@@ -26,12 +26,12 @@
* @test
* @bug 8031320
* @summary Verify that rtm locking is used for stack locks.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestUseRTMForStackLocks
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestUseRTMForStackLocks
*/
@@ -41,9 +41,9 @@
import jdk.test.lib.*;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
/**
* Test verifies that RTM-based lock elision could be used for stack locks
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rtm/locking/TestUseRTMXendForLockBusy.java
--- a/hotspot/test/compiler/rtm/locking/TestUseRTMXendForLockBusy.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rtm/locking/TestUseRTMXendForLockBusy.java Wed Jun 22 23:31:33 2016 +0000
@@ -27,12 +27,12 @@
* @bug 8031320
* @summary Verify that UseRTMXendForLockBusy option affects
* method behaviour if lock is busy.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestUseRTMXendForLockBusy
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestUseRTMXendForLockBusy
*/
@@ -42,9 +42,9 @@
import jdk.test.lib.*;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
/**
* Test verifies that with +UseRTMXendForLockBusy there will be no aborts
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rtm/method_options/TestNoRTMLockElidingOption.java
--- a/hotspot/test/compiler/rtm/method_options/TestNoRTMLockElidingOption.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rtm/method_options/TestNoRTMLockElidingOption.java Wed Jun 22 23:31:33 2016 +0000
@@ -27,12 +27,12 @@
* @bug 8031320
* @summary Verify that NoRTMLockEliding option could be applied to
* specified method and that such method will not use rtm.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestNoRTMLockElidingOption
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestNoRTMLockElidingOption
*/
@@ -41,9 +41,9 @@
import jdk.test.lib.*;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
/**
* Test verifies that method tagged with option NoRTMLockElidingOption
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rtm/method_options/TestUseRTMLockElidingOption.java
--- a/hotspot/test/compiler/rtm/method_options/TestUseRTMLockElidingOption.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rtm/method_options/TestUseRTMLockElidingOption.java Wed Jun 22 23:31:33 2016 +0000
@@ -28,12 +28,12 @@
* @summary Verify that UseRTMLockEliding option could be applied to
* specified method and that such method will not be deoptimized
* on high abort ratio.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestUseRTMLockElidingOption
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestUseRTMLockElidingOption
*/
@@ -42,9 +42,9 @@
import jdk.test.lib.*;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
/**
* Test verifies that method tagged with option UseRTMLockElidingOption
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java
--- a/hotspot/test/compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/rtm/print/TestPrintPreciseRTMLockingStatistics.java Wed Jun 22 23:31:33 2016 +0000
@@ -29,12 +29,12 @@
* on overall aborts and locks count and count of aborts of
* different types. Test also verify that VM output does not
* contain rtm locking statistics when it should not.
- * @library /testlibrary /test/lib /compiler/testlibrary
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TestPrintPreciseRTMLockingStatistics
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI TestPrintPreciseRTMLockingStatistics
*/
@@ -44,9 +44,9 @@
import jdk.test.lib.*;
import jdk.test.lib.cli.CommandLineOptionTest;
import jdk.test.lib.cli.predicate.AndPredicate;
-import rtm.*;
-import rtm.predicate.SupportedCPU;
-import rtm.predicate.SupportedVM;
+import compiler.testlibrary.rtm.*;
+import compiler.testlibrary.rtm.predicate.SupportedCPU;
+import compiler.testlibrary.rtm.predicate.SupportedVM;
/**
* Test verifies that VM output does not contain RTM locking statistics when it
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/testlibrary/intrinsics/Verifier.java
--- a/hotspot/test/compiler/testlibrary/intrinsics/Verifier.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/testlibrary/intrinsics/Verifier.java Wed Jun 22 23:31:33 2016 +0000
@@ -20,7 +20,8 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
-package intrinsics;
+
+package compiler.testlibrary.intrinsics;
import java.io.BufferedReader;
import java.io.FileReader;
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/testlibrary/rtm/AbortProvoker.java
--- a/hotspot/test/compiler/testlibrary/rtm/AbortProvoker.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/testlibrary/rtm/AbortProvoker.java Wed Jun 22 23:31:33 2016 +0000
@@ -22,7 +22,7 @@
*
*/
-package rtm;
+package compiler.testlibrary.rtm;
import java.util.Objects;
import java.util.concurrent.BrokenBarrierException;
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/testlibrary/rtm/AbortType.java
--- a/hotspot/test/compiler/testlibrary/rtm/AbortType.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/testlibrary/rtm/AbortType.java Wed Jun 22 23:31:33 2016 +0000
@@ -22,7 +22,7 @@
*
*/
-package rtm;
+package compiler.testlibrary.rtm;
import jdk.test.lib.Asserts;
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/testlibrary/rtm/BufferOverflowProvoker.java
--- a/hotspot/test/compiler/testlibrary/rtm/BufferOverflowProvoker.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/testlibrary/rtm/BufferOverflowProvoker.java Wed Jun 22 23:31:33 2016 +0000
@@ -22,7 +22,7 @@
*
*/
-package rtm;
+package compiler.testlibrary.rtm;
/**
* In order to provoke transactional execution abort due to
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/testlibrary/rtm/BusyLock.java
--- a/hotspot/test/compiler/testlibrary/rtm/BusyLock.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/testlibrary/rtm/BusyLock.java Wed Jun 22 23:31:33 2016 +0000
@@ -22,7 +22,7 @@
*
*/
-package rtm;
+package compiler.testlibrary.rtm;
import java.util.concurrent.BrokenBarrierException;
import java.util.concurrent.CyclicBarrier;
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/testlibrary/rtm/CompilableTest.java
--- a/hotspot/test/compiler/testlibrary/rtm/CompilableTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/testlibrary/rtm/CompilableTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -22,7 +22,7 @@
*
*/
-package rtm;
+package compiler.testlibrary.rtm;
/**
* Interface for test scenarios that contain methods
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/testlibrary/rtm/MemoryConflictProvoker.java
--- a/hotspot/test/compiler/testlibrary/rtm/MemoryConflictProvoker.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/testlibrary/rtm/MemoryConflictProvoker.java Wed Jun 22 23:31:33 2016 +0000
@@ -22,7 +22,7 @@
*
*/
-package rtm;
+package compiler.testlibrary.rtm;
import java.util.concurrent.BrokenBarrierException;
import java.util.concurrent.CyclicBarrier;
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/testlibrary/rtm/NestedAbortProvoker.java
--- a/hotspot/test/compiler/testlibrary/rtm/NestedAbortProvoker.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/testlibrary/rtm/NestedAbortProvoker.java Wed Jun 22 23:31:33 2016 +0000
@@ -22,7 +22,7 @@
*
*/
-package rtm;
+package compiler.testlibrary.rtm;
import java.util.Arrays;
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/testlibrary/rtm/RTMLockingStatistics.java
--- a/hotspot/test/compiler/testlibrary/rtm/RTMLockingStatistics.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/testlibrary/rtm/RTMLockingStatistics.java Wed Jun 22 23:31:33 2016 +0000
@@ -22,7 +22,7 @@
*
*/
-package rtm;
+package compiler.testlibrary.rtm;
import java.util.EnumMap;
import java.util.LinkedList;
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/testlibrary/rtm/RTMTestBase.java
--- a/hotspot/test/compiler/testlibrary/rtm/RTMTestBase.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/testlibrary/rtm/RTMTestBase.java Wed Jun 22 23:31:33 2016 +0000
@@ -22,7 +22,7 @@
*
*/
-package rtm;
+package compiler.testlibrary.rtm;
import java.io.IOException;
import java.nio.file.Files;
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/testlibrary/rtm/XAbortProvoker.java
--- a/hotspot/test/compiler/testlibrary/rtm/XAbortProvoker.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/testlibrary/rtm/XAbortProvoker.java Wed Jun 22 23:31:33 2016 +0000
@@ -22,7 +22,7 @@
*
*/
-package rtm;
+package compiler.testlibrary.rtm;
import jdk.test.lib.Utils;
import jdk.internal.misc.Unsafe;
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/testlibrary/rtm/predicate/SupportedCPU.java
--- a/hotspot/test/compiler/testlibrary/rtm/predicate/SupportedCPU.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/testlibrary/rtm/predicate/SupportedCPU.java Wed Jun 22 23:31:33 2016 +0000
@@ -22,7 +22,7 @@
*
*/
-package rtm.predicate;
+package compiler.testlibrary.rtm.predicate;
import sun.hotspot.cpuinfo.CPUInfo;
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/testlibrary/rtm/predicate/SupportedVM.java
--- a/hotspot/test/compiler/testlibrary/rtm/predicate/SupportedVM.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/testlibrary/rtm/predicate/SupportedVM.java Wed Jun 22 23:31:33 2016 +0000
@@ -22,7 +22,7 @@
*
*/
-package rtm.predicate;
+package compiler.testlibrary.rtm.predicate;
import jdk.test.lib.Platform;
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/testlibrary/sha/predicate/IntrinsicPredicates.java
--- a/hotspot/test/compiler/testlibrary/sha/predicate/IntrinsicPredicates.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/testlibrary/sha/predicate/IntrinsicPredicates.java Wed Jun 22 23:31:33 2016 +0000
@@ -21,7 +21,7 @@
* questions.
*/
-package sha.predicate;
+package compiler.testlibrary.sha.predicate;
import jdk.test.lib.Platform;
import jdk.test.lib.cli.predicate.AndPredicate;
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/testlibrary/uncommontrap/Verifier.java
--- a/hotspot/test/compiler/testlibrary/uncommontrap/Verifier.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/testlibrary/uncommontrap/Verifier.java Wed Jun 22 23:31:33 2016 +0000
@@ -21,7 +21,7 @@
* questions.
*/
-package uncommontrap;
+package compiler.testlibrary.uncommontrap;
import java.io.FileReader;
import java.io.IOException;
@@ -34,6 +34,7 @@
import java.util.regex.Pattern;
import jdk.test.lib.Asserts;
+
/**
* Utility tool aimed to verify presence or absence of specified uncommon trap
* in compilation log.
@@ -78,7 +79,9 @@
PROPERTIES_FILE_SUFFIX);
Properties properties = new Properties();
- properties.load(new FileReader(propertiesFile.toFile()));
+ try (FileReader reader = new FileReader(propertiesFile.toFile())) {
+ properties.load(reader);
+ }
if (Boolean.valueOf(properties.getProperty(
VERIFICATION_SHOULD_BE_SKIPPED, "false"))) {
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/tiered/ConstantGettersTransitionsTest.java
--- a/hotspot/test/compiler/tiered/ConstantGettersTransitionsTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/tiered/ConstantGettersTransitionsTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -21,13 +21,9 @@
* questions.
*/
-import java.lang.reflect.Executable;
-import java.util.concurrent.Callable;
-import compiler.whitebox.CompilerWhiteBoxTest;
-
/**
* @test ConstantGettersTransitionsTest
- * @library /testlibrary /test/lib /compiler/whitebox /
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* java.management
* @build TransitionsTestExecutor ConstantGettersTransitionsTest
@@ -38,6 +34,11 @@
* TransitionsTestExecutor ConstantGettersTransitionsTest
* @summary Test the correctness of compilation level transitions for constant getters methods
*/
+
+import java.lang.reflect.Executable;
+import java.util.concurrent.Callable;
+import compiler.whitebox.CompilerWhiteBoxTest;
+
public class ConstantGettersTransitionsTest extends LevelTransitionTest {
public static void main(String[] args) {
assert (!CompilerWhiteBoxTest.skipOnTieredCompilation(false));
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/tiered/LevelTransitionTest.java
--- a/hotspot/test/compiler/tiered/LevelTransitionTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/tiered/LevelTransitionTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -21,6 +21,22 @@
* questions.
*/
+/**
+ * @test LevelTransitionTest
+ * @library /testlibrary /test/lib /
+ * @modules java.base/jdk.internal.misc
+ * java.management
+ * @ignore 8067651
+ * @build TransitionsTestExecutor LevelTransitionTest
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @run main/othervm/timeout=240 -Xmixed -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
+ * -XX:+WhiteBoxAPI -XX:+TieredCompilation
+ * -XX:CompileCommand=compileonly,compiler.whitebox.SimpleTestCaseHelper::*
+ * -XX:CompileCommand=compileonly,ExtendedTestCase$CompileMethodHolder::*
+ * TransitionsTestExecutor LevelTransitionTest
+ * @summary Test the correctness of compilation level transitions for different methods
+ */
+
import java.lang.reflect.Executable;
import java.lang.reflect.Method;
import java.util.Objects;
@@ -28,21 +44,6 @@
import compiler.whitebox.CompilerWhiteBoxTest;
import compiler.whitebox.SimpleTestCase;
-/**
- * @test LevelTransitionTest
- * @library /testlibrary /test/lib /compiler/whitebox /
- * @modules java.base/jdk.internal.misc
- * java.management
- * @ignore 8067651
- * @build TransitionsTestExecutor LevelTransitionTest
- * @run main ClassFileInstaller sun.hotspot.WhiteBox sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main/othervm/timeout=240 -Xmixed -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
- * -XX:+WhiteBoxAPI -XX:+TieredCompilation
- * -XX:CompileCommand=compileonly,compiler.whitebox.SimpleTestCaseHelper::*
- * -XX:CompileCommand=compileonly,ExtendedTestCase$CompileMethodHolder::*
- * TransitionsTestExecutor LevelTransitionTest
- * @summary Test the correctness of compilation level transitions for different methods
- */
public class LevelTransitionTest extends TieredLevelsTest {
/** Shows if method was profiled by being executed on levels 2 or 3 */
protected boolean isMethodProfiled;
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/tiered/NonTieredLevelsTest.java
--- a/hotspot/test/compiler/tiered/NonTieredLevelsTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/tiered/NonTieredLevelsTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -21,12 +21,9 @@
* questions.
*/
-import java.util.function.IntPredicate;
-import compiler.whitebox.CompilerWhiteBoxTest;
-
/**
* @test NonTieredLevelsTest
- * @library /testlibrary /test/lib /compiler/whitebox /
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* @modules java.management
* @build NonTieredLevelsTest
@@ -39,6 +36,10 @@
* @summary Verify that only one level can be used
* @author igor.ignatyev@oracle.com
*/
+
+import java.util.function.IntPredicate;
+import compiler.whitebox.CompilerWhiteBoxTest;
+
public class NonTieredLevelsTest extends CompLevelsTest {
private static final int AVAILABLE_COMP_LEVEL;
private static final IntPredicate IS_AVAILABLE_COMPLEVEL;
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/tiered/TieredLevelsTest.java
--- a/hotspot/test/compiler/tiered/TieredLevelsTest.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/tiered/TieredLevelsTest.java Wed Jun 22 23:31:33 2016 +0000
@@ -21,16 +21,14 @@
* questions.
*/
-import compiler.whitebox.CompilerWhiteBoxTest;
-
/**
* @test TieredLevelsTest
- * @library /testlibrary /test/lib /compiler/whitebox /
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.misc
* @modules java.management
* @build TieredLevelsTest
* @run driver ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbootclasspath/a:. -XX:+TieredCompilation
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI -XX:-UseCounterDecay
* -XX:CompileCommand=compileonly,compiler.whitebox.SimpleTestCaseHelper::*
@@ -38,6 +36,9 @@
* @summary Verify that all levels < 'TieredStopAtLevel' can be used
* @author igor.ignatyev@oracle.com
*/
+
+import compiler.whitebox.CompilerWhiteBoxTest;
+
public class TieredLevelsTest extends CompLevelsTest {
public static void main(String[] args) throws Exception, Throwable {
if (CompilerWhiteBoxTest.skipOnTieredCompilation(false)) {
diff -r 7464b1552bf7 -r ca66cfb4e62b hotspot/test/compiler/uncommontrap/TestUnstableIfTrap.java
--- a/hotspot/test/compiler/uncommontrap/TestUnstableIfTrap.java Wed Jun 22 22:39:32 2016 +0000
+++ b/hotspot/test/compiler/uncommontrap/TestUnstableIfTrap.java Wed Jun 22 23:31:33 2016 +0000
@@ -20,35 +20,19 @@
* or visit www.oracle.com if you need additional information or have any
* questions.
*/
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.util.Properties;
-
-import jdk.test.lib.ByteCodeLoader;
-import jdk.test.lib.Platform;
-import jdk.internal.org.objectweb.asm.ClassVisitor;
-import jdk.internal.org.objectweb.asm.ClassWriter;
-import jdk.internal.org.objectweb.asm.Label;
-import jdk.internal.org.objectweb.asm.MethodVisitor;
-import static jdk.internal.org.objectweb.asm.Opcodes.*;
-
-import sun.hotspot.WhiteBox;
-import uncommontrap.Verifier;
/*
* @test
* @bug 8030976 8059226
- * @library /testlibrary /compiler/testlibrary /test/lib
+ * @library /testlibrary /test/lib /
* @modules java.base/jdk.internal.org.objectweb.asm
* java.base/jdk.internal.misc
* java.compiler
* java.management
* jdk.jvmstat/sun.jvmstat.monitor
- * @build TestUnstableIfTrap jdk.test.lib.* uncommontrap.Verifier
- * @run main ClassFileInstaller sun.hotspot.WhiteBox
- * sun.hotspot.WhiteBox$WhiteBoxPermission
+ * @build TestUnstableIfTrap jdk.test.lib.* compiler.testlibrary.uncommontrap.Verifier
+ * @run driver ClassFileInstaller sun.hotspot.WhiteBox
+ * sun.hotspot.WhiteBox$WhiteBoxPermission
* @run main/othervm -Xbatch -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
* -XX:+WhiteBoxAPI -XX:+LogCompilation
* -XX:CompileCommand=compileonly,UnstableIfExecutable.test
@@ -69,11 +53,29 @@
* -XX:CompileCommand=compileonly,UnstableIfExecutable.test
* -XX:LogFile=never_taken_fired.xml
* TestUnstableIfTrap NEVER_TAKEN true
- * @run main/othervm uncommontrap.Verifier always_taken_not_fired.xml
- * always_taken_fired.xml
- * never_taken_not_fired.xml
- * never_taken_fired.xml
+ * @run driver compiler.testlibrary.uncommontrap.Verifier always_taken_not_fired.xml
+ * always_taken_fired.xml
+ * never_taken_not_fired.xml
+ * never_taken_fired.xml
*/
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.lang.reflect.Method;
+import java.util.Properties;
+
+import jdk.test.lib.ByteCodeLoader;
+import jdk.test.lib.Platform;
+import jdk.internal.org.objectweb.asm.ClassVisitor;
+import jdk.internal.org.objectweb.asm.ClassWriter;
+import jdk.internal.org.objectweb.asm.Label;
+import jdk.internal.org.objectweb.asm.MethodVisitor;
+import static jdk.internal.org.objectweb.asm.Opcodes.*;
+
+import sun.hotspot.WhiteBox;
+import compiler.testlibrary.uncommontrap.Verifier;
+
public class TestUnstableIfTrap {
private static final WhiteBox WB = WhiteBox.getWhiteBox();
private static final String CLASS_NAME = "UnstableIfExecutable";