add configurable params

Summary: make cross-dex-penalty configurable. behavior-preserving. will tune the param later.

Reviewed By: NTillmann

Differential Revision: D55080922

fbshipit-source-id: 8ff1bbca1122e5d07c68e6ccff848ff2b2faab17

opt/methodinline/MethodInlinePass.cpp

@@ -57,6 +57,15 @@ void MethodInlinePass::bind_config() {
   bind("insn_has_lit_cost_3",
        DEFAULT_COST_CONFIG.insn_has_lit_cost_3,
        m_inliner_cost_config.insn_has_lit_cost_3);
+  bind("cross_dex_penalty_coe1",
+       DEFAULT_COST_CONFIG.cross_dex_penalty_coe1,
+       m_inliner_cost_config.cross_dex_penalty_coe1);
+  bind("cross_dex_penalty_coe2",
+       DEFAULT_COST_CONFIG.cross_dex_penalty_coe2,
+       m_inliner_cost_config.cross_dex_penalty_coe2);
+  bind("cross_dex_penalty_const",
+       DEFAULT_COST_CONFIG.cross_dex_penalty_const,
+       m_inliner_cost_config.cross_dex_penalty_const);
 }
 
 void MethodInlinePass::run_pass(DexStoresVector& stores,

service/method-inliner/Inliner.cpp

@@ -72,6 +72,23 @@ std::unordered_set<DexType*> gather_resolved_init_class_types(
   return refined_init_class_types;
 }
 
+// Inlining methods into different classes might lead to worse cross-dex-ref
+// minimization results. \returns the estimated cross dex penalty caused by
+// inlining.
+float estimate_cross_dex_penalty(const InlinedCost* inlined_cost,
+                                 const InlinerCostConfig& inliner_cost_config,
+                                 bool use_other_refs) {
+  float cross_dex_penalty =
+      inliner_cost_config.cross_dex_penalty_coe1 * inlined_cost->method_refs;
+  if (use_other_refs &&
+      (inlined_cost->method_refs + inlined_cost->other_refs) > 0) {
+    cross_dex_penalty +=
+        inliner_cost_config.cross_dex_penalty_coe2 * inlined_cost->other_refs +
+        inliner_cost_config.cross_dex_penalty_const;
+  }
+  return cross_dex_penalty;
+}
+
 } // namespace
 
 MultiMethodInliner::MultiMethodInliner(
@@ -1582,11 +1599,9 @@ bool MultiMethodInliner::too_many_callers(const DexMethod* callee) {
     } else {
       // Inlining methods into different classes might lead to worse
       // cross-dex-ref minimization results.
-      cross_dex_penalty = inlined_cost->method_refs;
-      if (callee_caller_refs->classes > 1 &&
-          (inlined_cost->method_refs + inlined_cost->other_refs) > 0) {
-        cross_dex_penalty++;
-      }
+      cross_dex_penalty = estimate_cross_dex_penalty(
+          inlined_cost, m_inliner_cost_config,
+          callee_caller_refs->classes > 1 ? true : false);
     }
   }
 
@@ -1671,10 +1686,8 @@ bool MultiMethodInliner::should_inline_at_call_site(
       (caller == nullptr || caller->get_class() != callee->get_class())) {
     // Inlining methods into different classes might lead to worse
     // cross-dex-ref minimization results.
-    cross_dex_penalty = inlined_cost->method_refs;
-    if (inlined_cost->method_refs + inlined_cost->other_refs > 0) {
-      cross_dex_penalty++;
-    }
+    cross_dex_penalty =
+        estimate_cross_dex_penalty(inlined_cost, m_inliner_cost_config, true);
   }
 
   float invoke_cost =

service/method-inliner/Inliner.h

@@ -81,6 +81,12 @@ struct InlinerCostConfig {
   size_t insn_has_lit_cost_2;
 
   size_t insn_has_lit_cost_3;
+
+  // Those configs are used to calculate the penalty for worse cross-dex-ref
+  // minimization results due to inlining.
+  size_t cross_dex_penalty_coe1;
+  size_t cross_dex_penalty_coe2;
+  size_t cross_dex_penalty_const;
 };
 
 const struct InlinerCostConfig DEFAULT_COST_CONFIG = {
@@ -99,6 +105,9 @@ const struct InlinerCostConfig DEFAULT_COST_CONFIG = {
     4, // insn_has_lit_cost_1
     2, // insn_has_lit_cost_2
     1, // insn_has_lit_cost_3
+    1, // cross_dex_penalty_coe1;
+    0, // cross_dex_penalty_coe2;
+    1, // cross_dex_penalty_const;
 };
 
 // All call-sites of a callee.