# HG changeset patch
# User anoll
# Date 1394011230 -3600
# Node ID a5f0657a16665254a7bd42d305ee32ba5f8a3be9
# Parent  bbfe3ac1471dcfdc1751dde90565f9b267699b9e
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 bbfe3ac1471d -r a5f0657a1666 src/share/vm/runtime/arguments.cpp
--- a/src/share/vm/runtime/arguments.cpp	Tue Jan 28 15:05:46 2014 +0100
+++ b/src/share/vm/runtime/arguments.cpp	Wed Mar 05 10:20:30 2014 +0100
@@ -2409,7 +2409,7 @@
   status &= verify_interval(NmethodSweepActivity, 0, 2000, "NmethodSweepActivity");
 
   // 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 bbfe3ac1471d -r a5f0657a1666 test/compiler/membars/DekkerTest.java
--- a/test/compiler/membars/DekkerTest.java	Tue Jan 28 15:05:46 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.