# HG changeset patch
# User anoll
# Date 1394011230 -3600
# Node ID e8225dc7c94b45d23fb83f5c444f7e5888a9aef2
# Parent  2eda90444a0d5a507d27cf56cff0a365bceb1e83
8036091: compiler/membars/DekkerTest.java fails with -XX:CICompilerCount=1
Summary: Start test with -XX:-TieredCompilation so that one compiler thread works
Reviewed-by: kvn, twisti

diff -r 2eda90444a0d -r e8225dc7c94b src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Tue Feb 25 13:52:37 2014 +0100
+++ b/src/share/vm/runtime/arguments.cpp	Wed Mar 05 10:20:30 2014 +0100
@@ -2463,7 +2463,7 @@
 #endif
 
   // TieredCompilation needs at least 2 compiler threads.
-  const int num_min_compiler_threads = (TieredCompilation) ? 2 : 1;
+  const int num_min_compiler_threads = (TieredCompilation && (TieredStopAtLevel >= CompLevel_full_optimization)) ? 2 : 1;
   status &=verify_min_value(CICompilerCount, num_min_compiler_threads, "CICompilerCount");
 
   return status;
diff -r 2eda90444a0d -r e8225dc7c94b test/compiler/membars/DekkerTest.java
--- a/test/compiler/membars/DekkerTest.java	Tue Feb 25 13:52:37 2014 +0100
+++ b/test/compiler/membars/DekkerTest.java	Wed Mar 05 10:20:30 2014 +0100
@@ -25,9 +25,9 @@
  * @test
  * @bug 8007898
  * @summary Incorrect optimization of Memory Barriers in Matcher::post_store_load_barrier().
- * @run main/othervm -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:CICompilerCount=1 -XX:+StressGCM -XX:+StressLCM DekkerTest
- * @run main/othervm -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:CICompilerCount=1 -XX:+StressGCM -XX:+StressLCM DekkerTest
- * @run main/othervm -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:CICompilerCount=1 -XX:+StressGCM -XX:+StressLCM DekkerTest
+ * @run main/othervm -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:CICompilerCount=1 -XX:-TieredCompilation -XX:+StressGCM -XX:+StressLCM DekkerTest
+ * @run main/othervm -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:CICompilerCount=1 -XX:-TieredCompilation -XX:+StressGCM -XX:+StressLCM DekkerTest
+ * @run main/othervm -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:CICompilerCount=1 -XX:-TieredCompilation -XX:+StressGCM -XX:+StressLCM DekkerTest
  * @author Martin Doerr martin DOT doerr AT sap DOT com
  *
  * Run 3 times since the failure is intermittent.