comparison test/compiler/whitebox/CompilerWhiteBoxTest.java @ 12958:600c83f8e6a5

8023318: compiler/whitebox tests timeout with enabled TieredCompilation Reviewed-by: kvn, twisti
author iignatyev
date Sat, 19 Oct 2013 21:54:46 +0400
parents 303826f477c6
children f9a4b59ae350
comparison
equal deleted inserted replaced
12957:19c5a042b0b3 12958:600c83f8e6a5
78 protected static final String MODE 78 protected static final String MODE
79 = System.getProperty("java.vm.info"); 79 = System.getProperty("java.vm.info");
80 80
81 static { 81 static {
82 if (TIERED_COMPILATION) { 82 if (TIERED_COMPILATION) {
83 THRESHOLD = 150000; 83 BACKEDGE_THRESHOLD = THRESHOLD = 150000;
84 BACKEDGE_THRESHOLD = 0xFFFFFFFFL;
85 } else { 84 } else {
86 THRESHOLD = COMPILE_THRESHOLD; 85 THRESHOLD = COMPILE_THRESHOLD;
87 BACKEDGE_THRESHOLD = COMPILE_THRESHOLD * Long.parseLong(getVMOption( 86 BACKEDGE_THRESHOLD = COMPILE_THRESHOLD * Long.parseLong(getVMOption(
88 "OnStackReplacePercentage")); 87 "OnStackReplacePercentage"));
89 } 88 }
362 STATIC_TEST(Helper.STATIC, Helper.STATIC_CALLABLE, false), 361 STATIC_TEST(Helper.STATIC, Helper.STATIC_CALLABLE, false),
363 362
364 /** OSR constructor test case */ 363 /** OSR constructor test case */
365 OSR_CONSTRUCTOR_TEST(Helper.OSR_CONSTRUCTOR, 364 OSR_CONSTRUCTOR_TEST(Helper.OSR_CONSTRUCTOR,
366 Helper.OSR_CONSTRUCTOR_CALLABLE, true), 365 Helper.OSR_CONSTRUCTOR_CALLABLE, true),
367 /** OSR method test case */ 366 /** OSR method test case */
368 OSR_METOD_TEST(Helper.OSR_METHOD, Helper.OSR_METHOD_CALLABLE, true), 367 OSR_METOD_TEST(Helper.OSR_METHOD, Helper.OSR_METHOD_CALLABLE, true),
369 /** OSR static method test case */ 368 /** OSR static method test case */
370 OSR_STATIC_TEST(Helper.OSR_STATIC, Helper.OSR_STATIC_CALLABLE, true); 369 OSR_STATIC_TEST(Helper.OSR_STATIC, Helper.OSR_STATIC_CALLABLE, true);
371 370
372 /** tested method */ 371 /** tested method */
373 final Executable executable; 372 final Executable executable;
374 /** object to invoke {@linkplain #executable} */ 373 /** object to invoke {@linkplain #executable} */
375 final Callable<Integer> callable; 374 final Callable<Integer> callable;
376 /** flag for OSR test case */ 375 /** flag for OSR test case */
377 final boolean isOsr; 376 final boolean isOsr;
378 377
379 private TestCase(Executable executable, Callable<Integer> callable, 378 private TestCase(Executable executable, Callable<Integer> callable,
380 boolean isOsr) { 379 boolean isOsr) {
381 this.executable = executable; 380 this.executable = executable;