--- a/hotspot/test/compiler/aot/RecompilationTest.java Tue Dec 13 16:26:07 2016 +0100
+++ b/hotspot/test/compiler/aot/RecompilationTest.java Tue Dec 13 17:58:19 2016 -0800
@@ -30,31 +30,36 @@
* compiler.aot.AotCompiler
* @run main ClassFileInstaller sun.hotspot.WhiteBox
* sun.hotspot.WhiteBox$WhiteBoxPermission
- * @run main compiler.aot.AotCompiler -libname libRecompilationTest.so
+ * @run main compiler.aot.AotCompiler -libname libRecompilationTest1.so
* -class compiler.whitebox.SimpleTestCaseHelper
* -extraopt -Dgraal.TieredAOT=true -extraopt -Dgraal.ProfileSimpleMethods=true
* -extraopt -XX:+UnlockDiagnosticVMOptions -extraopt -XX:+WhiteBoxAPI -extraopt -Xbootclasspath/a:.
* -extraopt -XX:-UseCompressedOops
+ * -extraopt -XX:CompileCommand=dontinline,compiler.whitebox.SimpleTestCaseHelper::method
* @run main/othervm -Xmixed -Xbatch -XX:+UseAOT -XX:+TieredCompilation
* -XX:-UseCounterDecay -XX:-UseCompressedOops
- * -XX:CompileCommand=dontinline,*.*
- * -XX:AOTLibrary=./libRecompilationTest.so -Xbootclasspath/a:.
+ * -XX:-Inline
+ * -XX:AOTLibrary=./libRecompilationTest1.so -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -Dcompiler.aot.RecompilationTest.check_level=1
* compiler.aot.RecompilationTest
- * @run main compiler.aot.AotCompiler -libname libRecompilationTest.so
+ * @run main compiler.aot.AotCompiler -libname libRecompilationTest2.so
* -class compiler.whitebox.SimpleTestCaseHelper
* -extraopt -Dgraal.TieredAOT=false
* -extraopt -XX:+UnlockDiagnosticVMOptions -extraopt -XX:+WhiteBoxAPI -extraopt -Xbootclasspath/a:.
- * @run main/othervm -Xmixed -Xbatch -XX:+UseAOT -XX:+TieredCompilation -XX:-UseCounterDecay
- * -XX:CompileCommand=dontinline,*.*
- * -XX:AOTLibrary=./libRecompilationTest.so -Xbootclasspath/a:.
+ * -extraopt -XX:-UseCompressedOops
+ * -extraopt -XX:CompileCommand=dontinline,compiler.whitebox.SimpleTestCaseHelper::method
+ * @run main/othervm -Xmixed -Xbatch -XX:+UseAOT -XX:+TieredCompilation
+ * -XX:-UseCounterDecay -XX:-UseCompressedOops
+ * -XX:-Inline
+ * -XX:AOTLibrary=./libRecompilationTest2.so -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -Dcompiler.aot.RecompilationTest.check_level=-1
* compiler.aot.RecompilationTest
- * @run main/othervm -Xmixed -Xbatch -XX:+UseAOT -XX:-TieredCompilation -XX:-UseCounterDecay
- * -XX:CompileCommand=dontinline,*.*
- * -XX:AOTLibrary=./libRecompilationTest.so -Xbootclasspath/a:.
+ * @run main/othervm -Xmixed -Xbatch -XX:+UseAOT -XX:-TieredCompilation
+ * -XX:-UseCounterDecay -XX:-UseCompressedOops
+ * -XX:-Inline
+ * -XX:AOTLibrary=./libRecompilationTest2.so -Xbootclasspath/a:.
* -XX:+UnlockDiagnosticVMOptions -XX:+WhiteBoxAPI
* -Dcompiler.aot.RecompilationTest.check_level=-1
* compiler.aot.RecompilationTest