8255011: UnexpectedDeoptimizationAllTest.java timed out

Author: Nils Eliasson

test/hotspot/jtreg/compiler/codecache/stress/CodeCacheStressRunner.java

@@ -27,17 +27,21 @@
 import jdk.test.lib.Utils;
 
 public class CodeCacheStressRunner {
+    private static long end_time;
     private final Runnable action;
+
     public CodeCacheStressRunner(Runnable action) {
         this.action = action;
     }
 
     protected final void runTest() {
         Helper.startInfiniteLoopThread(action);
         try {
-            // adjust timeout and substract vm init and exit time
+            // Adjust timeout and substract vm init and exit time
+            // Runs with fixed workload that is capped by the TimeLimitedRunner
+            end_time = System.nanoTime() + 60 * 1000 * 1000 * 1000L;
             long timeout = Utils.adjustTimeout(Utils.DEFAULT_TEST_TIMEOUT);
-            timeout *= 0.8;
+            timeout *= 0.75;
             new TimeLimitedRunner(timeout, 2.0d, this::test).call();
         } catch (Exception e) {
             throw new Error("Exception occurred during test execution", e);
@@ -47,7 +51,7 @@ protected final void runTest() {
     private boolean test() {
         Helper.TestCase obj = Helper.TestCase.get();
         Helper.callMethod(obj.getCallable(), obj.expectedValue());
-        return true;
+        return end_time > System.nanoTime();
     }
 
 }

test/hotspot/jtreg/compiler/codecache/stress/UnexpectedDeoptimizationAllTest.java

@@ -57,7 +57,7 @@ public static void main(String[] args) {
     public void run() {
         Helper.WHITE_BOX.deoptimizeAll();
         try {
-            Thread.sleep(10);
+            Thread.sleep(100);
         } catch (Exception e) {
         }
     }

test/hotspot/jtreg/compiler/codecache/stress/UnexpectedDeoptimizationTest.java

@@ -60,6 +60,11 @@ public static void main(String[] args) {
     @Override
     public void run() {
         Helper.WHITE_BOX.deoptimizeFrames(rng.nextBoolean());
+        try {
+            Thread.sleep(10);
+        } catch (Exception e) {
+        }
+
     }
 
 }