test/compiler/rtm/locking/TestRTMAfterNonRTMDeopt.java

rev 11557 : 8132919: use package in compiler tests
Reviewed-by: duke

*** 30,55 ****
   *          method's RTM state. And if we don't use RTMDeopt, then
   *          RTM state remain the same after such deoptimization.
   * @library /testlibrary /test/lib /
   * @modules java.base/jdk.internal.misc
   *          java.management
!  * @build TestRTMAfterNonRTMDeopt
   * @run driver ClassFileInstaller sun.hotspot.WhiteBox
   *                                sun.hotspot.WhiteBox$WhiteBoxPermission
   * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
!  *                   -XX:+WhiteBoxAPI TestRTMAfterNonRTMDeopt
   */
  
! import java.util.List;
! import jdk.test.lib.*;
! import jdk.test.lib.cli.CommandLineOptionTest;
! import jdk.test.lib.cli.predicate.AndPredicate;
! import compiler.testlibrary.rtm.*;
  import compiler.testlibrary.rtm.predicate.SupportedCPU;
  import compiler.testlibrary.rtm.predicate.SupportedVM;
  import jdk.internal.misc.Unsafe;
  
  /**
   * To verify that with +UseRTMDeopt method's RTM state will be
   * changed to ProfileRTM on deoptimization unrelated to
   * rtm_state_change following sequence of events is used:
   * <pre>
--- 30,64 ----
   *          method's RTM state. And if we don't use RTMDeopt, then
   *          RTM state remain the same after such deoptimization.
   * @library /testlibrary /test/lib /
   * @modules java.base/jdk.internal.misc
   *          java.management
!  * @build compiler.rtm.locking.TestRTMAfterNonRTMDeopt
   * @run driver ClassFileInstaller sun.hotspot.WhiteBox
   *                                sun.hotspot.WhiteBox$WhiteBoxPermission
   * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
!  *                   -XX:+WhiteBoxAPI
!  *                   compiler.rtm.locking.TestRTMAfterNonRTMDeopt
   */
  
! package compiler.rtm.locking;
! 
! import compiler.testlibrary.rtm.AbortProvoker;
! import compiler.testlibrary.rtm.CompilableTest;
! import compiler.testlibrary.rtm.RTMLockingStatistics;
! import compiler.testlibrary.rtm.RTMTestBase;
  import compiler.testlibrary.rtm.predicate.SupportedCPU;
  import compiler.testlibrary.rtm.predicate.SupportedVM;
  import jdk.internal.misc.Unsafe;
+ import jdk.test.lib.Asserts;
+ import jdk.test.lib.OutputAnalyzer;
+ import jdk.test.lib.Utils;
+ import jdk.test.lib.cli.CommandLineOptionTest;
+ import jdk.test.lib.cli.predicate.AndPredicate;
  
+ import java.util.List;
+ 
  /**
   * To verify that with +UseRTMDeopt method's RTM state will be
   * changed to ProfileRTM on deoptimization unrelated to
   * rtm_state_change following sequence of events is used:
   * <pre>