test/hotspot/jtreg/compiler/rtm/locking/TestRTMTotalCountIncrRate.java

rev 54746 : 8223660: jtreg: Decouple Unsafe from RTM tests
Reviewed-by:

*** 1,7 ****
  /*
!  * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
--- 1,7 ----
  /*
!  * Copyright (c) 2014, 2019, Oracle and/or its affiliates. All rights reserved.
   * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   *
   * This code is free software; you can redistribute it and/or modify it
   * under the terms of the GNU General Public License version 2 only, as
   * published by the Free Software Foundation.
*** 31,52 ****
   *          java.management
   * @requires vm.rtm.cpu & vm.rtm.compiler
   * @build sun.hotspot.WhiteBox
   * @run driver ClassFileInstaller sun.hotspot.WhiteBox
   *                                sun.hotspot.WhiteBox$WhiteBoxPermission
!  * @run main/othervm -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
   *                   -XX:+WhiteBoxAPI
   *                   compiler.rtm.locking.TestRTMTotalCountIncrRate
   */
  
  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 jdk.internal.misc.Unsafe;
  import jdk.test.lib.Asserts;
  import jdk.test.lib.process.OutputAnalyzer;
  import jdk.test.lib.cli.CommandLineOptionTest;
  
  import java.util.List;
--- 31,52 ----
   *          java.management
   * @requires vm.rtm.cpu & vm.rtm.compiler
   * @build sun.hotspot.WhiteBox
   * @run driver ClassFileInstaller sun.hotspot.WhiteBox
   *                                sun.hotspot.WhiteBox$WhiteBoxPermission
!  * @run main/othervm/native -Xbootclasspath/a:. -XX:+UnlockDiagnosticVMOptions
   *                          -XX:+WhiteBoxAPI
   *                          compiler.rtm.locking.TestRTMTotalCountIncrRate
   */
  
  package compiler.rtm.locking;
  
  import compiler.testlibrary.rtm.AbortProvoker;
+ import compiler.testlibrary.rtm.XAbortProvoker;
  import compiler.testlibrary.rtm.CompilableTest;
  import compiler.testlibrary.rtm.RTMLockingStatistics;
  import compiler.testlibrary.rtm.RTMTestBase;
  import jdk.test.lib.Asserts;
  import jdk.test.lib.process.OutputAnalyzer;
  import jdk.test.lib.cli.CommandLineOptionTest;
  
  import java.util.List;
*** 102,112 ****
          }
      }
  
      public static class Test implements CompilableTest {
          private static final long TOTAL_ITERATIONS = 10000L;
!         private static final Unsafe UNSAFE = Unsafe.getUnsafe();
          private final Object monitor = new Object();
          // Following field have to be static in order to avoid escape analysis.
          @SuppressWarnings("UnsuedDeclaration")
          private static int field = 0;
  
--- 102,112 ----
          }
      }
  
      public static class Test implements CompilableTest {
          private static final long TOTAL_ITERATIONS = 10000L;
!         private final XAbortProvoker xabort = new XAbortProvoker();
          private final Object monitor = new Object();
          // Following field have to be static in order to avoid escape analysis.
          @SuppressWarnings("UnsuedDeclaration")
          private static int field = 0;
  
*** 115,125 ****
              return this.getClass().getName() + "::lock";
          }
  
          @Override
          public String[] getMethodsToCompileNames() {
!             return new String[] { getMethodWithLockName() };
          }
  
          public void lock(boolean forceAbort) {
              synchronized(monitor) {
                  if (forceAbort) {
--- 115,125 ----
              return this.getClass().getName() + "::lock";
          }
  
          @Override
          public String[] getMethodsToCompileNames() {
!             return new String[] { getMethodWithLockName(), "*.doAbort" };
          }
  
          public void lock(boolean forceAbort) {
              synchronized(monitor) {
                  if (forceAbort) {
*** 127,137 ****
                      // abort. It's done by explicit xabort call emitted
                      // in SharedRuntime::generate_native_wrapper.
                      // If an actual JNI call will be replaced by
                      // intrinsic - we'll be in trouble, since xabort
                      // will be no longer called and test may fail.
!                     UNSAFE.pageSize();
                  }
                  Test.field++;
              }
          }
  
--- 127,137 ----
                      // abort. It's done by explicit xabort call emitted
                      // in SharedRuntime::generate_native_wrapper.
                      // If an actual JNI call will be replaced by
                      // intrinsic - we'll be in trouble, since xabort
                      // will be no longer called and test may fail.
!                     xabort.doAbort();
                  }
                  Test.field++;
              }
          }