8023318: compiler/whitebox tests timeout with enabled TieredCompilation

Reviewed-by: kvn, twisti
This commit is contained in:
Igor Ignatyev 2013-10-19 21:54:46 +04:00
parent fce1adef81
commit 50b8567c55

View file

@ -80,8 +80,7 @@ public abstract class CompilerWhiteBoxTest {
static { static {
if (TIERED_COMPILATION) { if (TIERED_COMPILATION) {
THRESHOLD = 150000; BACKEDGE_THRESHOLD = THRESHOLD = 150000;
BACKEDGE_THRESHOLD = 0xFFFFFFFFL;
} else { } else {
THRESHOLD = COMPILE_THRESHOLD; THRESHOLD = COMPILE_THRESHOLD;
BACKEDGE_THRESHOLD = COMPILE_THRESHOLD * Long.parseLong(getVMOption( BACKEDGE_THRESHOLD = COMPILE_THRESHOLD * Long.parseLong(getVMOption(
@ -364,7 +363,7 @@ enum TestCase {
/** OSR constructor test case */ /** OSR constructor test case */
OSR_CONSTRUCTOR_TEST(Helper.OSR_CONSTRUCTOR, OSR_CONSTRUCTOR_TEST(Helper.OSR_CONSTRUCTOR,
Helper.OSR_CONSTRUCTOR_CALLABLE, true), Helper.OSR_CONSTRUCTOR_CALLABLE, true),
/** OSR method test case */ /** OSR method test case */
OSR_METOD_TEST(Helper.OSR_METHOD, Helper.OSR_METHOD_CALLABLE, true), OSR_METOD_TEST(Helper.OSR_METHOD, Helper.OSR_METHOD_CALLABLE, true),
/** OSR static method test case */ /** OSR static method test case */
OSR_STATIC_TEST(Helper.OSR_STATIC, Helper.OSR_STATIC_CALLABLE, true); OSR_STATIC_TEST(Helper.OSR_STATIC, Helper.OSR_STATIC_CALLABLE, true);
@ -373,7 +372,7 @@ enum TestCase {
final Executable executable; final Executable executable;
/** object to invoke {@linkplain #executable} */ /** object to invoke {@linkplain #executable} */
final Callable<Integer> callable; final Callable<Integer> callable;
/** flag for OSR test case */ /** flag for OSR test case */
final boolean isOsr; final boolean isOsr;
private TestCase(Executable executable, Callable<Integer> callable, private TestCase(Executable executable, Callable<Integer> callable,