stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8295191: IR framework timeout options expect ms instead of s

Browse Source 
Reviewed-by: chagedorn, kvn, thartmann
This commit is contained in:
Eric Nothum 2023-06-29 06:59:12 +00:00 committed by Tobias Hartmann
parent af319d963f
commit b2eae16c45
2 changed files with 10 additions and 10 deletions
test/hotspot/jtreg/compiler/lib/ir_framework/test
AbstractTest.javaCustomRunTest.java

14
test/hotspot/jtreg/compiler/lib/ir_framework/test/AbstractTest.java

@ -37,8 +37,8 @@ import java.lang.reflect.Modifier;
*/
abstract class AbstractTest {
protected static final WhiteBox WHITE_BOX = WhiteBox.getWhiteBox();
protected static final int TEST_COMPILATION_TIMEOUT = Integer.parseInt(System.getProperty("TestCompilationTimeout", "10000"));
protected static final int WAIT_FOR_COMPILATION_TIMEOUT = Integer.parseInt(System.getProperty("WaitForCompilationTimeout", "10000"));
protected static final int TEST_COMPILATION_TIMEOUT_MS = Integer.parseInt(System.getProperty("TestCompilationTimeout", "10")) * 1000;
protected static final int WAIT_FOR_COMPILATION_TIMEOUT_MS = Integer.parseInt(System.getProperty("WaitForCompilationTimeout", "10")) * 1000;
protected static final boolean VERIFY_OOPS = (Boolean)WHITE_BOX.getVMFlag("VerifyOops");
protected final int warmupIterations;
@ -149,10 +149,10 @@ abstract class AbstractTest {
break;
}
elapsed = System.currentTimeMillis() - started;
} while (elapsed < TEST_COMPILATION_TIMEOUT);
TestRun.check(elapsed < TEST_COMPILATION_TIMEOUT,
} while (elapsed < TEST_COMPILATION_TIMEOUT_MS);
TestRun.check(elapsed < TEST_COMPILATION_TIMEOUT_MS,
"Could not compile " + testMethod + " at level " + test.getCompLevel() + " after "
+ TEST_COMPILATION_TIMEOUT/1000 + "s. Last compilation level: " + lastCompilationLevel);
+ TEST_COMPILATION_TIMEOUT_MS/1000 + "s. Last compilation level: " + lastCompilationLevel);
checkCompilationLevel(test);
}
@ -194,9 +194,9 @@ abstract class AbstractTest {
// Don't wait for compilation if -Xcomp is enabled or if we are randomly excluding methods from compilation.
return;
}
} while (elapsed < WAIT_FOR_COMPILATION_TIMEOUT);
} while (elapsed < WAIT_FOR_COMPILATION_TIMEOUT_MS);
throw new TestRunException(testMethod + " not compiled after waiting for "
+ WAIT_FOR_COMPILATION_TIMEOUT/1000 + " s");
+ WAIT_FOR_COMPILATION_TIMEOUT_MS/1000 + " s");
}
/**

6
test/hotspot/jtreg/compiler/lib/ir_framework/test/CustomRunTest.java

@ -133,11 +133,11 @@ class CustomRunTest extends AbstractTest {
executor.shutdown();
int timeout;
if (anyCompileMethod && anyWaitForCompilation) {
timeout = Math.max(WAIT_FOR_COMPILATION_TIMEOUT, TEST_COMPILATION_TIMEOUT) + 5000;
timeout = Math.max(WAIT_FOR_COMPILATION_TIMEOUT_MS, TEST_COMPILATION_TIMEOUT_MS) + 5000;
} else if (anyWaitForCompilation) {
timeout = WAIT_FOR_COMPILATION_TIMEOUT + 5000;
timeout = WAIT_FOR_COMPILATION_TIMEOUT_MS + 5000;
} else {
timeout = TEST_COMPILATION_TIMEOUT + 5000;
timeout = TEST_COMPILATION_TIMEOUT_MS + 5000;
}
try {
executor.awaitTermination(timeout, TimeUnit.MILLISECONDS);