# HG changeset patch
# User Christian Haeubl <christian.haeubl@oracle.com>
# Date 1330136940 28800
# Node ID 83e7065e9c753326d6bf7423db49d9f01d4cbe93
# Parent  6872a9e3a4b96b3182b58e323a14b3a516293c2f
adjust inlining policy's maximum trivial size

diff -r 6872a9e3a4b9 -r 83e7065e9c75 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/GraalOptions.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/GraalOptions.java	Fri Feb 24 18:23:41 2012 -0800
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/GraalOptions.java	Fri Feb 24 18:29:00 2012 -0800
@@ -47,7 +47,7 @@
     public static boolean InlineMegamorphicCalls             = ____;
     public static int     InliningPolicy                     = 4;
     public static int     WeightComputationPolicy            = 2;
-    public static int     MaximumTrivialSize                 = 6;
+    public static int     MaximumTrivialSize                 = 10;
     public static int     MaximumInlineLevel                 = 30;
     public static int     MaximumDesiredSize                 = 6000;
     public static int     MaximumRecursiveInlining           = 1;
@@ -59,11 +59,13 @@
     public static float   MaximumInlineWeight                = 1.25f;
     public static float   InliningSizePenalty                = 1;
     // StaticSizeBasedInliningPolicy (1), MinimumCodeSizeBasedInlining (2),
-    // DynamicSizeBasedInliningPolicy (3), GreedySizeBasedInlining (4)
+    // DynamicSizeBasedInliningPolicy (3)
     public static int     MaximumInlineSize                  = 35;
+    // GreedySizeBasedInlining (4)
+    public static int     MaximumGreedyInlineSize            = 200;
+    // Common options for inlining policies 1 to 4
     public static float   NestedInliningSizeRatio            = 1f;
     public static float   BoostInliningForEscapeAnalysis     = 2f;
-    public static int     MaximumGreedyInlineSize            = 200;
     public static float   ProbabilityCapForInlining          = 1f;
 
     // escape analysis settings
diff -r 6872a9e3a4b9 -r 83e7065e9c75 graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/InliningPhase.java
--- a/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/InliningPhase.java	Fri Feb 24 18:23:41 2012 -0800
+++ b/graal/com.oracle.max.graal.compiler/src/com/oracle/max/graal/compiler/phases/InliningPhase.java	Fri Feb 24 18:29:00 2012 -0800
@@ -307,7 +307,7 @@
 
             double inlineRatio = Math.min(GraalOptions.ProbabilityCapForInlining, info.invoke.probability());
             double maxSize = Math.pow(GraalOptions.NestedInliningSizeRatio, info.level) * GraalOptions.MaximumGreedyInlineSize * inlineRatio;
-            maxSize = Math.max(maxSize, GraalOptions.MaximumInlineSize);
+            maxSize = Math.max(maxSize, GraalOptions.MaximumTrivialSize);
             return info.weight <= maxSize;
         }
     }